Changeset bd72d5c for asadb/template/groups

Timestamp:

Sep 15, 2011, 3:34:54 PM (15 years ago)

Author:

Alex Dehnert <adehnert@…>

Branches:

master, space-access, stable, stage, test-hooks

Children:

5c68184

Parents:

ceaf3bd (diff), fbb362a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Alex Dehnert <adehnert@…> (09/15/11 15:34:54)

git-committer:

Alex Dehnert <adehnert@…> (09/15/11 15:34:54)

Message:

Merge remote branch 'remotes/origin/new-db'

Location:

asadb/template/groups

Files:

• group_change_main.html (added)
• group_change_officers.html (added)
• group_detail.html (added)
• group_list.html (modified) (2 diffs)
• group_search.html (added)
• group_version.html (added)
• groups_signatories.html (added)
• note/detail.head.html (added)
• note/detail.row.html (added)

asadb/template/groups/group_list.html

@@ -6 +6 @@
 <h1>MIT Student Groups</h1>
 
+<h2>Search</h2>
+
+<form action="" method="get">
+    <table class='pretty-table'>
+    {{ filter.form.as_table }}
+    </table>
+    <input type="submit" value="Search" />
+</form>
+
+<h2>The Groups</h2>
+
 <table class='pretty-table'>
 <thead>
     <tr>
         <th>Name</th>
+        <th>Website</th>
+        <th>ASA DB</th>
+        <th>Description</th>
         <th>Meeting Time</th>
     </tr>
@@ -16 +30 @@
 {% for group in group_list %}
     <tr>
-        <td>{% if group.website_url %}<a href='{{group.website_url}}'>{% endif %}{{group.name}}{%if group.website_url%}</a>{%endif%}</td>
+        <th>{{group.name}}</th>
+        <td>{% if group.website_url %}<a href='{{group.website_url}}'>Website</a>{%endif%}</td>
+        <td><a href='{% url groups:group-detail group.pk %}'>DB Entry</a></td>
+        <td>{{group.description}}</td>
         <td>{{group.meeting_times}}</td>
     </tr>