]> 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: 80c639a)
More readable multi-line ruby in erbs
authorHarry Wood <github@harrywood.co.uk>
Sat, 5 Mar 2022 01:53:07 +0000 (01:53 +0000)
committerHarry Wood <github@harrywood.co.uk>
Sat, 5 Mar 2022 02:56:43 +0000 (02:56 +0000)
A couple of erb files had unnecessary start and end erb tags around every line in a multi-line block of ruby. More readable this way.

app/views/site/_id.html.erb patch | blob | history
app/views/site/id.html.erb patch | blob | history

diff --git a/app/views/site/_id.html.erb b/app/views/site/_id.html.erb
index f1f48c1e10687f71f600f9f5235ff9aff8f1332a..1a3807e4afcc6900c39d4fc429d2b6fd290dfa44 100644 (file)
--- a/app/views/site/_id.html.erb
+++ b/app/views/site/_id.html.erb
@@ -1,10 +1,10 @@
 <%= javascript_include_tag "edit/id" %>
 
 <div id="map">
-  <% data = { :key => Settings.id_key } -%>
-  <% data[:lat] = @lat if @lat -%>
-  <% data[:lon] = @lon if @lon -%>
-  <% data[:gpx] = trace_data_url(params[:gpx], :format => :xml) if params[:gpx] -%>
-  <% data[:url] = id_url(:locale => params[:locale]) -%>
+  <% data = { :key => Settings.id_key }
+     data[:lat] = @lat if @lat
+     data[:lon] = @lon if @lon
+     data[:gpx] = trace_data_url(params[:gpx], :format => :xml) if params[:gpx]
+     data[:url] = id_url(:locale => params[:locale]) %>
   <%= tag.iframe "", :frameBorder => 0, :id => "id-embed", :class => "id-embed", :allowfullscreen => "", :data => data %>
 </div>
diff --git a/app/views/site/id.html.erb b/app/views/site/id.html.erb
index 0178c8f22f817b2d5c58a85e14cd56ce61e53c81..ec067b9e7ae5f285769cf8138d5fe85c7ba81cac 100644 (file)
--- a/app/views/site/id.html.erb
+++ b/app/views/site/id.html.erb
@@ -8,16 +8,16 @@
   <!-- <![endif]-->
 </head>
 <body>
-<% data = {} -%>
-<% if Settings.key?(:id_key) %>
-<% token = current_user.access_token(Settings.id_key) %>
-<% data[:token] = token.token -%>
-<% data[:token_secret] = token.secret -%>
-<% data[:consumer_key] = token.client_application.key -%>
-<% data[:consumer_secret] = token.client_application.secret -%>
-<% end %>
-<% data[:locale] = ID::LOCALES.preferred(preferred_languages).to_s -%>
-<% data[:asset_map] = assets("iD").to_json -%>
+<% data = {}
+   if Settings.key?(:id_key)
+     token = current_user.access_token(Settings.id_key)
+     data[:token] = token.token
+     data[:token_secret] = token.secret
+     data[:consumer_key] = token.client_application.key
+     data[:consumer_secret] = token.client_application.secret
+   end
+   data[:locale] = ID::LOCALES.preferred(preferred_languages).to_s
+   data[:asset_map] = assets("iD").to_json %>
 <%= tag.div "", :id => "id-container", :data => data %>
 </body>
 </html>
The OpenStreetMap web site