Revision 0a63687f

b/snf-astakos-app/astakos/im/templates/im/astakosgroup_detail.html
48 48
			 			Not set yet
49 49
			 		{% endif %}
50 50
			 	</dd>
51
			 	<dt>Moderation</dt>
51
			 	<dt>Moderated</dt>
52 52
			 	<dd>
53 53
			 		{{ object.moderation_enabled|yesno:"Yes, No" }}
54 54
			 	</dd>
......
73 73
		 	<dd>{{ object.name }}&nbsp;</dd>
74 74
		 	<!--<dt>Type</dt>
75 75
		 	<dd>{{object.kindname|capfirst}}&nbsp;</dd>-->
76
		 	<dt>Issue date:</dt>
76
		 	<dt>Start date</dt>
77 77
		 	<dd>{{object.issue_date|date:"d/m/Y"}}&nbsp;</dd>
78
		 	<dt>Expiration Date</dt>
78
		 	<dt>End Date</dt>
79 79
		 	<dd>{{object.expiration_date|date:"d/m/Y"}}&nbsp;</dd>
80 80
<!--
81 81
		 	<dt>Moderation</dt>
......
94 94
                    {% endif %}
95 95
                {% endfor %}&nbsp;
96 96
            </dd>
97
            <dt>Max participants</dt>
97
            <dt>Total number of members</dt>
98 98
		 	<dd>{% if object.max_participants%}{{object.max_participants}}{% else %}&nbsp;{% endif %}</dd>
99 99
		 </dl>
100 100
	 </div>
......
181 181
             <div class="pagination">
182 182
                <p class="next-prev">
183 183
                    {% if membership.has_previous %}
184
                        <a href="?page={{ membership.previous_page_number }}{% if sorting %}&sorting={{sorting}}{% endif %}">previous</a>
184
                        <a href="?page={{ membership.previous_page_number }}{% if sorting %}&sorting={{sorting}}{% endif %}">< previous</a>
185
                    {% else  %}
186
                        	<a href="javascript:void()" class="disabled">< previous</a>
185 187
                    {% endif %}
186 188
                    {% if membership.has_next %}
187
                        <a href="?page={{ membership.next_page_number }}{% if sorting %}&sorting={{sorting}}{% endif %}">next</a>
189
                        <a href="?page={{ membership.next_page_number }}{% if sorting %}&sorting={{sorting}}{% endif %}">next ></a>
190
                    {% else  %}
191
                        	<a href="javascript:void()" class="disabled">next ></a>
188 192
                    {% endif %}
189 193
                </p>
190 194
                <p class="nums">
b/snf-astakos-app/astakos/im/templates/im/astakosgroup_form_summary.html
21 21
			<dl class="alt-style">			    
22 22
				<dt>Homepage Url</dt>
23 23
				<dd>{{ data.homepage }}&nbsp;</dd>
24
				<dt>Modaration</dt>
24
				<dt>Modarated</dt>
25 25
			 	<dd>{{ data.moderation_enabled|yesno:"Yes, No" }}</dd>
26 26
			</dl>
27 27
		</div>
......
32 32
			 	<dd>{{ data.name }}&nbsp;</dd>
33 33
			 	<!--<dt>Type</dt>
34 34
			 	<dd>Course&nbsp;</dd>-->
35
			 	<dt>Issue date:</dt>
35
			 	<dt>Start date</dt>
36 36
			 	<dd>{{ data.issue_date|date:"d/m/Y"}}&nbsp;</dd>
37
			 	<dt>Expiration Date</dt>
37
			 	<dt>End Date</dt>
38 38
			 	<dd>{{ data.expiration_date|date:"d/m/Y"}}&nbsp;</dd>
39
			 	<dt>Max members per group</dt>
39
			 	<dt>Total number of members</dt>
40 40
			 	<dd>{% if  data.max_participants %}{{ data.max_participants }}{% else %}Unlimited{% endif %}</dd>
41 41
			 </dl>
42 42
		 </div>
......
49 49
		 		{% for p in policies %}
50 50
			 		 
51 51
			 		<dt>
52
           				Max {% if p.is_abbreviation %}{{ p.name|upper }}{% else %}{{ p.name }}{% endif %}{% if not p.unit %}s {% endif  %}  per user
52
           				Max {% if p.is_abbreviation %}{{ p.verbose_name|upper }}{% else %}{{ p.verbose_name }}{% endif %}{% if not p.unit %}s {% endif  %}  per user
53 53
           			</dt>
54 54
			 		<dd>
55 55
           			{% if p.uplimit %}
b/snf-astakos-app/astakos/im/templates/im/astakosgroup_list.html
86 86
                  <tr>
87 87
                    <th>Name</th>
88 88
                    <!--<th>Type</th>-->
89
                    <th>Issued</th>
90
                    <th>Expires</th>
89
                    <th>Start date</th>
90
                    <th>End date</th>
91 91
                     
92
                    <th>Enrolled</th>
92
                    <th>Members</th>
93 93
                   
94 94
                     
95 95
                    <th>Status</th>
......
203 203
	    <div class="pagination">
204 204
			<p class="next-prev">
205 205
		        {% if page_obj.has_previous %}
206
	                <a href="?page={{ page_obj.previous_page_number }}{% if q %}&q={{q}}{% endif %}{% if sorting %}&sorting={{sorting}}{% endif %}">previous</a>
206
	                <a href="?page={{ page_obj.previous_page_number }}{% if q %}&q={{q}}{% endif %}{% if sorting %}&sorting={{sorting}}{% endif %}">< previous</a>
207
	            {% else  %}
208
                        	<a href="javascript:void()" class="disabled">< previous</a>    
207 209
	            {% endif %}
208 210
	            {% if page_obj.has_next %}
209
	                <a href="?page={{ page_obj.next_page_number }}{% if q %}&q={{q}}{% endif %}{% if sorting %}&sorting={{sorting}}{% endif %}">next</a>
211
	                <a href="?page={{ page_obj.next_page_number }}{% if q %}&q={{q}}{% endif %}{% if sorting %}&sorting={{sorting}}{% endif %}">next ></a>
212
	            {% else  %}
213
                        	<a href="javascript:void()" class="disabled">next ></a>
210 214
	            {% endif %}
211 215
	    	</p>
212 216
			<p class="nums">
......
240 244
			              <tr>
241 245
			                <th>Name</th>
242 246
			                <!--th>Type</th-->
243
			                <th>Issued</th>
244
			                <th>Expires</th>
245
			                <th>Enrolled</th>
247
			                <th>Start date</th>
248
			                <th>End date</th>
249
			                <th>Members</th>
246 250
			                <th>Status</th>
247 251
			                <th>&nbsp;</th>
248 252
			                <th class="centered">Moderated</th>
......
334 338
				<div class="pagination">
335 339
					<p class="next-prev">
336 340
				        {% if page_obj.has_previous %}
337
                            <a href="?page={{ page_obj.previous_page_number }}{% if sorting %}&sorting={{ sorting }}{% endif%}#allGroups">previous</a>
341
                            <a href="?page={{ page_obj.previous_page_number }}{% if sorting %}&sorting={{ sorting }}{% endif%}#allGroups">< previous</a>
342
                        {% else  %}
343
                        	<a href="javascript:void()" class="disabled">< previous</a>
338 344
                        {% endif %}
339 345
			            {% if page_obj.has_next %}
340
                            <a href="?page={{ page_obj.next_page_number }}{% if sorting %}&sorting={{ sorting }}{% endif%}#allGroups">next</a>
346
                            <a href="?page={{ page_obj.next_page_number }}{% if sorting %}&sorting={{ sorting }}{% endif%}#allGroups">next ></a>
347
                        {% else %}
348
							<a href="javascript:void()" class="disabled">next ></a>
341 349
                        {% endif %}
342 350
			    	</p>
343 351
					<p class="nums">

Also available in: Unified diff