-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<%= I18n.locale %>" lang="<%= I18n.locale %>" dir="<%= t'html.dir' %>">
<%= render :partial => "layouts/head" %>
<body class="<%= params[:controller] %>">
editclass = 'geolink llz object minzoom13 disabled'
historyclass = 'geolink bbox minzoom11'
exportclass = 'geolink llz layers'
- traceclass = ''
- viewclass += ' active' if params['controller'] == 'site' and params['action'] == 'index'
- editclass += ' active' if params['controller'] == 'site' and params['action'] == 'edit'
- historyclass += ' active' if params['controller'] == 'changeset' and params['action'] == 'list'
+ viewclass += ' active' if params['controller'] == 'site' and params['action'] == 'index'
+ editclass += ' active' if params['controller'] == 'site' and params['action'] == 'edit'
+ historyclass += ' active' if params['controller'] == 'changeset' and params['action'] == 'list'
exportclass += ' active' if params['controller'] == 'site' and params['action'] == 'export'
- traceclass += ' active' if params['controller'] == 'trace'
%>
<li><%= link_to t('layouts.view'), {:controller => 'site', :action => 'index'}, {:id => 'viewanchor', :title => t('layouts.view_tooltip'), :class => viewclass} %></li>
- <li><%= link_to h(t('layouts.edit')) + ' ▾'.html_safe, {:controller => 'site', :action => 'edit'}, {:id => 'editanchor', :title => t('javascripts.site.edit_tooltip'), :class => editclass} %></li>
+ <li><%= link_to h(t('layouts.edit')) + content_tag(:span, "▾", :class => "menuicon"), {:controller => 'site', :action => 'edit'}, {:id => 'editanchor', :title => t('javascripts.site.edit_tooltip'), :class => editclass} %></li>
<li><%= link_to t('layouts.history'), {:controller => 'changeset', :action => 'list' }, {:id => 'historyanchor', :title => t('javascripts.site.history_tooltip'), :class => historyclass} %></li>
<li><%= link_to t('layouts.export'), {:controller => 'site', :action => 'export'}, {:id => 'exportanchor', :title => t('layouts.export_tooltip'), :class => exportclass} %></li>
- <li><%= link_to t('layouts.gps_traces'), {:controller => 'trace', :action => 'list', :display_name => nil, :tag => nil, :page => nil}, {:id => 'traceanchor', :title => t('layouts.gps_traces_tooltip'), :class => traceclass} %></li>
</ul>
</div>
<% Editors::ALL_EDITORS.each do |editor| %>
<li><%= link_to t('layouts.edit_with', :editor => t("editor.#{editor}.description")), {:controller => 'site', :action => 'edit', :editor => editor}, {:id => editor + 'anchor', :class => "geolink llz object"} %></li>
<% end %>
- <% unless STATUS == :api_offline or STATUS == :database_offline %>
- <li><%= link_to_function(t('browse.start_rjs.data_layer_name'), 'showData()') %></li>
- <% end %>
+ <%= yield :editmenu %>
</ul>
</div>
<script type="text/javascript">
- createMenu("editanchor", "editmenu", 1000, "left");
+ createMenu("editanchor", "editmenu", "left");
</script>
<div id="left">
<%= yield :optionals %>
<% unless @user %>
- <div class="sidebar-copy">
+ <div class="sidebar-copy intro">
<p>
<%= t 'layouts.intro_1' %>
</p>
<p><%= t 'layouts.osm_offline' %></p>
</div>
<% elsif STATUS == :database_readonly or STATUS == :api_readonly %>
- <div id="sidebar-alert">
+ <div class="sidebar-alert">
<p><%= t 'layouts.osm_read_only' %></p>
</div>
<% end %>
</div>
<% end %>
- <div class="sidebar-notice">
- Scheduled service notice: OpenStreetMap database will be in read-only mode from April 1st to April 4th <a href='http://blog.osmfoundation.org/2012/03/27/service-schedule-march-april-2012/comment-page-1/'>[more]</a>
- </div>
-
<div id="left_menu" class="left_menu">
<ul>
- <%= yield :left_menu %>
<li><%= t'layouts.help' %>
<ul>
<li><%= link_to(t('layouts.help_centre'), t('layouts.help_url'), :title => t('layouts.help_title')) %></li>
}) %></li>
</ul>
</li>
+ <li><%= link_to t('layouts.gps_traces'), {:controller => 'trace', :action => 'list', :display_name => nil, :tag => nil, :page => nil}, {:id => 'traceanchor', :title => t('layouts.gps_traces_tooltip') } %></li>
+ <%= yield :left_menu %>
</ul>
</div>
+ <div id="sotm">
+ <%= link_to image_tag("sotm.png", :alt => t('layouts.sotm2012'), :title => t('layouts.sotm2012'), :border => "0"), "http://stateofthemap.org/register-now/" %>
+ </div>
+
<div class="donate">
<a href="http://donate.openstreetmap.org/" title="<%= h(t('layouts.make_a_donation.title')) %>"><%= h(t('layouts.make_a_donation.text')) %></a>
</div>
<div class='sidebar-copy'>
- <p><%= t 'layouts.partners_html',
+ <p class='deemphasize'><%= t 'layouts.partners_html',
:ucl => link_to(t('layouts.partners_ucl'), "http://www.vr.ucl.ac.uk"),
:ic => link_to(t('layouts.partners_ic'), "http://www.imperial.ac.uk/"),
:bytemark => link_to(t('layouts.partners_bytemark'), "http://www.bytemark.co.uk"),
</div>
</div>
- <script type="text/javascript">
- $(document).ready(function () {
- var auth_token = $("meta[name=csrf-token]").attr("content");
- $("form input[name=authenticity_token]").val(auth_token);
-
- $("textarea").autoGrow();
- });
- </script>
-
<% if defined?(PIWIK_LOCATION) and defined?(PIWIK_SITE) -%>
- <%= render :partial => "layouts/piwik" %>
+ <noscript><p><img src="<%= request.protocol %><%= PIWIK_LOCATION %>/piwik.php?idsite=<%= PIWIK_SITE %>" style="border:0" alt="" /></p></noscript>
<% end -%>
</body>
</html>
projects / rails.git / blobdiff