-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<%= I18n.locale %>" lang="<%= I18n.locale %>" dir="<%= t'html.dir' %>">
+<!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] %>">
+ <body class="<%= params[:controller] %> <%= params[:controller] %>-<%= params[:action] %>">
<div id="small-title">
- <%= link_to(image_tag("osm_logo.png", :size => "16x16", :border => 0, :alt => t('layouts.logo.alt_text')), :controller => 'site', :action => 'index') %>
+ <%= 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>
- <div id="content" class="<%= params[:controller] %>_<%= params[:action] %>">
- <%= render :partial => "layouts/flash", :locals => { :flash => flash } %>
-
- <%= yield %>
- </div>
-
- <div id='top-bar'>
- <span id="greeting">
- <% if @user and @user.id %>
- <span id="full-greeting"><%= raw(t 'layouts.welcome_user', :user_link => (link_to h(@user.display_name), {:controller => 'user', :action => 'view', :display_name => @user.display_name}, :title => t('layouts.welcome_user_link_tooltip'))) %></span>
- <span id="small-greeting"><%= link_to t('layouts.welcome_user_link_tooltip'), {:controller => 'user', :action => 'view', :display_name => @user.display_name} %></span> |
- <%= yield :greeting %>
- <%= render :partial => "layouts/inbox" %> |
- <%= link_to t('layouts.logout'), {:controller => 'user', :action => 'logout', :session => request.session_options[:id], :referer => request.fullpath}, {:id => 'logoutanchor', :title => t('layouts.logout_tooltip')}%>
- <% else %>
- <%= link_to t('layouts.log_in'), {:controller => 'user', :action => 'login', :referer => request.fullpath}, {:id => 'loginanchor', :title => t('layouts.log_in_tooltip')} %> |
- <%= link_to t('layouts.sign_up'), {:controller => 'user', :action => 'new'}, {:id => 'registeranchor', :title => t('layouts.sign_up_tooltip')} %>
- <% end %>
- </span>
- <ul id="tabnav">
- <%
- viewclass = 'geolink llz layers'
- editclass = 'geolink llz object minzoom13 disabled'
- historyclass = 'geolink bbox minzoom11'
- exportclass = 'geolink llz layers'
- traceclass = ''
- diaryclass = ''
- 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'
- diaryclass += ' active' if params['controller'] == 'diary_entry'
- %>
- <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 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>
- <li><%= link_to t('layouts.user_diaries'), {:controller => 'diary_entry', :action => 'list', :display_name => nil}, {:id => 'diaryanchor', :title => t('layouts.user_diaries_tooltip'), :class => diaryclass} %></li>
- </ul>
- </div>
-
- <div id="editmenu" class="menu">
- <ul>
- <% 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 %>
- </ul>
- </div>
-
- <script type="text/javascript">
- createMenu("editanchor", "editmenu", 1000, "left");
- </script>
-
- <div id="left">
+ <div id="left">
<div id="logo">
- <%= link_to(image_tag("osm_logo.png", :size => "120x120", :border => 0, :alt => t('layouts.logo.alt_text')), :controller => 'site', :action => 'index') %><br/>
+ <%= link_to(image_tag("osm_logo.png",
+ :size => "120x120",
+ :alt => t('layouts.logo.alt_text')),
+ root_path) %>
<h1><%= t 'layouts.project_name.h1' %></h1>
<h2 class="nowrap"><%= t('layouts.tag_line') %></h2>
</div>
-
<%= yield :optionals %>
-
<% unless @user %>
- <div id="intro">
- <p>
- <%= t 'layouts.intro_1' %>
- </p>
- <p>
- <%= t 'layouts.intro_2' %>
- </p>
+ <div class="sidebar-copy intro">
+ <p><%= t 'layouts.intro_1' %></p>
<p>
- <%= raw(t 'layouts.intro_3',
- :ucl => link_to(t('layouts.intro_3_ucl'), "http://www.vr.ucl.ac.uk"),
- :ic => link_to(t('layouts.intro_3_ic'), "http://www.imperial.ac.uk/"),
- :bytemark => link_to(t('layouts.intro_3_bytemark'), "http://www.bytemark.co.uk"),
- :partners => link_to(t('layouts.intro_3_partners'), t('layouts.intro_3_partners_url'))) %>
+ <%= t 'layouts.intro_2_html',
+ :download => link_to(t('layouts.intro_2_download'), "http://planet.openstreetmap.org/"),
+ :use => link_to(t('layouts.intro_2_use'), t('layouts.intro_2_use_url')),
+ :license => link_to(t('layouts.intro_2_license'), copyright_path),
+ :create_account => link_to(t('layouts.intro_2_create_account'), user_new_path)
+ %>
</p>
</div>
<% end %>
-
<% if STATUS == :database_offline or STATUS == :api_offline %>
- <div id="alert">
- <%= t 'layouts.osm_offline' %>
+ <div class="sidebar-alert">
+ <p><%= t 'layouts.osm_offline' %></p>
</div>
<% elsif STATUS == :database_readonly or STATUS == :api_readonly %>
- <div id="alert">
- <%= t 'layouts.osm_read_only' %>
+ <div class="sidebar-alert">
+ <p><%= t 'layouts.osm_read_only' %></p>
</div>
<% end %>
-
<% if false %>
- <div id="donate" class="notice">
- <%= raw t 'layouts.donate', :link => "<a href=\"http://donate.openstreetmap.org/\">#{t('layouts.donate_link_text')}</a>" %>
+ <div class="sidebar-notice">
+ <p><%= raw t 'layouts.donate', :link => "<a href=\"http://donate.openstreetmap.org/\">#{t('layouts.donate_link_text')}</a>" %></p>
</div>
<% end %>
-
- <div id="left_menu" class="left_menu">
- <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'), {:controller => 'site', :action => 'copyright'} %></li>
- <li><a href="http://blogs.openstreetmap.org/" title="<%= t 'layouts.community_blogs_title' %>"><%= t 'layouts.community_blogs' %></a></li>
- <li><a href="http://www.osmfoundation.org" title="<%= t 'layouts.foundation_title' %>"><%= t 'layouts.foundation' %></a></li>
- <%= yield :left_menu %>
- </ul>
+ <ul id="left_menu" class="left_menu">
+ <li>
+ <h4><%= t'layouts.help' %></h4>
+ <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>
+ <h4><%= t'layouts.community' %></h4>
+ <ul>
+ <li><a href="http://blogs.openstreetmap.org/" title="<%= t 'layouts.community_blogs_title' %>"><%= t 'layouts.community_blogs' %></a></li>
+ <li><a href="http://www.osmfoundation.org" title="<%= t 'layouts.foundation_title' %>"><%= t 'layouts.foundation' %></a></li>
+ <li><%= link_to(t('layouts.user_diaries'), diary_path, {
+ :title => t('layouts.user_diaries_tooltip')
+ }) %></li>
+ </ul>
+ </li>
+ <li>
+ <h4><%= link_to t('layouts.gps_traces'), traces_path, {
+ :id => 'traceanchor',
+ :title => t('layouts.gps_traces_tooltip')
+ } %></h4>
+ </li>
+ <%= yield :left_menu %>
+ </ul>
+ <a title="<%= h(t('layouts.make_a_donation.title')) %>" href="http://donate.openstreetmap.org/" class="donate">
+ <span class='donate-icon'></span><p><%= h(t('layouts.make_a_donation.text')) %></p>
+ </a>
+ <div class='sidebar-copy'>
+ <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"),
+ :partners => link_to(t('layouts.partners_partners'), t('layouts.partners_url')) %>
+ </p>
</div>
-
- <center>
- <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>
- </center>
</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>
+ <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 %>
+ </ul>
+ </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);
- });
+ createMenu("editanchor", "editmenu", "left");
</script>
-
+ <div class="wrapper">
+ <%= render :partial => "layouts/flash", :locals => { :flash => flash } %>
+ <% if content_for? :heading %>
+ <div class="content-heading">
+ <%= yield :heading %>
+ </div>
+ <% end %>
+ <div id="content" class="clearfix">
+ <%= yield %>
+ </div>
+ </div>
<% 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