From 0f5237b52ff543495ea331f6db25449ddda68609 Mon Sep 17 00:00:00 2001
From: Alberto Garcia Cabeza <alberto@decabeza.es>
Date: Tue, 12 Jan 2016 18:38:31 +0100
Subject: [PATCH] Removes unused code for filters

---
 app/assets/stylesheets/admin.scss             |  4 --
 app/assets/stylesheets/layout.scss            |  4 +-
 app/views/debates/index.html.erb              | 50 ++++++++--------
 .../proposals/_featured_proposal.html.erb     |  2 +-
 app/views/proposals/index.html.erb            | 60 +++++++++----------
 app/views/welcome/highlights.html.erb         | 21 +++----
 6 files changed, 65 insertions(+), 76 deletions(-)

diff --git a/app/assets/stylesheets/admin.scss b/app/assets/stylesheets/admin.scss
index 5d3418748..470885665 100644
--- a/app/assets/stylesheets/admin.scss
+++ b/app/assets/stylesheets/admin.scss
@@ -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;
     }
diff --git a/app/assets/stylesheets/layout.scss b/app/assets/stylesheets/layout.scss
index 6fa1b9695..7edd5e020 100644
--- a/app/assets/stylesheets/layout.scss
+++ b/app/assets/stylesheets/layout.scss
@@ -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 {
diff --git a/app/views/debates/index.html.erb b/app/views/debates/index.html.erb
index 3312fa0e7..3d714828f 100644
--- a/app/views/debates/index.html.erb
+++ b/app/views/debates/index.html.erb
@@ -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">
diff --git a/app/views/proposals/_featured_proposal.html.erb b/app/views/proposals/_featured_proposal.html.erb
index 808ebf583..623932c38 100644
--- a/app/views/proposals/_featured_proposal.html.erb
+++ b/app/views/proposals/_featured_proposal.html.erb
@@ -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">
diff --git a/app/views/proposals/index.html.erb b/app/views/proposals/index.html.erb
index 4a64df728..fc20bc3af 100644
--- a/app/views/proposals/index.html.erb
+++ b/app/views/proposals/index.html.erb
@@ -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">
diff --git a/app/views/welcome/highlights.html.erb b/app/views/welcome/highlights.html.erb
index f0b4e446e..66d335448 100644
--- a/app/views/welcome/highlights.html.erb
+++ b/app/views/welcome/highlights.html.erb
@@ -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">