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

b/snf-astakos-app/astakos/im/templates/im/projects/project_list.html
66 66 
			            <option value="definition__start_date" {% if sorting == 'definition__start_date' %}selected{% endif %}>Sort by Start Date</option>
67 67 
			            <option value="definition__end_date" {% if sorting == 'definition__end_date' %}selected{% endif %}>Sort by End Date</option>
68 68 
			            <!-- <option value="approved_members_num" {% if sorting == 'approved_members_num' %}selected{% endif %}>Sort by Participants</option> -->
69 
			            <!-- <option value="status" {% if sorting == '' %}selected{% endif %}>Sort by Member Accept Policy</option> -->
69 70 
			            <option value="definition__member_accept_policy" {% if sorting == 'definition__member_accept_policy' %}selected{% endif %}>Sort by Member Accept Policy</option>
71 
			            <option value="definition__member_reject_policy" {% if sorting == 'definition__member_reject_policy' %}selected{% endif %}>Sort by Member Reject Policy</option>
70 72 
					</select>
71 73 
					<input type="hidden" name="q" value="{{q}}"/>
72 74 
				</div>
......
81 83 
                    <!--<th>Type</th>-->
82 84 
                    <th>Issued</th>
83 85 
                    <th>Starts</th>
84 
                    <th>Expires</th>
85
86 
                    <th>Ends</th>
86 87 
                    <th>Enrolled</th>
87
88
89 88 
                    <th>Status</th>
89 
                    <th>Membership Status</th>
90 90 
                    <th>&nbsp;</th>
91 91 
			        <th>Member accept policy</th>
92 
			        <th>Member reject policy</th>
92 93 
                   <!-- <th>&nbsp;</th>-->
93 94
94 95 
                  </tr>
......
104 105 
	                    <td style="width:13%">{{o.definition.start_date|date:"d/m/Y"}}</td>
105 106 
	                    <td style="width:13%">{{o.definition.end_date|date:"d/m/Y"}}</td>
106 107 
	                    <td style="width:11%">{{approved_members|length}}</td>
107
108 
	                    <td style="width:11%">
109 
	                        {{o.status}} <a href="{% url project_update o.serial %}">Update</a>
110 
	                    </td>
108 111 
	                    <td style="width:17%">
109 112 
	                    	<div class="msg-wrap">
110 113 
	                        {% if user == o.owner %}
......
126 129 
	                    	<div class="msg-wrap">
127 130
128 131 
		                    {% if user in members %}
129 
		                        {% if user in approved_members %}
130
131
132 
		                        {% if user in approved_members %}
132 133 
			                       	{% if not user == o.owner %}
133
134 134 
			                            <form action="{% url project_leave o.serial %}" method="post" class="link-like">{% csrf_token %}
135 135 
			                                 <input type="submit"  value="x leave group" class="leave"/>
136 136 
			                            </form>
137 137 
			                            <div class="dialog">
138 138 
					                		Are you sure you what to leave this group?<br>
139 139 
					                		Name: <a  href="{% url project_detail o.serial %}" title="visit group page">{{o.groupname}}</a><br>
140 
					                		{% if o.definition.description %}Description:{{o.definition.description|truncatewords:30}}{% endif %}<br><br>
141
140 
					                		{% if o.definition.description %}Description:{{o.definition.description|truncatewords:30}}{% endif %}<br><br>
142 141 
					                		<a href="#" class="yes submit">Yes</a>&nbsp;&nbsp;&nbsp;<a href="#" class="no submit">No</a>
143 142 
					                	</div>
144 143 
			                        {% else %}
145 144 
			                        	 &nbsp;
146 145 
			                        {% endif %}
147
148
149
150 146 
		                        {% else %}
151 147 
		                            &nbsp;
152 148 
		                        {% endif %}
......
167 163 
	                    	</div>
168 164 
	                    </td>
169 165 
			            <td class="centered" style="width:9%">{{o.definition.member_accept_policy}}</td>
166 
	                    <td class="centered" style="width:9%">{{o.definition.member_reject_policy}}</td>
170 167 
	                    <!--td><a href="#" class="more-info" title="more info">+ more info</a></td-->
171 168 
                  </tr>
172 169 
                  <tr class="{% cycle 'tmore1' 'tmore2' %}" style="display:none">

Also available in: Unified diff