Skip to content

GitLab

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

Uniform text in group details/group list

parent 9704633c
Hide whitespace changes
Inline Side-by-side
Showing with 33 additions and 21 deletions
snf-astakos-app/astakos/im/templates/im/astakosgroup_detail.html
View file @ f0491e0f
......@@ -48,7 +48,7 @@
Not set yet
{% endif %}
</dd>
<dt>Moderation</dt>
<dt>Moderated</dt>
<dd>
{{ object.moderation_enabled|yesno:"Yes, No" }}
</dd>
......@@ -73,9 +73,9 @@
<dd>{{ object.name }}&nbsp;</dd>
<!--<dt>Type</dt>
<dd>{{object.kindname|capfirst}}&nbsp;</dd>-->
<dt>Issue date:</dt>
<dt>Start date</dt>
<dd>{{object.issue_date|date:"d/m/Y"}}&nbsp;</dd>
<dt>Expiration Date</dt>
<dt>End Date</dt>
<dd>{{object.expiration_date|date:"d/m/Y"}}&nbsp;</dd>
<!--
<dt>Moderation</dt>
......@@ -94,7 +94,7 @@
{% endif %}
{% endfor %}&nbsp;
</dd>
<dt>Max participants</dt>
<dt>Total number of members</dt>
<dd>{% if object.max_participants%}{{object.max_participants}}{% else %}&nbsp;{% endif %}</dd>
</dl>
</div>
......@@ -181,10 +181,14 @@
<div class="pagination">
<p class="next-prev">
{% if membership.has_previous %}
<a href="?page={{ membership.previous_page_number }}{% if sorting %}&sorting={{sorting}}{% endif %}">previous</a>
<a href="?page={{ membership.previous_page_number }}{% if sorting %}&sorting={{sorting}}{% endif %}">< previous</a>
{% else %}
<a href="javascript:void()" class="disabled">< previous</a>
{% endif %}
{% if membership.has_next %}
<a href="?page={{ membership.next_page_number }}{% if sorting %}&sorting={{sorting}}{% endif %}">next</a>
<a href="?page={{ membership.next_page_number }}{% if sorting %}&sorting={{sorting}}{% endif %}">next ></a>
{% else %}
<a href="javascript:void()" class="disabled">next ></a>
{% endif %}
</p>
<p class="nums">
......
snf-astakos-app/astakos/im/templates/im/astakosgroup_form_summary.html
View file @ f0491e0f
......@@ -21,7 +21,7 @@
<dl class="alt-style">
<dt>Homepage Url</dt>
<dd>{{ data.homepage }}&nbsp;</dd>
<dt>Modaration</dt>
<dt>Modarated</dt>
<dd>{{ data.moderation_enabled|yesno:"Yes, No" }}</dd>
</dl>
</div>
......@@ -32,11 +32,11 @@
<dd>{{ data.name }}&nbsp;</dd>
<!--<dt>Type</dt>
<dd>Course&nbsp;</dd>-->
<dt>Issue date:</dt>
<dt>Start date</dt>
<dd>{{ data.issue_date|date:"d/m/Y"}}&nbsp;</dd>
<dt>Expiration Date</dt>
<dt>End Date</dt>
<dd>{{ data.expiration_date|date:"d/m/Y"}}&nbsp;</dd>
<dt>Max members per group</dt>
<dt>Total number of members</dt>
<dd>{% if data.max_participants %}{{ data.max_participants }}{% else %}Unlimited{% endif %}</dd>
</dl>
</div>
......@@ -49,7 +49,7 @@
{% for p in policies %}
<dt>
Max {% if p.is_abbreviation %}{{ p.name|upper }}{% else %}{{ p.name }}{% endif %}{% if not p.unit %}s {% endif %} per user
Max {% if p.is_abbreviation %}{{ p.verbose_name|upper }}{% else %}{{ p.verbose_name }}{% endif %}{% if not p.unit %}s {% endif %} per user
</dt>
<dd>
{% if p.uplimit %}
......
snf-astakos-app/astakos/im/templates/im/astakosgroup_list.html
View file @ f0491e0f
......@@ -86,10 +86,10 @@
<tr>
<th>Name</th>
<!--<th>Type</th>-->
<th>Issued</th>
<th>Expires</th>
<th>Start date</th>
<th>End date</th>
<th>Enrolled</th>
<th>Members</th>
<th>Status</th>
......@@ -203,10 +203,14 @@
<div class="pagination">
<p class="next-prev">
{% if page_obj.has_previous %}
<a href="?page={{ page_obj.previous_page_number }}{% if q %}&q={{q}}{% endif %}{% if sorting %}&sorting={{sorting}}{% endif %}">previous</a>
<a href="?page={{ page_obj.previous_page_number }}{% if q %}&q={{q}}{% endif %}{% if sorting %}&sorting={{sorting}}{% endif %}">< previous</a>
{% else %}
<a href="javascript:void()" class="disabled">< previous</a>
{% endif %}
{% if page_obj.has_next %}
<a href="?page={{ page_obj.next_page_number }}{% if q %}&q={{q}}{% endif %}{% if sorting %}&sorting={{sorting}}{% endif %}">next</a>
<a href="?page={{ page_obj.next_page_number }}{% if q %}&q={{q}}{% endif %}{% if sorting %}&sorting={{sorting}}{% endif %}">next ></a>
{% else %}
<a href="javascript:void()" class="disabled">next ></a>
{% endif %}
</p>
<p class="nums">
......@@ -240,9 +244,9 @@
<tr>
<th>Name</th>
<!--th>Type</th-->
<th>Issued</th>
<th>Expires</th>
<th>Enrolled</th>
<th>Start date</th>
<th>End date</th>
<th>Members</th>
<th>Status</th>
<th>&nbsp;</th>
<th class="centered">Moderated</th>
......@@ -334,10 +338,14 @@
<div class="pagination">
<p class="next-prev">
{% if page_obj.has_previous %}
<a href="?page={{ page_obj.previous_page_number }}{% if sorting %}&sorting={{ sorting }}{% endif%}#allGroups">previous</a>
<a href="?page={{ page_obj.previous_page_number }}{% if sorting %}&sorting={{ sorting }}{% endif%}#allGroups">< previous</a>
{% else %}
<a href="javascript:void()" class="disabled">< previous</a>
{% endif %}
{% if page_obj.has_next %}
<a href="?page={{ page_obj.next_page_number }}{% if sorting %}&sorting={{ sorting }}{% endif%}#allGroups">next</a>
<a href="?page={{ page_obj.next_page_number }}{% if sorting %}&sorting={{ sorting }}{% endif%}#allGroups">next ></a>
{% else %}
<a href="javascript:void()" class="disabled">next ></a>
{% endif %}
</p>
<p class="nums">
......
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