X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/02de53eb45f31242bed45537aab2598d8f7dffae..eeadb9e20222eade2f1db0bb599bef50eea15f93:/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 7f55fb38b..be19d01cc 100644
--- a/app/views/layouts/site.html.erb
+++ b/app/views/layouts/site.html.erb
@@ -1,93 +1,19 @@
-
+
<%= 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 %>
- <%= 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.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 %>
-
-
- - <%= link_to t('layouts.view'), {
- :controller => 'site',
- :action => 'index'
- }, {
- :id => 'viewanchor',
- :title => t('layouts.view_tooltip'),
- :class => 'geolink llz layers'
- } %>
- - <%= 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'
- } %>
- - <%= link_to t('layouts.history'), {
- :controller => 'changeset',
- :action => 'list'
- }, {
- :id => 'historyanchor',
- :data => { :minzoom => 11 },
- :title => t('javascripts.site.history_tooltip'),
- :class => 'geolink bbox'
- } %>
- - <%= link_to t('layouts.export'), {
- :controller => 'site',
- :action => 'export'
- }, {
- :id => 'exportanchor',
- :title => t('layouts.export_tooltip'),
- :class => 'geolink llz layers'
- } %>
-
-
+
<%= link_to(image_tag("osm_logo.png",
:size => "120x120",
:alt => t('layouts.logo.alt_text')),
- :controller => 'site',
- :action => 'index') %>
+ root_path) %>
<%= t 'layouts.project_name.h1' %>
- <%= t('layouts.tag_line') %>
+ <%= t('layouts.tag_line') %>
<%= yield :optionals %>
<% unless @user %>
@@ -97,10 +23,8 @@
<%= 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)
%>
@@ -114,55 +38,51 @@
<%= t 'layouts.osm_read_only' %>
- <%= link_to image_tag("sotm.png",
- :alt => t('layouts.sotm2012'),
- :title => t('layouts.sotm2012'),
- :border => "0"), "http://stateofthemap.org/register-now/" %>
-
-
-
<%= h(t('layouts.make_a_donation.text')) %>
+ } %>
+
+ <%= yield :left_menu %>
+
+
+
+ <%= ad = [{:image => 'sotm-birmingham-ad.png',
+ :title => 'State of the Map Birmingham',
+ :href =>'http://stateofthemap.org/'},
+ {:image => 'sotm-us-ad.png',
+ :title => 'State of the Map USA',
+ :href =>'http://stateofthemap.us/'}].sample
+
+ link_to ad[:href], :title => ad[:title] do
+ image_tag ad[:image], :class => :ad
+ end
+ %>
+
+
+ <%= h(t('layouts.make_a_donation.text')) %>
+
+
+ <% 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 %>
+
+ <% end %>
+
+ <%= yield %>
+
+
<% end -%>