Skip to content
This repository has been archived by the owner on Sep 19, 2024. It is now read-only.

Made Few Changes #380

Open
wants to merge 3 commits into
base: development
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 18 additions & 3 deletions Home/static/home/assets/css/template.css
Original file line number Diff line number Diff line change
Expand Up @@ -57,14 +57,16 @@ iframe{
width:100%;
bottom:0;
left:0;
padding:15px 30px;
padding:0px 10px;
font-size:11px;
margin-top: 50px;
margin-bottom: 0px;
}

.sidebar .social-icons a{
position: relative;
font-size:12px;
margin-right:10px;
margin-bottom: 0px;
}

.wrapper{
Expand Down Expand Up @@ -1939,6 +1941,19 @@ textarea {
height: 80%;
}

.dropdown-item p:hover{
/* .dropdown-item p:hover{
background-color: black;
} */

div.dropdown-menu {
background-color:#ffffff;
overflow-y:scroll;
height:230px;
width:620px;
position:relative;
right:5px;
}

.dropdown-item p:hover {
background-color: #BDBDBD;
}
4 changes: 2 additions & 2 deletions clubManagement/templates/clubManagement/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,8 @@ <h5 class="card-subtitle col-md-12 text-muted">Attendance report</h5>
<input type="hidden" id="search-id" name="user_id">
<div class="dropdown-menu" id="search-results">
{% for user in user_list %}
<p onclick="addText({{ user.id }}, '{{ user.first_name }} {{ user.last_name }}')"
class="dropdown-item">{{ user.first_name }} {{ user.last_name }}</p>
<div onclick="addText({{ user.id }}, '{{ user.first_name }} {{ user.last_name }}')"
class="dropdown-item"><p>{{ user.first_name }} {{ user.last_name }}</p></div>
{% endfor %}
</div>
</div>
Expand Down
Binary file not shown.
Binary file not shown.
9 changes: 5 additions & 4 deletions registration/static/registration/fonts/icomoon/style.css
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
@font-face {
font-family: 'icomoon';
src:url('fonts/icomoon.eot');
src:
url('fonts/icomoon.ttf?8dntj0') format('truetype'),
url('fonts/icomoon.woff?8dntj0') format('woff'),
url('fonts/icomoon.svg?8dntj0#icomoon') format('svg');
url('fonts/icomoon.eot') format('embedded-openttype'),
url('fonts/icomoon.ttf') format('truetype'),
url('fonts/icomoon.woff') format('woff'),
url('fonts/icomoon.svg#icomoon') format('svg');
font-weight: normal;
font-style: normal;
}
Expand Down Expand Up @@ -2132,4 +2134,3 @@
.crt-icon-meetup:before {
content: "\f2e0";
}

6 changes: 3 additions & 3 deletions registration/templates/registration/profile.html
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ <h2 class="text-upper">{{ user_info.user.first_name }} {{ user_info.user.last_na
</div><!-- #crt-side-box -->
</div><!-- #crt-side-box-wrap -->

<div id="crt-nav-wrap" class="hidden-sm hidden-xs">
<div id="crt-nav-wrap">
<div id="crt-nav-inner">
<div class="crt-nav-cont">
<div id="crt-nav-scroll">
Expand Down Expand Up @@ -335,9 +335,9 @@ <h2 class="title-lg text-upper">Teams</h2>
<div class="ref-info">
{% for team in teams %}
<blockquote class="ref-cont clear-mrg">
<a href="{% url 'team_detail' team.id %}">
<a href="{% url 'team_detail' team.team.id %}">
<ul>
<li><p>{{ team.name }}</p></li>
<li><p>{{ team.team.name }}</p></li>
</ul>
</a>
</blockquote>
Expand Down
4 changes: 2 additions & 2 deletions registration/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
import xlrd, datetime
from allauth.socialaccount.models import SocialAccount
from achievements.models import Contribution
from clubManagement.models import Team
from clubManagement.models import Team, TeamMember
from projects.models import Project
from registration.forms import UserSignUpForm, UserForm
from registration.models import UserInfo, WorkExperience
Expand Down Expand Up @@ -91,7 +91,7 @@ def get_context_data(self, **kwargs):
context['user_info'] = UserInfo.objects.get(user=self.get_object())
except User.DoesNotExist:
context['error'] = 'No data found for this user!'
context['teams'] = Team.objects.filter(created_by=self.get_object())
context['teams'] = TeamMember.objects.filter(user=self.get_object())
context['projects'] = Project.objects.filter(created_by=self.get_object())
context['objects'] = WorkExperience.objects.order_by('-end_date')
return context
Expand Down