From 287a7dd227a8b37641dd86c2a9fd6be61e8938d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felipe=20=C3=81lvarez?= <falvarez@ciudadanointeligente.org>
Date: Thu, 18 Aug 2016 19:20:30 -0300
Subject: [PATCH] =?UTF-8?q?=C3=BAltimas=20movidas=20para=20que=20ciertas?=
 =?UTF-8?q?=20acciones=20no=20se=20puedan=20realizar=20desde=20la=20versi?=
 =?UTF-8?q?=C3=B3n=20embedded=20por=20que=20queda=20la=20cagada?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/popular_proposal/_likers.html   | 46 ++++++++++---------
 .../popular_proposal/_lista_propuestas.html   |  2 +-
 .../templates/popular_proposal/home.html      |  5 +-
 .../popular_proposal_card.html                |  8 +++-
 4 files changed, 35 insertions(+), 26 deletions(-)

diff --git a/votai_general_theme/templates/popular_proposal/_likers.html b/votai_general_theme/templates/popular_proposal/_likers.html
index fe25b004..d5050ded 100644
--- a/votai_general_theme/templates/popular_proposal/_likers.html
+++ b/votai_general_theme/templates/popular_proposal/_likers.html
@@ -29,31 +29,33 @@
 </script>
 <div class="apoyo">
     <div class="apoyo-btn pull-left">
-        {% if user.is_authenticated %}
+        {% if not is_embedded %}
+            {% if user.is_authenticated %}
 
-            {% if not user|likes:proposal %}
-            
-            <a class="btn-apoyo" data-toggle="modal" data-target="#supportProposal" 
-                data-url="{% url 'popular_proposals:like_a_proposal' pk=proposal.id %}{%if next_url%}?next={{next_url}}{% endif %}">
-                {% blocktrans %}
-                  <span class="fa-stack fa-2x">
-                    <i class="fa fa-circle fa-stack-2x"></i>
-                    <i class="fa fa-heart fa-stack-1x fa-inverse"></i>
-                  </span>
-                {% endblocktrans %}
-            </a>
-            {% include 'modal.html' with modalId='supportProposal' title='Apoya una propuesta' %}
+                {% if not user|likes:proposal %}
+                
+                <a class="btn-apoyo" data-toggle="modal" data-target="#supportProposal" 
+                    data-url="{% url 'popular_proposals:like_a_proposal' pk=proposal.id %}{%if next_url%}?next={{next_url}}{% endif %}">
+                    {% blocktrans %}
+                      <span class="fa-stack fa-2x">
+                        <i class="fa fa-circle fa-stack-2x"></i>
+                        <i class="fa fa-heart fa-stack-1x fa-inverse"></i>
+                      </span>
+                    {% endblocktrans %}
+                </a>
+                {% include 'modal.html' with modalId='supportProposal' title='Apoya una propuesta' %}
+                {% else %}
+                {% with  user|support:proposal as support %}
+                    <a class="unlike_proposal" href="{% url 'popular_proposals:unlike_proposal' pk=support.id %}"><img src="{% static 'img/adherido.svg' %}"></a>
+                {% endwith %}
+                {% endif %}
             {% else %}
-            {% with  user|support:proposal as support %}
-                <a class="unlike_proposal" href="{% url 'popular_proposals:unlike_proposal' pk=support.id %}"><img src="{% static 'img/adherido.svg' %}"></a>
-            {% endwith %}
-            {% endif %}
-        {% else %}
-            <a class="btn btn-md btn-success full-width"  href="{% url 'auth_login' %}">
-                {% blocktrans %}<i class="fa fa-heart" aria-hidden="true"></i>{% endblocktrans %}
-            </a>
+                <a class="btn btn-md btn-success full-width"  href="{% url 'auth_login' %}">
+                    {% blocktrans %}<i class="fa fa-heart" aria-hidden="true"></i>{% endblocktrans %}
+                </a>
 
-        {% endif%}
+            {% endif %}
+        {% endif %}
     </div>
     <div class="apoyo-contador">
         {% blocktrans with count=proposal.likers.count %}
diff --git a/votai_general_theme/templates/popular_proposal/_lista_propuestas.html b/votai_general_theme/templates/popular_proposal/_lista_propuestas.html
index b73ae95d..1a2de8ed 100644
--- a/votai_general_theme/templates/popular_proposal/_lista_propuestas.html
+++ b/votai_general_theme/templates/popular_proposal/_lista_propuestas.html
@@ -27,7 +27,7 @@
 <div id="grid">
   <div id="posts">
     {% for proposal in popular_proposals %}
-    {% include 'popular_proposal/popular_proposal_card.html' with proposal=proposal %}
+    {% include 'popular_proposal/popular_proposal_card.html' with proposal=proposal is_embedded=is_embedded %}
     {% empty %}
     {% blocktrans %}
     Aún no hay propuestas acá.
diff --git a/votai_general_theme/templates/popular_proposal/home.html b/votai_general_theme/templates/popular_proposal/home.html
index cebb3fe4..0905b89b 100644
--- a/votai_general_theme/templates/popular_proposal/home.html
+++ b/votai_general_theme/templates/popular_proposal/home.html
@@ -17,7 +17,8 @@
 		  ¡Incrusta esto en tu página!
 		</button>
 		<div class="collapse" id="incrustaEnTuPagina">
-			  	<textarea style="width:700px;" readonly><iframe src="{% if request.is_secure %}https://{% else %}http://{% endif %}{{ request.get_host }}{% url 'popular_proposals:embedded_home' %}" width="600px" height="500px"></iframe></textarea>
+			  	<textarea style="width:700px;" readonly>
+			  		<iframe src="//{{ request.get_host }}{% url 'popular_proposals:embedded_home' %}" width="600px" height="500px"></iframe></textarea>
 		</div>
 		</div>
 	</div>
@@ -25,7 +26,7 @@
 	<div>
 	  <h1 class="text-center">{% trans "Propuestas en VotaInteligente" %}</h1>
 	  	<div>
-	  		{% include 'popular_proposal/_lista_propuestas.html' with popular_proposals=popular_proposals form=form %}
+	  		{% include 'popular_proposal/_lista_propuestas.html' with popular_proposals=popular_proposals form=form is_embedded=is_embedded %}
 	  	</div>
 	</div>
 </div>
diff --git a/votai_general_theme/templates/popular_proposal/popular_proposal_card.html b/votai_general_theme/templates/popular_proposal/popular_proposal_card.html
index 4386f560..1631c1b7 100644
--- a/votai_general_theme/templates/popular_proposal/popular_proposal_card.html
+++ b/votai_general_theme/templates/popular_proposal/popular_proposal_card.html
@@ -4,7 +4,13 @@
 {% load thumbnail %}
 <div class="post propuesta">
   <span class="label label-default">{{proposal.data.clasification}}</span>
-  <div class="small text-light">Propuesta para <a href="{% url 'area' slug=proposal.area.id %}">{{proposal.area}}</a></div>
+  <div class="small text-light">Propuesta para 
+    {% if not is_embedded %}
+      <a href="{% url 'area' slug=proposal.area.id %}">
+    {% endif %}
+      {{proposal.area}}
+    {% if not is_embedded %}</a>{% endif %}
+  </div>
   {% if proposal.title %}
       <h3><a href="{% url 'popular_proposals:detail' slug=proposal.slug %}">{{proposal.title}}</a></h3>
   {% endif %}