últimas movidas para que ciertas acciones no se puedan realizar desde…

… la versión embedded por que queda la cagada
ciudadanointeligente · Aug 18, 2016 · b09e571 · b09e571
1 parent f23c974
commit b09e571
Show file tree

Hide file tree

Showing 6 changed files with 51 additions and 27 deletions.
diff --git a/popular_proposal/urls.py b/popular_proposal/urls.py
@@ -18,7 +18,7 @@
         HomeView.as_view(),
         name='home'),
     url(r'^embedded/?$',
-        HomeView.as_view(is_embedded=True),
+        xframe_options_exempt(HomeView.as_view(is_embedded=True)),
         name='embedded_home'),
     url(r'^area_embedded/(?P<slug>[-\w]+)/?$',
         xframe_options_exempt(ProposalsPerArea.as_view(is_embedded=True)),

diff --git 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
@@ -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
@@ -17,15 +17,16 @@
 		  ¡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>
 	{% endif %}
 	<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
@@ -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 %}

diff --git a/votainteligente/view_mixins.py b/votainteligente/view_mixins.py
@@ -0,0 +1,15 @@
+from django.views.generic import View
+
+
+class EmbeddedViewBase(View):
+    layout = 'base.html'
+    embedded_layout = 'embedded_base.html'
+    is_embedded = False
+
+    def get_context_data(self, * args, **kwargs):
+        context = super(EmbeddedViewBase, self).get_context_data(* args, **kwargs)
+        if self.is_embedded:
+            self.layout = self.embedded_layout
+        context['layout'] = self.layout
+        context['is_embedded'] = self.is_embedded
+        return context