cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

More readable multi-line ruby in erbs

Browse source 
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.
This commit is contained in:
Harry Wood 2022-03-05 01:53:07 +00:00
parent 80c639a6b5
commit 51b7c3a5be
2 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

10
app/views/site/_id.html.erb
View file

@ -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>

20
app/views/site/id.html.erb
View file

@ -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>