Merge pull request #863 from /issues/853/apoyo

Issues/853/apoyo
ciudadanointeligente · Aug 23, 2017 · aa9bb3f · aa9bb3f
2 parents ec5d686 + f624e8c
commit aa9bb3f
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 17 deletions.
diff --git a/votai_general_theme/static/sass/_2017sitio1.scss b/votai_general_theme/static/sass/_2017sitio1.scss
@@ -423,9 +423,10 @@ input[type=file]{
 /*Propuestas*/
 .propuesta{
   border: 3px solid $grey-one;
-  min-height: 500px;
+  min-height: 550px;
   padding: 0;
   position: relative;
+  border-radius: 10px;
 }
 
 .propuesta-content{
@@ -518,7 +519,10 @@ input[type=file]{
   margin: 0 0 20px;
   font-family: 'Montserrat', sans-serif;
   font-weight: 700;
-  text-transform: uppercase;
+  line-height: 1.3;
+}
+
+p.intro{
   line-height: 1.3;
 }
 .logo-ong img{

diff --git a/votai_general_theme/templates/popular_proposal/_likers.html b/votai_general_theme/templates/popular_proposal/_likers.html
@@ -38,7 +38,7 @@
                     <div class="apoyo-btn pull-left">
                         {% if not avoid_counter %}
                         <div class="apoyo-contador text-center">
-                            <p class="nota"><span id='likers_count_{{proposal.id}}' class="conteo">{{proposal.likers.count}}</span> ciudadanos apoyan esta propuesta</p>
+                            <p class="nota">Esta propuesta tiene <span id='likers_count_{{proposal.id}}' class="conteo">{{proposal.likers.count}}</span> apoyo(s)</p>
                         </div>
                         {% endif %}
                         <a class="btn-apoyo disabled" data-toggle="tooltip" data-placement="top" title="Este tipo de apoyo esta reservado sólo para ciudadanos">
@@ -74,7 +74,7 @@
                     {% with "supportProposal"|add:proposal.slug as modalid %}
                     {% if not avoid_counter %}
                     <div class="apoyo-contador text-center">
-                        <p class="nota"><span id='likers_count_{{proposal.id}}' class="conteo">{{proposal.likers.count}}</span> ciudadanos apoyan esta propuesta</p>
+                        <p class="nota">Esta propuesta tiene <span id='likers_count_{{proposal.id}}' class="conteo">{{proposal.likers.count}}</span> apoyo(s)</p>
                     </div>
                     {% endif %}
                     <span class="corazon-{{proposal.id}}">
@@ -90,7 +90,7 @@
                     {% with  user|support:proposal as support %}
                     {% if not avoid_counter %}
                     <div class="apoyo-contador text-center">
-                          <p class="nota"><span id='likers_count_{{proposal.id}}' class="conteo">{{proposal.likers.count}}</span> ciudadanos apoyan esta propuesta</p>
+                          <p class="nota">Esta propuesta tiene <span id='likers_count_{{proposal.id}}' class="conteo">{{proposal.likers.count}}</span> apoyo(s)</p>
                       </div>
                       {% endif %}
                         <span class="corazon-{{proposal.id}} btn btn-no-apoyo text-center {% if not avoid_counter %} pull-left{% endif %}" style="cursor:auto;">
@@ -103,7 +103,7 @@
         {% else %}<!-- Cuando usuario no esta logueado -->
         {% if not avoid_counter %}
         <div class="apoyo-contador text-center">
-                <p class="nota"><span id='likers_count_{{proposal.id}}' class="conteo">{{proposal.likers.count}}</span> ciudadanos apoyan esta propuesta</p>
+                <p class="nota">Esta propuesta tiene <span id='likers_count_{{proposal.id}}' class="conteo">{{proposal.likers.count}}</span> apoyo(s)</p>
             </div>
             {% endif %}
             <span class="corazon-{{proposal.id}}">
@@ -116,7 +116,7 @@
     <a class="btn-apoyo" href="{{proposal.get_absolute_url}}">
         {% if not avoid_counter %}
           <div class="apoyo-contador text-center">
-              <p class="apoyo-ciudadano"><span id='likers_count_{{proposal.id}}' class="conteo">{{proposal.likers.count}}</span> ciudadanos apoyan esta propuesta</p>
+              <p class="apoyo-ciudadano">Esta propuesta tiene <span id='likers_count_{{proposal.id}}' class="conteo">{{proposal.likers.count}}</span> apoyo(s)</p>
           </div>
           {% endif %}
           <span class="corazon-{{proposal.id}}">

diff --git a/votai_general_theme/templates/popular_proposal/detail.html b/votai_general_theme/templates/popular_proposal/detail.html
@@ -207,7 +207,7 @@ <h1>{{popular_proposal.title}}</h1>
       {% endif %}
 
       {% if popular_proposal.background %}
-        <div class="antecedentes light-text print_hidden">
+        <div class="col-md-12 antecedentes light-text print_hidden">
           <div class="row">
             <hr>
               <h3>{% trans 'Antecedentes' %}</h3>
@@ -424,7 +424,7 @@ <h5><a href="{{commitment.candidate.get_absolute_url}}">{{candidate}}</a><span c
     </div>
     <div class="col-md-3 hidden-sm hidden-xs text-center print_hidden">
       <label>Apoya esta propuesta</label>
-      <p class="apoyo-ciudadano">Esta propuesta tiene <span id='likers_count_{{popular_proposal.id}}' class="conteo">{{popular_proposal.likers.count}} <i class="fa fa-heart blue-light-txt" aria-hidden="true"></i></span> apoyos</p>
+      <p class="apoyo-ciudadano">Esta propuesta tiene <span id='likers_count_{{popular_proposal.id}}' class="conteo">{{popular_proposal.likers.count}} <i class="fa fa-heart blue-light-txt" aria-hidden="true"></i></span> apoyo(s)</p>
       <div class="share-detail">
         {% include 'popular_proposal/_likers.html' with proposal=popular_proposal next_url=request.path avoid_counter=True %}
       <hr>

diff --git a/votai_general_theme/templates/popular_proposal/popular_proposal_card.html b/votai_general_theme/templates/popular_proposal/popular_proposal_card.html
@@ -26,9 +26,8 @@
     </div>
     {% endcomment %}
 
-    {% if proposal.title %}
-        <h4><a href="{% url 'popular_proposals:detail' slug=proposal.slug %}">{{proposal.title|truncatechars:100 }}</a></h4>
-    {% endif %}
+    <h4><a href="{% url 'popular_proposals:detail' slug=proposal.slug %}">{{proposal.title|truncatechars:100 }}</a></h4>
+    <p class="intro">{{proposal.data.solution_at_the_end|linebreaksbr|truncatechars:150}}</p>
     {% if proposal.proposer.profile.is_organization %}
       <div class="logo-ong text-center text-light">
         <span>Propuesta de </span>
@@ -51,16 +50,15 @@ <h4><a href="{% url 'popular_proposals:detail' slug=proposal.slug %}">{{proposal
 
 
   {% if user %}
-  <div class="share-card">
+  <div class="share-card text-center">
     <div class="text-center">{% url 'popular_proposals:home' as popular_proposals_home %}</div>
-
     {% include 'popular_proposal/_likers.html' with proposal=proposal area=area next_url=popular_proposals_home  support_button_extra_class="pull-left" %}
-
+    {% comment %}
     <div class="share">
-
       {% include 'popular_proposal/_share.html' with popular_proposal=proposal %}
-
     </div>
+    {% endcomment %}
+    <a href="{% url 'popular_proposals:detail' slug=proposal.slug %}" class="btn btn-blue">Leer más</a>
   </div>
   {% endif %}
 </div>