Agregandole ribbon a votita

ciudadanointeligente · Nov 3, 2017 · d9c0342 · d9c0342
1 parent 0b65e97
commit d9c0342
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 3 deletions.
diff --git a/popular_proposal/models.py b/popular_proposal/models.py
@@ -311,6 +311,11 @@ def display_card(self, context={}):
             template = self.card_template
         return get_template(template).render(context)
 
+    @property
+    def ribbon_text(self):
+        if self.is_local_meeting:
+            return u"Generada desde un encuentro ciudadano"
+
     @property
     def card(self):
         return self.display_card({})

diff --git a/popular_proposal/tests/popular_proposal_model_tests.py b/popular_proposal/tests/popular_proposal_model_tests.py
@@ -156,6 +156,16 @@ def test_home_view_brings_featured_first(self):
         self.assertIn(p3, featured_proposals)
         self.assertNotIn(p1, featured_proposals)
 
+    def test_get_ribbon_text(self):
+        p1 = PopularProposal.objects.create(proposer=self.fiera,
+                                            area=self.arica,
+                                            data=self.data,
+                                            title=u'This is a title1',
+                                            clasification=u'education'
+                                            )
+        self.assertFalse(p1.ribbon_text)
+        p1.is_local_meeting = True
+        self.assertTrue(p1.ribbon_text)
 
 
     @override_settings(EXCLUDED_PROPOSALS_APPS=["sites" ,])

diff --git a/votai_general_theme/static/sass/main.scss b/votai_general_theme/static/sass/main.scss
@@ -2129,6 +2129,12 @@ input#id_4-title {
     color: $grey-two;
   }
 }
+.propuesta.popular_proposal {
+
+}
+.propuesta.votita {
+
+}
 
 /* Medium devices */
 

diff --git a/votai_general_theme/templates/popular_proposal/popular_proposal_card.html b/votai_general_theme/templates/popular_proposal/popular_proposal_card.html
@@ -2,12 +2,12 @@
 {% load votainteligente_extras %}
 {% load i18n %}
 {% load thumbnail %}
-<div class="post propuesta{% if proposal.for_all_areas %} transversal{% endif %}">
+<div class="post propuesta {{proposal.content_type.app_label}}">
 <!-- Cata compañera puedes saber si la propuesta es para todas las comunas mediante esto {% comment %}{% if proposal.for_all_areas %}{% else %}{% endif %}{% endcomment %}-->
   <div class="propuesta-content">
-    {% if proposal.is_local_meeting %}
+    {% if proposal.ribbon_text %}
     <div class="ribbon-wrapper">
-      <div class="ribbon">Generada desde un encuentro ciudadano</div>
+      <div class="ribbon">{{proposal.ribbon_text}}</div>
     </div>
     {% endif %}
     <a href="/propuestas/?clasification={{proposal.clasification}}" onclick="ga('send','event','card-filterby-clasification','click')"><span class="label label-default">{{proposal.get_classification}}</span></a>

diff --git a/votita/models.py b/votita/models.py
@@ -158,6 +158,10 @@ def get_topic_choices_dict(cls):
         from votita.forms.forms import TOPIC_CHOICES_DICT
         return TOPIC_CHOICES_DICT
 
+    @property
+    def ribbon_text(self):
+        return u"Propuesta generada por niñas, niños y adolescentes"
+
     class Meta:
         verbose_name = _(u'Medida')
         verbose_name_plural = _(u"Medidas")