<% content_for(:body_class) { "map-layout" } %>
-<% if @user and !@user.home_lon.nil? and !@user.home_lat.nil? %>
+<% if current_user and !current_user.home_lon.nil? and !current_user.home_lat.nil? %>
<% content_for :greeting do %>
<%= link_to t("layouts.home"),
"#",
:id => "homeanchor",
- :class => "set_position",
- :data => { :lat => @user.home_lat,
- :lon => @user.home_lon,
+ :class => "set_position dropdown-item",
+ :data => { :lat => current_user.home_lat,
+ :lon => current_user.home_lon,
:zoom => 15 } %>
<% end %>
<% end %>
<div id="sidebar">
<%= render :partial => "layouts/search", :locals => { :autofocus => true } %>
- <% if STATUS == :database_offline or STATUS == :api_offline %>
- <p class="error"><%= t 'layouts.osm_offline' %></p>
- <% elsif STATUS == :database_readonly or STATUS == :api_readonly %>
- <p class="error"><%= t 'layouts.osm_read_only' %></p>
- <% end %>
-
- <div id="donate">
- <a href="http://donate.openstreetmap.org/server2015/"><div class="sprite logo"></div></a>
- <h2>
- <a><span class="icon close"></span></a>
- <a href="http://donate.openstreetmap.org/server2015/"><%= t 'layouts.donate_done_header' %></a>
- </h2>
- <p><a href="http://donate.openstreetmap.org/server2015/">
- <%= t 'layouts.donate_done_line_1' %>
- </a></p>
- <p><a href="http://donate.openstreetmap.org/server2015/">
- <%= t 'layouts.donate_line_3' %>
- </a></p>
- </div>
-
<div id="flash">
<%= render :partial => "layouts/flash" %>
</div>
<div id="browse_status"></div>
- <div id="sidebar_loader" style="display: none;">
- <img alt="<%= t('browse.start_rjs.loading') %>" class="loader" src="<%= image_path("searching.gif") %>">
+ <div id="sidebar_loader">
+ <img alt="<%= t("browse.start_rjs.loading") %>" class="loader" src="<%= image_path("searching.gif") %>">
</div>
<div id="sidebar_content">
<%= yield %>
</div>
- <% unless @user %>
+ <% unless current_user %>
<div class="welcome">
- <h2><a><span class="icon close"></span></a><%= t 'layouts.intro_header' %></h2>
- <p><%= t 'layouts.intro_text' %></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>
+ <h2><%= t "layouts.intro_header" %></h2>
+ <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/") %>
+ </p>
+ <div class="standard-form">
+ <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>
+ </div>
</div>
<% end %>
+
+ <div id="banner">
+ <%= render :partial => "layouts/banner" %>
+ </div>
</div>
<noscript>
<div id="noscript">
- <p><%= t 'site.index.js_1' %></p>
- <p><%= t 'site.index.js_2' %></p>
+ <p><%= t "site.index.js_1" %></p>
+ <p><%= t "site.index.js_2" %></p>
</div>
</noscript>
<div id="attribution">
<table>
<tr>
- <td class="attribution_license"><%= t 'site.index.license.license_url' %></td>
- <td class="attribution_project"><%= t 'site.index.license.project_url' %></td>
+ <td class="attribution_license"><%= t "site.index.license.license_url" %></td>
+ <td class="attribution_project"><%= t "site.index.license.project_url" %></td>
</tr>
<tr>
- <td colspan="2" class="attribution_notice"><%= t 'site.index.license.copyright' %></td>
+ <td colspan="2" class="attribution_notice"><%= t "site.index.license.copyright" %></td>
</tr>
</table>
</div>
<% end %>
-<%= render :template => 'layouts/site' %>
+<%= render :template => "layouts/site" %>