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

Whitespace fixes for layouts erb files

Browse source
This commit is contained in:
Andy Allan 2019-03-06 11:11:15 +01:00 • committed by Tom Hughes
parent 0625c1effb
commit 9077419ca8
4 changed files with 19 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

20
app/views/layouts/_header.html.erb
View file

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

4
app/views/layouts/_search.html.erb
View file

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

2
app/views/layouts/error.html.erb
View file

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

6
app/views/layouts/map.html.erb
View file

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