Arreglando unas cositas en los htmls

ciudadanointeligente · Aug 29, 2017 · 0864af7 · 0864af7
1 parent 0d3448b
commit 0864af7
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 58 deletions.
diff --git a/votai_general_theme/templates/popular_proposal/_likers.html b/votai_general_theme/templates/popular_proposal/_likers.html
@@ -30,7 +30,12 @@
           {% else %}
             {% with proposal.get_absolute_url as detail_url %}
             <div class="btn_pronunciarme {{support_button_extra_class}}">
-              <a href="{% url 'popular_proposals:commit_yes' candidate_pk=candidacy.candidate.id proposal_pk=proposal.id %}" class="btn btn-apoyo">Comprometerme</a>
+              <a href="{% url 'popular_proposals:commit_yes' candidate_pk=candidacy.candidate.id proposal_pk=proposal.id %}" alt="Comprometerme" class="btn btn-apoyo">
+                {% if not support_button_extra_class %}Comprometerme{% else %}<i class="fa fa-thumbs-up" aria-hidden="true"></i>{% endif %}
+              </a>
+              <a href="{% url 'popular_proposals:commit_no' candidate_pk=candidacy.candidate.id proposal_pk=proposal.id %}" alt="No comprometerme" class="btn btn-no-apoyo">
+                {% if not support_button_extra_class %}No comprometerme{% else %}<i class="fa fa-thumbs-down" aria-hidden="true"></i>{% endif %}
+              </a>
             </div>
             {% endwith %}
           {% endif %}

diff --git a/votai_general_theme/templates/popular_proposal/_likers_candidatos.html b/votai_general_theme/templates/popular_proposal/_likers_candidatos.html
@@ -10,19 +10,22 @@
     <ul class="list-inline">
 
       {% for commitment in commitments.all %}
-      <li>
-        <a href="{{commitment.get_absolute_url}}">
-          {% if commitment.candidate.image %}
-            {% thumbnail commitment.candidate.image "50x50" crop="center" as im %}
-                <img src="{{ im.url }}" alt="{{commitment.candidate.name}}" height="50" width="50" border="0" class="img-responsive img-circle img-candidato">
-            {% endthumbnail %}
-            {% else %}
-            <img src="{% static 'img/candidate-default.jpg' %}" alt="{{commitment.candidate.name}}" border="0" class="img-responsive img-circle img-candidato img-candidato">
-          {% endif %}
 
-          {{commitment.candidate}}
-        </a>
-      </li>
+        <li class="{% if not commitment.commited %}no-comprometido{% endif %}">
+          <a href="{{commitment.get_absolute_url}}">
+            {% if commitment.commited %}
+              {% if commitment.candidate.image %}
+                {% thumbnail commitment.candidate.image "50x50" crop="center" as im %}
+                    <img src="{{ im.url }}" alt="{{commitment.candidate.name}}" height="50" width="50" border="0" class="img-responsive img-circle img-candidato">
+                {% endthumbnail %}
+                {% else %}
+                <img src="{% static 'img/candidate-default.jpg' %}" alt="{{commitment.candidate.name}}" border="0" class="img-responsive img-circle img-candidato img-candidato">
+              {% endif %}
+            {% endif %}
+            {{commitment.candidate}}
+          </a>
+        </li>
+
       {% endfor %}
     </ul>
 {% endif %}

diff --git a/votai_general_theme/templates/popular_proposal/commitment/commit_no.html b/votai_general_theme/templates/popular_proposal/commitment/commit_no.html
@@ -24,16 +24,7 @@
 	<div class="fondo-blanco text-width">
 
 
-
-	{% if candidate.election.position == 'concejal' %}
-		Yo <strong>{{candidate.name}}</strong> candidata/o al Concejo Municipal de {{proposal.area}} <strong>NO</strong> apoyaré la propuesta ciudadana <strong>{{proposal.title}}</strong>.
-	{% elif candidate.election.position == 'alcalde' %}
-		Yo <strong>{{candidate.name}}</strong> candidata/o a la alcaldía de {{proposal.area}} <strong>NO</strong> me comprometo con la propuesta ciudadana <strong>{{proposal.title}}</strong>.
-
-	{% else %}
-
-		Yo <strong>{{candidate.name}}</strong> candidata/o por {{proposal.area}} <strong>NO</strong> me comprometo con la propuesta ciudadana <strong>{{proposal.title}}</strong>.
-	{% endif %}
+		Yo <strong>{{candidate.name}}</strong> candidata/o a {{candidate.election.position}} de {{proposal.area}} <strong>NO</strong> me comprometo con la propuesta ciudadana <strong>{{proposal.title}}</strong>.
 
 		<p>Por las razones que explicaré a continuación:</p>
 

diff --git a/votai_general_theme/templates/popular_proposal/commitment/detail_no.html b/votai_general_theme/templates/popular_proposal/commitment/detail_no.html
@@ -35,8 +35,7 @@
         {% endif %}
 
 
-		{% if commitment.candidate.election.position == 'concejal' %}
-		<p> <strong>{{commitment.candidate.name}}</strong> candidata/o al concejo municipal de {{commitment.proposal.area}} <strong>NO</strong> apoyará la propuesta ciudadana <strong>{{commitment.proposal.title}}</strong>.</p>
+		<p>Lamentablemente <strong>{{commitment.candidate.name}}</strong> candidata/o a {{commitment.candidate.election.position}} de {{commitment.proposal.area}} <strong>NO</strong> incluirá <strong>{{commitment.proposal.title}}</strong> en su programa.</p>
 
 		<p>Sus razones fueron las siguientes:</p>
 		<p>{{commitment.detail|linebreaksbr}}</p>
@@ -47,39 +46,6 @@
 			<p>Candidata/o {% if commitment.candidate.election.position %}a {{commitment.candidate.election.position|title }}{% endif %} por {{commitment.proposal.area}}.</p>
 
 		</div>
-	{% elif commitment.candidate.election.position == 'alcalde' %}
-		<p> <strong>{{commitment.candidate.name}}</strong> candidata/o la alcaldía de {{commitment.proposal.area}} <strong>NO</strong> incluirá <strong>{{commitment.proposal.title}}</strong> en su programa.</p>
-
-		<p>Sus razones fueron las siguientes:</p>
-		<p>{{commitment.detail|linebreaksbr}}</p>
-
-		<div class="pull-right">
-			<p><strong>{{commitment.candidate.name}}</strong></p>
-
-			<p>Candidata/o {% if commitment.candidate.election.position %}a {{commitment.candidate.election.position|title }}{% endif %} por {{commitment.proposal.area}}.</p>
-
-		</div>
-
-
-	{% else %}
-
-		<p>Lamentablemente <strong>{{commitment.candidate.name}}</strong> candidata/o por {{commitment.proposal.area}} <strong>NO</strong> incluirá <strong>{{commitment.proposal.title}}</strong> en su programa.</p>
-
-		<p>Sus razones fueron las siguientes:</p>
-		<p>{{commitment.detail|linebreaksbr}}</p>
-
-		<div class="pull-right">
-			<p><strong>{{commitment.candidate.name}}</strong></p>
-
-			<p>Candidata/o {% if commitment.candidate.election.position %}a {{commitment.candidate.election.position|title }}{% endif %} por {{commitment.proposal.area}}.</p>
-
-		</div>
-	{% endif %}
-
-
-
-
-
 
 
 

diff --git a/votai_general_theme/templates/popular_proposal/commitment/detail_yes.html b/votai_general_theme/templates/popular_proposal/commitment/detail_yes.html
@@ -56,6 +56,7 @@ <h1 class="page-header">Compromiso</h1>
       <p>Candidata/o {% if commitment.candidate.election.position %}a {{commitment.candidate.election.position|title }}{% endif %} por {{commitment.candidate.election.area}}.</p>
     </div>
 </div>
+{% if user|manages_this:commitment.candidate %}
 <div class="container text-center">
   <h3>Hazlo público!</h3>
   <p>Cuéntales a tus futuros electores el compromiso que acabas de firmar!</p>
@@ -64,4 +65,5 @@ <h3>Hazlo público!</h3>
     <li><a href="#" onclick="window.open('https://facebook.com/sharer/sharer.php?u=https://{% url_domain %}{% url 'popular_proposals:commitment' commitment.candidate.id commitment.proposal.slug %}','facebook','width=450, height=250'); ga('send','event','compartir-compromiso-fb','click')"><i class="fa fa-facebook fa-2x"></i></a></li>
   </ul>
 </div>
+{% endif %}
 {% endblock content %}