Merge pull request #1770 from consul/back-link

Back link

app/helpers/application_helper.rb

@@ -43,10 +43,9 @@ module ApplicationHelper
     authorable.author_id == user.id
   end
 
-  def back_link_to(destination_path)
-    destination = destination_path || :back
+  def back_link_to(destination = :back, text = t("shared.back"))
     link_to destination, class: "back" do
-      "<span class='icon-angle-left'></span>".html_safe + t("shared.back")
+      content_tag(:span, nil, class: "icon-angle-left") + text
     end
   end
 

app/views/admin/geozones/edit.html.erb

@@ -1,10 +1,6 @@
 <div class="row">
-
   <div class="small-12 column">
-    <%= link_to admin_geozones_path, class: "back" do %>
-      <span class="icon-angle-left"></span>
-      <%= t("admin.geozones.edit.back") %>
-    <% end %>
+    <%= back_link_to admin_geozones_path, t("admin.geozones.edit.back") %>
 
     <h1><%= t("admin.geozones.edit.editing") %></h1>
 

app/views/admin/geozones/new.html.erb

@@ -1,10 +1,6 @@
 <div class="geozone-new row">
-
   <div class="small-12 column">
-    <%= link_to admin_geozones_path, class: "back" do %>
-      <span class="icon-angle-left"></span>
-      <%= t("admin.geozones.new.back") %>
-    <% end %>
+    <%= back_link_to admin_geozones_path, t("admin.geozones.new.back") %>
 
     <h1><%= t("admin.geozones.new.creating") %></h1>
 

app/views/admin/hidden_users/show.html.erb

@@ -1,4 +1,4 @@
-<%= render 'shared/back_link' %>
+<%= back_link_to %>
 
 <h2><%= t("admin.hidden_users.show.title", user: @user.name) %></h2>
 

app/views/admin/legislation/draft_versions/edit.html.erb

@@ -4,10 +4,8 @@
 
 <div class="legislation-admin legislation-draft-versions-edit legislation-draft-versions-form row">
   <div class="small-12 column">
-    <%= link_to admin_legislation_process_draft_versions_path(@process), class: "back" do %>
-      <span class="icon-angle-left"></span>
-      <%= t("admin.legislation.draft_versions.edit.back") %>
-    <% end %>
+    <%= back_link_to admin_legislation_process_draft_versions_path(@process),
+                     t("admin.legislation.draft_versions.edit.back") %>
 
     <h2><%= @process.title %></h2>
 

app/views/admin/legislation/draft_versions/index.html.erb

@@ -4,10 +4,7 @@
 
 <div class="legislation-admin legislation-draft-versions-index row">
   <div class="small-12 column">
-    <%= link_to admin_legislation_processes_path, class: "back" do %>
-      <span class="icon-angle-left"></span>
-      <%= t("admin.legislation.processes.edit.back") %>
-    <% end %>
+    <%= back_link_to admin_legislation_processes_path, t("admin.legislation.processes.edit.back") %>
 
     <h2><%= @process.title %></h2>
 

app/views/admin/legislation/draft_versions/new.html.erb

@@ -4,10 +4,8 @@
 
 <div class="legislation-admin legislation-draft-versions-new legislation-draft-versions-form row">
   <div class="small-12 column">
-    <%= link_to admin_legislation_process_draft_versions_path(@process), class: "back" do %>
-      <span class="icon-angle-left"></span>
-      <%= t("admin.legislation.draft_versions.new.back") %>
-    <% end %>
+    <%= back_link_to admin_legislation_process_draft_versions_path(@process),
+                     t("admin.legislation.draft_versions.new.back") %>
 
     <h2><%= @process.title %></h2>
 

app/views/admin/legislation/processes/edit.html.erb

@@ -5,10 +5,7 @@
 <div class="legislation-admin legislation-process-edit row">
 
   <div class="small-12 column">
-    <%= link_to admin_legislation_processes_path, class: "back" do %>
-      <span class="icon-angle-left"></span>
-      <%= t("admin.legislation.processes.edit.back") %>
-    <% end %>
+    <%= back_link_to admin_legislation_processes_path, t("admin.legislation.processes.edit.back") %>
 
     <h2><%= @process.title %></h2>
 

app/views/admin/legislation/processes/new.html.erb

@@ -5,10 +5,7 @@
 <div class="legislation-admin legislation-process-new row">
 
   <div class="small-12 column">
-    <%= link_to admin_legislation_processes_path, class: "back" do %>
-      <span class="icon-angle-left"></span>
-      <%= t("admin.legislation.processes.new.back") %>
-    <% end %>
+    <%= back_link_to admin_legislation_processes_path, t("admin.legislation.processes.new.back") %>
 
     <h2><%= t("admin.legislation.processes.new.title") %></h2>
 

app/views/admin/legislation/questions/edit.html.erb

@@ -4,10 +4,7 @@
 
 <div class="legislation-admin legislation-questions-edit legislation-questions-form row">
   <div class="small-12 column">
-    <%= link_to admin_legislation_process_questions_path(@process), class: "back" do %>
-      <span class="icon-angle-left"></span>
-      <%= t("admin.legislation.questions.edit.back") %>
-    <% end %>
+    <%= back_link_to admin_legislation_process_questions_path(@process), t("admin.legislation.questions.edit.back") %>
 
     <h2><%= @process.title %></h2>
 

app/views/admin/legislation/questions/index.html.erb

@@ -4,10 +4,7 @@
 
 <div class="legislation-admin legislation-draft-versions-index row">
   <div class="small-12 column">
-    <%= link_to admin_legislation_processes_path, class: "back" do %>
-      <span class="icon-angle-left"></span>
-      <%= t("admin.legislation.questions.index.back") %>
-    <% end %>
+    <%= back_link_to admin_legislation_processes_path, t("admin.legislation.questions.index.back") %>
 
     <h2><%= @process.title %></h2>
 

app/views/admin/legislation/questions/new.html.erb

@@ -4,10 +4,7 @@
 
 <div class="legislation-admin legislation-questions-new legislation-questions-form row">
   <div class="small-12 column">
-    <%= link_to admin_legislation_process_questions_path(@process), class: "back" do %>
-      <span class="icon-angle-left"></span>
-      <%= t("admin.legislation.questions.new.back") %>
-    <% end %>
+    <%= back_link_to admin_legislation_process_questions_path(@process), t("admin.legislation.questions.new.back") %>
 
     <h2><%= @process.title %></h2>
 

app/views/admin/officials/edit.html.erb

@@ -1,4 +1,4 @@
-<%= render 'shared/back_link' %>
+<%= back_link_to %>
 
 <div class="clear"></div>
 

app/views/admin/poll/polls/edit.html.erb

@@ -1,4 +1,4 @@
-<%= render 'shared/back_link' %>
+<%= back_link_to %>
 
 <h2><%= t("admin.polls.edit.title") %></h2>
 

app/views/admin/poll/polls/new.html.erb

@@ -1,4 +1,4 @@
-<%= render 'shared/back_link' %>
+<%= back_link_to %>
 
 <h2><%= t("admin.polls.new.title") %></h2>
 

app/views/admin/poll/questions/edit.html.erb

@@ -1,4 +1,4 @@
-<%= render "shared/back_link" %>
+<%= back_link_to %>
 
 <h2><%= t("admin.questions.edit.title") %></h2>
 

app/views/admin/poll/questions/new.html.erb

@@ -1,4 +1,4 @@
-<%= render "shared/back_link" %>
+<%= back_link_to %>
 
 <h2><%= t("admin.questions.new.title") %></h2>
 

app/views/admin/poll/questions/show.html.erb

@@ -1,4 +1,4 @@
-<%= render "shared/back_link" %>
+<%= back_link_to %>
 
 <%= link_to t('shared.edit'), edit_admin_question_path(@question),
             class: "button hollow float-right" %>

app/views/admin/signature_sheets/new.html.erb

@@ -1,4 +1,4 @@
-<%= render 'shared/back_link' %>
+<%= back_link_to %>
 
 <h2><%= t("admin.signature_sheets.new.title") %></h2>
 

app/views/admin/stats/direct_messages.html.erb

@@ -1,4 +1,4 @@
-<%= render 'shared/back_link' %>
+<%= back_link_to %>
 
 <h2><%= t("admin.stats.direct_messages.title")%></h2>
 

app/views/admin/stats/proposal_notifications.html.erb

@@ -1,4 +1,4 @@
-<%= render 'shared/back_link' %>
+<%= back_link_to %>
 
 <h2><%= t("admin.stats.proposal_notifications.title")%></h2>
 

app/views/admin/valuators/summary.html.erb

@@ -1,4 +1,4 @@
-<%= render 'shared/back_link' %>
+<%= back_link_to %>
 
 <h2><%= t("admin.valuators.summary.title") %></h2>
 

app/views/comments/show.html.erb

@@ -1,9 +1,7 @@
 <div class="row">
   <div class="small-12 column margin-top">
-    <%= link_to commentable_path(@comment), class: "back" do %>
-      <span class="icon-angle-left"></span>
-      <%= t("comments.show.return_to_commentable") + @comment.commentable.title %>
-    <% end %>
+    <%= back_link_to commentable_path(@comment),
+                     t("comments.show.return_to_commentable") + @comment.commentable.title %>
   </div>
 </div>
 

app/views/debates/edit.html.erb

@@ -1,7 +1,7 @@
 <div class="debate-form row">
 
   <div class="small-12 column">
-    <%= render "shared/back_link" %>
+    <%= back_link_to %>
 
     <div class="float-right">
       <%= link_to t("debates.edit.show_link"), @debate %>

app/views/debates/new.html.erb

@@ -1,7 +1,7 @@
 <div class="debate-form row">
 
   <div class="small-12 medium-9 column">
-    <%= render "shared/back_link" %>
+    <%= back_link_to %>
 
     <h1><%= t("debates.new.start_new") %></h1>
     <div data-alert class="callout primary">

app/views/debates/show.html.erb

@@ -7,7 +7,7 @@
   <div class="debate-show">
     <div id="<%= dom_id(@debate) %>" class="row">
       <div class="small-12 medium-9 column">
-        <%= render "shared/back_link" %>
+        <%= back_link_to %>
 
         <% if current_user && @debate.editable_by?(current_user) %>
           <%= link_to edit_debate_path(@debate), class: 'edit-debate button success small float-right' do %>

app/views/direct_messages/new.html.erb

@@ -1,6 +1,6 @@
 <div class="row">
   <div class="small-12 medium-9 column">
-    <%= render 'shared/back_link' %>
+    <%= back_link_to %>
 
     <h1>
       <%= t("users.direct_messages.new.title", receiver: @receiver.name) %>

app/views/direct_messages/show.html.erb

@@ -1,9 +1,6 @@
 <div class="row">
   <div class="small-12 medium-9 column">
-    <%= link_to user_path(@direct_message.receiver), class: "back" do %>
-      <span class="icon-angle-left"></span>
-      <%= t("shared.back") %>
-    <% end %>
+    <%= back_link_to user_path(@direct_message.receiver) %>
 
     <div class="clear"></div>
 

app/views/management/user_invites/create.html.erb

@@ -1,5 +1,5 @@
 <div class="small-12 medium-8 column">
-  <%= render 'shared/back_link' %>
+  <%= back_link_to %>
 
   <h1><%= t('management.user_invites.create.title') %></h1>
 

app/views/pages/more_info/faq/index.html.erb

@@ -4,7 +4,7 @@
 
 <div class="row margin-top">
   <div class="menu small-12 medium-3 column">
-    <%= render "shared/back_link" %>
+    <%= back_link_to %>
 
     <ul class="menu vertical margin-top">
       <li><a href="#1"><strong><%= t("pages.more_info.faq.page.faq_1_title") %></strong></a></li>

app/views/pages/more_info/how_to_use/index.html.erb

@@ -4,7 +4,7 @@
 
 <div class="row margin-top">
   <div class="text small-12 column">
-    <%= render "shared/back_link" %>
+    <%= back_link_to %>
 
     <h1><%= t('pages.more_info.titles.how_to_use') %></h1>
 

app/views/polls/questions/show.html.erb

@@ -3,7 +3,7 @@
 <div class="expanded no-margin-top dark-heading">
   <div class="row">
     <div class="small-12 medium-9 column padding">
-      <%= render "shared/back_link" %>
+      <%= back_link_to %>
 
       <h1><%= @question.title %></h1>
 

app/views/proposal_notifications/new.html.erb

@@ -1,13 +1,13 @@
 <div class="row">
   <div class="small-12 column">
-    <%= render 'shared/back_link' %>
+    <%= back_link_to %>
 
     <h1><%= t("proposal_notifications.new.title") %></h1>
 
     <div class="callout primary">
       <p>
         <%= t("proposal_notifications.new.info_about_receivers_html",
-              count: @proposal.users_to_notify.count, 
+              count: @proposal.users_to_notify.count,
               proposal_page: link_to(t("proposal_notifications.new.proposal_page"),
                                      proposal_path(@proposal, anchor: "comments"))).html_safe %>
       </p>

app/views/proposal_notifications/show.html.erb

@@ -1,9 +1,6 @@
 <div class="row">
   <div class="small-12 medium-9">
-    <%= link_to user_path(current_user), class: "back" do %>
-      <span class="icon-angle-left"></span>
-      <%= t("proposal_notifications.show.back") %>
-    <% end %>
+    <%= back_link_to user_path(current_user), t("proposal_notifications.show.back") %>
 
     <h2><%= @notification.title %></h2>
     <p><%= @notification.body %></p>

app/views/proposals/edit.html.erb

@@ -1,7 +1,7 @@
 <div class="proposal-edit row">
 
   <div class="small-12 column">
-    <%= render "shared/back_link" %>
+    <%= back_link_to %>
 
     <div class="float-right">
       <%= link_to t("proposals.edit.show_link"), @proposal %>

app/views/proposals/new.html.erb

@@ -1,7 +1,7 @@
 <div class="proposal-form row">
 
   <div class="small-12 medium-9 column">
-    <%= render "shared/back_link" %>
+    <%= back_link_to %>
 
     <h1><%= t("proposals.new.start_new") %></h1>
     <div data-alert class="callout primary">

app/views/proposals/show.html.erb

@@ -14,7 +14,7 @@
   <div class="proposal-show">
     <div id="<%= dom_id(@proposal) %>" class="row">
       <div class="small-12 medium-9 column">
-        <%= render "shared/back_link" %>
+        <%= back_link_to %>
 
         <% if author_of?(@proposal, current_user) %>
           <%= link_to t("proposals.show.send_notification"), new_proposal_notification_path(proposal_id: @proposal.id),

app/views/proposals/summary.html.erb

@@ -1,7 +1,7 @@
 <main>
   <div class="row proposals-summary">
     <div id="proposals" class="proposals-list small-12 medium-9 column">
-      <%= render "shared/back_link" %>
+      <%= back_link_to %>
 
       <% @proposals.each do |group_name, proposals| %>
         <div id="<%= group_name.parameterize %>">

app/views/shared/_back_link.html.erb

@@ -1,4 +0,0 @@
-<%= link_to :back, class: "back" do %>
-  <span class="icon-angle-left"></span>
-  <%= t("shared.back") %>
-<% end %>

app/views/spending_proposals/new.html.erb

@@ -1,7 +1,7 @@
 <div class="spending-proposal-form row margin-top">
 
   <div class="small-12 medium-9 column">
-    <%= render "shared/back_link" %>
+    <%= back_link_to %>
 
     <h1><%= t("spending_proposals.new.start_new") %></h1>
     <div data-alert class="callout primary">

app/views/users/registrations/delete_form.html.erb

@@ -1,4 +1,4 @@
-<%= render "shared/back_link" %>
+<%= back_link_to %>
 
 <h2><%= t("devise_views.users.registrations.delete_form.title") %></h2>
 

app/views/users/registrations/edit.html.erb

@@ -1,4 +1,4 @@
-<%= render "shared/back_link" %>
+<%= back_link_to %>
 
 <h2><%= t("devise_views.users.registrations.edit.edit") %></h2>
 

app/views/valuation/spending_proposals/show.html.erb

@@ -1,4 +1,4 @@
-<%= render "shared/back_link" %>
+<%= back_link_to %>
 
 <h2><%= t("valuation.spending_proposals.show.heading") %> <%= @spending_proposal.id %> </h2>
 <h1><%= @spending_proposal.title %></h1>

app/views/verification/letter/new.html.erb

@@ -20,10 +20,7 @@
 
     <div class="small-12 medium-4 column">
 
-      <%= link_to account_path, class: "back" do %>
-        <span class="icon-angle-left float-left"></span>
-        <%= t("verification.back") %>
-      <% end %>
+      <%= back_link_to account_path, t("verification.back") %>
 
       <h1><%= t("verification.letter.new.title") %></h1>
 

app/views/verification/letter/show.html.erb

@@ -2,10 +2,7 @@
   <%track_event(category: "verification", action: "start_letter" )%>
   <div class="small-12 column">
 
-    <%= link_to account_path, class: "back" do %>
-      <span class="icon-angle-left"></span>
-      <%= t("verification.back") %>
-    <% end %>
+    <%= back_link_to account_path, t("verification.back") %>
 
     <h1><%= t("verification.letter.edit.title") %></h1>
 

app/views/verification/residence/new.html.erb

@@ -18,10 +18,7 @@
       <span class="meter" style="width: 33%"></span>
     </div>
 
-    <%= link_to account_path, class: "back" do %>
-      <span class="icon-angle-left"></span>
-      <%= t("verification.back") %>
-    <% end %>
+    <%= back_link_to account_path, t("verification.back") %>
 
     <h1><%= t("verification.residence.new.title") %></h1>
 

app/views/verification/sms/edit.html.erb

@@ -18,10 +18,7 @@
       <span class="meter" style="width: 66%"></span>
     </div>
 
-    <%= link_to account_path, class: "back" do %>
-      <span class="icon-angle-left"></span>
-      <%= t("verification.back") %>
-    <% end %>
+    <%= back_link_to account_path, t("verification.back") %>
 
     <h1><%= t("verification.sms.edit.title") %></h1>
 

app/views/verification/sms/new.html.erb

@@ -18,10 +18,7 @@
       <span class="meter" style="width: 66%"></span>
     </div>
 
-    <%= link_to account_path, class: "back" do %>
-      <span class="icon-angle-left"></span>
-      <%= t("verification.back") %>
-    <% end %>
+    <%= back_link_to account_path, t("verification.back") %>
 
     <h1><%= t("verification.sms.new.title") %></h1>
 

app/views/verification/verified_user/show.html.erb

@@ -1,10 +1,7 @@
 <div class="verification account row">
   <div class="small-12 column">
 
-    <%= link_to account_path, class: "back" do %>
-      <span class="icon-angle-left"></span>
-      <%= t("verification.back") %>
-    <% end %>
+    <%= back_link_to account_path, t("verification.back") %>
 
     <h1><%= t("verification.verified_user.show.title") %></h1>