From 286371c9d911f0859f3203a2a3a7245381a0c019 Mon Sep 17 00:00:00 2001 From: decabeza Date: Tue, 30 Jan 2018 18:26:30 +0100 Subject: [PATCH] Changes more_info folder and path to help --- app/views/debates/new.html.erb | 2 +- app/views/legislation/proposals/new.html.erb | 2 +- app/views/pages/{more_info => help}/_budgets.html.erb | 0 app/views/pages/{more_info => help}/_debates.html.erb | 0 app/views/pages/{more_info => help}/_menu.html.erb | 0 app/views/pages/{more_info => help}/_other.html.erb | 0 app/views/pages/{more_info => help}/_polls.html.erb | 0 app/views/pages/{more_info => help}/_proposals.html.erb | 0 app/views/pages/{more_info => help}/_sidebar.html.erb | 0 app/views/pages/{more_info => help}/faq/index.html.erb | 0 .../pages/{more_info => help}/how_to_use/index.html.erb | 0 app/views/pages/{more_info => help}/index.html.erb | 0 app/views/proposals/new.html.erb | 2 +- app/views/shared/_subnavigation.html.erb | 4 ++-- app/views/welcome/index.html.erb | 2 +- config/routes.rb | 6 +++--- config/sitemap.rb | 2 +- spec/features/site_customization/custom_pages_spec.rb | 6 +++--- spec/lib/tasks/sitemap_spec.rb | 2 +- 19 files changed, 14 insertions(+), 14 deletions(-) rename app/views/pages/{more_info => help}/_budgets.html.erb (100%) rename app/views/pages/{more_info => help}/_debates.html.erb (100%) rename app/views/pages/{more_info => help}/_menu.html.erb (100%) rename app/views/pages/{more_info => help}/_other.html.erb (100%) rename app/views/pages/{more_info => help}/_polls.html.erb (100%) rename app/views/pages/{more_info => help}/_proposals.html.erb (100%) rename app/views/pages/{more_info => help}/_sidebar.html.erb (100%) rename app/views/pages/{more_info => help}/faq/index.html.erb (100%) rename app/views/pages/{more_info => help}/how_to_use/index.html.erb (100%) rename app/views/pages/{more_info => help}/index.html.erb (100%) diff --git a/app/views/debates/new.html.erb b/app/views/debates/new.html.erb index 5085ca17a..97990048d 100644 --- a/app/views/debates/new.html.erb +++ b/app/views/debates/new.html.erb @@ -7,7 +7,7 @@
<%= t("debates.new.info", info_link: link_to(t("debates.new.info_link"), new_proposal_path )).html_safe %> - <%= link_to more_info_path, title: t('shared.target_blank_html'), target: "_blank" do %> + <%= link_to help_path, title: t('shared.target_blank_html'), target: "_blank" do %> <%= t("debates.new.more_info") %> <% end %>
diff --git a/app/views/legislation/proposals/new.html.erb b/app/views/legislation/proposals/new.html.erb index f6f31bff5..72051825e 100644 --- a/app/views/legislation/proposals/new.html.erb +++ b/app/views/legislation/proposals/new.html.erb @@ -5,7 +5,7 @@

<%= t("proposals.new.start_new") %>

- <%= link_to more_info_path(anchor: "proposals") ,title: t('shared.target_blank_html'), target: "_blank" do %> + <%= link_to help_path(anchor: "proposals") ,title: t('shared.target_blank_html'), target: "_blank" do %> <%= t("proposals.new.more_info")%> <% end %>
diff --git a/app/views/pages/more_info/_budgets.html.erb b/app/views/pages/help/_budgets.html.erb similarity index 100% rename from app/views/pages/more_info/_budgets.html.erb rename to app/views/pages/help/_budgets.html.erb diff --git a/app/views/pages/more_info/_debates.html.erb b/app/views/pages/help/_debates.html.erb similarity index 100% rename from app/views/pages/more_info/_debates.html.erb rename to app/views/pages/help/_debates.html.erb diff --git a/app/views/pages/more_info/_menu.html.erb b/app/views/pages/help/_menu.html.erb similarity index 100% rename from app/views/pages/more_info/_menu.html.erb rename to app/views/pages/help/_menu.html.erb diff --git a/app/views/pages/more_info/_other.html.erb b/app/views/pages/help/_other.html.erb similarity index 100% rename from app/views/pages/more_info/_other.html.erb rename to app/views/pages/help/_other.html.erb diff --git a/app/views/pages/more_info/_polls.html.erb b/app/views/pages/help/_polls.html.erb similarity index 100% rename from app/views/pages/more_info/_polls.html.erb rename to app/views/pages/help/_polls.html.erb diff --git a/app/views/pages/more_info/_proposals.html.erb b/app/views/pages/help/_proposals.html.erb similarity index 100% rename from app/views/pages/more_info/_proposals.html.erb rename to app/views/pages/help/_proposals.html.erb diff --git a/app/views/pages/more_info/_sidebar.html.erb b/app/views/pages/help/_sidebar.html.erb similarity index 100% rename from app/views/pages/more_info/_sidebar.html.erb rename to app/views/pages/help/_sidebar.html.erb diff --git a/app/views/pages/more_info/faq/index.html.erb b/app/views/pages/help/faq/index.html.erb similarity index 100% rename from app/views/pages/more_info/faq/index.html.erb rename to app/views/pages/help/faq/index.html.erb diff --git a/app/views/pages/more_info/how_to_use/index.html.erb b/app/views/pages/help/how_to_use/index.html.erb similarity index 100% rename from app/views/pages/more_info/how_to_use/index.html.erb rename to app/views/pages/help/how_to_use/index.html.erb diff --git a/app/views/pages/more_info/index.html.erb b/app/views/pages/help/index.html.erb similarity index 100% rename from app/views/pages/more_info/index.html.erb rename to app/views/pages/help/index.html.erb diff --git a/app/views/proposals/new.html.erb b/app/views/proposals/new.html.erb index 95249e36e..df48c7754 100644 --- a/app/views/proposals/new.html.erb +++ b/app/views/proposals/new.html.erb @@ -5,7 +5,7 @@

<%= t("proposals.new.start_new") %>

- <%= link_to more_info_path(anchor: "proposals") ,title: t('shared.target_blank_html'), target: "_blank" do %> + <%= link_to help_path(anchor: "proposals") ,title: t('shared.target_blank_html'), target: "_blank" do %> <%= t("proposals.new.more_info")%> <% end %>
diff --git a/app/views/shared/_subnavigation.html.erb b/app/views/shared/_subnavigation.html.erb index aebbe1d13..4c9b79580 100644 --- a/app/views/shared/_subnavigation.html.erb +++ b/app/views/shared/_subnavigation.html.erb @@ -54,9 +54,9 @@ <% end %>
  • <%= link_to t("layouts.header.help"), - more_info_path, + help_path, accesskey: "5", - class: ("active" if current_page?(more_info_path)), + class: ("active" if current_page?(help_path)), title: t("shared.go_to_page") + t("layouts.header.help") %>
    • diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb index 70919b235..7a55aa263 100644 --- a/app/views/welcome/index.html.erb +++ b/app/views/welcome/index.html.erb @@ -17,7 +17,7 @@ <%= t("layouts.header.open_city_slogan_html") %>

    - <%= link_to t("shared.more_info"), more_info_path, class: "button expanded large" %> + <%= link_to t("shared.more_info"), help_path, class: "button expanded large" %>
    diff --git a/config/routes.rb b/config/routes.rb index 73d1443d2..f3739c922 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -42,9 +42,9 @@ Rails.application.routes.draw do resources :follows, only: [:create, :destroy] # More info pages - get 'more-information', to: 'pages#show', id: 'more_info/index', as: 'more_info' - get 'more-information/how-to-use', to: 'pages#show', id: 'more_info/how_to_use/index', as: 'how_to_use' - get 'more-information/faq', to: 'pages#show', id: 'more_info/faq/index', as: 'faq' + get 'help', to: 'pages#show', id: 'help/index', as: 'help' + get 'help/how-to-use', to: 'pages#show', id: 'help/how_to_use/index', as: 'how_to_use' + get 'help/faq', to: 'pages#show', id: 'help/faq/index', as: 'faq' # Static pages get '/blog' => redirect("http://blog.consul/") diff --git a/config/sitemap.rb b/config/sitemap.rb index e60cee617..0846ecc91 100644 --- a/config/sitemap.rb +++ b/config/sitemap.rb @@ -14,7 +14,7 @@ SitemapGenerator::Sitemap.create do add page_path(id: page) end - add more_info_path + add help_path add how_to_use_path add faq_path diff --git a/spec/features/site_customization/custom_pages_spec.rb b/spec/features/site_customization/custom_pages_spec.rb index 38c2536e1..09ad797dc 100644 --- a/spec/features/site_customization/custom_pages_spec.rb +++ b/spec/features/site_customization/custom_pages_spec.rb @@ -80,7 +80,7 @@ feature "Custom Pages" do locale: "en" ) - visit more_info_path + visit help_path expect(page).to have_content("Another custom page") end @@ -93,7 +93,7 @@ feature "Custom Pages" do locale: "en" ) - visit more_info_path + visit help_path expect(page).not_to have_content("Another custom page") @@ -112,7 +112,7 @@ feature "Custom Pages" do locale: "fr" ) - visit more_info_path + visit help_path expect(page).not_to have_content("Ce texte est en français") diff --git a/spec/lib/tasks/sitemap_spec.rb b/spec/lib/tasks/sitemap_spec.rb index b68413ad6..01dd3f430 100644 --- a/spec/lib/tasks/sitemap_spec.rb +++ b/spec/lib/tasks/sitemap_spec.rb @@ -30,7 +30,7 @@ feature 'rake sitemap:create' do # Static pages expect(sitemap).to include(faq_path) - expect(sitemap).to include(more_info_path) + expect(sitemap).to include(help_path) expect(sitemap).to include(how_to_use_path) expect(sitemap).to include(page_path(id: 'general_terms'))