Revision 84a7cd69
b/snf-astakos-app/astakos/im/static/im/css/modules.css | ||
---|---|---|
376 | 376 |
.quotas-form fieldset { background:url(../images/dots.jpg) repeat-x scroll center bottom transparent; margin-bottom:3em; padding-bottom:3em; position:relative; } |
377 | 377 |
.quotas-form legend { color:#55B577; font-size:1.308em; margin-bottom:3em; position:relative; } |
378 | 378 |
.quotas-form legend span { color:#222; font-size:0.867em; } |
379 |
form.quotas-form legend span.info { position:relative; display:inline-block; top:auto; left:auto; margin-left:10px;} |
|
379 |
form.quotas-form legend span.info { position:relative; display:inline-block; top:auto; left:auto; margin-left:10px; vertical-align:middle; margin-top:-2px;}
|
|
380 | 380 |
form.quotas-form legend span.info em { position:static; } |
381 | 381 |
form.quotas-form legend span.info span { width:395px; } |
382 | 382 |
.quotas-form .with-checkbox .checkbox-widget { margin-top:9px; } |
... | ... | |
461 | 461 |
form.quotas-form span.error-msg span { display:block; color:red; } |
462 | 462 |
form.quotas-form span.error-msg em, |
463 | 463 |
form.quotas-form span.error-msg:hover em { background-position:-58px -3px; } |
464 |
.two-cols-links { margin:5em 0; } |
|
465 |
.two-cols-links p { width:auto; overflow:hidden; } |
|
466 |
.two-cols-links a { color:grey; display:block; margin-bottom:10px;} |
|
467 |
.two-cols-links a:hover { color:#F89A1C } |
|
468 |
.two-cols-links p:first-child { width:224px; float:left; overflow:auto } |
|
469 |
.two-cols-links p:first-child a { color:#222; } |
|
470 |
.two-cols-links p:first-child a:hover { color:#F89A1C } |
b/snf-astakos-app/astakos/im/templates/im/astakosgroup_list.html | ||
---|---|---|
66 | 66 |
<form method="GET" class="minimal" action="#searchResults"> |
67 | 67 |
<div class="form-row"> |
68 | 68 |
<select name="sorting" onchange="this.form.submit();" class="dropkicked" tabindex="1"> |
69 |
<option value="">Sort by Creation Date</option> |
|
70 |
<option value="groupname" {% if sorting == 'groupname' %}selected{% endif %}>Name</option> |
|
71 |
<!--option value="kindname" {% if sorting == 'kindname' %}selected{% endif %}>Type</option--> |
|
69 |
<option value="">Sort by Name</option> |
|
72 | 70 |
<option value="issue_date" {% if sorting == 'issue_date' %}selected{% endif %}>Issue date</option> |
73 | 71 |
<option value="expiration_date" {% if sorting == 'expiration_date' %}selected{% endif %}>Expiration Date</option> |
74 | 72 |
<option value="approved_members_num" {% if sorting == 'approved_members_num' %}selected{% endif %}>Participants</option> |
... | ... | |
194 | 192 |
<form method="GET" class="minimal" action="#allGroups" id="mygroups"> |
195 | 193 |
<div class="form-row"> |
196 | 194 |
<select name="sorting" class="dropkicked" tabindex="1"> |
197 |
<option value="">Sort by Creation Date</option> |
|
198 |
<option value="groupname" {% if sorting == 'groupname' %}selected{% endif %}>Sort by Name</option> |
|
195 |
<option value="">Sort by Name</option> |
|
199 | 196 |
<!--<option value="kindname" {% if sorting == 'kindname' %}selected{% endif %}>Type</option>--> |
200 | 197 |
<option value="issue_date" {% if sorting == 'issue_date' %}selected{% endif %}>Sort by Issue date</option> |
201 | 198 |
<option value="expiration_date" {% if sorting == 'expiration_date' %}selected{% endif %}>Sort by Expiration Date</option> |
b/snf-astakos-app/astakos/im/templates/im/profile.html | ||
---|---|---|
15 | 15 |
</div> |
16 | 16 |
|
17 | 17 |
</form> |
18 |
<p style="font-size:1.154em;"> |
|
19 |
<a href="{% url password_change %}">Change Password</a> |
|
20 |
</p> |
|
18 |
|
|
19 |
<div class="two-cols-links"> |
|
20 |
<p><a href="{% url password_change %}">Change Password</a></p> |
|
21 |
<p> |
|
22 |
<a href="https://okeanos.grnet.gr/home/">Back to ~okeanos</a> |
|
23 |
<a href="https://cyclades.okeanos.grnet.gr/ui/">Take me to cyclades</a> |
|
24 |
<a href="https://pithos.okeanos.grnet.gr/ui/">Take me to pithos+</a> |
|
25 |
</p> |
|
26 |
</div> |
|
21 | 27 |
{% endblock body %} |
b/snf-astakos-app/astakos/im/views.py | ||
---|---|---|
894 | 894 |
if sorting: |
895 | 895 |
query = query+" ORDER BY %s ASC" %sorting |
896 | 896 |
else: |
897 |
query = query+" ORDER BY creation_date DESC"
|
|
897 |
query = query+" ORDER BY groupname ASC"
|
|
898 | 898 |
q = AstakosGroup.objects.raw(query) |
899 | 899 |
|
900 | 900 |
|
... | ... | |
1061 | 1061 |
if sorting: |
1062 | 1062 |
# TODO check sorting value |
1063 | 1063 |
queryset = queryset.order_by(sorting) |
1064 |
else: |
|
1065 |
queryset = queryset.order_by("groupname") |
|
1064 | 1066 |
|
1065 | 1067 |
else: |
1066 | 1068 |
queryset = AstakosGroup.objects.none() |
... | ... | |
1108 | 1110 |
if sorting: |
1109 | 1111 |
# TODO check sorting value |
1110 | 1112 |
q = q.order_by(sorting) |
1113 |
else: |
|
1114 |
q = q.order_by("groupname") |
|
1115 |
|
|
1111 | 1116 |
return object_list( |
1112 | 1117 |
request, |
1113 | 1118 |
q, |
Also available in: Unified diff