Commit 5d885006 by liuyingying

成员顺序

parent 5b1394f8
...@@ -235,7 +235,6 @@ nav>div{ ...@@ -235,7 +235,6 @@ nav>div{
} }
#former_member{ #former_member{
margin-top:30px; margin-top:30px;
padding-top:20px;
background-color: #ffffff; background-color: #ffffff;
} }
......
...@@ -107,7 +107,7 @@ ...@@ -107,7 +107,7 @@
</div> </div>
{% endfor %} {% endfor %}
</div> </div>
<div class="wrap"> <div class="wrap" style="padding-top:30px;">
{% for tp,users in user_type_list.items %} {% for tp,users in user_type_list.items %}
<div class="member_type"> <div class="member_type">
{% if users %} {% if users %}
......
...@@ -32,10 +32,7 @@ def index(request): ...@@ -32,10 +32,7 @@ def index(request):
else: else:
u.member_type = "Phd" u.member_type = "Phd"
member_type = u.member_type member_type = u.member_type
if member_type in user_type_list.keys():
user_type_list[member_type].append(u) user_type_list[member_type].append(u)
else:
user_type_list[member_type] = [u]
user_list_former = User.objects.filter(isCurrent=0, identity='0').all() user_list_former = User.objects.filter(isCurrent=0, identity='0').all()
user_type_list_former = {"Academic STAFF": [], "Phd": [], "Master": [], "Engineer STAFF": []} user_type_list_former = {"Academic STAFF": [], "Phd": [], "Master": [], "Engineer STAFF": []}
...@@ -51,10 +48,7 @@ def index(request): ...@@ -51,10 +48,7 @@ def index(request):
else: else:
u.member_type = "Phd" u.member_type = "Phd"
member_type = u.member_type member_type = u.member_type
if member_type in user_type_list_former.keys():
user_type_list_former[member_type].append(u) user_type_list_former[member_type].append(u)
else:
user_type_list_former[member_type] = [u]
publication_list = Publications.objects.filter(isOpen='1').order_by('-date') publication_list = Publications.objects.filter(isOpen='1').order_by('-date')
publication_year_list = {} publication_year_list = {}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment