Merge pull request #1018 from /issues/978/compromisos-tarjetas

Issues/978/compromisos tarjetas
ciudadanointeligente · Nov 16, 2017 · ba37ee9 · ba37ee9
2 parents 27a24b7 + 9ce74d4
commit ba37ee9
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 11 deletions.
diff --git a/votai_general_theme/static/sass/_2017sitio1.scss b/votai_general_theme/static/sass/_2017sitio1.scss
@@ -622,7 +622,7 @@ a.candidate-commit-name {
 
 .share-card{
   background-color: $grey-one;
-  min-height: 115px;
+  min-height: 122px;
   padding: 5px 17px 5px;
   position: absolute;
   bottom: 0;
@@ -669,7 +669,7 @@ a.candidate-commit-name {
   background-color: $yellow;
   color: white;
   position: relative;
-  top: 9px;
+  top: 0;
   &:hover{
     color: $grey-one;
   }

diff --git a/votai_general_theme/templates/index_first_launch.html b/votai_general_theme/templates/index_first_launch.html
@@ -30,7 +30,7 @@ <h3>¡En Ciudadano Inteligente te ayudamos con nuestras herramientas para esta p
           <a href="http://levantalamano.cl" onclick="ga('send','event','home-nna','click')" target="_blank">
             <img src="{% static 'img/h-nna.svg' %}" alt="Propuestas de niños, niñas y adolescentes" class="img-responsive">
           </a>
-          <p class="text-center tool-description">Apoya las propuestas de niños, niñas y adolescentes hacia las candidaturas</p>
+          <p class="text-center tool-description">Apoya las propuestas de niños, niñas y adolescentes a las candidaturas</p>
         </div>
       <div class="col-md-4">
         <a href="{% url 'material_ciudadano' %}" onclick="ga('send','event','home-infografias','click')">
@@ -50,7 +50,7 @@ <h3>¡En Ciudadano Inteligente te ayudamos con nuestras herramientas para esta p
           <a href="https://api.whatsapp.com/send?phone=56932973444&text=hola,%20quiero%20denunciar%20propaganda%20ilegal" onclick="ga('send','event','home-wsp-acusete','click')" target="_blank">
             <img src="{% static 'img/h-acusete.svg' %}" alt="WhatsApp Acusete" class="img-responsive">
           </a>
-          <p class="text-center tool-description">Denuncia aquí propaganda ilegal +569 32973444</p>
+          <p class="text-center tool-description">Denuncia aquí propaganda ilegal<br>+569 32973444</p>
         </div>
         <div class="col-md-4">
           <a href="https://open.spotify.com/user/1curudtk4qxgx0dejcvcaogvr/playlist/6b8xpAv7QXaNCwQ0nasbca" onclick="ga('send','event','home-playlist','click')" target="_blank">

diff --git a/votai_general_theme/templates/popular_proposal/_likers.html b/votai_general_theme/templates/popular_proposal/_likers.html
@@ -16,7 +16,8 @@
         <div class="apoyo-btn">
         {% if not avoid_counter %}
           <div class="apoyo-contador">
-            <p class="nota">Esta propuesta tiene <span id='likers_count_{{proposal.id}}' class="conteo">{{proposal.likers.count}}</span> apoyo(s)</p>
+            <p class="nota"><span id='likers_count_{{proposal.id}}' class="conteo">{{proposal.commitments.count}}</span> candidatura(s) comprometida(s)</p>
+            <p class="nota"><span id='likers_count_{{proposal.id}}' class="conteo">{{proposal.likers.count}}</span> apoyo(s) ciudadano(s)</p>
           </div>
         {% endif %}
         </div>
@@ -62,7 +63,8 @@
           <!-- "logueado sin support" -->
           {% if not avoid_counter %}
           <div class="apoyo-contador">
-            <p class="nota">Esta propuesta tiene <span id='likers_count_{{proposal.id}}' class="conteo">{{proposal.likers.count}}</span> apoyo(s)</p>
+            <p class="nota"><span id='likers_count_{{proposal.id}}' class="conteo">{{proposal.commitments.count}}</span> candidatura(s) comprometida(s)</p>
+            <p class="nota"><span id='likers_count_{{proposal.id}}' class="conteo">{{proposal.likers.count}}</span> apoyo(s) ciudadano(s)</p>
           </div>
           {% endif %}
           <span class="corazon-{{proposal.id}}">
@@ -80,7 +82,8 @@
         <!-- apoyando -->
           {% if not avoid_counter %}
             <div class="apoyo-contador">
-              <p class="nota">Esta propuesta tiene <span id='likers_count_{{proposal.id}}' class="conteo">{{proposal.likers.count}}</span> apoyo(s)</p>
+              <p class="nota"><span id='likers_count_{{proposal.id}}' class="conteo">{{proposal.commitments.count}}</span> candidatura(s) comprometida(s)</p>
+              <p class="nota"><span id='likers_count_{{proposal.id}}' class="conteo">{{proposal.likers.count}}</span> apoyo(s) ciudadano(s)</p>
             </div>
           {% endif %}
           {% if not support_button_extra_class %}
@@ -104,7 +107,8 @@
     <!-- usuario no logueado -->
       {% if not avoid_counter %}
       <div class="apoyo-contador">
-        <p class="nota">Esta propuesta tiene <span id='likers_count_{{proposal.id}}' class="conteo">{{proposal.likers.count}}</span> apoyo(s)</p>
+        <p class="nota"><span id='likers_count_{{proposal.id}}' class="conteo">{{proposal.commitments.count}}</span> candidatura(s) comprometida(s)</p>
+        <p class="nota"><span id='likers_count_{{proposal.id}}' class="conteo">{{proposal.likers.count}}</span> apoyo(s) ciudadano(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
@@ -189,8 +189,11 @@ <h4 class="modal-title">Términos y Condiciones</h4>
       </div><!-- col-md-9 -->
 
       <div class="col-md-3 hidden-sm hidden-xs text-center print_hidden">
+        <label>Esta propuesta tiene</label>
+        <p class="apoyo-ciudadano"><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) ciudadano(s)
+        <br><span id='likers_count_{{popular_proposal.id}}' class="conteo">{{popular_proposal.commitments.count}} <i class="fa fa-heart blue-light-txt" aria-hidden="true"></i></span>candidatura(s) comprometida(s)</p>
+        <hr>
         <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> apoyo(s)</p>
         <div class="share-detail">
           {% include 'popular_proposal/_likers.html' with proposal=popular_proposal next_url=request.path  avoid_counter=True %}
         </div>
@@ -239,11 +242,13 @@ <h4 class="modal-title">Términos y Condiciones</h4>
     <div class="row">
       <div class="col-md-4 col-md-offset-2">
         <div class="apoyo-contador">
-          <p class="apoyo-ciudadano">Esta propuesta tiene <span id='likers_count_{{popular_proposal.id}}' class="conteo">{{popular_proposal.likers.count}}</span> apoyos</p>
+          <p class="apoyo-ciudadano">
+            <span id='likers_count_{{popular_proposal.id}}' class="conteo">{{popular_proposal.likers.count}}</span> apoyo(s) ciudadano(s)<br>
+            <span id='likers_count_{{popular_proposal.id}}' class="conteo">{{popular_proposal.commitments.count}}</span> candidatura(s) comprometida(s)</p>
         </div>
       </div>
       <div class="col-md-4">
-        <div class="share-detail">
+        <div class="share-detail mobile-fix">
           {% include 'popular_proposal/_share.html' with proposal=popular_proposal next_url=request.path %}
           {% include 'popular_proposal/_likers.html' with proposal=popular_proposal next_url=request.path avoid_counter=True %}
         </div>