From: John Firebaugh <john.firebaugh@gmail.com>
Date: Fri, 4 Oct 2013 18:36:53 +0000 (-0700)
Subject: Don't rely on body classes so much
X-Git-Tag: live~4661^2~225
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/3d4a137959573a9bada01e2622613c87b5056f92

Don't rely on body classes so much

Doesn't work well with pushState-based navigation.
---

diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss
index 0c8ea4ec9..43d59cfb5 100644
--- a/app/assets/stylesheets/common.css.scss
+++ b/app/assets/stylesheets/common.css.scss
@@ -947,7 +947,7 @@ a.donate {
 
 /* Rules for the data browser */
 
-body.browse #sidebar_content {
+#sidebar_content {
   .browse-section {
     padding: 20px;
     border-bottom: 1px solid #CCC;
diff --git a/app/controllers/site_controller.rb b/app/controllers/site_controller.rb
index eb8749f6f..997973922 100644
--- a/app/controllers/site_controller.rb
+++ b/app/controllers/site_controller.rb
@@ -45,8 +45,6 @@ class SiteController < ApplicationController
       return
     end
 
-    @extra_body_class = "site-edit-#{editor}"
-
     if params[:node]
       bbox = Node.find(params[:node]).bbox.to_unscaled
       @lat = bbox.centre_lat
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 23e3b34c5..5d61e8c63 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -94,24 +94,14 @@ module ApplicationHelper
   end
 
   def body_class
-    [
-        params[:controller],
-        "#{params[:controller]}-#{params[:action]}",
-        "#{current_layout}-layout",
-        @extra_body_class
-    ].compact.join(" ")
+    if content_for? :body_class
+      content_for :body_class
+    else
+      "#{params[:controller]} #{params[:controller]}-#{params[:action]}"
+    end
   end
 
   def current_page_class(path)
     :current if current_page?(path)
   end
-
-  def current_layout
-    layout = controller.send(:_layout)
-    if layout.instance_of? String
-      layout
-    else
-      File.basename(layout.identifier).split('.').first
-    end
-  end
 end
diff --git a/app/views/layouts/map.html.erb b/app/views/layouts/map.html.erb
index d5666ed09..6e6caf95c 100644
--- a/app/views/layouts/map.html.erb
+++ b/app/views/layouts/map.html.erb
@@ -2,6 +2,8 @@
   <%= javascript_include_tag "index" %>
 <% end %>
 
+<% content_for(:body_class) { "map-layout" } %>
+
 <% content_for :content do %>
   <div id="sidebar">
     <%= form_tag url_for(:controller => :geocoder, :action => :search), :id => "search_form" do %>