From 0625c1effb8f5e2871557439c5ebf7c106db6a1f Mon Sep 17 00:00:00 2001 From: Andy Allan Date: Wed, 6 Mar 2019 11:02:54 +0100 Subject: [PATCH 1/1] Whitespace fixes for diary_entry erb files --- app/views/diary_entries/_diary_comment.html.erb | 2 +- app/views/diary_entries/comments.html.erb | 2 +- app/views/diary_entries/edit.html.erb | 2 +- app/views/diary_entries/index.html.erb | 6 +++--- app/views/diary_entries/show.html.erb | 1 - 5 files changed, 6 insertions(+), 7 deletions(-) diff --git a/app/views/diary_entries/_diary_comment.html.erb b/app/views/diary_entries/_diary_comment.html.erb index 4ac9a0f96..2bc892a86 100644 --- a/app/views/diary_entries/_diary_comment.html.erb +++ b/app/views/diary_entries/_diary_comment.html.erb @@ -9,7 +9,7 @@
<%= diary_comment.body.to_html %>
<% if current_user && current_user.administrator? %> - <%= link_to t('.hide_link'), hide_diary_comment_path(:display_name => diary_comment.diary_entry.user.display_name, :id => diary_comment.diary_entry.id, :comment => diary_comment.id), :method => :post, :data=> { :confirm => t('.confirm') } %> + <%= link_to t('.hide_link'), hide_diary_comment_path(:display_name => diary_comment.diary_entry.user.display_name, :id => diary_comment.diary_entry.id, :comment => diary_comment.id), :method => :post, :data => { :confirm => t('.confirm') } %> <% end %> diff --git a/app/views/diary_entries/comments.html.erb b/app/views/diary_entries/comments.html.erb index 3960df302..31ee778a4 100644 --- a/app/views/diary_entries/comments.html.erb +++ b/app/views/diary_entries/comments.html.erb @@ -19,6 +19,6 @@
- <%= link_to t('.older_comments') , { :page => @comment_pages.current.next} if @comment_pages.current.next %> + <%= link_to t('.older_comments'), { :page => @comment_pages.current.next } if @comment_pages.current.next %> <%= link_to t('.newer_comments'), { :page => @comment_pages.current.previous } if @comment_pages.current.previous %>
diff --git a/app/views/diary_entries/edit.html.erb b/app/views/diary_entries/edit.html.erb index b46dadf1c..881a6ac84 100644 --- a/app/views/diary_entries/edit.html.erb +++ b/app/views/diary_entries/edit.html.erb @@ -26,7 +26,7 @@
- <%= content_tag "div", "", :id => "map", :data => {:lat => @lat, :lon => @lon, :zoom => @zoom} %> + <%= content_tag "div", "", :id => "map", :data => { :lat => @lat, :lon => @lon, :zoom => @zoom } %>
diff --git a/app/views/diary_entries/index.html.erb b/app/views/diary_entries/index.html.erb index 63a805b3c..1f7a35ae3 100644 --- a/app/views/diary_entries/index.html.erb +++ b/app/views/diary_entries/index.html.erb @@ -13,13 +13,13 @@ <% if @user %> <% if @user == current_user %>
-
  • <%= link_to image_tag("new.png", :class => "small_icon", :border=>0) + t('.new'), diary_new_path, {:title => t('.new_title')} %>
  • +
  • <%= link_to image_tag("new.png", :class => "small_icon", :border => 0) + t('.new'), diary_new_path, { :title => t('.new_title') } %>
  • <% end %> <% else %> <% if current_user %>
    -
  • <%= link_to image_tag("new.png", :class => "small_icon", :border=>0) + t('.new'), diary_new_path, {:title => t('.new_title')} %>
  • +
  • <%= link_to image_tag("new.png", :class => "small_icon", :border => 0) + t('.new'), diary_new_path, { :title => t('.new_title') } %>
  • <% end %> <% end %> @@ -42,7 +42,7 @@ <% if @entries.size < @page_size -%> <%= t('.older_entries') %> <% else -%> - <%= link_to t('.older_entries'), @params.merge(:page => @page + 1 ) %> + <%= link_to t('.older_entries'), @params.merge(:page => @page + 1) %> <% end -%> | diff --git a/app/views/diary_entries/show.html.erb b/app/views/diary_entries/show.html.erb index 02bebc5bc..91a4c61f5 100644 --- a/app/views/diary_entries/show.html.erb +++ b/app/views/diary_entries/show.html.erb @@ -13,7 +13,6 @@ <%= render :partial => 'diary_comment', :collection => @entry.visible_comments %>
    -
    <% if current_user %>

    <%= t '.leave_a_comment' %>

    -- 2.43.2