X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/bb83f28a5e9326be55a431d5c3f7b4ae7529a942..7901815718df724958198a9f471902ab63263932:/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 d04a2877f..ca4901311 100644 --- a/app/views/layouts/site.html.erb +++ b/app/views/layouts/site.html.erb @@ -2,7 +2,11 @@ <%= 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') %> +

<%= t 'layouts.project_name.h1' %>

+
+
<%= render :partial => "layouts/flash", :locals => { :flash => flash } %> <%= yield %> @@ -10,13 +14,13 @@ <% 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')) %> + <%= 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'))) %> <%= 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)}%> + <%= link_to t('layouts.logout'), {:controller => 'user', :action => 'logout', :session => request.session_options[:id], :referer => request.fullpath}, {:id => 'logoutanchor', :title => t('layouts.logout_tooltip'), :method => :post, :href => url_for(:controller => 'user', :action => 'logout', :referer => request.fullpath)}%> <% 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.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 %> @@ -24,41 +28,38 @@
    <% - viewclass = '' - editclass = '' - historyclass = '' - exportclass = '' + viewclass = 'geolink llz layers' + editclass = 'geolink llz object minzoom13 disabled' + historyclass = 'geolink bbox minzoom11' + exportclass = 'geolink llz layers' traceclass = '' - 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' + 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}, {:id => 'traceanchor', :title => t('layouts.gps_traces_tooltip'), :class => traceclass} %>
    • +
  • <%= 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} %>
-
+
@@ -71,6 +72,8 @@
+ <%= yield :optionals %> + <% unless @user %>

@@ -80,10 +83,11 @@ <%= t 'layouts.intro_2' %>

- <%= 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"), - :partners => link_to(t('layouts.intro_3_partners'), t('layouts.intro_3_partners_url')) %> + <%= 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'))) %>

<% end %> @@ -115,17 +119,14 @@
-
- <%= link_to image_tag("sotm.png", :alt => t('layouts.sotm2011'), :title => t('layouts.sotm2011'), :border => "0"), "http://stateofthemap.org/register-now/" %> -
- - <%= yield :optionals %> -
+ <% if defined?(PIWIK_LOCATION) and defined?(PIWIK_SITE) -%> + <%= render :partial => "layouts/piwik" %> + <% end -%>