<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<%= I18n.locale %>" lang="<%= I18n.locale %>" dir="<%= t'html.dir' %>">
+<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", :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">
- <li><%= link_to t('layouts.view'), {
- :controller => 'site',
- :action => 'index'
- }, {
- :id => 'viewanchor',
- :title => t('layouts.view_tooltip'),
- :class => 'geolink llz layers'
- } %></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'),
- :data => { :minzoom => 13 },
- :class => 'geolink llz object disabled'
- } %></li>
- <li><%= link_to t('layouts.history'), {
- :controller => 'changeset',
- :action => 'list'
- }, {
- :id => 'historyanchor',
- :data => { :minzoom => 11 },
- :title => t('javascripts.site.history_tooltip'),
- :class => 'geolink bbox'
- } %></li>
- <li><%= link_to t('layouts.export'), {
- :controller => 'site',
- :action => 'export'
- }, {
- :id => 'exportanchor',
- :title => t('layouts.export_tooltip'),
- :class => 'geolink llz layers'
- } %></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 %>
- <%= yield :editmenu %>
- </ul>
- </div>
- <script type="text/javascript">
- createMenu("editanchor", "editmenu", "left");
- </script>
- <div id="left">
+ <div id="left">
<div id="logo">
<%= link_to(image_tag("osm_logo.png",
:size => "120x120",
:alt => t('layouts.logo.alt_text')),
- :controller => 'site',
- :action => 'index') %><br/>
+ root_path) %>
<h1><%= t 'layouts.project_name.h1' %></h1>
- <h2 class="nowrap"><%= t('layouts.tag_line') %></h2>
+ <h2><%= t('layouts.tag_line') %></h2>
</div>
<%= yield :optionals %>
<% unless @user %>
<%= 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'),
- url_for({:controller => 'site', :action => 'copyright'})),
- :create_account => link_to(t('layouts.intro_2_create_account'),
- url_for({:controller => 'user', :action => 'new'}))
+ :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>
<p><%= t 'layouts.osm_read_only' %></p>
</div>
<% end %>
- <% if false %>
- <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><%= t'layouts.help' %>
- <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'), {:controller => 'site', :action => 'copyright'} %></li>
- </ul>
- </li>
- <li><%= t'layouts.community' %>
+ </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'), {
- :controller => 'diary_entry',
- :action => 'list',
- :display_name => nil
- }, {
+ <li><%= link_to(t('layouts.user_diaries'), diary_path, {
:title => t('layouts.user_diaries_tooltip')
}) %></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>
+ </ul>
+ </li>
+ <li>
+ <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 inner11'>
+ <div class='ads'>
+ <%= ad = [{:image => 'sotm-birmingham-ad.png',
+ :title => 'State of the Map Birmingham',
+ :href =>'http://stateofthemap.org/'},
+ {: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'>
<p class='deemphasize'><%= t 'layouts.partners_html',
:ucl => link_to(t('layouts.partners_ucl'), "http://www.vr.ucl.ac.uk"),
</p>
</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>
+ <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>
+ </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">
+ 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) -%>
<noscript><p><img src="<%= request.protocol %><%= PIWIK_LOCATION %>/piwik.php?idsite=<%= PIWIK_SITE %>" style="border:0" alt="" /></p></noscript>
<% end -%>
projects / rails.git / blobdiff