Preserve location hash in referer

[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 bd77966db009a2d15f53b7b54578740cd5628b87..548dc35fbf9c43a1c7ee30f42b4d4b8b02045c2e 100644 (file)
--- a/app/views/layouts/site.html.erb
+++ b/app/views/layouts/site.html.erb
@@ -44,7 +44,6 @@
           <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>
-            <li><%= link_to t('layouts.copyright'), copyright_path %></li>
           </ul>
         </li>
         <li>
@@ -58,21 +57,24 @@
           </ul>
         </li>
         <li>
-          <h4><%= link_to t('layouts.gps_traces'), traces_path, {
-            :id => 'traceanchor',
-            :title => t('layouts.gps_traces_tooltip')
-          } %></h4>
+          <h4><%= t'layouts.data' %></h4>
+          <ul>
+            <li><%= link_to t('layouts.copyright'), copyright_path %></li>
+          </ul>
+          <ul>
+            <li><%= link_to t('layouts.export_data'), export_path %></li>
+          </ul>
+          <ul>
+            <li><%= link_to t('layouts.gps_traces'), traces_path %></li>
+          </ul>
         </li>
         <%= yield :left_menu %>
       </ul>
-      <div class='ad-container'>
+      <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 => 'sotm-us-ad.png',
-                     :title => 'State of the Map USA',
-                     :href =>'http://stateofthemap.us/'},
                     {:image => 'donate-ad.png',
                      :title => 'Server Donation Drive',
                      :href =>'http://donate.openstreetmap.org/'}].sample
@@ -84,6 +86,7 @@
         </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>
       </a>
       <div class='sidebar-copy'>
@@ -125,12 +128,6 @@
           :title => t('javascripts.site.history_tooltip'),
           :class => 'geolink bbox'
         } %></li>
-        <li><%= 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'
-        } %></li>
       </ul>
     </div>
     <div id="editmenu" class="menu">