Changeset 251503b for asadb/template


Ignore:
Timestamp:
Nov 4, 2012, 2:48:18 AM (14 years ago)
Author:
Alex Dehnert <adehnert@…>
Branches:
master, space-access, stable, stage
Children:
0a31846
Parents:
c547de5 (diff), bda4d86 (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@…> (11/04/12 02:48:18)
git-committer:
Alex Dehnert <adehnert@…> (11/04/12 02:48:18)
Message:

Merge branch 'membership-confirm'

Location:
asadb/template
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • asadb/template/forms/select.html

    rc9d8369 rbda4d86  
    44{% block content %}
    55
    6 <h2>Select Group</h2>
     6<h2>{{title}}</h2>
     7
     8{% if msg %}<p>{{msg}}</p>{%endif%}
    79
    810<form method="post" action="">

  • asadb/template/index.html

    rab17953 rbda4d86  
    4343        <li><a href='{%url fysm-select%}'>Submit an entry</a></li>
    4444    </ul></li>
    45     {% comment %}
    4645    <li>Membership updates<ul>
    47         <li><a href='{%url membership-update%}'>Group update</a></li>
     46        <li><a href='{%url membership-update-cycle %}'>Group update</a></li>
    4847        <li><a href='{%url membership-confirm%}'>Individual confirmations</a></li>
    4948        <li><a href='{%url membership-submitted%}'>Groups with submitted updates</a></li>
    5049        {% if perms.groups.view_group_private_info %}<li><a href='{%url membership-issues%}'>Issues</a> (CSV)</li>{% endif %}
    5150    </ul></li>
    52     {% endcomment %}
    5351    <li>Group recognition<ul>
    5452        <li><a href='http://web.mit.edu/asa/start/new-group-app.html'>New Group Application</a></li>

  • asadb/template/membership/confirm.html

    r56e8cb8 r11941e1  
    1414<p>
    1515The ASA is attempting to verify that all currently recognized groups are active
    16 and have at least five members.
     16and have at least five student members.
    1717</p>
    1818
    … …  
    2121<h3>Groups you currently say you're a member of:</h3>
    2222{% if member_groups %}
    23 <ul>
     23<table class='pretty-table'>
     24<thead>
     25<tr>
     26    <th>Group</th>
     27    <th></th>
     28</tr>
     29</thead>
     30<tbody>
    2431{% for group in member_groups %}
    25     <li>{{group}}</li>
     32<tr>
     33    <th>{{group}}</th>
     34    <td><form action="" method="post">
     35        <input type="hidden" name="group" value="{{group.pk}}">
     36        {% csrf_token %}
     37        <input type="hidden" name="action" value="remove">
     38        <input type="submit" name="add-remove" value="Remove">
     39    </form></td>
     40</tr>
    2641{% endfor %}
    27 </ul>
     42</tbody>
     43</table>
    2844{% else %}
    2945<p>You are not currently indicating membership in any groups.</p>
    3046{% endif %}
    3147
    32 <h3>Option 1: Add or remove groups one at a time</h3>
     48<h3>Option 1: Add or remove groups that list a role for you</h3>
     49
     50<table class='pretty-table'>
     51<thead>
     52<tr>
     53    <th>Group</th>
     54    <th>Roles</th>
     55    <th>Add/Remove</th>
     56</tr>
     57</thead>
     58<tbody>
     59{% for group, roles in role_groups.values %}
     60<tr>
     61    <th>{{group}}</th>
     62    <td>{{roles|join:", "}}</td>
     63    <td><form action="" method="post">
     64        <input type="hidden" name="group" value="{{group.pk}}">
     65        {% csrf_token %}
     66        {% if group in member_groups %}
     67        <input type="hidden" name="action" value="remove">
     68        <input type="submit" name="add-remove" value="Remove">
     69        {% else %}
     70        <input type="hidden" name="action" value="add">
     71        <input type="submit" name="add-remove" value="Add">
     72        {% endif %}
     73    </form></td>
     74</tr>
     75{% endfor %}
     76</tbody>
     77</table>
     78
     79<h3>Option 2: Add or remove groups by searching</h3>
    3380
    3481<form action="" method="get">
    … …  
    80127
    81128
    82 <h3>Option 2: Select all your groups at once</h3>
     129<h3>Option 3: Select all your groups at once</h3>
    83130
    84131<p>Below is a list of all recognized groups. You can go through picking out the groups you are a member of. However, you should be careful not to deselect any groups (unless you aren't a member of them, of course).</p>

  • asadb/template/membership/update.html

    rf48884a rbda4d86  
    5757{% csrf_token %}
    5858<table class='pretty-table'>
     59<tr>
     60    <th>Group</th>
     61    <td>{{group}}</td>
     62</tr>
    5963{{ form.as_table }}
    6064<tr><th colspan='2'><input type='submit' value='Submit membership update' /></th></tr>

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

    rd768e47 r264efa0  
    55to the MIT community!
    66
    7 The last step to finalize the group recognition is for you to enter the
     7The last step to finalize the group recognition is for you to finish entering the
    88group's complete information into the ASA Database:
    99
    1010      http://web.mit.edu/asa/www/asa-db.shtml
     11
     12Your group's entry is at:
     13
     14      http://asa.mit.edu/{% url groups:group-detail group.pk %}
     15
     16You should make sure to do the following:
     17* add membership numbers
     18* put your constitution somewhere permanent (preferably in your group's Athena
     19  locker, {{group.athena_locker}}) and list the new location in the DB
     20
     21You may also want to:
     22* add your website and meeting times so potential members can find
     23  you more easily
     24* add any group officers who should be able to reserve rooms, update your DB
     25  entry, etc.
    1126
    1227Note that at this point only the President and Treasurer of the group
Note: See TracChangeset for help on using the changeset viewer.