From d789925c107c5fb9af22c0ee7d6a641aecf28f4a Mon Sep 17 00:00:00 2001
From: Andrew Williams <andy@tensixtyone.com>
Date: Sun, 4 Dec 2011 16:04:20 +0000
Subject: [PATCH] groups update for new styling and fixes

---
 .../templates/groups/create_request.html      | 14 +++--
 app/groups/templates/groups/group_admin.html  | 62 ++++++++++++-------
 2 files changed, 48 insertions(+), 28 deletions(-)

diff --git a/app/groups/templates/groups/create_request.html b/app/groups/templates/groups/create_request.html
index 51b3a28..75ed1f0 100644
--- a/app/groups/templates/groups/create_request.html
+++ b/app/groups/templates/groups/create_request.html
@@ -3,13 +3,17 @@
 {% block title %}Create a Membership Request{% endblock %}
 
 {% block content %}
+<div class="page-header">
+  <h1>Create Membership Request</h1>
+</div>
+
 <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">
-{% csrf_token %}
-<table>
-{{ form.as_table }}
-</table>
-<input type="submit" value="Create Request" />
+<formset>
+  {% include "formtools/formfield.html" with field=form.reason class="xxlarge" %}
+  {% csrf_token %}
+  <input type="submit" value="Create Request" class="btn primary" />
+</formset>
 </form>
 {% endblock %}
diff --git a/app/groups/templates/groups/group_admin.html b/app/groups/templates/groups/group_admin.html
index c3648a5..c456aa5 100644
--- a/app/groups/templates/groups/group_admin.html
+++ b/app/groups/templates/groups/group_admin.html
@@ -2,45 +2,61 @@
 
 {% block content %}
 
-<h2>{{ group.name }}</h2>
+<div class="page-header">
+  <h1>{{ group.name }}</h1>
+</div>
 
 <h3>Members</h3>
 
 {% if group.user_set.all %}
-<table>
-<tr><th>Member Username</th><th>Character</th><th>Status</th><th>Actions</th></tr>
-{% for user, chars, status in member_list %}
-<tr><td><a href="{% url sso.views.user_view user.username %}">{{ user.username }}</a></td>
-    <td>{{ chars }}</td>
-    <td>{{ status }}</td>
-    <td><a href="{% url groups.views.kick_member group.id user.id %}">Kick Member</a>
-    {% if request.user.is_superuser %}&nbsp;<a href="{% url groups.views.promote_member group.id user.id %}">Toggle Admin</a>{% endif %}</td>
-</tr>
-{% endfor %}
+<table class="zebra-striped" id="members">
+  <thead>
+    <tr><th>Member Username</th><th>Character</th><th>Status</th><th>Actions</th></tr>
+  </thead>
+  <tbody>
+    {% for user, chars, status in member_list %}
+    <tr><td><a href="{% url sso.views.user_view user.username %}">{{ user.username }}</a></td>
+      <td>{{ chars }}</td>
+      <td>{{ status }}</td>
+      <td><a href="{% url groups.views.kick_member group.id user.id %}">Kick Member</a>
+      {% if request.user.is_superuser %}&nbsp;<a href="{% url groups.views.promote_member group.id user.id %}">Toggle Admin</a>{% endif %}</td>
+    </tr>
+    {% endfor %}
+  </tbody>
 </table>
 {% else %}
-<b>This group has no members</b>
+<p><b>This group has no members</b></p>
 {% endif %}
 
 <h3>Membership Requests</h3>
 
 {% if requests %}
-<table>
-<tr><th>Username</th><th>Character</th><th>Reason</th><th>Status</th><th>Created Date</th><th>Actions</th></tr>
-{% for req in requests %}
-<tr><td><a href="{% url sso.views.user_view req.user.username %}">{{ req.user }}</a></td>
-    <td>{{ req.character }}</td>
-    <td>{{ req.reason }}</td>
-    <td>{{ req.get_status_description }}</td>
-    <td>{{ req.created_date }}</td>
-    <td><a href="{% url groups.views.accept_request req.id %}">Accept</a>&nbsp;
-        <a href="{% url groups.views.reject_request req.id %}">Reject</a></td>
-</tr>
+<table class="zebra-striped" id="requests">
+  <thead>
+    <tr><th>Username</th><th>Character</th><th>Reason</th><th>Status</th><th>Created Date</th><th>Actions</th></tr>
+  </thead>
+  <tbody>
+    {% for req in requests %}
+    <tr><td><a href="{% url sso.views.user_view req.user.username %}">{{ req.user }}</a></td>
+      <td>{{ req.character }}</td>
+      <td>{{ req.reason }}</td>
+      <td>{{ req.get_status_description }}</td>
+      <td>{{ req.created_date }}</td>
+      <td><a href="{% url groups.views.accept_request req.id %}">Accept</a>&nbsp;
+          <a href="{% url groups.views.reject_request req.id %}">Reject</a></td>
+    </tr>
+  </tbody>
 {% endfor %}
 </table>
 {% else %}
 <b>This group has no outstanding requests</b>
 {% endif %}
 
+<script src="/static/js/jquery.tablesorter.min.js"></script>
+<script >
+    $(function() {
+        $("table.zebra-striped").tablesorter({ sortList: [[0,0]] });
+    });
+</script>
 
 {% endblock %}