Changeset b8172c8 for asadb/template

Timestamp:

Mar 28, 2013, 6:16:41 AM (13 years ago)

Author:

Alex Dehnert <adehnert@…>

Branches:

master, space-access, stable, stage

Children:

870992c

Parents:

5260840 (diff), c3a5618 (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@…> (03/28/13 06:16:41)

git-committer:

Alex Dehnert <adehnert@…> (03/28/13 06:16:41)

Message:

Merge branch 'midway'

• midway: Handle duplicate groups Fix spelling of midway permission Add the midway permissions to the asa-ebm group Allow running diff_static_data from any directory Add Midway map link to front page Allow sorting and filtering the midway page Sort imports more Basic list of groups at the midway WIP: midway page WIP: Midway

Location:

asadb/template

Files:

• index.html (modified) (1 diff)
• midway/map.html (added)
• midway/upload.html (added)
• groups/create/startup_review.html (modified) (1 diff)

asadb/template/index.html

@@ -44 +44 @@
         <li><a href='{%url fysm-select%}'>Submit an entry</a></li>
     </ul></li>
+    <li>Midway assignments: <a href='{% url midway-map-latest %}'>map</a></li>
     <li>Membership updates<ul>
         <li><a href='{%url membership-update-cycle %}'>Group update</a></li>

asadb/template/groups/create/startup_review.html

@@ -14 +14 @@
 <tr><th>Description</th><td>{{group.description}}</td></tr>
 
-<tr><th colspan='2'>Type</th></tr>
+<tr><th colspan='2'>Officers</th></tr>
 <tr><th>President</th><td>{{startup.president_name}} ({{startup.president_kerberos}})</td></tr>
 <tr><th>Treasurer</th><td>{{startup.treasurer_name}} ({{startup.treasurer_kerberos}})</td></tr>