<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<%= I18n.locale %>" lang="<%= I18n.locale %>" dir="<%= dir %>">
<%= render :partial => "layouts/head" %>
- <body class="<%= params[:controller] %> <%= params[:controller] %>-<%= params[:action] %>">
- <div id="small-title">
- <%= link_to(image_tag("osm_logo.png", :size => "16x16", :alt => t('layouts.logo.alt_text')), root_path) %>
- <h1><%= t 'layouts.project_name.h1' %></h1>
- </div>
+ <body class="<%= body_class %>">
+ <h1 id="small-title">
+ <%= image_tag "osm_logo.png", :size => "16x16", :alt => t('layouts.logo.alt_text') %>
+ <%= t 'layouts.project_name.h1' %>
+ </h1>
+ <div id="left">
<div id="logo">
<%= link_to(image_tag("osm_logo.png",
:size => "120x120",
<ul>
<li><%= link_to(t('layouts.help_centre'), t('layouts.help_url'), :title => t('layouts.help_title')) %></li>
<li><%= link_to(t('layouts.documentation'), t('layouts.wiki_url'), :title => t('layouts.documentation_title')) %></li>
- <li><%= link_to t('layouts.copyright'), copyright_path %></li>
</ul>
</li>
<li>
</ul>
</li>
<li>
- <h4><%= link_to t('layouts.gps_traces'), traces_path, {
- :id => 'traceanchor',
- :title => t('layouts.gps_traces_tooltip')
- } %></h4>
+ <h4><%= t'layouts.data' %></h4>
+ <ul>
+ <li><%= link_to t('layouts.copyright'), copyright_path %></li>
+ </ul>
+ <ul>
+ <li><%= link_to t('layouts.export_data'), export_path %></li>
+ </ul>
+ <ul>
+ <li><%= link_to t('layouts.gps_traces'), traces_path %></li>
+ </ul>
</li>
<%= yield :left_menu %>
</ul>
- <div class='ad-container'>
- <div class='ads'>
- <%= ad = [{:image => 'sotm-birmingham-ad.png',
- :title => 'State of the Map Birmingham',
- :href =>'http://stateofthemap.org/'},
- {:image => 'sotm-us-ad.png',
- :title => 'State of the Map USA',
- :href =>'http://stateofthemap.us/'},
- {:image => 'donate-ad.png',
- :title => 'Server Donation Drive',
- :href =>'http://donate.openstreetmap.org/'}].sample
-
- link_to ad[:href], :title => ad[:title] do
- image_tag ad[:image], :class => :ad
- end
- %>
- </div>
- </div>
<a title="<%= h(t('layouts.make_a_donation.title')) %>" href="http://donate.openstreetmap.org/" class="donate">
+ <span class='icon donate'></span>
<span><%= h(t('layouts.make_a_donation.text')) %></span>
</a>
<div class='sidebar-copy'>
</div>
</div>
<div id='top-bar'>
- <ul class='secondary-actions' id="greeting">
- <% if @user and @user.id %>
- <li id="full-greeting"><%=link_to h(@user.display_name), user_path(:display_name => @user.display_name), :title => t('layouts.welcome_user_link_tooltip') %></li>
- <li><%= yield :greeting %></li>
- <li><%= render :partial => "layouts/inbox" %></li>
- <li><%= link_to t('layouts.logout'), logout_path(:session => request.session_options[:id], :referer => request.fullpath), {:id => 'logoutanchor', :title => t('layouts.logout_tooltip')}%></li>
- <% else %>
- <li><%= link_to t('layouts.log_in'), login_path(:referer => request.fullpath), {:id => 'loginanchor', :title => t('layouts.log_in_tooltip')} %></li>
- <li><%= link_to t('layouts.sign_up'), user_new_path, {:id => 'registeranchor', :title => t('layouts.sign_up_tooltip')} %></li>
- <% end %>
- </ul>
+ <% if @user and @user.id %>
+ <%= render :partial => "layouts/user_menu" %>
+ <% else %>
+ <ul class='secondary-actions' id='greeting'>
+ <li><%= link_to t('layouts.log_in'), login_path(:referer => request.fullpath), {:id => 'loginanchor', :title => t('layouts.log_in_tooltip')} %></li>
+ <li><%= link_to t('layouts.sign_up'), user_new_path, {:id => 'registeranchor', :title => t('layouts.sign_up_tooltip')} %></li>
+ </ul>
+ <% end %>
<ul id="tabnav">
- <li><%= link_to t('layouts.view'), root_path, {
- :id => 'viewanchor',
- :title => t('layouts.view_tooltip'),
- :class => 'geolink llz layers'
- } %></li>
- <li><%= link_to h(t('layouts.edit')) + content_tag(:span, "▼", :class => "menuicon"), edit_path, {
- :id => 'editanchor',
- :title => t('javascripts.site.edit_tooltip'),
- :data => { :minzoom => 13, :editor => preferred_editor },
- :class => 'geolink llz object disabled'
- } %></li>
- <li><%= link_to t('layouts.history'), browse_changesets_path, {
- :id => 'historyanchor',
- :data => { :minzoom => 11 },
- :title => t('javascripts.site.history_tooltip'),
- :class => 'geolink bbox'
- } %></li>
- <li><%= link_to t('layouts.export'), export_path, {
- :id => 'exportanchor',
- :title => t('layouts.export_tooltip'),
- :data => { :url => url_for(:controller => :export, :action => :start) },
- :class => 'geolink llz layers'
- } %></li>
- </ul>
- </div>
- <div id="editmenu" class="menu">
- <ul>
- <% Editors::RECOMMENDED_EDITORS.each do |editor| %>
- <li><%= link_to t('layouts.edit_with',
- :editor => t("editor.#{editor}.description")),
- edit_path(:editor => editor), {
- :data => { :editor => editor },
- :class => "geolink llz object"
- } %></li>
- <% end %>
- <%= yield :editmenu %>
+ <li id="view_tab">
+ <%= link_to t('layouts.view'), root_path, :class => 'tab geolink llz layers' %>
+ </li><li id="edit_tab">
+ <%= render :partial => 'layouts/edit_menu',
+ :locals => { :link_text => t('layouts.edit'), :link_class => 'llz object' }%>
+ </li><li id="history_tab">
+ <%= link_to t('layouts.history'), browse_changesets_path, :class => 'tab geolink bbox' %>
+ </li>
</ul>
</div>
- <script type="text/javascript">
- createMenu("editanchor", "editmenu", "left");
- </script>
<div class="wrapper">
<%= render :partial => "layouts/flash", :locals => { :flash => flash } %>
<% if content_for? :heading %>
<%= yield %>
</div>
</div>
- <% if defined?(PIWIK_LOCATION) and defined?(PIWIK_SITE) -%>
- <noscript><p><img src="<%= request.protocol %><%= PIWIK_LOCATION %>/piwik.php?idsite=<%= PIWIK_SITE %>" style="border:0" alt="" /></p></noscript>
+ <% if defined?(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