Skip to content

Commit

Permalink
Embeded for comparing and index
Browse files Browse the repository at this point in the history
  • Loading branch information
Felipe Álvarez committed Jul 23, 2012
1 parent 5d9d07a commit 5e1d544
Show file tree
Hide file tree
Showing 19 changed files with 1,055 additions and 173 deletions.
1 change: 1 addition & 0 deletions elections/models.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ class Election(models.Model):
created_at = models.DateTimeField(auto_now_add=True, editable=False)
updated_at = models.DateTimeField(auto_now=True, editable=False)
date = models.CharField(max_length=255, verbose_name=_(u"fecha en que ocurrirá:"), blank=True)
#highlighted = models.BooleanField(default=False)

class Meta:
unique_together = ('owner', 'slug')
Expand Down
35 changes: 28 additions & 7 deletions elections/templates/elections/base.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
<!doctype html>
<html>
<head>
<meta charset="utf-8" />
<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}css/style.css">
<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}css/footer.css">
<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}css/nav.css">
Expand All @@ -14,12 +15,12 @@
{% block extra_head %}
{% endblock extra_head %}
</head>

<body>
<div class="bulb_container">
<div class="fci-ampolleta-light"><iframe src="http://ciudadanointeligente.org/assets/bulb_light.html?wmode=transparent" width="120px" height="220" frameborder="0"></iframe></div>
<div class="fci-ampolleta-light"><iframe src="http://ciudadanointeligente.org/assets/bulb_light.html?wmode=transparent" width="120" height="220" frameborder="0"></iframe></div>
</div>

<body>

<div>

</div>
Expand Down Expand Up @@ -59,9 +60,11 @@ <h1 style="display: none;">Candideit.org</h1>
</div>
</nav>
</div>

<div class="papel">
<div class="newElection"><a href="{% url election_create %}"><img src="{{ STATIC_URL }}/img/bt_nuevaeleccion.png" ></a></div>
{% block content %}
{% endblock content %}
</div>

<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.7.0/jquery.min.js"></script>
<script src="{{ STATIC_URL }}js/accordionForElections.js"></script>
Expand All @@ -86,10 +89,28 @@ <h1 style="display: none;">Candideit.org</h1>
{% block extra_js %}
{% endblock extra_js %}

</body>
<div class="contenedor1">
<div class="contenedor2">
<div id="fb-root">
<br>
{% if facebook_link %}
<div class="fb-comments" data-href="{{facebook_link}}" data-num-posts="2" data-width="824"></div>
{% else %}
<div class="fb-comments" data-href="{{ request.build_absolute_uri }}" data-num-posts="2" data-width="824"></div>
{% endif %}
<br>
</div>
</div>
</div>








<div id="footer">
</div>

</body>
</html>
<html>
50 changes: 50 additions & 0 deletions elections/templates/elections/base_embed.html
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
{% load i18n %}
<!doctype html>
<html>
<head>
<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}css/style.css">
<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}css/footer.css">
<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}css/nav.css">
<link href="{{ STATIC_URL }}img/favicon.ico" rel="icon" type="image/x-icon" />
<meta name="keywords" content="transparencia, participación, democracia, eleccion, candidato" />
<title>{% block title%}{% trans 'Aquí los conoces, tú los eliges' %}{% endblock title %} | {% trans 'candideit.org' %}</title>
{% if election %}
<meta name="Description" content="{{ election.description }}" />
{% endif %}
{% block extra_head %}
{% endblock extra_head %}
</head>
<body>
{% block content %}
{% endblock content %}

<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.7.0/jquery.min.js"></script>
<script src="{{ STATIC_URL }}js/accordionForElections.js"></script>
<script type="text/javascript">
var uvOptions = {};
(function() {
var uv = document.createElement('script'); uv.type = 'text/javascript'; uv.async = true;
uv.src = ('https:' == document.location.protocol ? 'https://' : 'http://') + 'widget.uservoice.com/5M7s1fetVuJpCZzITw9g.js';
var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(uv, s);
})();
var _gaq = _gaq || [];
_gaq.push(['_setAccount', 'UA-29858310-1']);
_gaq.push(['_trackPageview']);

(function() {
var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
})();

</script>
{% block extra_js %}
{% endblock extra_js %}

</body>

<div id="footer">
</div>

</html>
<html>
28 changes: 0 additions & 28 deletions elections/templates/elections/candidate_detail.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -180,34 +180,6 @@ <h3>{{ category.name }}</h3>

</div>
</div>

<div class="contenedor1">
<div class="contenedor2">


<script>(function(d, s, id) {
var js, fjs = d.getElementsByTagName(s)[0];
if (d.getElementById(id)) return;
js = d.createElement(s); js.id = id;
js.src = "//connect.facebook.net/es_LA/all.js#xfbml=1";
fjs.parentNode.insertBefore(js, fjs);
}(document, 'script', 'facebook-jssdk'));</script>

<div id="fb-root">
<center>
<div class="fb-comments" data-href="{{ request.build_absolute_uri }}" data-num-posts="2" data-width="823"></div>
</center>
</div>




</div>
</div>




</div>

{% endblock content %}
16 changes: 0 additions & 16 deletions elections/templates/elections/election_compare.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -378,22 +378,6 @@ <h3 class="categoriesTitle">{% trans "Temas" %}</h3>
</div>
</div>

<div class="contenedor1">
<div class="contenedor2">

<div id="fb-root">
<br>
{% if facebook_link %}
<div class="fb-comments" data-href="{{facebook_link}}" data-num-posts="2" data-width="824"></div>
{% else %}
<div class="fb-comments" data-href="{{ request.build_absolute_uri }}" data-num-posts="2" data-width="824"></div>
{% endif %}
<br>
</div>

</div>
</div>

</div>

{% endblock content %}
24 changes: 1 addition & 23 deletions elections/templates/elections/election_detail.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,7 @@

{% block content %}

<div class="papel">

<div class="newElection"><a href="{% url election_create %}"><img src="{{ STATIC_URL }}/img/bt_nuevaeleccion.png" ></a></div>


<div class="contenedor3">

Expand Down Expand Up @@ -80,26 +78,6 @@ <h5>{% trans 'Compara' %} <br> {% trans 'candidatos' %} </h5>
<br>


</div>

<div class="contenedor1">
<div class="contenedor2">

<div id="fb-root">
<div class="fb-comments" data-href="{{ request.build_absolute_uri }}" data-num-posts="2" data-width="824"></div>
</div>


<!-- <div class="fb-comments fb_iframe_widget" data-href="{{ request.build_absolute_uri }}"
data-num-posts="2" data-width="890"><span><iframe id="f266ae179" name="f1e6473d3c" scrolling="no"
style="border-width: initial; border-color: initial; overflow-x: hidden; overflow-y: hidden; width: 890px; height: 160px; border-top-style: none; border-right-style: none; border-bottom-style: none; border-left-style: none; border-width: initial; border-color: initial; "
class="fb_ltr"
src="https://www.facebook.com/plugins/comments.php?channel_url=https%3A%2F%2Fs-static.ak.fbcdn.net%2Fconnect%2Fxd_proxy.php%3Fversion%3D3%23cb%3Df4ad704e4%26origin%3Dhttp%253A%252F%252F{{ request.get_host }}%252Ff224357b74%26relation%3Dparent.parent%26transport%3Dpostmessage&amp;href={{ request.build_absolute_uri|urlencode:"" }}&amp;locale=en_US&amp;numposts=2&amp;sdk=joey&amp;width=890"></iframe></span>
</div> -->

</div>
</div>

</div>

{% endblock content %}
15 changes: 0 additions & 15 deletions elections/templates/elections/election_detail_profiles.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,21 +88,6 @@
</div>
</div>


<div class="contenedor1">
<div class="contenedor2">


<div id="fb-root">
<center>
<div class="fb-comments" data-href="{{ request.build_absolute_uri }}" data-num-posts="2" data-width="823"></div>
</center>
</div>


</div>
</div>

</div>

{% endblock content %}
Loading

0 comments on commit 5e1d544

Please sign in to comment.