Final cleanup, formset was actually supposed to be fieldset.

This commit is contained in:
2011-12-04 19:23:25 +00:00
parent 8ad4634fe7
commit e2223f6702
21 changed files with 97 additions and 92 deletions

View File

@@ -10,10 +10,10 @@
<p>Please fill in a reason why you like to be a member of this group and any supporting evidence as requested by the group adminship</p>
<form action="{% url groups.views.create_request groupid %}" method="post">
<formset>
<fieldset>
{% include "formtools/formfield.html" with field=form.reason class="xxlarge" %}
{% csrf_token %}
<input type="submit" value="Create Request" class="btn primary" />
</formset>
</fieldset>
</form>
{% endblock %}

View File

@@ -8,6 +8,26 @@
<p>This is the list of your current groups, and groups you can request to be a member of.</p>
{% if group_list %}
<table class="zebra-striped" id="groups">
<thead>
<tr><th>Group Name</th><th>Description</th><th>Status</th><th>Actions</th></tr>
</thead>
<tbody>
{% for id, group, description, status, requestable, fixed, pending, moderated in group_list %}
<tr><td>{{ group }}</td>
<td>{{ description }}</td>
<td>{% if pending %}Request Pending{% else %}{% if status %}{{ status }}{% endif %}{% endif %}</td>
<td>{% ifequal status None %}{% if requestable %}<a href="{% url groups.views.create_request id %}">{% if moderated %}Request Membership{% else %}Join{% endif %}</a>{% endif %}{% endifequal %}
{% if not fixed and status %}<a href="{% url groups.views.kick_member id request.user.id %}">Leave</a>&nbsp;{% endif %}
{% if status == 'Admin' or request.user.is_superuser %}{% if not fixed %}<a href="{% url groups.views.admin_group id %}">Admin</a>{% endif %}{% endif %}</td>
</tr>
{% endfor %}
</tbody>
</table>
{% else %}
<b>No groups are available.</b>
{% endif %}
<script src="{{ STATIC_URL }}js/jquery.tablesorter.min.js"></script>
<script >
@@ -16,25 +36,4 @@
});
</script>
<table class="zebra-striped" id="groups">
{% if group_list %}
<thead>
<tr><th>Group Name</th><th>Description</th><th>Status</th><th>Actions</th></tr>
</thead>
<tbody>
{% for id, group, description, status, requestable, fixed, pending, moderated in group_list %}
<tr><td>{{ group }}</td>
<td>{{ description }}</td>
<td>{% if pending %}Request Pending{% else %}{% if status %}{{ status }}{% endif %}{% endif %}</td>
<td>{% ifequal status None %}{% if requestable %}<a href="{% url groups.views.create_request id %}">{% if moderated %}Request Membership{% else %}Join{% endif %}</a>{% endif %}{% endifequal %}
{% if not fixed and status %}<a href="{% url groups.views.kick_member id request.user.id %}">Leave</a>&nbsp;{% endif %}
{% if status == 'Admin' or request.user.is_superuser %}{% if not fixed %}<a href="{% url groups.views.admin_group id %}">Admin</a>{% endif %}{% endif %}</td>
</tr>
{% endfor %}
</tbody>
</table>
{% else %}
<b>No groups are available.</b>
{% endif %}
{% endblock %}