X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/dc48c9a5101c263dfd0eb33fa358490fc2ad9de0..69d91bf24aa38c22640749c2e3b371f34a70ef6d:/app/views/layouts/site.html.erb

diff --git a/app/views/layouts/site.html.erb b/app/views/layouts/site.html.erb
index 19835489c..2c6752ab9 100644
--- a/app/views/layouts/site.html.erb
+++ b/app/views/layouts/site.html.erb
@@ -31,18 +31,15 @@
         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' 
+        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'
         %>
         <li><%= link_to t('layouts.view'), {:controller => 'site', :action => 'index'}, {:id => 'viewanchor', :title => t('layouts.view_tooltip'), :class => viewclass} %></li>
-        <li><%= link_to h(t('layouts.edit')) + '&nbsp;&#x25be;'.html_safe, {:controller => 'site', :action => 'edit'}, {:id => 'editanchor', :title => t('javascripts.site.edit_tooltip'), :class => editclass} %></li>
+        <li><%= link_to h(t('layouts.edit')) + content_tag(:span, "▾", :class => "menuicon"), {:controller => 'site', :action => 'edit'}, {:id => 'editanchor', :title => t('javascripts.site.edit_tooltip'), :class => editclass} %></li>
         <li><%= link_to t('layouts.history'), {:controller => 'changeset', :action => 'list' }, {:id => 'historyanchor', :title => t('javascripts.site.history_tooltip'), :class => historyclass} %></li>
         <li><%= link_to t('layouts.export'), {:controller => 'site', :action => 'export'}, {:id => 'exportanchor', :title => t('layouts.export_tooltip'), :class => exportclass} %></li>
-        <li><%= 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} %></li>
       </ul>
     </div>
 
@@ -51,11 +48,12 @@
         <% Editors::ALL_EDITORS.each do |editor| %>
           <li><%= link_to t('layouts.edit_with', :editor => t("editor.#{editor}.description")), {:controller => 'site', :action => 'edit', :editor => editor}, {:id => editor + 'anchor', :class => "geolink llz object"} %></li>
         <% end %>
+        <%= yield :editmenu %>
       </ul>
     </div>
 
     <script type="text/javascript">
-      createMenu("editanchor", "editmenu", 1000, "left");
+      createMenu("editanchor", "editmenu", "left");
     </script>
 
     <div id="left">
@@ -73,37 +71,36 @@
           <%= t 'layouts.intro_1' %>
         </p>
         <p>
-        <%= raw(t 'layouts.intro_2',
+        <%= 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'})))
+                                   url_for({:controller => 'user', :action => 'new'}))
         %>
         </p>
       </div>
       <% end %>
 
       <% if STATUS == :database_offline or STATUS == :api_offline %>
-      <div id="alert">
-        <%= t 'layouts.osm_offline' %>
+      <div class="sidebar-alert">
+        <p><%= t 'layouts.osm_offline' %></p>
       </div>
       <% elsif STATUS == :database_readonly or STATUS == :api_readonly %>
-      <div id="alert">
-        <%= t 'layouts.osm_read_only' %>
+      <div class="sidebar-alert">
+        <p><%= t 'layouts.osm_read_only' %></p>
       </div>
       <% end %>
 
       <% if false %>
-      <div id="donate" class="notice">
-        <%= raw t 'layouts.donate', :link => "<a href=\"http://donate.openstreetmap.org/\">#{t('layouts.donate_link_text')}</a>" %>
+      <div class="sidebar-notice">
+        <p><%= raw t 'layouts.donate', :link => "<a href=\"http://donate.openstreetmap.org/\">#{t('layouts.donate_link_text')}</a>" %></p>
       </div>
       <% end %>
 
       <div id="left_menu" class="left_menu">
         <ul>
-          <%= yield :left_menu %>
           <li><%= t'layouts.help' %>
               <ul>
               <li><%= link_to(t('layouts.help_centre'), t('layouts.help_url'), :title => t('layouts.help_title')) %></li>
@@ -124,6 +121,8 @@
               }) %></li>
               </ul>
           </li>
+          <li><%= 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') } %></li>
+          <%= yield :left_menu %>
         </ul>
       </div>
 
@@ -131,19 +130,21 @@
         <a href="http://donate.openstreetmap.org/" title="<%= h(t('layouts.make_a_donation.title')) %>"><%= h(t('layouts.make_a_donation.text')) %></a>
       </div>
       <div class='sidebar-copy'>
-          <p><%= raw(t 'layouts.partners',
+          <p><%= t 'layouts.partners_html',
               :ucl => link_to(t('layouts.partners_ucl'), "http://www.vr.ucl.ac.uk"),
               :ic => link_to(t('layouts.partners_ic'), "http://www.imperial.ac.uk/"),
               :bytemark => link_to(t('layouts.partners_bytemark'), "http://www.bytemark.co.uk"),
-              :partners => link_to(t('layouts.partners_partners'), t('layouts.partners_url'))) %>
+              :partners => link_to(t('layouts.partners_partners'), t('layouts.partners_url')) %>
           </p>
       </div>
+    </div>
 
     <script type="text/javascript">
     $(document).ready(function () {
       var auth_token = $("meta[name=csrf-token]").attr("content");
-
       $("form input[name=authenticity_token]").val(auth_token);
+
+      $("textarea").autoGrow();
     });
     </script>