X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/cea0cccc6d73d7543d80d659b0f221f0d3196c0e..bab26e3884bd770b89d652d855f1e9b5d4a8736e:/app/views/layouts/site.html.erb?ds=sidebyside

diff --git a/app/views/layouts/site.html.erb b/app/views/layouts/site.html.erb
index a89db5078..461257207 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,6 +77,9 @@
       </div>
     </div>
     <div id='top-bar'>
+      <ul class='secondary-actions'>
+        <li><%= link_to t('layouts.help'), help_path %></li>
+      </ul>
       <% if @user and @user.id %>
         <%= render :partial => "layouts/user_menu" %>
       <% else %>
@@ -129,8 +110,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>