Changeset 0ac15a1 for asadb/template

Timestamp:

Apr 5, 2012, 1:12:37 AM (14 years ago)

Author:

Alex Dehnert <adehnert@…>

Branches:

master, space-access, stable, stage

Children:

a03cb61

Parents:

ffecc7f (diff), a9a8f3d (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@…> (04/05/12 01:12:37)

git-committer:

Alex Dehnert <adehnert@…> (04/05/12 01:12:37)

Message:

Merge branch 'office-access'

Location:

asadb/template

Files:

• groups/group_tools.part.html (modified) (1 diff)
• space/cac-change-email.txt (added)
• space/group-change-email.txt (added)
• space/manage-access.html (added)
• form_utils/better_form.html (modified) (1 diff)
• groups/diffs/new-group-announce.txt (modified) (2 diffs)
• groups/group_search.html (modified) (1 diff)
• groups/reporting.html (added)
• index.html (modified) (1 diff)

asadb/template/groups/group_tools.part.html

@@ -5 +5 @@
     <li><a href='{% url groups:group-manage-main group.pk %}'>Update main</a></li>
     <li><a href='{% url groups:group-manage-officers group.pk %}'>Update people</a></li>
+    <li><a href='{% url groups:group-space-access group.pk %}'>Space access</a></li>
     <li><a href='{% url groups:group-manage-history group.pk %}'>History</a></li>
     {% if group.pk < 1905 %}

asadb/template/form_utils/better_form.html

@@ -6 +6 @@
 {% if fieldset.legend %}
 <legend>{{ fieldset.legend }}</legend>
+{% endif %}
+{% if fieldset.description %}
+<p>{{ fieldset.description }}</p>
 {% endif %}
 <table class='pretty-table'>

asadb/template/groups/diffs/new-group-announce.txt

@@ -11 +11 @@
       http://web.mit.edu/asa/www/asa-db.shtml
 
-Note that at this point only the President of the group ({{president}})
+Note that at this point only the President and Treasurer of the group
+({{officer_emails|join:", "}})
 can modify the information and that MIT personal certificates are
 required to access the group's account in the ASA Database.
@@ -23 +24 @@
 ASA and they will create your locker and e-mail accounts as needed.
 
-The Athena locker for Spinning Arts Club, MIT will be :
+The Athena locker for {{group.name}} will be :
 
       {{group.athena_locker}}

asadb/template/groups/group_search.html

@@ -10 +10 @@
     {{ filter.form.as_table }}
     </table>
-    <input type="submit" name="group-info" value="Show Group Information" />
+    <input type="submit" name="group-goto" value="Show Group Information" title="If exactly one group matches, go directly to that group's database entry. Otherwise, show the group list." />
+    <input type="submit" name="group-list" value="Show Group List" />
     {% if perms.groups.view_signatories %}
     <input type="submit" name="signatories" value="Show Signatories" />

asadb/template/index.html

@@ -33 +33 @@
         <li><a href='{%url groups:list%}'>List of groups</a></li>
         {%if perms.groups.view_signatories %}<li><a href='{% url groups:signatories %}'>View Signatories</a></li>{%endif%}
+        {%if perms.groups.view_group_private_info %}<li><a href='{%url groups:reporting%}'>Reporting</a></li>{%endif%}
         <li><a href='{%url groups:account-lookup%}'>Account lookup</a></li>
     </ul></li>