Revision ef2b6ef0 snf-astakos-app/astakos/im/templates/im/projects/project_list.html

b/snf-astakos-app/astakos/im/templates/im/projects/project_list.html
61 61
    {% if is_search %}
62 62
   		
63 63
    	{% if object_list %}
64
    	 
64 65
        <div> 
65 66
            <table class="alt-style complex" id="searchResults">
66 67
                <caption>
......
68 69
                </caption>
69 70
                <thead>
70 71
                  <tr>
71
                    <th><a href="?{% if q %}q={{q}}&{% endif %}sorting={% if sorting == 'name' %}-name{% else %}name{% endif %}#searchResults">Name</a></th>
72
                    <th><a href="?{% if q %}q={{q}}&{% endif %}sorting={% if sorting == 'issue_date' %}-issue_date{% else %}issue_date{% endif %}#searchResults">Issue Date</a></th>
73
                    <th><a href="?{% if q %}q={{q}}&{% endif %}sorting={% if sorting == 'start_date' %}-start_date{% else %}start_date{% endif %}#searchResults">Start Date</a></th>
74
                    <th><a href="?{% if q %}q={{q}}&{% endif %}sorting={% if sorting == 'end_date' %}-end_date{% else %}end_date{% endif %}#searchResults">End Date</a></th>
75
                    <th><a href="#searchResults">Enrolled</a></th>
76
                    <th><a href="?{% if q %}q={{q}}&{% endif %}sorting={% if sorting == 'state' %}-state{% else %}state{% endif %}#searchResults">Status</a></th>
72
                    <th><a href="?{% if q %}q={{q}}&{% endif %}sorting={% if sorting == 'name' %}-name{% else %}name{% endif %}#searchResults" class="sortable {% if sorting == 'name' %}asc{% endif %}">Name</a></th>
73
                    
74
                    <th><a href="?{% if q %}q={{q}}&{% endif %}sorting={% if sorting == 'start_date' %}-start_date{% else %}start_date{% endif %}#searchResults" class="sortable {% if sorting == 'start_date' %}asc{% endif %}">Start Date</a></th>
75
                    <th><a href="?{% if q %}q={{q}}&{% endif %}sorting={% if sorting == 'end_date' %}-end_date{% else %}end_date{% endif %}#searchResults" class="sortable {% if sorting == 'end_date' %}asc{% endif %}">End Date</a></th>
76
                    <th ><a href="#searchResults">Members</a></th>
77
                    <th><a href="?{% if q %}q={{q}}&{% endif %}sorting={% if sorting == 'state' %}-state{% else %}state{% endif %}#searchResults" class="sortable {% if sorting == 'state' %}asc{% endif %}">Status</a></th>
77 78
                    <th>&nbsp;</th>
78 79
			        <th><a href="#searchResults">Membership Status</a></th>
79 80
                    <th>&nbsp;</th>
80
			        <th><a href="?{% if q %}q={{q}}&{% endif %}sorting={% if sorting == 'member_join_policy__description' %}-member_join_policy__description{% else %}member_join_policy__description{%endif%}#searchResults">Member Join Policy</a></th>
81
                    <th><a href="?{% if q %}q={{q}}&{% endif %}sorting={% if sorting == 'member_leave_policy__description' %}-member_leave_policy__description{% else %}member_leave_policy__description{%endif%}#searchResults">Member Leave Policy</a></th>
81
			         
82 82
                    <!-- <th>&nbsp;</th>-->
83 83
                  </tr>
84 84
                </thead>
......
88 88
                  {% with o.project.approved_members as approved_members%}
89 89
                   <tr class="{% cycle 'tr1' 'tr2' %}">
90 90
	                    <td><a href="{% url project_detail o.id %}" title="visit project page">{{o.name|truncatename}}</a></td>
91
	                    <!--td>{{o.kindname|capfirst}}</td-->
92
	                    <td>{{o.issue_date|date:"d/m/Y"}}</td>
91
	                    
93 92
	                    <td>{{o.start_date|date:"d/m/Y"}}</td>
94 93
	                    <td>{{o.end_date|date:"d/m/Y"}}</td>
95 94
	                    <td>{{approved_members|length}}</td>
96 95
	                    <td>
97 96
	                        {{o.state}}
98 97
	                    </td>
99
	                    <td>{% if o.state != 'Replaced' %}<a href="{% url project_update o.id %}">Update</a>{% endif %}</td>
98
	                    <td>{% if user == o.owner %}{% if o.state != 'Replaced' %}<a href="{% url project_update o.id %}">Update</a>{% endif %}{% else %}&nbsp;{% endif %}</td>
100 99
	                    <td>
101 100
	                    	<div class="msg-wrap">
102 101
	                        {% if user == o.owner %}
......
121 120
		                        {% if user in approved_members %}    
122 121
			                       	{% if not user == o.owner %}
123 122
			                            <form action="{% url project_leave o.id %}?next={{request.path}}" method="post" class="link-like">{% csrf_token %}
124
			                                 <input type="submit"  value="x leave group" class="leave"/>
123
			                                 <input type="submit"  value="x leave" class="leave"/>
125 124
			                            </form>
126 125
			                            <div class="dialog">
127 126
					                		Are you sure you what to leave this project?<br>
......
138 137
		                    {% else %}
139 138
		                       {% if o.project.is_alive and not user == o.owner %}
140 139
		                                <form action="{% url project_join o.id %}?next={{request.path}}" method="post" class="link-like">{% csrf_token %}
141
		                                    <input type="submit"   value="+ join group" class="join_group join" />
140
		                                    <input type="submit"   value="+ join" class="join_group join" />
142 141
		                                </form>
143 142
		                                <div class="dialog">
144 143
					                		Are you sure you what to join this project?<br>
......
151 150
		                    {% endif %}
152 151
	                    	</div>
153 152
	                    </td>
154
			            <td class="centered">{{o.member_join_policy}}</td>
155
	                    <td class="centered">{{o.member_leave_policy}}</td>
153
			            
156 154
	                    <!--td><a href="#" class="more-info" title="more info">+ more info</a></td-->
157 155
                  </tr>
158 156
                  <tr class="{% cycle 'tmore1' 'tmore2' %}" style="display:none">
......
172 170
                  {% endfor %}
173 171
                </tbody>
174 172
            </table>
175
           
173
            <br><br><br><br><br>
174
            
176 175
        </div>
177 176
        
178 177
     
......
195 194
	            </span>
196 195
			</p>
197 196
	   </div>
198
	   
197
	   {% else %}
198
	   		<h2>No projects found!</h2>
199 199
	   {% endif %}
200 200
      
201 201
      <!-- Group listing -->
......
209 209
			            <caption>MY PROJECTS</caption>
210 210
			            <thead>
211 211
			              <tr>
212
		                    <th><a href="?sorting={% if sorting == 'name' %}-name{% else %}name{% endif %}#allGroups">Name</a></th>
213
                            <th><a href="?sorting={% if sorting == 'issue_date' %}-issue_date{% else %}issue_date{% endif %}#allGroups">Issue Date</a></th>
214
                            <th><a href="?sorting={% if sorting == 'start_date' %}-start_date{% else %}start_date{% endif %}#allGroups">Start Date</a></th>
215
                            <th><a href="?sorting={% if sorting == 'end_date' %}-end_date{% else %}end_date{% endif %}#allGroups">End Date</a></th>
216
                            <th><a href="#allGroups">Enrolled</a></th>
217
                            <th><a href="?sorting={% if sorting == 'state' %}-state{% else %}state{% endif %}#allGroups">Status</a></th>
212
		                    <th><a href="?sorting={% if sorting == 'name' %}-name{% else %}name{% endif %}#allGroups" class="sortable {% if sorting == 'name' %}asc{% endif %}">Name</a></th>
213
                             
214
                            <th><a href="?sorting={% if sorting == 'start_date' %}-start_date{% else %}start_date{% endif %}#allGroups" class="sortable {% if sorting == 'start_date' %}asc{% endif %}">Start Date</a></th>
215
                            <th><a href="?sorting={% if sorting == 'end_date' %}-end_date{% else %}end_date{% endif %}#allGroups" class="sortable {% if sorting == 'end_date' %}asc{% endif %}">End Date</a></th>
216
                            <th><a href="#allGroups">Members</a></th>
217
                            <th><a href="?sorting={% if sorting == 'state' %}-state{% else %}state{% endif %}#allGroups" class="sortable {% if sorting == 'status' %}asc{% endif %}">Status</a></th>
218 218
                            <th>&nbsp;</th>
219 219
                            <th><a href="#allGroups">Membership Status</a></th>
220 220
                            <th>&nbsp;</th>
221
                            <th><a href="?sorting={% if sorting == 'member_join_policy__description' %}-member_join_policy__description{% else %}member_join_policy__description{% endif %}#allGroups">Member Join Policy</a></th>
222
                            <th><a href="?sorting={% if sorting == 'member_leave_policy__description' %}-member_leave_policy__description{% else %}member_leave_policy__description{% endif %}#allGroups">Member Leave Policy</a></th>
221
                             
223 222
                            <!-- <th>&nbsp;</th>-->
224 223
			              </tr>
225 224
			            </thead>
......
229 228
                            {% with o.project.approved_members as approved_members %}
230 229
			              <tr class="{% cycle 'tr1' 'tr2' %}">
231 230
			                <td><a  href="{% url project_detail o.id %}" title="visit group page">{{o.name|truncatename }}</a></td>
232
			                <td>{{o.issue_date|date:"d/m/Y"}}</td>
231
			                
233 232
			                <td>{{o.start_date|date:"d/m/Y"}}</td>
234 233
			                <td>{{o.end_date|date:"d/m/Y"}}</td>
235 234
			                <td>{{approved_members|length}}</td>
236 235
			                <td>
237 236
		                        {{o.state}}
238 237
		                    </td>
239
		                    <td>{% if o.state != 'Replaced' %}<a href="{% url project_update o.id %}">Update</a>{% endif %}</td>
238
		                    <td>{% if user == o.owner %}{% if o.state != 'Replaced' %}<a href="{% url project_update o.id %}">Update</a>{% endif %}{% else %}&nbsp;{% endif %}</td>
240 239
			                <td>
241 240
		                    	 
242 241
		                        {% if user == o.owner %}
......
261 260
			                        {% if user in approved_members %}    
262 261
				                       	{% if not user == o.owner %}
263 262
				                            <form action="{% url project_leave o.id %}?next={{request.path}}" method="post" class="link-like">{% csrf_token %}
264
				                                 <input type="submit"  value="x leave group" class="leave"/>
263
				                                 <input type="submit"  value="x leave" class="leave"/>
265 264
				                            </form>
266 265
				                            <div class="dialog">
267 266
						                		Are you sure you what to leave this project?<br>
......
278 277
			                    {% else %}
279 278
			                        {% if o.project.is_alive and not user == o.owner %}
280 279
			                                <form action="{% url project_join o.id %}?next={{request.path}}" method="post" class="link-like">{% csrf_token %}
281
			                                    <input type="submit"   value="+ join group" class="join_group join" />
280
			                                    <input type="submit"   value="+ join" class="join_group join" />
282 281
			                                </form>
283 282
			                                <div class="dialog">
284 283
						                		Are you sure you what to join this project?<br>
......
291 290
			                    {% endif %}
292 291
		                    	</div>
293 292
		                    </td>
294
				            <td class="centered" >{{o.member_join_policy}}</td>
295
		                    <td class="centered">{{o.member_leave_policy}}</td>
296
				               <!-- <td><a href="#" class="more-info" title="more info">+ more info </a></td>-->
293
				            
294
				            <!-- <td><a href="#" class="more-info" title="more info">+ more info </a></td>-->
297 295
			              </tr>
298 296
			              <tr class="{% cycle 'tmore1' 'tmore2' %}" style="display:none">
299 297
			                <td colspan="11" class="info-td">
......
332 330
                        </span>
333 331
					</p>
334 332
			   </div>
333
			{% else %}
334
				No projects found!
335 335
		 	{% endif %}
336 336
        	 
337 337
	      	{% endif %}

Also available in: Unified diff