Update notifiers to use new ActionMailer API

[rails.git] / app / views / layouts / site.html.erb

diff --git a/app/views/layouts/site.html.erb b/app/views/layouts/site.html.erb
index df99b51daa54e56ebfc9bfd4516ad5c72f5fae9b..3a8e1f1c0a03505ae5c513e7d4aba3cf23235d37 100644 (file)
--- a/app/views/layouts/site.html.erb
+++ b/app/views/layouts/site.html.erb
@@ -33,6 +33,7 @@
         historyclass = 'geolink bbox minzoom11'
         exportclass = 'geolink llz layers'
         traceclass = ''
+        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' 
@@ -43,17 +44,13 @@
         <li><%= link_to t('layouts.view'), {:controller => 'site', :action => 'index'}, {:id => 'viewanchor', :title => t('layouts.view_tooltip'), :class => viewclass} %></li>
         <li><%= link_to t('layouts.edit') + '&nbsp;&#x25be;', {: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>
-        <% if params['controller'] == 'site' and (params['action'] == 'index' or params['action'] == 'export') %>
-        <li><%= link_to_remote t('layouts.export'), {:url => {:controller => 'export', :action => 'start'}}, {:id => 'exportanchor', :title => t('layouts.export_tooltip'), :class => exportclass, :href => url_for(:controller => 'site', :action => 'export')} %></li>
-        <% else %>
         <li><%= link_to t('layouts.export'), {:controller => 'site', :action => 'export'}, {:id => 'exportanchor', :title => t('layouts.export_tooltip'), :class => exportclass} %></li>
-        <% end %>
         <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>
         <li><%= link_to t('layouts.user_diaries'), {:controller => 'diary_entry', :action => 'list', :display_name => nil}, {:id => 'diaryanchor', :title => t('layouts.user_diaries_tooltip'), :class => diaryclass} %></li>
       </ul>
     </div>
 
-    <div id="editmenu">
+    <div id="editmenu" class="menu">
       <ul>
         <% 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>
@@ -62,7 +59,7 @@
     </div>
 
     <script type="text/javascript">
-      createMenu("editanchor", "editmenu", 1000);
+      createMenu("editanchor", "editmenu", 1000, "left");
     </script>
 
     <div id="left">
@@ -122,15 +119,14 @@
         </ul>
       </div>
 
-      <div id="sotm">
-        <%= link_to image_tag("sotm.png", :alt => t('layouts.sotm2011'), :title => t('layouts.sotm2011'), :border => "0"), "http://stateofthemap.org/register-now/" %>
-      </div>
-
       <center>
         <div class="donate">
           <a href="http://donate.openstreetmap.org/" title="<%= h(t('layouts.make_a_donation.title')) %>"><%= h(t('layouts.make_a_donation.text')) %></a>
         </div>
       </center>
     </div>
+    <% if defined?(PIWIK_LOCATION) and defined?(PIWIK_SITE) -%>
+    <%= render :partial => "layouts/piwik" %>
+    <% end -%>
   </body>
 </html>