Changeset bd72d5c for asadb/template

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

Files:

• base.html (modified) (1 diff)
• form_utils/better_form.html (added)
• form_utils/fields_as_trs.html (added)
• groups/group_change_main.html (added)
• groups/group_change_officers.html (added)
• groups/group_detail.html (added)
• groups/group_list.html (modified) (2 diffs)
• groups/group_search.html (added)
• groups/group_version.html (added)
• groups/groups_signatories.html (added)
• groups/note/detail.head.html (added)
• groups/note/detail.row.html (added)
• index.html (modified) (1 diff)
• registration/login.html (modified) (1 diff)
• membership/anti-hazing.txt (added)
• membership/confirm.html (added)
• membership/submit-confirm-email.txt (added)
• membership/thanks.html (added)
• membership/update.html (added)

asadb/template/base.html

@@ -12 +12 @@
     <ul class='tab-navigation'>
         <li{% ifequal pagename "homepage" %} class='selected'{% endifequal %}><a href="{% url homepage   %}">Home</a></li>
-        <li{% ifequal pagename "groups"   %} class='selected'{% endifequal %}><a href="{% url group-list %}">Groups</a></li>
+        <li{% ifequal pagename "groups"   %} class='selected'{% endifequal %}><a href="{% url groups:list %}">Groups</a></li>
         <li{% ifequal pagename "fysm"     %} class='selected'{% endifequal %}><a href="{% url fysm       %}">FYSM</a></li>
+        {% if user.is_staff %}<li><a href='{% url admin:index %}'>Admin</a></li>{% endif %}
     </ul>
     <div id='content'>

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>

asadb/template/index.html

@@ -7 +7 @@
 
 <ul>
-    <li><a href='{%url group-list%}'>List of groups</a></li>
+    <li><a href='{%url groups:search%}'>Search groups</a></li>
+    <li><a href='{%url groups:list%}'>List of groups</a></li>
     <li>First Year Summer Mailing<ul>
         <li><a href='{%url fysm%}'>View the entries</a></li>
         <li><a href='{%url fysm-select%}'>Submit an entry</a></li>
     </ul></li>
+    {%if perms.groups.view_signatories %}<li><a href='{% url groups:signatories %}'>View Signatories</a></li>{%endif%}
 </ul>
 
+<h2>My Groups</h2>
+
+{% if user.is_anonymous %}
+<p><a href='{% url login %}'>Login</a> to see your groups.</p>
+{% else %}
+{%if not groups %}
+<p>You do not currently appear to be listed with any groups.</p>
+{% endif %}
+{% endif %}
+
+{% if groups %}
+<ul>
+{% for group in groups %}
+    <li><a href='{% url groups:group-detail group.pk %}'>{{group}}</a></li>
+{%endfor%}
+</ul>
+{% endif %}
+
+{% if has_perms %}
+<h2>Permissions</h2>
+
+<p>You have the following permissions:</p>
+
+<table class='pretty-table'>
+<tr>
+    <th>Name</th>
+    <th>Description</th>
+</tr>
+{% for perm_name, perm_desc in has_perms %}
+<tr>
+    <td>{{perm_name}}</td>
+    <td>{{perm_desc}}</td>
+</tr>
+{% endfor %}
+</table>
+{% endif %}
+
 {% endblock %}

asadb/template/registration/login.html

@@ -15 +15 @@
 <p>In the unlikely event that you have a username and password, you can log in below.</p>
 
-<form method="post" action="{% url login %}">
+<form method="post" action="{% url login-password %}">
 {% csrf_token %}
 <table>