consul/grecia
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'select_debates_which_display_as_featured' of https://github.com/MaiteHdezRivas/consul into MaiteHdezRivas-select_debates_which_display_as_featured

Browse Source 
Conflicts:
	db/schema.rb
This commit is contained in:
Alberto Garcia Cabeza
2016-04-05 14:05:27 +02:00
parent 55b7617ef0 69bd24d2c8
commit 3fd8e76a79
15 changed files with 107 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/views/debates/_actions.html.erb
View File

@@ -8,3 +8,14 @@
<%= link_to t("admin.actions.hide_author").capitalize, hide_moderation_user_path(debate.author_id),
method: :put, data: { confirm: t('admin.actions.confirm') } %>
<% end %>
<% if can? :feature, debate %>
&nbsp;|&nbsp;
<% if debate.featured? %>
<%= link_to t("admin.actions.remove_feature").capitalize, remove_feature_debate_path(debate),
method: :put, data: { confirm: t('admin.actions.confirm') } %>
<% else %>
<%= link_to t("admin.actions.feature").capitalize, feature_debate_path(debate),
method: :put, data: { confirm: t('admin.actions.confirm') } %>
<% end %>
<% end %>

13
app/views/debates/_featured_debates.html.erb Normal file
View File

@@ -0,0 +1,13 @@
<div id="featured-debates" class="row featured-debates">
<div class="small-12 column">
<h2><%= t("debates.index.featured_debates") %></h2>
</div>
<% @debates.featured.each do |debate| %>
<div class="small-12 medium-6 column">
<h3><%= link_to debate.title, debate %></h3>
<%= link_to debate.author.name, user_path(debate.author)%>
</div>
<% end %>
</div>

17
app/views/debates/_featured_debates_static.html.erb
View File

@@ -1,17 +0,0 @@
<div id="featured-debates" class="row featured-debates">
<div class="small-12 column">
<h2><%= t("debates.index.featured_debates") %></h2>
</div>
<div class="small-12 medium-6 column">
<h3><%= link_to "#Túpreguntas: Manuela Carmena, Alcaldesa de Madrid.", "https://decide.madrid.es/debates/4320" %></h3>
<%= link_to "Manuela Carmena ", "https://decide.madrid.es/users/21452"%>
</div>
<div class="small-12 medium-6 column">
<h3><%= link_to "¿Y si pudieras entrevistar a Manuela Carmena o a los otros concejales?", "https://decide.madrid.es/debates/4299" %></h3>
<%= link_to "ParticipaciónYTransparenciaAytoMadrid", "https://decide.madrid.es/users/52055"%>
</div>
</div>

4
app/views/debates/index.html.erb
View File

@@ -25,8 +25,8 @@
<% end %>
</div>
<% unless @tag_filter || @search_terms %>
<%= render "featured_debates_static" %>
<% unless @tag_filter || @search_terms || !has_featured %>
<%= render "featured_debates", debate: @debates.featured %>
<% end %>
<%= render "shared/advanced_search", search_path: debates_path(page: 1) %>