Commit e1d529f0 authored by Olga Brani's avatar Olga Brani
Browse files

- Update user/project activation status

- Fix float bug
parent 5099a887
......@@ -6,14 +6,23 @@
{% with object.owners as owners %}
<div class="projects">
<h2>
{% if object.is_member %}
<em>
{% if object.is_owner %}
[ ADMINISTRATOR ]
{% if object.is_enabled %}
[ ADMINISTRATOR - ACTIVE ]
{% else %}
[ ADMINISTRATOR - PENDING ]
{% endif %}
{% else %}
[ ENROLLED ]
{% if object.is_active_member %}
[ ENROLLED - ACTIVE ]
{% else %}
[ ENROLLED - PENDING ]
{% endif %}
{% endif %}
</em>
{% endif %}
......@@ -119,7 +128,7 @@
<p>No resources</p>
{% endif %}
</div>
{% if object.is_owner %}
<div class="full-dotted">
{% with page|concat:sorting as args %}
{% with object.membership_set.select_related.all|paginate:args as membership %}
......@@ -153,7 +162,7 @@
{% if m.is_approved %}
<td>Approved
{% if object.is_owner %}
<a href="{% url disapprove_member object.id m.person.id %}?{% if page %}page={{ page }}{% endif %}{% if sorting %}&sorting={{sorting}}{% endif %}">Reject</a>
<a href="{% url disapprove_member object.id m.person.id %}?{% if page %}page={{ page }}{% endif %}{% if sorting %}&sorting={{sorting}}{% endif %}">Remove</a>
{% endif %}
</td>
{% else %}
......@@ -192,7 +201,7 @@
</div>
{% if object.is_owner %}
<div class="full-dotted">
<form action="{% url astakos.im.views.group_detail object.id %}#members-table" method="post" class="withlabels" >{% csrf_token %}
<h2>Enroll more members</h2>
......
......@@ -106,9 +106,9 @@
<!--td>{{o.kindname|capfirst}}</td-->
<td style="width:13%">{{o.issue_date|date:"d/m/Y"}}</td>
<td style="width:13%">{{o.expiration_date|date:"d/m/Y"}}</td>
<td style="width:13%">{{o.approved_members_num}}</td>
<td style="width:11%">{{o.approved_members_num}}</td>
<td style="width:15%">
<td style="width:17%">
<div class="msg-wrap">
{% if o.is_member %}
......@@ -125,7 +125,7 @@
{% else %}
Pending
Activation pending
{% endif %}
{% else %}
Not member
......@@ -220,8 +220,8 @@
{% if not form %}
{% with page|concat:sorting as args %}
{% with q|paginate:args as page_obj %}
<div >
{% if page_obj.object_list %}
<div>
<form method="GET" class="minimal" action="#allGroups" id="mygroups">
<div class="form-row">
<select name="sorting" class="dropkicked" tabindex="1">
......@@ -257,12 +257,12 @@
<!--td>{{o.kindname|capfirst}}</td-->
<td style="width:13%">{{o.issue_date|date:"d/m/Y"}}</td>
<td style="width:13%">{{o.expiration_date|date:"d/m/Y"}}</td>
<td style="width:13%">{{ o.approved_members_num }}</td>
<td style="width:15%">
<td style="width:11%">{{ o.approved_members_num }}</td>
<td style="width:17%">
<div class="msg-wrap">
{% if user.email = o.groupowner %}
{% if o.is_enabled %}
Owner
Active (Owner)
{% else %}
Pending
{% endif %}
......@@ -272,7 +272,7 @@
Registered
{% else %}
Pending
Activation Pending
{% endif %}
{% else %}
-
......@@ -346,7 +346,7 @@
</span>
</p>
</div>
{% endif %}
{% endwith %}
{% endwith %}
{% endif %}
......
......@@ -183,7 +183,7 @@ def sizeof_fmt(num):
if num == 1:
return '1 byte'
else:
return '';
return '0';
@register.filter
def isinf(v):
......
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