Changes more_info folder and path to help

This commit is contained in:
decabeza
2018-01-30 18:26:30 +01:00
parent a958a75bb1
commit 286371c9d9
19 changed files with 14 additions and 14 deletions

View File

@@ -7,7 +7,7 @@
<div data-alert class="callout primary"> <div data-alert class="callout primary">
<%= t("debates.new.info", <%= t("debates.new.info",
info_link: link_to(t("debates.new.info_link"), new_proposal_path )).html_safe %> 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 %>
<strong><%= t("debates.new.more_info") %></strong> <strong><%= t("debates.new.more_info") %></strong>
<% end %> <% end %>
</div> </div>

View File

@@ -5,7 +5,7 @@
<h1><%= t("proposals.new.start_new") %></h1> <h1><%= t("proposals.new.start_new") %></h1>
<div data-alert class="callout primary"> <div data-alert class="callout primary">
<%= 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")%> <%= t("proposals.new.more_info")%>
<% end %> <% end %>
</div> </div>

View File

@@ -5,7 +5,7 @@
<h1><%= t("proposals.new.start_new") %></h1> <h1><%= t("proposals.new.start_new") %></h1>
<div data-alert class="callout primary"> <div data-alert class="callout primary">
<%= 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")%> <%= t("proposals.new.more_info")%>
<% end %> <% end %>
</div> </div>

View File

@@ -54,9 +54,9 @@
<% end %> <% end %>
<li> <li>
<%= link_to t("layouts.header.help"), <%= link_to t("layouts.header.help"),
more_info_path, help_path,
accesskey: "5", 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") %> title: t("shared.go_to_page") + t("layouts.header.help") %>
</li> </li>
</ul> </ul>

View File

@@ -17,7 +17,7 @@
<%= t("layouts.header.open_city_slogan_html") %> <%= t("layouts.header.open_city_slogan_html") %>
</p> </p>
<div class="small-12 medium-6 large-4 small-centered"> <div class="small-12 medium-6 large-4 small-centered">
<%= 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" %>
</div> </div>
</div> </div>
</div> </div>

View File

@@ -42,9 +42,9 @@ Rails.application.routes.draw do
resources :follows, only: [:create, :destroy] resources :follows, only: [:create, :destroy]
# More info pages # More info pages
get 'more-information', to: 'pages#show', id: 'more_info/index', as: 'more_info' get 'help', to: 'pages#show', id: 'help/index', as: 'help'
get 'more-information/how-to-use', to: 'pages#show', id: 'more_info/how_to_use/index', as: 'how_to_use' get 'help/how-to-use', to: 'pages#show', id: 'help/how_to_use/index', as: 'how_to_use'
get 'more-information/faq', to: 'pages#show', id: 'more_info/faq/index', as: 'faq' get 'help/faq', to: 'pages#show', id: 'help/faq/index', as: 'faq'
# Static pages # Static pages
get '/blog' => redirect("http://blog.consul/") get '/blog' => redirect("http://blog.consul/")

View File

@@ -14,7 +14,7 @@ SitemapGenerator::Sitemap.create do
add page_path(id: page) add page_path(id: page)
end end
add more_info_path add help_path
add how_to_use_path add how_to_use_path
add faq_path add faq_path

View File

@@ -80,7 +80,7 @@ feature "Custom Pages" do
locale: "en" locale: "en"
) )
visit more_info_path visit help_path
expect(page).to have_content("Another custom page") expect(page).to have_content("Another custom page")
end end
@@ -93,7 +93,7 @@ feature "Custom Pages" do
locale: "en" locale: "en"
) )
visit more_info_path visit help_path
expect(page).not_to have_content("Another custom page") expect(page).not_to have_content("Another custom page")
@@ -112,7 +112,7 @@ feature "Custom Pages" do
locale: "fr" locale: "fr"
) )
visit more_info_path visit help_path
expect(page).not_to have_content("Ce texte est en français") expect(page).not_to have_content("Ce texte est en français")

View File

@@ -30,7 +30,7 @@ feature 'rake sitemap:create' do
# Static pages # Static pages
expect(sitemap).to include(faq_path) 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(how_to_use_path)
expect(sitemap).to include(page_path(id: 'general_terms')) expect(sitemap).to include(page_path(id: 'general_terms'))