From 7320d17bea01b9b652a3b8668ab4bceed45c6b70 Mon Sep 17 00:00:00 2001 From: Alberto Garcia Cabeza Date: Tue, 26 Apr 2016 13:04:57 +0200 Subject: [PATCH] Moves back links inside a partial --- app/views/debates/edit.html.erb | 5 +---- app/views/debates/new.html.erb | 6 ++---- app/views/debates/show.html.erb | 6 ++---- app/views/pages/faq.html.erb | 5 +---- app/views/pages/how_it_works.html.erb | 5 +---- app/views/pages/how_to_use.html.erb | 5 +---- app/views/pages/participation.html.erb | 5 +---- app/views/pages/participation_facts.html.erb | 6 +----- app/views/pages/participation_world.html.erb | 5 +---- app/views/pages/proposals_info.html.erb | 6 +----- app/views/pages/spending_proposals_info.html.erb | 5 +---- app/views/proposals/edit.html.erb | 5 +---- app/views/proposals/new.html.erb | 6 ++---- app/views/proposals/show.html.erb | 6 ++---- app/views/proposals/summary.html.erb | 6 +----- app/views/shared/_back_link.html.erb | 4 ++++ app/views/spending_proposals/new.html.erb | 6 ++---- app/views/users/registrations/delete_form.html.erb | 5 +---- app/views/users/registrations/edit.html.erb | 5 +---- app/views/valuation/spending_proposals/show.html.erb | 4 +--- config/locales/en.yml | 2 +- 21 files changed, 29 insertions(+), 79 deletions(-) create mode 100644 app/views/shared/_back_link.html.erb diff --git a/app/views/debates/edit.html.erb b/app/views/debates/edit.html.erb index 34a7f70df..eea353438 100644 --- a/app/views/debates/edit.html.erb +++ b/app/views/debates/edit.html.erb @@ -1,10 +1,7 @@
- <%= link_to debates_path, class: "back" do %> - - <%= t("debates.edit.back_link") %> - <% end %> + <%= render "shared/back_link" %>
<%= link_to t("debates.edit.show_link"), @debate %> diff --git a/app/views/debates/new.html.erb b/app/views/debates/new.html.erb index 34821a4fd..65d47bbcd 100644 --- a/app/views/debates/new.html.erb +++ b/app/views/debates/new.html.erb @@ -1,10 +1,8 @@
- <%= link_to debates_path, class: "back" do %> - - <%= t("debates.new.back_link") %> - <% end %> + <%= render "shared/back_link" %> +

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

<%= t("debates.new.info", diff --git a/app/views/debates/show.html.erb b/app/views/debates/show.html.erb index cfce656a2..9625ab42d 100644 --- a/app/views/debates/show.html.erb +++ b/app/views/debates/show.html.erb @@ -3,10 +3,8 @@
- <%= link_to :back, class: "back" do %> - - <%= t("debates.show.back_link") %> - <% end %> + <%= render "shared/back_link" %> + <% if current_user && @debate.editable_by?(current_user) %> <%= link_to edit_debate_path(@debate), class: 'edit-debate button success small float-right' do %> diff --git a/app/views/pages/faq.html.erb b/app/views/pages/faq.html.erb index 0dcd09a68..3806cb22f 100644 --- a/app/views/pages/faq.html.erb +++ b/app/views/pages/faq.html.erb @@ -1,9 +1,6 @@
- <%= link_to "/more_information", class: 'back' do %> - - <%= t("debates.show.back_link") %> - <% end %> + <%= render "shared/back_link" %>
  • No me funciona la verificación de residencia.
    • diff --git a/app/views/pages/how_it_works.html.erb b/app/views/pages/how_it_works.html.erb index 9d52c2732..67fb38371 100644 --- a/app/views/pages/how_it_works.html.erb +++ b/app/views/pages/how_it_works.html.erb @@ -1,9 +1,6 @@
    - <%= link_to "/more_information", class: 'back' do %> - - <%= t("debates.show.back_link") %> - <% end %> + <%= render "shared/back_link" %>
    • diff --git a/app/views/pages/how_to_use.html.erb b/app/views/pages/how_to_use.html.erb index 680d15cdf..a594961a8 100644 --- a/app/views/pages/how_to_use.html.erb +++ b/app/views/pages/how_to_use.html.erb @@ -1,9 +1,6 @@
      - <%= link_to "/more_information", class: 'back' do %> - - <%= t("debates.show.back_link") %> - <% end %> + <%= render "shared/back_link" %>

      <%= t('pages.more_information.titles.how_to_use') %>

      diff --git a/app/views/pages/participation.html.erb b/app/views/pages/participation.html.erb index 78debb113..5e274986c 100644 --- a/app/views/pages/participation.html.erb +++ b/app/views/pages/participation.html.erb @@ -1,9 +1,6 @@
      - <%= link_to "/more_information", class: 'back' do %> - - <%= t("debates.show.back_link") %> - <% end %> + <%= render "shared/back_link" %>
      • diff --git a/app/views/pages/participation_facts.html.erb b/app/views/pages/participation_facts.html.erb index a4c97c483..579638028 100644 --- a/app/views/pages/participation_facts.html.erb +++ b/app/views/pages/participation_facts.html.erb @@ -1,10 +1,6 @@
        - - <%= link_to "/more_information", class: 'back' do %> - - <%= t("debates.show.back_link") %> - <% end %> + <%= render "shared/back_link" %>

        Hechos sobre participación ciudadana y democracia directa

        diff --git a/app/views/pages/participation_world.html.erb b/app/views/pages/participation_world.html.erb index 4b836ce7f..57ad94c7b 100644 --- a/app/views/pages/participation_world.html.erb +++ b/app/views/pages/participation_world.html.erb @@ -1,9 +1,6 @@
        - <%= link_to "/more_information", class: 'back' do %> - - <%= t("debates.show.back_link") %> - <% end %> + <%= render "shared/back_link" %>
        • La nueva ola global de participación ciudadana
          • diff --git a/app/views/pages/proposals_info.html.erb b/app/views/pages/proposals_info.html.erb index e95af5591..ffe0eec32 100644 --- a/app/views/pages/proposals_info.html.erb +++ b/app/views/pages/proposals_info.html.erb @@ -1,10 +1,6 @@
          - - <%= link_to "/more_information", class: 'back' do %> - - <%= t("debates.show.back_link") %> - <% end %> + <%= render "shared/back_link" %>
          • Explicación detallada del proceso
            • diff --git a/app/views/pages/spending_proposals_info.html.erb b/app/views/pages/spending_proposals_info.html.erb index bf22505bc..60e947343 100644 --- a/app/views/pages/spending_proposals_info.html.erb +++ b/app/views/pages/spending_proposals_info.html.erb @@ -1,9 +1,6 @@
            - <%= link_to "/more_information", class: 'back' do %> - - <%= t("debates.show.back_link") %> - <% end %> + <%= render "shared/back_link" %>
            • Explicación detallada del proceso
              • diff --git a/app/views/proposals/edit.html.erb b/app/views/proposals/edit.html.erb index f29149772..f0429a855 100644 --- a/app/views/proposals/edit.html.erb +++ b/app/views/proposals/edit.html.erb @@ -1,10 +1,7 @@
              - <%= link_to proposals_path, class: "back" do %> - - <%= t("proposals.edit.back_link") %> - <% end %> + <%= render "shared/back_link" %>
              <%= link_to t("proposals.edit.show_link"), @proposal %> diff --git a/app/views/proposals/new.html.erb b/app/views/proposals/new.html.erb index 79a1b236d..2887cd97a 100644 --- a/app/views/proposals/new.html.erb +++ b/app/views/proposals/new.html.erb @@ -1,10 +1,8 @@
              - <%= link_to proposals_path, class: "back" do %> - - <%= t("proposals.new.back_link") %> - <% end %> + <%= render "shared/back_link" %> +

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

              <%= link_to "/proposals_info",title: t('shared.target_blank_html'), target: "_blank" do %> diff --git a/app/views/proposals/show.html.erb b/app/views/proposals/show.html.erb index 0a5b35c0c..4e8799574 100644 --- a/app/views/proposals/show.html.erb +++ b/app/views/proposals/show.html.erb @@ -10,10 +10,8 @@
              - <%= link_to :back, class: "back" do %> - - <%= t("proposals.show.back_link") %> - <% end %> + <%= render "shared/back_link" %> + <% if current_user && @proposal.editable_by?(current_user) %> <%= link_to edit_proposal_path(@proposal), class: 'edit-proposal button success small float-right' do %> diff --git a/app/views/proposals/summary.html.erb b/app/views/proposals/summary.html.erb index acf1d0255..05ed7dac9 100644 --- a/app/views/proposals/summary.html.erb +++ b/app/views/proposals/summary.html.erb @@ -1,11 +1,7 @@
              - - <%= link_to :back, class: 'back left' do %> - - <%= t("proposals.show.back_link") %> - <% end %> + <%= render "shared/back_link" %> <% @proposals.each do |group_name, proposals| %>
              diff --git a/app/views/shared/_back_link.html.erb b/app/views/shared/_back_link.html.erb new file mode 100644 index 000000000..efeef9f1f --- /dev/null +++ b/app/views/shared/_back_link.html.erb @@ -0,0 +1,4 @@ +<%= link_to :back, class: "back" do %> + + <%= t("shared.back") %> +<% end %> diff --git a/app/views/spending_proposals/new.html.erb b/app/views/spending_proposals/new.html.erb index a8d35338f..219444857 100644 --- a/app/views/spending_proposals/new.html.erb +++ b/app/views/spending_proposals/new.html.erb @@ -1,10 +1,8 @@
              - <%= link_to spending_proposals_path, class: "back" do %> - - <%= t("spending_proposals.new.back_link") %> - <% end %> + <%= render "shared/back_link" %> +

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

              <%= link_to "/spending_proposals_info", title: t('shared.target_blank_html'), target: "_blank" do %> diff --git a/app/views/users/registrations/delete_form.html.erb b/app/views/users/registrations/delete_form.html.erb index aab1d4a0a..17d241a88 100644 --- a/app/views/users/registrations/delete_form.html.erb +++ b/app/views/users/registrations/delete_form.html.erb @@ -1,7 +1,4 @@ -<%= link_to :back, class: "back" do %> - - <%= t("devise_views.users.registrations.edit.back_link") %> -<% end %> +<%= render "shared/back_link" %>

              <%= t("devise_views.users.registrations.delete_form.title") %>

              diff --git a/app/views/users/registrations/edit.html.erb b/app/views/users/registrations/edit.html.erb index c01403ae8..bbf33ccfa 100644 --- a/app/views/users/registrations/edit.html.erb +++ b/app/views/users/registrations/edit.html.erb @@ -1,7 +1,4 @@ -<%= link_to :back, class: "back" do %> - - <%= t("devise_views.users.registrations.edit.back_link") %> -<% end %> +<%= render "shared/back_link" %>

              <%= t("devise_views.users.registrations.edit.edit") %>

              diff --git a/app/views/valuation/spending_proposals/show.html.erb b/app/views/valuation/spending_proposals/show.html.erb index d91635efe..555660cbe 100644 --- a/app/views/valuation/spending_proposals/show.html.erb +++ b/app/views/valuation/spending_proposals/show.html.erb @@ -1,6 +1,4 @@ -<%= link_to :back, class: 'back' do %> - <%= t("valuation.spending_proposals.show.back") %> -<% end %> +<%= render "shared/back_link" %>

              <%= t("valuation.spending_proposals.show.heading") %> <%= @spending_proposal.id %>

              <%= @spending_proposal.title %>

              diff --git a/config/locales/en.yml b/config/locales/en.yml index 729effd4c..1f587f7c1 100755 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -362,7 +362,7 @@ en: to: 'To' author_info: author_deleted: User deleted - back: Back + back: Go back check: Select check_all: All check_none: None