Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Propuestas en el home #550

Merged
merged 9 commits into from Sep 7, 2016
Merged

Propuestas en el home #550

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
417a6e5
Propuestas transversales
Sep 6, 2016
4c5d612
Proposals for all areas are listed last
Sep 6, 2016
ac0f9f6
Paginando las propuestas
Sep 6, 2016
c71c184
Paginator at the beggining
Sep 6, 2016
b672f51
Estilo propuesta transversal (falta logo)
camargozzini Sep 6, 2016
167f6f6
Ordering proposals based on the amount of likers
Sep 6, 2016
8e95b21
@camargozzini en el home vienen las 3 propuestas con más likes =)
Sep 6, 2016
9507dbc
Propuestas en el nuevo home
Sep 6, 2016
4c4395e
resolviendo conflicto
camargozzini Sep 7, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 0 additions & 1 deletion votai_general_theme/static/sass/main.scss
View file
Open in desktop
Expand Up @@ -1655,7 +1655,6 @@ input#id_4-title {
padding: 25px 20px 35px;
border-bottom: 18px solid $blue;
position: relative;
height: 430px;
}

.propuesta:after {
Expand Down
115 changes: 6 additions & 109 deletions votai_general_theme/templates/_slide_propuestas.html
View file
Open in desktop
Expand Up @@ -15,22 +15,11 @@ <h2 class="text-center">Propuestas con más apoyo de los ciudadanos</h2>

<div class="carousel-inner">
<div class="item active">
<div class="col-md-4 col-sm-6">
<div class="block-text rel zmin">
<a title="" href="#">Hercules</a>
<div class="mark">My rating: <span class="rating-input"><span data-value="0" class="glyphicon glyphicon-star"></span><span data-value="1" class="glyphicon glyphicon-star"></span><span data-value="2" class="glyphicon glyphicon-star"></span><span data-value="3" class="glyphicon glyphicon-star"></span><span data-value="4" class="glyphicon glyphicon-star-empty"></span><span data-value="5" class="glyphicon glyphicon-star-empty"></span> </span></div>
<p>Never before has there been a good film portrayal of ancient Greece's favourite myth. So why would Hollywood start now? This latest attempt at bringing the son of Zeus to the big screen is brought to us by X-Men: The last Stand director Brett Ratner. If the name of the director wasn't enough to dissuade ...</p>
<ins class="ab zmin sprite sprite-i-triangle block"></ins>
</div>
<div class="person-text rel">

<a title="" href="#">Anna</a>
<i>from Glasgow, Scotland</i>
</div>
</div>
<!-- Te traje 3 no más si quieres más me avisai =) -->
{% for proposal in proposals %}
<div class="col-md-4 col-sm-6 hidden-xs">
<div class="block-text rel zmin">
<a title="" href="#">The Purge: Anarchy</a>
<a title="" href="#">{{proposal.title}}</a>
<div class="mark">My rating: <span class="rating-input"><span data-value="0" class="glyphicon glyphicon-star"></span><span data-value="1" class="glyphicon glyphicon-star"></span><span data-value="2" class="glyphicon glyphicon-star-empty"></span><span data-value="3" class="glyphicon glyphicon-star-empty"></span><span data-value="4" class="glyphicon glyphicon-star-empty"></span><span data-value="5" class="glyphicon glyphicon-star-empty"></span> </span></div>
<p>The 2013 movie "The Purge" left a bad taste in all of our mouths as nothing more than a pseudo-slasher with a hamfisted plot, poor pacing, and a desperate attempt at "horror." Upon seeing the first trailer for "The Purge: Anarchy," my first and most immediate thought was "we really don't need another one of these." </p>
<ins class="ab zmin sprite sprite-i-triangle block"></ins>
Expand All @@ -41,101 +30,9 @@ <h2 class="text-center">Propuestas con más apoyo de los ciudadanos</h2>
<i>United States</i>
</div>
</div>
<div class="col-md-4 col-sm-6 hidden-sm hidden-xs">
<div class="block-text rel zmin">
<a title="" href="#">Planes: Fire & Rescue</a>
<div class="mark">My rating: <span class="rating-input"><span data-value="0" class="glyphicon glyphicon-star"></span><span data-value="1" class="glyphicon glyphicon-star"></span><span data-value="2" class="glyphicon glyphicon-star"></span><span data-value="3" class="glyphicon glyphicon-star"></span><span data-value="4" class="glyphicon glyphicon-star"></span><span data-value="5" class="glyphicon glyphicon-star"></span> </span></div>
<p>What a funny and entertaining film! I did not know what to expect, this is the fourth film in this vehicle's universe with the two Cars movies and then the first Planes movie. I was wondering if maybe Disney pushed it a little bit. However, Planes: Fire and Rescue is an entertaining film that is a fantastic sequel in this magical franchise. </p>
<ins class="ab zmin sprite sprite-i-triangle block"></ins>
</div>
<div class="person-text rel">

<a title="" href="#">Rannynm</a>
<i>Indonesia</i>
</div>
</div>
</div>
<div class="item">
<div class="col-md-4 col-sm-6">
<div class="block-text rel zmin">
<a title="" href="#">Hercules</a>
<div class="mark">My rating: <span class="rating-input"><span data-value="0" class="glyphicon glyphicon-star"></span><span data-value="1" class="glyphicon glyphicon-star"></span><span data-value="2" class="glyphicon glyphicon-star"></span><span data-value="3" class="glyphicon glyphicon-star"></span><span data-value="4" class="glyphicon glyphicon-star-empty"></span><span data-value="5" class="glyphicon glyphicon-star-empty"></span> </span></div>
<p>Never before has there been a good film portrayal of ancient Greece's favourite myth. So why would Hollywood start now? This latest attempt at bringing the son of Zeus to the big screen is brought to us by X-Men: The last Stand director Brett Ratner. If the name of the director wasn't enough to dissuade ...</p>
<ins class="ab zmin sprite sprite-i-triangle block"></ins>
</div>
<div class="person-text rel">
<img alt="" src="http://myinstantcms.ru/images/img13.png">
<a title="" href="#">Anna</a>
<i>from Glasgow, Scotland</i>
</div>
</div>
<div class="col-md-4 col-sm-6 hidden-xs">
<div class="block-text rel zmin">
<a title="" href="#">The Purge: Anarchy</a>
<div class="mark">My rating: <span class="rating-input"><span data-value="0" class="glyphicon glyphicon-star"></span><span data-value="1" class="glyphicon glyphicon-star"></span><span data-value="2" class="glyphicon glyphicon-star-empty"></span><span data-value="3" class="glyphicon glyphicon-star-empty"></span><span data-value="4" class="glyphicon glyphicon-star-empty"></span><span data-value="5" class="glyphicon glyphicon-star-empty"></span> </span></div>
<p>The 2013 movie "The Purge" left a bad taste in all of our mouths as nothing more than a pseudo-slasher with a hamfisted plot, poor pacing, and a desperate attempt at "horror." Upon seeing the first trailer for "The Purge: Anarchy," my first and most immediate thought was "we really don't need another one of these." </p>
<ins class="ab zmin sprite sprite-i-triangle block"></ins>
</div>
<div class="person-text rel">
<img alt="" src="http://myinstantcms.ru/images/img14.png">
<a title="" href="#">Ella Mentree</a>
<i>United States</i>
</div>
</div>
<div class="col-md-4 col-sm-6 hidden-sm hidden-xs">
<div class="block-text rel zmin">
<a title="" href="#">Planes: Fire & Rescue</a>
<div class="mark">My rating: <span class="rating-input"><span data-value="0" class="glyphicon glyphicon-star"></span><span data-value="1" class="glyphicon glyphicon-star"></span><span data-value="2" class="glyphicon glyphicon-star"></span><span data-value="3" class="glyphicon glyphicon-star"></span><span data-value="4" class="glyphicon glyphicon-star"></span><span data-value="5" class="glyphicon glyphicon-star"></span> </span></div>
<p>What a funny and entertaining film! I did not know what to expect, this is the fourth film in this vehicle's universe with the two Cars movies and then the first Planes movie. I was wondering if maybe Disney pushed it a little bit. However, Planes: Fire and Rescue is an entertaining film that is a fantastic sequel in this magical franchise. </p>
<ins class="ab zmin sprite sprite-i-triangle block"></ins>
</div>
<div class="person-text rel">
<img alt="" src="http://myinstantcms.ru/images/img15.png">
<a title="" href="#">Rannynm</a>
<i>Indonesia</i>
</div>
</div>
</div>
<div class="item">
<div class="col-md-4 col-sm-6">
<div class="block-text rel zmin">
<a title="" href="#">Hercules</a>
<div class="mark">My rating: <span class="rating-input"><span data-value="0" class="glyphicon glyphicon-star"></span><span data-value="1" class="glyphicon glyphicon-star"></span><span data-value="2" class="glyphicon glyphicon-star"></span><span data-value="3" class="glyphicon glyphicon-star"></span><span data-value="4" class="glyphicon glyphicon-star-empty"></span><span data-value="5" class="glyphicon glyphicon-star-empty"></span> </span></div>
<p>Never before has there been a good film portrayal of ancient Greece's favourite myth. So why would Hollywood start now? This latest attempt at bringing the son of Zeus to the big screen is brought to us by X-Men: The last Stand director Brett Ratner. If the name of the director wasn't enough to dissuade ...</p>
<ins class="ab zmin sprite sprite-i-triangle block"></ins>
</div>
<div class="person-text rel">
<img alt="" src="http://myinstantcms.ru/images/img13.png">
<a title="" href="#">Anna</a>
<i>from Glasgow, Scotland</i>
</div>
</div>
<div class="col-md-4 col-sm-6 hidden-xs">
<div class="block-text rel zmin">
<a title="" href="#">The Purge: Anarchy</a>
<div class="mark">My rating: <span class="rating-input"><span data-value="0" class="glyphicon glyphicon-star"></span><span data-value="1" class="glyphicon glyphicon-star"></span><span data-value="2" class="glyphicon glyphicon-star-empty"></span><span data-value="3" class="glyphicon glyphicon-star-empty"></span><span data-value="4" class="glyphicon glyphicon-star-empty"></span><span data-value="5" class="glyphicon glyphicon-star-empty"></span> </span></div>
<p>The 2013 movie "The Purge" left a bad taste in all of our mouths as nothing more than a pseudo-slasher with a hamfisted plot, poor pacing, and a desperate attempt at "horror." Upon seeing the first trailer for "The Purge: Anarchy," my first and most immediate thought was "we really don't need another one of these." </p>
<ins class="ab zmin sprite sprite-i-triangle block"></ins>
</div>
<div class="person-text rel">
<img alt="" src="http://myinstantcms.ru/images/img14.png">
<a title="" href="#">Ella Mentree</a>
<i>United States</i>
</div>
</div>
<div class="col-md-4 col-sm-6 hidden-sm hidden-xs">
<div class="block-text rel zmin">
<a title="" href="#">Planes: Fire & Rescue</a>
<div class="mark">My rating: <span class="rating-input"><span data-value="0" class="glyphicon glyphicon-star"></span><span data-value="1" class="glyphicon glyphicon-star"></span><span data-value="2" class="glyphicon glyphicon-star"></span><span data-value="3" class="glyphicon glyphicon-star"></span><span data-value="4" class="glyphicon glyphicon-star"></span><span data-value="5" class="glyphicon glyphicon-star"></span> </span></div>
<p>What a funny and entertaining film! I did not know what to expect, this is the fourth film in this vehicle's universe with the two Cars movies and then the first Planes movie. I was wondering if maybe Disney pushed it a little bit. However, Planes: Fire and Rescue is an entertaining film that is a fantastic sequel in this magical franchise. </p>
<ins class="ab zmin sprite sprite-i-triangle block"></ins>
</div>
<div class="person-text rel">
<img alt="" src="http://myinstantcms.ru/images/img15.png">
<a title="" href="#">Rannynm</a>
<i>Indonesia</i>
</div>
</div>
{% endfor %}


</div>
</div>
<a class="left carousel-control" href="#carousel-propuestas" role="button" data-slide="prev">
Expand Down
2 changes: 1 addition & 1 deletion votai_general_theme/templates/elections/home.html
View file
Open in desktop
Expand Up @@ -84,7 +84,7 @@ <h5 class="text-center">4. A difundir la propuesta y sumar adherentes</h5>
</section> -->

<section id="propuestas-mas-apoyo">
{% include '_slide_propuestas.html' %}
{% include '_slide_propuestas.html' with proposals=proposals_with_likers %}
</section>

<section id="que-hago">
Expand Down