Changeset e0ed952

Timestamp:

Jul 7, 2013, 12:37:40 AM (12 years ago)

Author:

Alex Dehnert <adehnert@…>

Branches:

master, stable, stage

Children:

8948cef

Parents:

8c0a2ff

git-author:

Alex Dehnert <adehnert@…> (07/07/13 00:37:40)

git-committer:

Alex Dehnert <adehnert@…> (07/07/13 00:37:40)

Message:

FYSM: don't request or link slides (ASA-#242)

I haven't removed the infrastructure to *display* them, because I feel a little
silly making old slides inaccessible. Perhaps ASA-#23 can make slides from the
appropriate years get linked.

Location:

asadb

Files:

• forms/models.py (modified) (1 diff)
• forms/views.py (modified) (1 diff)
• template/fysm/fysm_listing.html (modified) (1 diff)

asadb/forms/models.py

@@ -18 +18 @@
     description = models.TextField(help_text="Explain, in no more than 400 characters (including spaces), what your group does and why incoming students should get involved.")
     logo = models.ImageField(upload_to='fysm/logos', blank=True, help_text="Upload a logo (JPG, GIF, or PNG) to display on the main FYSM page as well as the group detail page. This will be scaled to be 100px wide.")
-    slide = models.ImageField(upload_to='fysm/slides', default="", help_text="Upload a slide (JPG, GIF, or PNG) to display on the group detail page. This will be scaled to be at most 600x600 pixels. We recommend making it exactly that size.")
+    slide = models.ImageField(upload_to='fysm/slides', blank=True, default="", help_text="Upload a slide (JPG, GIF, or PNG) to display on the group detail page. This will be scaled to be at most 600x600 pixels. We recommend making it exactly that size.")
     tags = models.CharField(max_length=100, blank=True, help_text="Specify some free-form, comma-delimited tags for your group", )
     categories = models.ManyToManyField('FYSMCategory', blank=True, help_text="Put your group into whichever of our categories seem applicable.", )

asadb/forms/views.py

@@ -153 +153 @@
             'description',
             'logo',
-            'slide',
             'tags',
             'categories',

asadb/template/fysm/fysm_listing.html

@@ -59 +59 @@
 {% for fysm in fysm_list %}
 <div class='single-fysm-entry'>
-    <h3><a href='{% url fysm-view year fysm.pk %}'>{{fysm.display_name}}</a></h3>
+    {% comment %}
+    If we were cooler, years when we had slides would still link them here.
+    We're not that cool, though, so we just always link the join page.
+    {% endcomment %}
+    <h3><a href='{% url fysm-link year "join" fysm.pk %}'>{{fysm.display_name}}</a></h3>
     <div class='fysm-body'>
     <div class='logo'>