X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/832b96b75ac05177e6baad7b414066ccfd7cfa51..0e7324839b2f1cd6a2d07be073ae14dfbf611beb:/app/views/layouts/site.html.erb diff --git a/app/views/layouts/site.html.erb b/app/views/layouts/site.html.erb index 7346802a9..9cb6d3df0 100644 --- a/app/views/layouts/site.html.erb +++ b/app/views/layouts/site.html.erb @@ -6,7 +6,7 @@ <%= 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 %> @@ -28,17 +28,18 @@
    <% - 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} %>
  • @@ -53,16 +54,16 @@
-
+
@@ -87,7 +88,8 @@

<%= t 'layouts.intro_3', - :ucl => link_to(t('layouts.intro_3_ucl'), "http://www.vr.ucl.ac.uk"), + :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')) %>