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

Move link to selected proposals on proposals index

Browse Source
This commit is contained in:
decabeza
2019-05-30 11:47:24 +02:00
committed by Julian Herrero
parent d4ec750428
commit 7ed80d7883
5 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/views/proposals/_proposals_lists.html.erb
View File

@@ -13,8 +13,4 @@
<%= link_to t("proposals.index.retired_proposals_link"), <%= link_to t("proposals.index.retired_proposals_link"),
proposals_path(retired: "all"), proposals_path(retired: "all"),
class: "small" %> class: "small" %>
<br>
<%= link_to t("proposals.index.selected_proposals"),
proposals_path(selected: "all"),
class: "small" %>
</p> </p>

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

@@ -124,6 +124,14 @@
<%= link_to t("proposals.index.start_proposal"), <%= link_to t("proposals.index.start_proposal"),
new_proposal_path, new_proposal_path,
class: "button expanded" %> class: "button expanded" %>
<div class="sidebar-divider"></div>
<h2 class="sidebar-title"><%= t("proposals.index.selected_proposals") %></h2>
<br>
<p class="small">
<%= link_to t("proposals.index.selected_proposals_link"), proposals_path(selected: "all") %>
</p>
<% if params[:retired].blank? %> <% if params[:retired].blank? %>
<%= render "categories" %> <%= render "categories" %>
<%= render "shared/tag_cloud", taggable: "proposal" %> <%= render "shared/tag_cloud", taggable: "proposal" %>

1
config/locales/en/general.yml
View File

@@ -377,6 +377,7 @@ en:
retired_proposals: Retired proposals retired_proposals: Retired proposals
retired_proposals_link: "Proposals retired by the author" retired_proposals_link: "Proposals retired by the author"
selected_proposals: Selected proposals selected_proposals: Selected proposals
selected_proposals_link: View selected proposals
archived_proposals: Archived proposals archived_proposals: Archived proposals
proposals_lists: Proposals lists proposals_lists: Proposals lists
retired_links: retired_links:

1
config/locales/es/general.yml
View File

@@ -377,6 +377,7 @@ es:
retired_proposals: Propuestas retiradas retired_proposals: Propuestas retiradas
retired_proposals_link: "Propuestas retiradas por sus autores" retired_proposals_link: "Propuestas retiradas por sus autores"
selected_proposals: Propuestas seleccionadas selected_proposals: Propuestas seleccionadas
selected_proposals_link: Ver propuestas seleccionadas
archived_proposals: Propuestas archivadas archived_proposals: Propuestas archivadas
proposals_lists: Listas de propuestas proposals_lists: Listas de propuestas
retired_links: retired_links:

8
spec/features/proposals_spec.rb
View File

@@ -949,7 +949,7 @@ feature "Proposals" do
scenario "show in selected proposals list" do scenario "show in selected proposals list" do
visit proposals_path visit proposals_path
click_link "Selected proposals" click_link "View selected proposals"
expect(page).to have_selector("#proposals .proposal", count: 1) expect(page).to have_selector("#proposals .proposal", count: 1)
expect(page).to have_content selected_proposal.title expect(page).to have_content selected_proposal.title
@@ -972,7 +972,7 @@ feature "Proposals" do
expect(page).to have_selector("#proposals .proposal-featured") expect(page).to have_selector("#proposals .proposal-featured")
expect(page).to have_selector("#featured-proposals") expect(page).to have_selector("#featured-proposals")
click_link "Selected proposals" click_link "View selected proposals"
expect(page).not_to have_selector("#proposals .proposal-featured") expect(page).not_to have_selector("#proposals .proposal-featured")
expect(page).not_to have_selector("#featured-proposals") expect(page).not_to have_selector("#featured-proposals")
@@ -991,7 +991,7 @@ feature "Proposals" do
expect(page).to have_link "Recommended" expect(page).to have_link "Recommended"
expect(page).to have_link "See more recommendations" expect(page).to have_link "See more recommendations"
click_link "Selected proposals" click_link "View selected proposals"
expect(page).not_to have_css ".recommendation" expect(page).not_to have_css ".recommendation"
expect(page).not_to have_link "Recommended" expect(page).not_to have_link "Recommended"
@@ -1006,7 +1006,7 @@ feature "Proposals" do
expect(page).to have_link "highest rated" expect(page).to have_link "highest rated"
expect(page).to have_link "newest" expect(page).to have_link "newest"
click_link "Selected proposals" click_link "View selected proposals"
expect(page).not_to have_css "ul.submenu" expect(page).not_to have_css "ul.submenu"
expect(page).not_to have_link "most active" expect(page).not_to have_link "most active"