X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/f242c9de94fb197c79291c5c885bd9acfb74ab28..68044c60545093f813ab46611973f052b4584e9a:/app/views/layouts/site.html.erb?ds=inline
diff --git a/app/views/layouts/site.html.erb b/app/views/layouts/site.html.erb
index 9cb6d3df0..1d23aba0d 100644
--- a/app/views/layouts/site.html.erb
+++ b/app/views/layouts/site.html.erb
@@ -1,137 +1,154 @@
-
-
+
+
<%= render :partial => "layouts/head" %>
-
+
- <%= 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) %>
<%= t 'layouts.project_name.h1' %>
-
- <%= render :partial => "layouts/flash", :locals => { :flash => flash } %>
-
- <%= yield %>
-
-
-
- <% if @user and @user.id %>
- <%= 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')) %>
- <%= link_to t('layouts.welcome_user_link_tooltip'), {:controller => 'user', :action => 'view', :display_name => @user.display_name} %> |
- <%= yield :greeting %>
- <%= 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')} %>
- <% end %>
-
-
-
-
- <%
- 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'
- %>
- - <%= link_to t('layouts.view'), {:controller => 'site', :action => 'index'}, {:id => 'viewanchor', :title => t('layouts.view_tooltip'), :class => viewclass} %>
- - <%= link_to t('layouts.edit') + ' ▾', {:controller => 'site', :action => 'edit'}, {:id => 'editanchor', :title => t('javascripts.site.edit_tooltip'), :class => editclass} %>
- - <%= link_to t('layouts.history'), {:controller => 'changeset', :action => 'list' }, {:id => 'historyanchor', :title => t('javascripts.site.history_tooltip'), :class => historyclass} %>
- <% if params['controller'] == 'site' and (params['action'] == 'index' or params['action'] == 'export') %>
- - <%= 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')} %>
- <% else %>
- - <%= link_to t('layouts.export'), {:controller => 'site', :action => 'export'}, {:id => 'exportanchor', :title => t('layouts.export_tooltip'), :class => exportclass} %>
- <% end %>
- - <%= 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} %>
- - <%= link_to t('layouts.user_diaries'), {:controller => 'diary_entry', :action => 'list', :display_name => nil}, {:id => 'diaryanchor', :title => t('layouts.user_diaries_tooltip'), :class => diaryclass} %>
-
-
-
-
-
-
-
-
-
+
-
- <%= t 'layouts.project_name.h1' %>
- <%= link_to(image_tag("osm_logo.png", :size => "120x120", :border => 0, :alt => t('layouts.logo.alt_text')), :controller => 'site', :action => 'index') %>
- <%= t('layouts.tag_line') %>
-
+ <%= link_to(image_tag("osm_logo.png",
+ :size => "120x120",
+ :alt => t('layouts.logo.alt_text')),
+ root_path) %>
+ <%= t 'layouts.project_name.h1' %>
+ <%= t('layouts.tag_line') %>
-
<%= yield :optionals %>
-
<% unless @user %>
-
-
- <%= t 'layouts.intro_1' %>
-
-
- <%= t 'layouts.intro_2' %>
-
+
<% end %>
-
<% if STATUS == :database_offline or STATUS == :api_offline %>
-
- <%= t 'layouts.osm_offline' %>
+
<% elsif STATUS == :database_readonly or STATUS == :api_readonly %>
-
- <%= t 'layouts.osm_read_only' %>
+
<% end %>
-
<% if false %>
-
- <%= t 'layouts.donate', :link => "
#{t('layouts.donate_link_text')}" %>
+
<% end %>
-
-
+
+
+ <% if @user and @user.id %>
+ - <%=link_to h(@user.display_name), user_path(:display_name => @user.display_name), :title => t('layouts.welcome_user_link_tooltip') %>
+ - <%= yield :greeting %>
+ - <%= render :partial => "layouts/inbox" %>
+ - <%= link_to t('layouts.logout'), logout_path(:session => request.session_options[:id], :referer => request.fullpath), {:id => 'logoutanchor', :title => t('layouts.logout_tooltip')}%>
+ <% else %>
+ - <%= link_to t('layouts.log_in'), login_path(:referer => request.fullpath), {:id => 'loginanchor', :title => t('layouts.log_in_tooltip')} %>
+ - <%= link_to t('layouts.sign_up'), user_new_path, {:id => 'registeranchor', :title => t('layouts.sign_up_tooltip')} %>
+ <% end %>
+
+
+ - <%= link_to t('layouts.view'), root_path, {
+ :id => 'viewanchor',
+ :title => t('layouts.view_tooltip'),
+ :class => 'geolink llz layers'
+ } %>
+ - <%= 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'
+ } %>
+ - <%= link_to t('layouts.history'), browse_changesets_path, {
+ :id => 'historyanchor',
+ :data => { :minzoom => 11 },
+ :title => t('javascripts.site.history_tooltip'),
+ :class => 'geolink bbox'
+ } %>
+ - <%= 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'
+ } %>
+
+
+
+
+
+ <%= render :partial => "layouts/flash", :locals => { :flash => flash } %>
+ <% if content_for? :heading %>
+
+ <%= yield :heading %>
-
-
- <%= link_to image_tag("sotm.png", :alt => t('layouts.sotm2011'), :title => t('layouts.sotm2011'), :border => "0"), "http://stateofthemap.org/register-now/" %>
+ <% end %>
+
+ <%= yield %>
-
-
-
-
+ <% if defined?(PIWIK_LOCATION) and defined?(PIWIK_SITE) -%>
+
+ <% end -%>