Revision 65bd6c25
| b/snf-astakos-app/astakos/im/templates/im/astakosgroup_detail.html | ||
|---|---|---|
| 6 | 6 |
{% with object.owners as owners %}
|
| 7 | 7 |
|
| 8 | 8 |
<div class="projects"> |
| 9 |
|
|
| 9 | 10 |
|
| 10 | 11 |
<h2> |
| 11 | 12 |
{% if object.is_member %}
|
| 12 | 13 |
<em> |
| 13 | 14 |
{% if object.is_owner %}
|
| 14 |
[ ADMINISTRATOR ] |
|
| 15 |
{% if object.is_enabled %}
|
|
| 16 |
[ ADMINISTRATOR - ACTIVE ] |
|
| 17 |
{% else %}
|
|
| 18 |
[ ADMINISTRATOR - PENDING ] |
|
| 19 |
{% endif %}
|
|
| 15 | 20 |
{% else %}
|
| 16 |
[ ENROLLED ] |
|
| 21 |
{% if object.is_active_member %}
|
|
| 22 |
[ ENROLLED - ACTIVE ] |
|
| 23 |
{% else %}
|
|
| 24 |
[ ENROLLED - PENDING ] |
|
| 25 |
{% endif %}
|
|
| 17 | 26 |
{% endif %}
|
| 18 | 27 |
</em> |
| 19 | 28 |
{% endif %}
|
| ... | ... | |
| 119 | 128 |
<p>No resources</p> |
| 120 | 129 |
{% endif %}
|
| 121 | 130 |
</div> |
| 122 |
|
|
| 131 |
{% if object.is_owner %}
|
|
| 123 | 132 |
<div class="full-dotted"> |
| 124 | 133 |
{% with page|concat:sorting as args %}
|
| 125 | 134 |
{% with object.membership_set.select_related.all|paginate:args as membership %}
|
| ... | ... | |
| 153 | 162 |
{% if m.is_approved %}
|
| 154 | 163 |
<td>Approved |
| 155 | 164 |
{% if object.is_owner %}
|
| 156 |
<a href="{% url disapprove_member object.id m.person.id %}?{% if page %}page={{ page }}{% endif %}{% if sorting %}&sorting={{sorting}}{% endif %}">Reject</a>
|
|
| 165 |
<a href="{% url disapprove_member object.id m.person.id %}?{% if page %}page={{ page }}{% endif %}{% if sorting %}&sorting={{sorting}}{% endif %}">Remove</a>
|
|
| 157 | 166 |
{% endif %}
|
| 158 | 167 |
</td> |
| 159 | 168 |
{% else %}
|
| ... | ... | |
| 192 | 201 |
</div> |
| 193 | 202 |
|
| 194 | 203 |
|
| 195 |
{% if object.is_owner %}
|
|
| 204 |
|
|
| 196 | 205 |
<div class="full-dotted"> |
| 197 | 206 |
<form action="{% url astakos.im.views.group_detail object.id %}#members-table" method="post" class="withlabels" >{% csrf_token %}
|
| 198 | 207 |
<h2>Enroll more members</h2> |
| b/snf-astakos-app/astakos/im/templates/im/astakosgroup_list.html | ||
|---|---|---|
| 106 | 106 |
<!--td>{{o.kindname|capfirst}}</td-->
|
| 107 | 107 |
<td style="width:13%">{{o.issue_date|date:"d/m/Y"}}</td>
|
| 108 | 108 |
<td style="width:13%">{{o.expiration_date|date:"d/m/Y"}}</td>
|
| 109 |
<td style="width:13%">{{o.approved_members_num}}</td>
|
|
| 109 |
<td style="width:11%">{{o.approved_members_num}}</td>
|
|
| 110 | 110 |
|
| 111 |
<td style="width:15%">
|
|
| 111 |
<td style="width:17%">
|
|
| 112 | 112 |
<div class="msg-wrap"> |
| 113 | 113 |
|
| 114 | 114 |
{% if o.is_member %}
|
| ... | ... | |
| 125 | 125 |
|
| 126 | 126 |
|
| 127 | 127 |
{% else %}
|
| 128 |
Pending
|
|
| 128 |
Activation pending
|
|
| 129 | 129 |
{% endif %}
|
| 130 | 130 |
{% else %}
|
| 131 | 131 |
Not member |
| ... | ... | |
| 220 | 220 |
{% if not form %}
|
| 221 | 221 |
{% with page|concat:sorting as args %}
|
| 222 | 222 |
{% with q|paginate:args as page_obj %}
|
| 223 |
|
|
| 224 |
<div >
|
|
| 223 |
{% if page_obj.object_list %}
|
|
| 224 |
<div> |
|
| 225 | 225 |
<form method="GET" class="minimal" action="#allGroups" id="mygroups"> |
| 226 | 226 |
<div class="form-row"> |
| 227 | 227 |
<select name="sorting" class="dropkicked" tabindex="1"> |
| ... | ... | |
| 257 | 257 |
<!--td>{{o.kindname|capfirst}}</td-->
|
| 258 | 258 |
<td style="width:13%">{{o.issue_date|date:"d/m/Y"}}</td>
|
| 259 | 259 |
<td style="width:13%">{{o.expiration_date|date:"d/m/Y"}}</td>
|
| 260 |
<td style="width:13%">{{ o.approved_members_num }}</td>
|
|
| 261 |
<td style="width:15%">
|
|
| 260 |
<td style="width:11%">{{ o.approved_members_num }}</td>
|
|
| 261 |
<td style="width:17%">
|
|
| 262 | 262 |
<div class="msg-wrap"> |
| 263 | 263 |
{% if user.email = o.groupowner %}
|
| 264 | 264 |
{% if o.is_enabled %}
|
| 265 |
Owner
|
|
| 265 |
Active (Owner)
|
|
| 266 | 266 |
{% else %}
|
| 267 | 267 |
Pending |
| 268 | 268 |
{% endif %}
|
| ... | ... | |
| 272 | 272 |
Registered |
| 273 | 273 |
|
| 274 | 274 |
{% else %}
|
| 275 |
Pending |
|
| 275 |
Activation Pending
|
|
| 276 | 276 |
{% endif %}
|
| 277 | 277 |
{% else %}
|
| 278 | 278 |
- |
| ... | ... | |
| 346 | 346 |
</span> |
| 347 | 347 |
</p> |
| 348 | 348 |
</div> |
| 349 |
|
|
| 349 |
{% endif %}
|
|
| 350 | 350 |
{% endwith %}
|
| 351 | 351 |
{% endwith %}
|
| 352 | 352 |
{% endif %}
|
| b/snf-astakos-app/astakos/im/templatetags/filters.py | ||
|---|---|---|
| 183 | 183 |
if num == 1: |
| 184 | 184 |
return '1 byte' |
| 185 | 185 |
else: |
| 186 |
return ''; |
|
| 186 |
return '0';
|
|
| 187 | 187 |
|
| 188 | 188 |
@register.filter |
| 189 | 189 |
def isinf(v): |
Also available in: Unified diff