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

Removes unused code for filters

Browse Source
This commit is contained in:
Alberto Garcia Cabeza
2016-01-12 18:38:31 +01:00
parent 6dff64a920
commit 0f5237b52f
6 changed files with 65 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/stylesheets/admin.scss
View File

@@ -70,10 +70,6 @@ body.admin {
.admin-content {
margin-top: rem-calc(24);
.filters h2 {
margin-top: 0;
}
.proposal-new, .proposal-edit {
padding-top: 0;
}

4
app/assets/stylesheets/layout.scss
View File

@@ -8,7 +8,7 @@
// 06. Forms
// 07. Alerts
// 08. User account
// 09. Filters & search
// 09. Search
// 10. Official levels
// 11. Pagination
// 12. Tables
@@ -1028,7 +1028,7 @@ img.avatar, img.admin-avatar, img.moderator-avatar, img.initialjs-avatar {
}
}
// 09. Filters & search
// 09. Search
// - - - - - - - - - - - - - - - - - - - - - - - - -
.search-form {

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

@@ -9,34 +9,32 @@
<div class="wrap row">
<div id="debates" class="debates-list small-12 medium-9 column">
<div class="filters">
<div class="small-12 medium-7 left">
<% if @search_terms %>
<h2 class="margin-top">
<%= page_entries_info @debates %>
<%= t("debates.index.search_results", count: @debates.size, search_term: @search_terms) %>
</h2>
<% elsif @tag_filter %>
<h2 class="margin-top">
<%= page_entries_info @debates %>
<%= t("debates.index.filter_topic", count: @debates.size, topic: @tag_filter) %>
</h2>
<% end %>
</div>
<% unless @tag_filter || @search_terms %>
<%= render "featured_debates_static" %>
<div class="small-12 medium-7 left">
<% if @search_terms %>
<h2 class="margin-top">
<%= page_entries_info @debates %>
<%= t("debates.index.search_results", count: @debates.size, search_term: @search_terms) %>
</h2>
<% elsif @tag_filter %>
<h2 class="margin-top">
<%= page_entries_info @debates %>
<%= t("debates.index.filter_topic", count: @debates.size, topic: @tag_filter) %>
</h2>
<% end %>
<%= render 'shared/order_links', i18n_namespace: "debates.index" %>
<div class="show-for-small-only">
<%= link_to t("debates.index.start_debate"), new_debate_path, class: 'button radius expand' %>
</div>
<%= render @debates %>
<%= paginate @debates %>
</div>
<% unless @tag_filter || @search_terms %>
<%= render "featured_debates_static" %>
<% end %>
<%= render 'shared/order_links', i18n_namespace: "debates.index" %>
<div class="show-for-small-only">
<%= link_to t("debates.index.start_debate"), new_debate_path, class: 'button radius expand' %>
</div>
<%= render @debates %>
<%= paginate @debates %>
</div>
<div class="small-12 medium-3 column">

2
app/views/proposals/_featured_proposal.html.erb
View File

@@ -1,4 +1,4 @@
<div id="<%= dom_id(proposal) %>" class="clear">
<div id="<%= dom_id(proposal) %>" class="proposal-featured clear">
<div class="small-12 medium-9 column">
<h3><%= link_to proposal.title, proposal %></h3>
<div class="info">

60
app/views/proposals/index.html.erb
View File

@@ -9,43 +9,41 @@
<div class="wrap row">
<div id="proposals" class="proposals-list small-12 medium-9 column">
<div class="filters">
<div class="small-12 medium-7 left">
<% if @search_terms %>
<h2 class="margin-top">
<%= page_entries_info @proposals %>
<%= t("proposals.index.search_results", count: @proposals.size, search_term: @search_terms) %>
</h2>
<% elsif @tag_filter %>
<h2 class="margin-top">
<%= page_entries_info @proposals %>
<%= t("proposals.index.filter_topic", count: @proposals.size, topic: @tag_filter) %>
<div class="small-12 medium-7 left">
<% if @search_terms %>
<h2 class="margin-top">
<%= page_entries_info @proposals %>
<%= t("proposals.index.search_results", count: @proposals.size, search_term: @search_terms) %>
</h2>
<% elsif @tag_filter %>
<h2 class="margin-top">
<%= page_entries_info @proposals %>
<%= t("proposals.index.filter_topic", count: @proposals.size, topic: @tag_filter) %>
</h2>
<% end %>
</div>
<% if @featured_proposals.present? %>
<div id="featured-proposals" class="row featured-proposals">
<div class="small-12 column">
<h2>
<%= t("proposals.index.featured_proposals") %>
</h2>
</div>
<% @featured_proposals.each do |featured_proposal| %>
<%= render "featured_proposal", proposal: featured_proposal %>
<% end %>
</div>
<% end %>
<% if @featured_proposals.present? %>
<div id="featured-proposals" class="row featured-proposals">
<div class="small-12 column">
<h2>
<%= t("proposals.index.featured_proposals") %>
</h2>
</div>
<% @featured_proposals.each do |featured_proposal| %>
<%= render "featured_proposal", proposal: featured_proposal %>
<% end %>
</div>
<% end %>
<%= render 'shared/order_links', i18n_namespace: "proposals.index" %>
<%= render 'shared/order_links', i18n_namespace: "proposals.index" %>
<div class="show-for-small-only">
<%= link_to t("proposals.index.start_proposal"), new_proposal_path, class: 'button radius expand' %>
</div>
<%= render partial: 'proposals/proposal', collection: @proposals %>
<%= paginate @proposals %>
<div class="show-for-small-only">
<%= link_to t("proposals.index.start_proposal"), new_proposal_path, class: 'button radius expand' %>
</div>
<%= render partial: 'proposals/proposal', collection: @proposals %>
<%= paginate @proposals %>
</div>
<div class="small-12 medium-3 column">

21
app/views/welcome/highlights.html.erb
View File

@@ -4,19 +4,16 @@
<div class="wrap row">
<div id="activities" class="debates-list small-12 medium-9 column">
<div class="filters">
<div class="small-12 medium-7 left">
<h1 class="inline-block"><%= t('welcome.highlights') %></h1>
&nbsp;&nbsp;
<h2 class="margin-top">
<%= t('welcome.signed_in_home_title') %>
</h2>
</div>
<%= render @list %>
<%= paginate @paginator %>
<div class="small-12 medium-7 left">
<h1 class="inline-block"><%= t('welcome.highlights') %></h1>
&nbsp;&nbsp;
<h2 class="margin-top">
<%= t('welcome.signed_in_home_title') %>
</h2>
</div>
<%= render @list %>
<%= paginate @paginator %>
</div>
<div class="small-12 medium-3 column">