Changeset 34ae23b for asadb/template

Timestamp:

Oct 17, 2011, 12:05:07 PM (14 years ago)

Author:

Alex Dehnert <adehnert@…>

Branches:

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

Children:

eabc6ee

Parents:

b04e142 (diff), ca21c49 (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@…> (10/17/11 12:05:07)

git-committer:

Alex Dehnert <adehnert@…> (10/17/11 12:05:07)

Message:

Merge branch 'master' into new-db

Location:

asadb/template

Files:

• groups/groups_signatories.html (modified) (1 diff)
• membership/anti-hazing.txt (added)
• membership/confirm.html (added)
• membership/submit-confirm-email.txt (added)
• membership/submitted.html (added)
• membership/thanks.html (added)
• membership/update.html (added)
• groups/diffs/asa-update-mail.txt (added)
• groups/diffs/new-group-accounts.txt (added)
• groups/diffs/new-group-announce.txt (added)
• groups/diffs/sao-update-mail.txt (added)
• groups/group_create.html (added)

asadb/template/groups/groups_signatories.html

@@ -16 +16 @@
 
 <h2>The Groups</h2>
-
-{% if changes %}
-<table class='pretty-table'>
-<tr>
-    <th>Action</th>
-    <th>Person</th>
-    <th>Role</th>
-</tr>
-{% for verb, color, person, role in changes %}
-    <tr><td style='background-color: {{color}}; color: black'>{{verb}}</td><td>{{person}}</td><td>{{role.display_name}}</td></tr>
-{% endfor %}
-</table>
-{% endif %}
-
-{%if edited %}
-<p>Untouched were {{kept}} filled people/role combinations and {{kept_not}} unfilled combinations.</p>
-{% endif %}
 
 <table class='pretty-table'>