Changeset 3c26efb

Timestamp:

Apr 1, 2011, 1:58:59 AM (15 years ago)

Author:

Alex Dehnert <adehnert@…>

Branches:

fysm-4-1

Children:

643466a

Parents:

4819145

git-author:

Alex Dehnert <adehnert@…> (04/01/11 01:58:59)

git-committer:

Alex Dehnert <adehnert@…> (04/01/11 01:58:59)

Message:

Minor tweaks for the Fifth Year Summer Mailing

Location:

asadb

Files:

• forms/models.py (modified) (1 diff)
• template/fysm/submit.html (modified) (1 diff)
• template/fysm/thanks.html (modified) (1 diff)
• template/fysm/update_email.txt (modified) (1 diff)
• template/index.html (modified) (1 diff)

asadb/forms/models.py

@@ -15 +15 @@
     website = models.URLField()
     join_url = models.URLField(verbose_name="recruiting URL", help_text="""<p>If you have a specific web page for recruiting new members of your group, you can link to it here. It will be used as the destination for most links about your group (join link on the main listing page and when clicking on the slide, but not the "website" link on the slide page). If you do not have such a page, use your main website's URL.</p>""")
-    contact_email = models.EmailField(help_text="Give an address for students interested in joining the group to email (e.g., an officers list)")
-    description = models.TextField(help_text="Explain in about three or four sentences what your group does and why incoming freshmen should get involved. If you go over 400 characters, we may ask you to cut your description, cut it ourselves, and/or display only the beginning on the group listing pages.")
+    contact_email = models.EmailField(help_text="Give an address for alumni interested in joining the group to email (e.g., an officers list)")
+    description = models.TextField(help_text="Explain in about three or four sentences what your group does and why alumni should get involved. If you go over 400 characters, we may ask you to cut your description, cut it ourselves, and/or display only the beginning on the group listing pages.")
     logo = models.ImageField(upload_to='fysm/logos', blank=True, )
     slide = models.ImageField(upload_to='fysm/slides', default="", help_text="Upload a slide to display on the group detail page. This will be scaled to be at most 600x600 pixels. We recommend making it exactly that size.")

asadb/template/fysm/submit.html

@@ -1 +1 @@
 {% extends "base.html" %}
 
-{% block title %}First Year Summer Mailing submission{% endblock %}
+{% block title %}Fifth (or Fiftieth) Year Summer Mailing submission{% endblock %}
 {% block content %}
 <div class='fysm-submit'>
 
-<h2>First Year Summer Mailing submission</h2>
+<h2>Fifth (or Fiftieth) Year Summer Mailing submission</h2>
 
 <p>You are submitting a FYSM entry for {{group}}. You can see <a href='{% url fysm %}'>other group's entries</a> for ideas on what your entry should look like.</p>

asadb/template/fysm/thanks.html

@@ -6 +6 @@
 <h2>Thanks for your FYSM submission</h2>
 
-<p>Thanks for submitting your First Year Summer Mailing entry for {{group}} (displayed as {{fysm.display_name}}. You can <a href='{% url fysm fysm.year %}'>view all FYSM entries</a> or <a href='{% url fysm-manage group.pk %}'>update your entry again</a>.</p>
+<p>Thanks for submitting your Fifth (or Fiftieth) Year Summer Mailing entry for {{group}} (displayed as {{fysm.display_name}}. You can <a href='{% url fysm fysm.year %}'>view all FYSM entries</a> or <a href='{% url fysm-manage group.pk %}'>update your entry again</a>.</p>
 
 {% endblock %}

asadb/template/fysm/update_email.txt

@@ -1 +1 @@
 {% autoescape off %}
 Hi officers of {{group.name}},
-   The user {{submitter.first_name}} {{submitter.last_name}} ({{submitter.username}}) has updated your entry in the ASA's First Year Summer Mailing.
+   The user {{submitter.first_name}} {{submitter.last_name}} ({{submitter.username}}) has updated your entry in the ASA's Fifth (or Fiftieth) Year Summer Mailing.
    
 The new information is:

asadb/template/index.html

@@ -8 +8 @@
 <ul>
     <li><a href='{%url group-list%}'>List of groups</a></li>
-    <li>First Year Summer Mailing<ul>
+    <li>Fifth (or Fiftieth) Year Summer Mailing<ul>
         <li><a href='{%url fysm%}'>View the entries</a></li>
         <li><a href='{%url fysm-select%}'>Submit an entry</a></li>