X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/a42dc9f4826da27b21fa1f66ea6318110afaa0b2..d9dbd3edf16335ffd6b9d57d63f55ca98fdc292c:/app/views/layouts/site.rhtml
diff --git a/app/views/layouts/site.rhtml b/app/views/layouts/site.rhtml
index 0ff110ced..aa534d63a 100644
--- a/app/views/layouts/site.rhtml
+++ b/app/views/layouts/site.rhtml
@@ -1,89 +1,129 @@
-
+
+
- <%= javascript_include_tag 'main.js' %>
-
- <%= javascript_include_tag 'tile.js' %>
- <%= javascript_include_tag 'site.js' %>
-
-
-<% if @flash[:notice] %>
-
<%= @flash[:notice] %>
-<% end %>
-
- <%= @content_for_layout %>
-
-
-
-
+ <% if @notice || flash[:notice] %>
+
<%= @notice || flash[:notice] %>
+ <% end %>
-
-
- OpenStreetMap
-
-
- The Free Wiki World Map
-
+ <%= yield %>
-
- OpenStreetMap is a free editable map of the whole world. It is made by people like you.
-
- OpenStreetMap allows you to view, edit and use geographical data in a collaborative way from anywhere on Earth.
-
- OpenStreetMap's hosting is kindly supported by the
UCL VR Centre and
bytemark.
-
+
+ <% 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}) %> |
+ <% @inbox_weight = 'bold' if @user.new_messages.size > 0 %>
+ <%= yield :greeting %>
+ <%= link_to t('layouts.inbox', :size => @user.new_messages.size), {:controller => 'message', :action => 'inbox', :display_name => @user.display_name}, {:style => "font-weight: #{@inbox_weight};" } %> |
+ <%= link_to t('layouts.logout'), {:controller => 'user', :action => 'logout', :referer => request.request_uri}, {:id => 'logoutanchor'}%>
+ <% else %>
+ <%= link_to t('layouts.log_in'), {:controller => 'user', :action => 'login', :referer => request.request_uri}, {:id => 'loginanchor'}%> |
+ <%= link_to t('layouts.sign_up'), {:controller => 'user', :action => 'new'}, {:id => 'registeranchor'} %>
+ <% end %>
+
+
+
+
+ <%
+ viewclass = ''
+ editclass = ''
+ historyclass = ''
+ exportclass = ''
+ 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_bbox'
+ 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 => 'view maps', :class => viewclass} %>
+ - <%= link_to t('layouts.edit'), {:controller => 'site', :action => 'edit'}, {:id => 'editanchor', :title => 'edit maps', :class => editclass} %>
+ - <%= link_to t('layouts.history'), {:controller => 'changeset', :action => 'list_bbox' }, {:id => 'historyanchor', :title => 'changeset history', :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 => 'export map data', :class => exportclass, :href => url_for(:controller => 'site', :action => 'export')} %>
+ <% else %>
+ - <%= link_to t('layouts.export'), {:controller => 'site', :action => 'export'}, {:id => 'exportanchor', :title => 'export map data', :class => exportclass} %>
+ <% end %>
+ - <%= link_to t('layouts.gps_traces'), {:controller => 'trace', :action => 'list'}, {:id => 'traceanchor', :title => 'manage traces', :class => traceclass} %>
+ - <%= link_to t('layouts.user_diaries'), {:controller => 'diary_entry', :action => 'list', :display_name => nil}, {:id => 'diaryanchor', :title => 'view user diaries', :class => diaryclass} %>
+
-