Change links for proposals lists

Changed applied:

- Remove Archived proposals from tab and add a link under Proposals
  lists
- Remove Popular proposals link from custom section and add it to the
  Proposals lists
- Remove Retired proposals link from custom section and add it to the
  Proposals lists
- Remove Selected proposals link from custom section and add it to the
  Proposals lists

app/controllers/proposals_controller.rb

@@ -53,6 +53,7 @@ class ProposalsController < ApplicationController
     load_retired
     load_selected
     load_featured
+    remove_archived_from_order_links
   end
 
   def vote
@@ -156,6 +157,10 @@ class ProposalsController < ApplicationController
       end
     end
 
+    def remove_archived_from_order_links
+      @valid_orders.delete("archival_date")
+    end
+
     def set_view
       @view = (params[:view] == "minimal") ? "minimal" : "default"
     end

app/views/proposals/_popular.html.erb

@@ -1,6 +0,0 @@
-<div class="sidebar-divider"></div>
-<h2 class="sidebar-title"><%= t("proposals.index.top") %></h2>
-
-<p>
-  <%= link_to t("proposals.index.top_link_proposals"), summary_proposals_path, class: "small" %><br>
-</p>

app/views/proposals/_proposals_lists.html.erb

@@ -0,0 +1,20 @@
+<div class="sidebar-divider"></div>
+<h2 class="sidebar-title"><%= t("proposals.index.proposals_lists") %></h2>
+
+<p>
+  <%= link_to t("proposals.index.top_link_proposals"),
+              summary_proposals_path,
+              class: "small" %>
+  <br>
+  <%= link_to t("proposals.index.archived_proposals"),
+              proposals_path(order: "archival_date"),
+              class: "small" %>
+  <br>
+  <%= link_to t("proposals.index.retired_proposals_link"),
+              proposals_path(retired: "all"),
+              class: "small" %>
+  <br>
+  <%= link_to t("proposals.index.selected_proposals"),
+              proposals_path(selected: "all"),
+              class: "small" %>
+</p>

app/views/proposals/_retired.html.erb

@@ -1,9 +1,7 @@
-<div class="sidebar-divider"></div>
+<% if params[:retired].present? %>
-<h2 class="sidebar-title"><%= t("proposals.index.retired_proposals") %></h2>
+  <div class="sidebar-divider"></div>
+  <h2 class="sidebar-title"><%= t("proposals.index.retired_proposals") %></h2>
 
-<% if params[:retired].blank? %>
-  <p><%= link_to t("proposals.index.retired_proposals_link"), proposals_path(retired: "all"), class: "small" %></p>
-<% else %>
   <div class="sidebar-links">
     <%= link_to t("proposals.index.retired_links.all"), proposals_path(retired: "all") %>
     <% Proposal::RETIRE_OPTIONS.each do |option| %>

app/views/proposals/_selected.html.erb

@@ -1,8 +0,0 @@
-<% if params[:selected].blank? %>
-  <div class="sidebar-divider"></div>
-  <h2 class="sidebar-title"><%= t("proposals.index.selected_proposals") %></h2>
-
-  <p>
-    <%= link_to t("proposals.index.selected_proposals"), proposals_path(selected: "all"), class: "small" %>
-  </p>
-<% end %>

app/views/proposals/index.html.erb

@@ -126,10 +126,9 @@
           <%= render "categories" %>
           <%= render "shared/tag_cloud", taggable: "proposal" %>
           <%= render "geozones" %>
-          <%= render "popular" %>
         <% end %>
         <%= render "retired" %>
-        <%= render "selected" %>
+        <%= render "proposals_lists" %>
       </aside>
     </div>
 

config/locales/en/general.yml

@@ -377,6 +377,8 @@ en:
       retired_proposals: Retired proposals
       retired_proposals_link: "Proposals retired by the author"
       selected_proposals: Selected proposals
+      archived_proposals: Archived proposals
+      proposals_lists: Proposals lists
       retired_links:
         all: All
         duplicated: Duplicated

config/locales/es/general.yml

@@ -377,6 +377,8 @@ es:
       retired_proposals: Propuestas retiradas
       retired_proposals_link: "Propuestas retiradas por sus autores"
       selected_proposals: Propuestas seleccionadas
+      archived_proposals: Propuestas archivadas
+      proposals_lists: Listas de propuestas
       retired_links:
         all: Todas
         duplicated: Duplicadas

spec/features/proposals_spec.rb

@@ -852,12 +852,12 @@ feature "Proposals" do
 
   feature "Archived proposals" do
 
-    scenario "show on archived tab" do
+    scenario "show on proposals list" do
       create_featured_proposals
       archived_proposals = create_archived_proposals
 
       visit proposals_path
-      click_link "archived"
+      click_link "Archived proposals"
 
       within("#proposals-list") do
         archived_proposals.each do |proposal|
@@ -925,7 +925,7 @@ feature "Proposals" do
         expect(page).not_to have_content(archived_proposal.title)
       end
 
-      click_link "archived"
+      click_link "Archived proposals"
 
       within("#featured-proposals") do
         expect(page).to have_content(featured_proposal.title)
@@ -943,7 +943,7 @@ feature "Proposals" do
       create(:proposal, :archived, title: "Some votes").update_column(:confidence_score, 25)
 
       visit proposals_path
-      click_link "archived"
+      click_link "Archived proposals"
 
       within("#proposals-list") do
         expect(all(".proposal")[0].text).to match "Most voted"