Lengthen summary text to 140 characters in proposition. When viewing …

…a poll, display summary text along with Item name for each proposition. If Proposition has a body, include a Read More link in order to view it.
mikemintz · May 15, 2013 · a3c224d · a3c224d
1 parent 72e08d0
commit a3c224d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/deme_django/modules/poll/models.py b/deme_django/modules/poll/models.py
@@ -114,7 +114,7 @@ class Meta:
         verbose_name_plural = _('propositions')
 
     #fields:
-    summary_text = models.CharField(_('summary text'), blank=True, max_length=40)
+    summary_text = models.CharField(_('summary text'), blank=True, max_length=140)
 
 
 class PropositionResponse(models.Model):

diff --git a/deme_django/modules/poll/templates/poll/agreedisagreepoll.html b/deme_django/modules/poll/templates/poll/agreedisagreepoll.html
@@ -96,7 +96,10 @@
       		{% for proposition in propositions %}
     		    <div class="proposition list-group-item">
     		      <h4>{% firstof proposition.name forloop.counter %}</h4>
-    		      <p>{{proposition.body|safe}}</p>
+    		      <p>{{proposition.summary_text|safe}}</p>
+    		      {% if proposition.body %}
+      		      <button onclick="$(this).next().removeClass('hide');$(this).remove()" class="btn btn-small">Read more</button><div class="hide"><p>{{proposition.body|safe}}</p></div>
+    		      {% endif %}
 
     	 	      <!-- admin -->
      		 	    {% ifagentcan 'modify_membership' item %}
@@ -156,7 +159,10 @@ <h3 class="panel-heading">Poll Results</h3>
       {% with dict.proposition as proposition %}
       <div class="proposition proposition-result">
         <h4>{% firstof proposition.name forloop.counter %}</h4>
-	      <p>{{proposition.body|safe}}</p>
+	      <p>{{proposition.summary_text|safe}}</p>
+	      {% if proposition.body %}
+		      <button onclick="$(this).next().removeClass('hide');$(this).remove()" class="btn btn-small">Read more</button><div class="hide"><p>{{proposition.body|safe}}</p></div>
+	      {% endif %}
 	      <div class="proposition_graph">
 	        <div class="position">
 	          <div class="title">