Changeset 6e247d3

Timestamp:

Nov 16, 2012, 5:06:22 AM (13 years ago)

Author:

Alex Dehnert <adehnert@…>

Branches:

master, space-access, stable, stage

Children:

cf43bea

Parents:

1f4ee0b

git-author:

Alex Dehnert <adehnert@…> (11/16/12 05:06:22)

git-committer:

Alex Dehnert <adehnert@…> (11/16/12 05:06:22)

Message:

Add links to the submitted membership updates page

While the page with information about which membership updates have been
submitted was linked on the front page, some people were still not finding it.
This adds a link on the update page and in the email that gets sent to
officers. Fixes ASA-#183.

Location:

asadb

Files:

• forms/views.py (modified) (2 diffs)
• template/membership/submit-confirm-email.txt (modified) (1 diff)
• template/membership/update.html (modified) (1 diff)

asadb/forms/views.py

@@ -297 +297 @@
 
     confirm_uri = request.build_absolute_uri(reverse('membership-confirm'))
+    submitted_uri = request.build_absolute_uri(reverse('membership-submitted'))
 
     if request.method == 'POST':
@@ -336 +337 @@
                 'submitter': request.user,
                 'confirm_uri': confirm_uri,
+                'submitted_uri': submitted_uri,
             })
             body = tmpl.render(ctx)

asadb/template/membership/submit-confirm-email.txt

@@ -1 +1 @@
 {% autoescape off %}{{submitter.first_name}} {{submitter.last_name}} submitted the following membership information for {{group.name}}.
 
-Please note, if you are still in the midst of or leading up to your major recruitment period, we encourage you to submit current numbers and a list 
-soon to ensure you have something submitted before the deadline. Then you can submit an updated form later, either before or after the deadline. You don't need 
-to do this if your membership changes slightly, but we recommend you do so if your numbers change significantly.
+Please note, if you are still in the midst of or leading up to your major recruitment period, we encourage you to submit current numbers and a list soon to ensure you have something submitted before the deadline. Then you can submit an updated form later, either before or after the deadline. You don't need to do this if your membership changes slightly, but we recommend you do so if your numbers change significantly.
 
-In addition to the membership provided by you, please have at least five student members confirm membership using the link below. You do not need to 
-have everyone do this, we are simply looking five students' confirmation.  Here is the link to provide to members: 
+In addition to the membership provided by you, please have at least five student members confirm membership using the link below. You do not need to have everyone do this, we are simply looking five students' confirmation.
+
+Here is the link to provide to members:
 {{confirm_uri}}
 
+Visit {{submitted_uri}} to see how many people have already confirmed.
 
 If you have questions, please email asa-exec@mit.edu.

asadb/template/membership/update.html

@@ -48 +48 @@
 <h3><a name='components-confirm'></a>4. Membership Confirmation</h3>
 
-<p>In addition to the membership info provided by you above, please have at least five student members confirm membership using the link below. You do not need to have everyone do this; we are simply looking for five students' confirmation.</p>
+<p>In addition to the membership info provided by you above, please have at least five student members confirm membership using the link below. You do not need to have everyone do this; we are simply looking for <em>five students'</em> confirmation. You can <a href='{% url membership-submitted %}'>see how many have confirmed already</a>.</p>
 
 <p>Link to provide to members: <a href='{{confirm_uri}}'>{{confirm_uri}}</a>.</p>