<%= javascript_strings %>
<%= javascript_include_tag 'prototype' %>
<%= javascript_include_tag 'site' %>
+ <%= javascript_include_tag 'menu' %>
<!--[if lt IE 7]><%= javascript_include_tag 'pngfix' %><![endif]--> <!-- thanks, microsoft! -->
<%= stylesheet_link_tag 'common' %>
- <!--[if IE]><%= stylesheet_link_tag 'site', :media => "screen" %><![endif]--> <!-- IE is totally broken with CSS media queries -->
- <%= stylesheet_link_tag 'site-sml', :media => "only screen and (max-width: 481px)" %>
- <%= stylesheet_link_tag 'site', :media => "screen and (min-width: 482px)" %>
+ <!--[if IE]><%= stylesheet_link_tag 'large', :media => "screen" %><![endif]--> <!-- IE is totally broken with CSS media queries -->
+ <%= stylesheet_link_tag 'small', :media => "only screen and (max-width: 481px)" %>
+ <%= stylesheet_link_tag 'large', :media => "screen and (min-width: 482px)" %>
<%= stylesheet_link_tag 'print', :media => "print" %>
<%= tag("link", { :rel => "search", :type => "application/opensearchdescription+xml", :title => "OpenStreetMap Search", :href => "/opensearch/osm.xml" }) %>
<%= tag("meta", { :name => "description", :content => "OpenStreetMap is the free wiki world map." }) %>
+ <%= style_rules %>
<%= yield :head %>
<title><%= t 'layouts.project_name.title' %><%= ' | '+ h(@title) if @title %></title>
</head>
<body>
<div id="content">
- <% if @notice || flash[:notice] %>
- <div id="notice"><%= @notice || flash[:notice] %></div>
+ <% if flash[:error] %>
+ <div id="error"><%= flash[:error] %></div>
+ <% end %>
+ <% if flash[:warning] %>
+ <div id="warning"><%= flash[:warning] %></div>
+ <% end %>
+ <% if flash[:notice] %>
+ <div id="notice"><%= flash[:notice] %></div>
<% end %>
<%= yield %>
<span id="full-greeting"><%= 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 %>
- <%
- inbox_attributes = {}
- inbox_attributes[:class] = 'greeting-bar-unread' if @user.new_messages.size > 0
- inbox_attributes[:title] = t 'layouts.inbox_tooltip', :count => @user.new_messages.size
- %>
- <%= link_to t('layouts.inbox', :count => @user.new_messages.size), {:controller => 'message', :action => 'inbox', :display_name => @user.display_name}, inbox_attributes %> |
- <%= link_to t('layouts.logout'), {:controller => 'user', :action => 'logout', :referer => request.request_uri}, {:id => 'logoutanchor', :title => t('layouts.logout_tooltip')}%>
+ <%= render :partial => "layouts/inbox" %> |
+ <%= link_to t('layouts.logout'), {:controller => 'user', :action => 'logout', :session => request.session_options[:id], :referer => request.request_uri}, {:id => 'logoutanchor', :title => t('layouts.logout_tooltip'), :method => :post, :href => url_for(:controller => 'user', :action => 'logout', :referer => request.request_uri)}%>
<% else %>
<%= link_to t('layouts.log_in'), {:controller => 'user', :action => 'login', :referer => request.request_uri}, {: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')} %>
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 t('layouts.edit'), {:controller => 'site', :action => 'edit'}, {:id => 'editanchor', :title => t('layouts.edit_tooltip'), :class => editclass} %></li>
- <li><%= link_to t('layouts.history'), {:controller => 'changeset', :action => 'list' }, {:id => 'historyanchor', :title => t('layouts.history_tooltip'), :class => historyclass} %></li>
+ <li><%= link_to t('layouts.edit'), {: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>
<% if params['controller'] == 'site' and (params['action'] == 'index' or params['action'] == 'export') %>
<li><%= link_to_remote t('layouts.export'), {:url => {:controller => 'export', :action => 'start'}}, {:id => 'exportanchor', :title => t('layouts.export_tooltip'), :class => exportclass, :href => url_for(:controller => 'site', :action => 'export')} %></li>
<% else %>
<li><%= link_to t('layouts.export'), {:controller => 'site', :action => 'export'}, {:id => 'exportanchor', :title => t('layouts.export_tooltip'), :class => exportclass} %></li>
<% end %>
- <li><%= link_to t('layouts.gps_traces'), {:controller => 'trace', :action => 'list'}, {:id => 'traceanchor', :title => t('layouts.gps_traces_tooltip'), :class => traceclass} %></li>
+ <li><%= link_to t('layouts.gps_traces'), {:controller => 'trace', :action => 'list', :display_name => 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">
+ <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'} %></li>
+ <% end %>
+ </ul>
+ </div>
+
+ <script type="text/javascript">
+ createMenu("editanchor", "editmenu", 1000);
+ </script>
+
<div id="left">
<div id="logo">
<p>
<%= t 'layouts.intro_3',
:ucl => link_to(t('layouts.intro_3_ucl'), "http://www.vr.ucl.ac.uk"),
- :bytemark => link_to(t('layouts.intro_3_bytemark'), "http://www.bytemark.co.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')) %>
</p>
</div>
<% end %>
- <% if OSM_STATUS == :database_offline or OSM_STATUS == :api_offline %>
+ <% if STATUS == :database_offline or STATUS == :api_offline %>
<div id="alert">
<%= t 'layouts.osm_offline' %>
</div>
- <% elsif OSM_STATUS == :database_readonly or OSM_STATUS == :api_readonly %>
+ <% elsif STATUS == :database_readonly or STATUS == :api_readonly %>
<div id="alert">
<%= t 'layouts.osm_read_only' %>
</div>
<% end %>
<div id="left_menu" class="left_menu">
- <a href="<%= t 'layouts.help_wiki_url' %>" title="<%= t 'layouts.help_wiki_tooltip' %>"><%= t 'layouts.help_wiki' %></a><br />
- <a href="http://www.opengeodata.org" title="<%= t 'layouts.news_blog_tooltip' %>"><%= t 'layouts.news_blog' %></a><br />
- <a href="<%= t 'layouts.shop_url' %>" title="<%= t 'layouts.shop_tooltip' %>"><%= t 'layouts.shop' %></a><br />
- <%= yield :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>
</div>
<%= yield :optionals %>
<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 id="cclogo" class="button" style="width: 88px">
- <%= link_to(
- image_tag("cc_button.png",
- :alt => t('layouts.license.alt'),
- :border => 0,
- :width => 88,
- :height => 31,
- :title => t('layouts.license.title')),
- "http://creativecommons.org/licenses/by-sa/2.0/",
- { :rel => "license" }) %>
- </div>
</center>
</div>
</body>
projects / rails.git / blobdiff