X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/250a068b066c8968047ed90c2de64a47f9301c7d..f74c984a49695df755ed853bc42f1da0fca363e6:/app/views/layouts/site.html.erb

diff --git a/app/views/layouts/site.html.erb b/app/views/layouts/site.html.erb
index a0e894e46..8239c8c2d 100644
--- a/app/views/layouts/site.html.erb
+++ b/app/views/layouts/site.html.erb
@@ -39,13 +39,6 @@
       </div>
       <% end %>
       <ul id="left_menu" class="left_menu">
-        <li>
-          <h4><%= t'layouts.help' %></h4>
-          <ul>
-            <li><%= link_to(t('layouts.help_centre'), t('layouts.help_url'), :title => t('layouts.help_title')) %></li>
-            <li><%= link_to(t('layouts.documentation'), t('layouts.wiki_url'), :title => t('layouts.documentation_title')) %></li>
-          </ul>
-        </li>
         <li>
           <h4><%= t'layouts.community' %></h4>
           <ul>
@@ -70,21 +63,6 @@
         </li>
         <%= yield :left_menu %>
       </ul>
-      <div class='ad-container inner11'>
-        <div class='ads'>
-          <%= ad = [{:image => 'sotm-birmingham-ad.png',
-                     :title => 'State of the Map Birmingham',
-                     :href =>'http://stateofthemap.org/'},
-                    {:image => 'donate-ad.png',
-                     :title => 'Server Donation Drive',
-                     :href =>'http://donate.openstreetmap.org/'}].sample
-
-              link_to ad[:href], :title => ad[:title] do
-                image_tag ad[:image], :class => :ad
-              end
-          %>
-        </div>
-      </div>
       <a title="<%= h(t('layouts.make_a_donation.title')) %>" href="http://donate.openstreetmap.org/" class="donate">
         <span class='icon donate'></span>
         <span><%= h(t('layouts.make_a_donation.text')) %></span>
@@ -99,53 +77,33 @@
       </div>
     </div>
     <div id='top-bar'>
-      <ul class='secondary-actions' id="greeting">
-         <% if @user and @user.id %>
-           <li id="full-greeting"><%=link_to h(@user.display_name), user_path(:display_name => @user.display_name), :title => t('layouts.welcome_user_link_tooltip') %></li>
-           <li><%= yield :greeting %></li>
-           <li><%= render :partial => "layouts/inbox" %></li>
-           <li><%= link_to t('layouts.logout'), logout_path(:session => request.session_options[:id], :referer => request.fullpath), {:id => 'logoutanchor', :title => t('layouts.logout_tooltip')}%></li>
-         <% else %>
-           <li><%= link_to t('layouts.log_in'), login_path(:referer => request.fullpath), {:id => 'loginanchor', :title => t('layouts.log_in_tooltip')} %></li>
-           <li><%= link_to t('layouts.sign_up'), user_new_path, {:id => 'registeranchor', :title => t('layouts.sign_up_tooltip')} %></li>
-         <% end %>
-      </ul>
-      <ul id="tabnav">
-        <li><%= link_to t('layouts.view'), root_path, {
-          :id => 'viewanchor',
-          :title => t('layouts.view_tooltip'),
-          :class => 'geolink llz layers'
-        } %></li>
-        <li><%= 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'
-        } %></li>
-        <li><%= link_to t('layouts.history'), browse_changesets_path, {
-          :id => 'historyanchor',
-          :data => { :minzoom => 11 },
-          :title => t('javascripts.site.history_tooltip'),
-          :class => 'geolink bbox'
-        } %></li>
-      </ul>
-    </div>
-    <div id="editmenu" class="menu">
-      <ul>
-        <% Editors::RECOMMENDED_EDITORS.each do |editor| %>
-          <li><%= link_to t('layouts.edit_with',
-            :editor => t("editor.#{editor}.description")),
-            edit_path(:editor => editor), {
-            :data => { :editor => editor },
-            :class => "geolink llz object"
-          } %></li>
+      <nav class='primary'>
+        <ul>
+          <li id="view_tab">
+            <%= link_to t('layouts.view'), root_path, :class => 'tab geolink llz layers' %>
+          </li><li id="edit_tab">
+            <%= render :partial => 'layouts/edit_menu',
+                       :locals => { :link_text => t('layouts.edit'), :link_class => 'llz object' }%>
+          </li><li id="history_tab">
+            <%= link_to t('layouts.history'), browse_changesets_path, :class => 'tab geolink bbox' %>
+          </li>
+        </ul>
+      </nav>
+      <nav class='secondary'>
+        <% if @user and @user.id %>
+          <ul>
+            <li><%= link_to t('layouts.help'), help_path %></li>
+          </ul>
+          <%= render :partial => "layouts/user_menu" %>
+        <% else %>
+          <ul class="secondary-actions">
+            <li><%= link_to t('layouts.help'), help_path %></li>
+            <li><%= link_to t('layouts.log_in'), login_path(:referer => request.fullpath), {:id => 'loginanchor', :title => t('layouts.log_in_tooltip')} %></li>
+            <li><%= link_to t('layouts.sign_up'), user_new_path, {:id => 'registeranchor', :title => t('layouts.sign_up_tooltip')} %></li>
+          </ul>
         <% end %>
-        <%= yield :editmenu %>
-      </ul>
+      </nav>
     </div>
-    <script type="text/javascript">
-      createMenu("editanchor", "editmenu", "left");
-    </script>
     <div class="wrapper">
       <%= render :partial => "layouts/flash", :locals => { :flash => flash } %>
       <% if content_for? :heading %>
@@ -157,8 +115,8 @@
         <%= yield %>
       </div>
     </div>
-    <% if defined?(PIWIK_LOCATION) and defined?(PIWIK_SITE) -%>
-    <noscript><p><img src="<%= request.protocol %><%= PIWIK_LOCATION %>/piwik.php?idsite=<%= PIWIK_SITE %>" style="border:0" alt="" /></p></noscript>
+    <% if defined?(PIWIK) -%>
+    <noscript><p><img src="<%= request.protocol %><%= PIWIK['location'] %>/piwik.php?idsite=<%= PIWIK['site'] %>" style="border:0" alt="" /></p></noscript>
     <% end -%>
   </body>
 </html>