Allow iD and Potlatch 2 to load assets outside the asset pipeline

[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 12b5b82c5c358c9aa123e16c739b53fce0b61019..ed8a6cf18833821240d497b6b299efd6cd870321 100644 (file)
--- a/app/views/layouts/site.html.erb
+++ b/app/views/layouts/site.html.erb
@@ -70,18 +70,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/'}].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>
@@ -126,8 +114,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>