Merge pull request #1090 from consul/back-links

Back links
2016-04-28 16:52:09 +02:00
parent 1276e7d478 79b0f38e34
commit 6760199a90
24 changed files with 31 additions and 97 deletions
--- a/app/views/debates/edit.html.erb
+++ b/app/views/debates/edit.html.erb
@@ -1,10 +1,7 @@
 <div class="debate-edit row">

  <div class="small-12 column">
-    <%= link_to debates_path, class: "back" do %>
-      <span class="icon-angle-left"></span>
-      <%= t("debates.edit.back_link") %>
-    <% end %>
+    <%= render "shared/back_link" %>

    <div class="float-right">
      <%= link_to t("debates.edit.show_link"), @debate %>
--- a/app/views/debates/new.html.erb
+++ b/app/views/debates/new.html.erb
@@ -1,10 +1,8 @@
 <div class="debate-new row">

  <div class="small-12 medium-9 column">
-    <%= link_to debates_path, class: "back" do %>
-      <span class="icon-angle-left"></span>
-      <%= t("debates.new.back_link") %>
-    <% end %>
+    <%= render "shared/back_link" %>
+
    <h1><%= t("debates.new.start_new") %></h1>
    <div data-alert class="callout primary">
      <%= t("debates.new.info",
--- a/app/views/debates/show.html.erb
+++ b/app/views/debates/show.html.erb
@@ -3,10 +3,8 @@
  <section class="debate-show">
    <div id="<%= dom_id(@debate) %>" class="row">
      <div class="small-12 medium-9 column">
-        <%= link_to :back, class: "back" do %>
-          <span class="icon-angle-left"></span>
-          <%= 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 %>
            <span class="icon-edit"></span>
--- a/app/views/pages/faq.html.erb
+++ b/app/views/pages/faq.html.erb
@@ -1,9 +1,6 @@
 <div class="row margin-top">
  <div class="menu small-12 medium-3 column">
-    <%= link_to "/more_information", class: 'back' do %>
-      <span class="icon-angle-left"></span>
-      <%= t("debates.show.back_link") %>
-    <% end %>
+    <%= render "shared/back_link" %>

    <ul class="menu vertical margin-top">
      <li><a href="#1"><strong>No me funciona la verificación de residencia.</strong></a></li>
--- a/app/views/pages/how_it_works.html.erb
+++ b/app/views/pages/how_it_works.html.erb
@@ -1,9 +1,6 @@
 <div class="row margin-top">
  <div class="small-12 medium-3 column">
-    <%= link_to "/more_information", class: 'back' do %>
-      <span class="icon-angle-left"></span>
-      <%= t("debates.show.back_link") %>
-    <% end %>
+    <%= render "shared/back_link" %>

    <ul class="menu vertical margin-top">
        <li>
--- a/app/views/pages/how_to_use.html.erb
+++ b/app/views/pages/how_to_use.html.erb
@@ -1,9 +1,6 @@
 <div class="row margin-top">
  <div class="text small-12 column">
-    <%= link_to "/more_information", class: 'back' do %>
-      <span class="icon-angle-left"></span>
-      <%= t("debates.show.back_link") %>
-    <% end %>
+    <%= render "shared/back_link" %>

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

--- a/app/views/pages/participation.html.erb
+++ b/app/views/pages/participation.html.erb
@@ -1,9 +1,6 @@
 <div class="row margin-top">
  <div class="small-12 medium-3 column">
-    <%= link_to "/more_information", class: 'back' do %>
-      <span class="icon-angle-left"></span>
-      <%= t("debates.show.back_link") %>
-    <% end %>
+    <%= render "shared/back_link" %>

    <ul class="menu vertical margin-top hide-for-small-only">
        <li>
--- a/app/views/pages/participation_facts.html.erb
+++ b/app/views/pages/participation_facts.html.erb
@@ -1,10 +1,6 @@
 <div class="row margin-top">
  <div class="text small-12 column">
-
-    <%= link_to "/more_information", class: 'back' do %>
-      <span class="icon-angle-left"></span>
-      <%= t("debates.show.back_link") %>
-    <% end %>
+    <%= render "shared/back_link" %>

    <h1>Hechos sobre participación ciudadana y democracia directa</h1>

--- a/app/views/pages/participation_world.html.erb
+++ b/app/views/pages/participation_world.html.erb
@@ -1,9 +1,6 @@
 <div class="row margin-top">
  <div class="small-12 medium-3 column">
-    <%= link_to "/more_information", class: 'back' do %>
-      <span class="icon-angle-left"></span>
-      <%= t("debates.show.back_link") %>
-    <% end %>
+    <%= render "shared/back_link" %>

    <ul class="menu vertical margin-top">
        <li><a href="#i"><strong>La nueva ola global de participación ciudadana</strong></a></li>
--- a/app/views/pages/proposals_info.html.erb
+++ b/app/views/pages/proposals_info.html.erb
@@ -1,10 +1,6 @@
 <div class="row margin-top">
  <div class="small-12 medium-3 column">
-
-    <%= link_to "/more_information", class: 'back' do %>
-      <span class="icon-angle-left"></span>
-      <%= t("debates.show.back_link") %>
-    <% end %>
+    <%= render "shared/back_link" %>

    <ul class="vertical menu margin-top">
        <li><a href="#i"><strong>Explicación detallada del proceso</strong></a></li>
--- a/app/views/pages/spending_proposals_info.html.erb
+++ b/app/views/pages/spending_proposals_info.html.erb
@@ -1,9 +1,6 @@
 <div class="row margin-top">
  <div class="small-12 medium-3 column">
-    <%= link_to "/more_information", class: 'back' do %>
-      <span class="icon-angle-left"></span>
-      <%= t("debates.show.back_link") %>
-    <% end %>
+    <%= render "shared/back_link" %>

    <ul class="menu vertical margin-top">
      <li><a href="#i"><strong>Explicación detallada del proceso</strong></a></li>
--- a/app/views/proposals/edit.html.erb
+++ b/app/views/proposals/edit.html.erb
@@ -1,10 +1,7 @@
 <div class="proposal-edit row">

  <div class="small-12 column">
-    <%= link_to proposals_path, class: "back" do %>
-      <span class="icon-angle-left"></span>
-      <%= t("proposals.edit.back_link") %>
-    <% end %>
+    <%= render "shared/back_link" %>

    <div class="float-right">
      <%= link_to t("proposals.edit.show_link"), @proposal %>
--- a/app/views/proposals/new.html.erb
+++ b/app/views/proposals/new.html.erb
@@ -1,10 +1,8 @@
 <div class="proposal-new row">

  <div class="small-12 medium-9 column">
-    <%= link_to proposals_path, class: "back" do %>
-      <span class="icon-angle-left"></span>
-      <%= t("proposals.new.back_link") %>
-    <% end %>
+    <%= render "shared/back_link" %>
+
    <h1><%= t("proposals.new.start_new") %></h1>
    <div data-alert class="callout primary">
      <%= link_to "/proposals_info",title: t('shared.target_blank_html'), target: "_blank" do %>
--- a/app/views/proposals/show.html.erb
+++ b/app/views/proposals/show.html.erb
@@ -10,10 +10,8 @@
  <section class="proposal-show">
    <div id="<%= dom_id(@proposal) %>" class="row">
      <div class="small-12 medium-9 column">
-        <%= link_to :back, class: "back" do %>
-          <span class="icon-angle-left"></span>
-          <%= 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 %>
            <span class="icon-edit"></span>
--- a/app/views/proposals/summary.html.erb
+++ b/app/views/proposals/summary.html.erb
@@ -1,11 +1,7 @@
 <main>
  <div class="wrap row proposals-summary">
    <div id="proposals" class="proposals-list small-12 medium-9 column">
-
-      <%= link_to :back, class: 'back left' do %>
-        <span class="icon-angle-left left"></span>
-        <%= t("proposals.show.back_link") %>
-      <% end %>
+      <%= render "shared/back_link" %>

      <% @proposals.each do |group_name, proposals| %>
        <div id="<%= group_name.parameterize %>">
--- a/app/views/shared/_back_link.html.erb
+++ b/app/views/shared/_back_link.html.erb
@@ -0,0 +1,4 @@
+<%= link_to :back, class: "back" do %>
+  <span class="icon-angle-left"></span>
+  <%= t("shared.back") %>
+<% end %>
--- a/app/views/spending_proposals/new.html.erb
+++ b/app/views/spending_proposals/new.html.erb
@@ -1,10 +1,8 @@
 <div class="spending-proposal-new row margin-top">

  <div class="small-12 medium-9 column">
-    <%= link_to spending_proposals_path, class: "back" do %>
-      <span class="icon-angle-left"></span>
-      <%= t("spending_proposals.new.back_link") %>
-    <% end %>
+    <%= render "shared/back_link" %>
+
    <h1><%= t("spending_proposals.new.start_new") %></h1>
    <div data-alert class="callout primary">
      <%= link_to "/spending_proposals_info", title: t('shared.target_blank_html'), target: "_blank" do %>
--- 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 %>
-  <span class="icon-angle-left"></span>
-  <%= t("devise_views.users.registrations.edit.back_link") %>
-<% end %>
+<%= render "shared/back_link" %>

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

--- 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 %>
-  <span class="icon-angle-left float-left"></span>
-  <%= t("devise_views.users.registrations.edit.back_link") %>
-<% end %>
+<%= render "shared/back_link" %>

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

--- 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 %>
-  <span class="icon-angle-left"></span> <%= t("valuation.spending_proposals.show.back") %>
-<% end %>
+<%= render "shared/back_link" %>

 <h2><%= t("valuation.spending_proposals.show.heading") %> <%= @spending_proposal.id %> </h2>
 <h1><%= @spending_proposal.title %></h1>
--- a/config/locales/devise_views.en.yml
+++ b/config/locales/devise_views.en.yml
@@ -96,7 +96,6 @@ en:
          submit: Erase my account
          title: Erase account
        edit:
-          back_link: Back
          current_password_label: Current password
          edit: Edit
          email_label: Email
--- a/config/locales/devise_views.es.yml
+++ b/config/locales/devise_views.es.yml
@@ -96,7 +96,6 @@ es:
          submit: Borrar mi cuenta
          title: Darme de baja
        edit:
-          back_link: Atrás
          current_password_label: Contraseña actual
          edit: Editar
          email_label: Email
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -76,7 +76,6 @@ en:
        other: "%{count} votes"
        zero: No votes
    edit:
-      back_link: Go back
      editing: Edit debate
      form:
        submit_button: Save changes
@@ -86,7 +85,7 @@ en:
      debate_title: Debate title
      tags_instructions: Tag this debate.
      tags_label: Topics
-      tags_placeholder: Enter the tags you would like to use, separated by commas (',')
+      tags_placeholder: "Enter the tags you would like to use, separated by commas (',')"
    index:
      featured_debates: Featured
      filter_topic:
@@ -109,7 +108,6 @@ en:
      start_debate: Start a debate
      title: Debates
    new:
-      back_link: Go back
      form:
        submit_button: Start a debate
      info: If you want to make a proposal, this is the wrong section, enter %{info_link}.
@@ -123,7 +121,6 @@ en:
      start_new: Start a debate
    show:
      author_deleted: User deleted
-      back_link: Go back
      comments:
        one: 1 comment
        other: "%{count} comments"
@@ -249,7 +246,6 @@ en:
      form:
        submit_button: Create proposal
    edit:
-      back_link: Go back
      editing: Edit proposal
      form:
        submit_button: Save changes
@@ -284,7 +280,7 @@ en:
      tag_category_label: "Categories"
      tags_instructions: "Tag this proposal. You can choose from proposed categories or add your own"
      tags_label: Tags
-      tags_placeholder: Enter the tags you would like to use, separated by commas (',')
+      tags_placeholder: "Enter the tags you would like to use, separated by commas (',')"
    index:
      featured_proposals: Featured
      filter_topic:
@@ -319,7 +315,6 @@ en:
      top: Top weekly
      top_link_proposals: The most supported proposals by category
    new:
-      back_link: Go back
      form:
        submit_button: Create proposal
      more_info: How do citizen proposals work?
@@ -348,7 +343,6 @@ en:
      total_percent: 100%
    show:
      author_deleted: User deleted
-      back_link: Go back
      code: 'Proposal code:'
      comments:
        one: 1 comment
@@ -390,7 +384,7 @@ en:
      to: 'To'
    author_info:
      author_deleted: User deleted
-    back: Back
+    back: Go back
    check: Select
    check_all: All
    check_none: None
@@ -456,7 +450,6 @@ en:
      recommendation_two: Any proposal or comment suggesting illegal action will be deleted.
      recommendations_title: How to create a spending proposal
      start_new: Create spending proposal
-      back_link: Back
    show:
      author_deleted: User deleted
      code: 'Proposal code:'
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -76,7 +76,6 @@ es:
        other: "%{count} votos"
        zero: Sin votos
    edit:
-      back_link: Volver
      editing: Editar debate
      form:
        submit_button: Guardar cambios
@@ -109,7 +108,6 @@ es:
      start_debate: Empieza un debate
      title: Debates
    new:
-      back_link: Volver
      form:
        submit_button: Empieza un debate
      info: Si lo que quieres es hacer una propuesta, esta es la sección incorrecta, entra en %{info_link}.
@@ -123,7 +121,6 @@ es:
      start_new: Empezar un debate
    show:
      author_deleted: Usuario eliminado
-      back_link: Volver
      comments:
        one: 1 Comentario
        other: "%{count} Comentarios"
@@ -249,7 +246,6 @@ es:
      form:
        submit_button: Crear propuesta
    edit:
-      back_link: Volver
      editing: Editar propuesta
      form:
        submit_button: Guardar cambios
@@ -319,7 +315,6 @@ es:
      top: Top semanal
      top_link_proposals: Propuestas más apoyadas por categoría
    new:
-      back_link: Volver
      form:
        submit_button: Crear propuesta
      more_info: "¿Cómo funcionan las propuestas ciudadanas?"
@@ -348,7 +343,6 @@ es:
      total_percent: 100%
    show:
      author_deleted: Usuario eliminado
-      back_link: Volver
      code: 'Código de la propuesta:'
      comments:
        one: 1 Comentario
@@ -456,7 +450,6 @@ es:
      recommendation_two: Cualquier propuesta o comentario que implique acciones ilegales será eliminada.
      recommendations_title: Cómo crear una propuesta de gasto
      start_new: Crear una propuesta de gasto
-      back_link: Volver
    show:
      author_deleted: Usuario eliminado
      code: 'Código de la propuesta:'