]> git.openstreetmap.org Git - rails.git/commitdiff
projects / rails.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 0625c1e)
Whitespace fixes for layouts erb files
authorAndy Allan <git@gravitystorm.co.uk>
Wed, 6 Mar 2019 10:11:15 +0000 (11:11 +0100)
committerTom Hughes <tom@compton.nu>
Tue, 26 Mar 2019 20:23:35 +0000 (20:23 +0000)
app/views/layouts/_header.html.erb patch | blob | history
app/views/layouts/_search.html.erb patch | blob | history
app/views/layouts/error.html.erb patch | blob | history
app/views/layouts/map.html.erb patch | blob | history

diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
index a9919f7d2216949b4ea76e691f22f0e4df5c8ea9..65b1729f0464aeb6e9cf63d3f6e0ae6d7e10dc99 100644 (file)
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@ -13,10 +13,12 @@
     <%= content_for :header %>
     <ul>
       <li id="edit_tab" class="dropdown <%= current_page_class(edit_path) %>">
-        <%= link_to t('layouts.edit'), edit_path, :class => "tab geolink editlink",
+        <%= link_to t('layouts.edit'),
+                    edit_path,
+                    :class => "tab geolink editlink",
                     :id => 'editanchor',
-                    :data => { :editor => preferred_editor }
-        %><a class='dropdown-toggle' data-toggle='dropdown' href='#'><b class="caret"></b></a>
+                    :data => { :editor => preferred_editor } %>
+        <a class='dropdown-toggle' data-toggle='dropdown' href='#'><b class="caret"></b></a>
         <ul class='dropdown-menu'>
           <% Editors::RECOMMENDED_EDITORS.each do |editor| %>
             <li>
@@ -73,10 +75,14 @@
     <% if current_user && current_user.id %>
       <div class='dropdown user-menu logged-in'>
         <a class='dropdown-toggle' data-toggle='dropdown' href="#">
-          <%= user_thumbnail_tiny(current_user, :width => 25, :height => 25)
-          %><%= render :partial => 'layouts/inbox'
-        %><span class="user-button"><span class='username'><%= current_user.display_name %></span>
-          <b class="caret"></b></span>
+          <%= user_thumbnail_tiny(current_user, :width => 25, :height => 25) %>
+          <%= render :partial => 'layouts/inbox' %>
+          <span class="user-button">
+            <span class='username'>
+              <%= current_user.display_name %>
+            </span>
+            <b class="caret"></b>
+          </span>
         </a>
         <ul class='dropdown-menu'>
           <li>
diff --git a/app/views/layouts/_search.html.erb b/app/views/layouts/_search.html.erb
index 98b3c6c542188b0e4b4ff081858797196b7bb094..36614fd56b5a854b41957a73fdd0cb20e22c248c 100644 (file)
--- a/app/views/layouts/_search.html.erb
+++ b/app/views/layouts/_search.html.erb
@@ -12,12 +12,12 @@
     <div class="header"><span class="icon close"></span></div>
 
     <div class="line">
-      <%= image_tag "marker-green.png", :class => "routing_marker", :data => { :type =>  "from" }, :draggable => "true" %>
+      <%= image_tag "marker-green.png", :class => "routing_marker", :data => { :type => "from" }, :draggable => "true" %>
       <span class="force_width"><%= text_field_tag "route_from", params[:from], :placeholder => t('site.search.from') %></span>
     </div>
     <div class="line">
       <%= image_tag "marker-red.png", :class => "routing_marker", :data => { :type => "to" }, :draggable => "true" %>
-      <span class="force_width"><%= text_field_tag "route_to"  , params[:to]  , :placeholder => t('site.search.to') %></span>
+      <span class="force_width"><%= text_field_tag "route_to", params[:to], :placeholder => t('site.search.to') %></span>
     </div>
     <div class="line">
       <select class="routing_engines" name="routing_engines"></select>
diff --git a/app/views/layouts/error.html.erb b/app/views/layouts/error.html.erb
index 590f32095dab8445db2c69c5e03d73f1e01a4477..f429feb5963b083201f242508ed97b3663a17b56 100644 (file)
--- a/app/views/layouts/error.html.erb
+++ b/app/views/layouts/error.html.erb
@@ -3,7 +3,7 @@
   <head>
     <meta charset="utf-8">
     <title>OpenStreetMap</title>
-    <%= stylesheet_link_tag "errors", :media=> "screen" %>
+    <%= stylesheet_link_tag "errors", :media => "screen" %>
   </head>
   <body>
     <%= image_tag "osm_logo.png", :class => "logo" %>
diff --git a/app/views/layouts/map.html.erb b/app/views/layouts/map.html.erb
index 05f070914b2cd7e235fc9f0fd477eca235c749db..7e2196a3b5f443dda2fa9a1616a9f81bf576e269 100644 (file)
--- a/app/views/layouts/map.html.erb
+++ b/app/views/layouts/map.html.erb
@@ -44,9 +44,9 @@
         <div class="close-wrap"><span class="icon close"></span></div>
         <p><%= t 'layouts.intro_text' %></p>
         <p><%= t 'layouts.hosting_partners_html',
-               :ucl => link_to(t('layouts.partners_ucl'), "https://www.ucl.ac.uk"),
-               :bytemark => link_to(t('layouts.partners_bytemark'), "https://www.bytemark.co.uk"),
-               :partners => link_to(t('layouts.partners_partners'), "https://hardware.openstreetmap.org/thanks/") %>
+                 :ucl => link_to(t('layouts.partners_ucl'), "https://www.ucl.ac.uk"),
+                 :bytemark => link_to(t('layouts.partners_bytemark'), "https://www.bytemark.co.uk"),
+                 :partners => link_to(t('layouts.partners_partners'), "https://hardware.openstreetmap.org/thanks/") %>
         </p>
         <a class="button learn-more" href="<%= about_path %>"><%= t('layouts.learn_more') %></a>
         <a class="button sign-up" href="<%= user_new_path %>"><%= t('layouts.start_mapping') %></a>
The OpenStreetMap web site