Nested layouts working

rogercampos · Nov 8, 2011 · cd20c04 · cd20c04
1 parent f3f0d22
commit cd20c04
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 31 deletions.
diff --git a/app/controllers/interpret/base_controller.rb b/app/controllers/interpret/base_controller.rb
@@ -2,7 +2,7 @@ class Interpret::BaseController < eval(Interpret.parent_controller.classify)
   before_filter :set_locale
   before_filter { authorize! :use, :interpret }
   before_filter :check_authorized_language
-  layout 'interpret/application'
+  layout 'interpret/interpret'
 
 protected
   def current_interpret_user

diff --git a/...ws/layouts/interpret/application.html.erb → ...iews/layouts/interpret/interpret.html.erb b/...ws/layouts/interpret/application.html.erb → ...iews/layouts/interpret/interpret.html.erb
@@ -1,14 +1,3 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <title><%= yield :title %></title>
-  <%= stylesheet_link_tag "interpret_style" %>
-  <%= javascript_include_tag "https://ajax.googleapis.com/ajax/libs/jquery/1.4.4/jquery.min.js" %>
-  <%= javascript_include_tag "best_in_place", "interpret" %>
-  <%= csrf_meta_tag %>
-</head>
-<body>
-
 <div id="interpret_container">
   <% if flash.any? %>
     <div class="interpret_flash grid_16 <%= flash.keys.first %>">
@@ -63,8 +52,4 @@
   </div>
 </div>
 
-
-</body>
-</html>
-
-
+<%= interpret_parent_layout Interpret.layout%>
diff --git a/lib/interpret/helpers.rb b/lib/interpret/helpers.rb
@@ -1,6 +1,5 @@
 module Interpret
   module InterpretHelpers
-
     # Generates the html tree from the given keys
     def interpret_show_tree(tree, origin_keys)
       tree = tree.first[1]
@@ -12,19 +11,14 @@ def interpret_show_tree(tree, origin_keys)
       build_tree(tree, origin_keys)
     end
 
-    def interpret_section_link_to(name, options = {}, html_options = {})
-      html_options.merge!({ :class => 'current' }) if current_controller?(options)
-      link_to name, options, html_options
-    end
-
     def interpret_title(title)
       content_for :title do
         title
       end
     end
 
     def interpret_parent_layout(layout)
-      @_content_for[:layout] = self.output_buffer
+      @view_flow.set(:layout, self.output_buffer)
       self.output_buffer = render(:file => "layouts/#{layout}")
     end
 
@@ -88,10 +82,5 @@ def build_tree(hash, origin_keys = "", prev_key = "")
       out << "</ul>"
       out.html_safe
     end
-
-    def current_controller?(opts)
-      hash = Rails.application.routes.recognize_path(url_for(opts))
-      params[:controller] == hash[:controller]
-    end
   end
 end
diff --git a/test_app/app/controllers/admin/dashboard_controller.rb b/test_app/app/controllers/admin/dashboard_controller.rb
@@ -0,0 +1,6 @@
+class Admin::DashboardController < ApplicationController
+  layout 'backoffice'
+
+  def index
+  end
+end
diff --git a/test_app/app/views/admin/dashboard/index.html.erb b/test_app/app/views/admin/dashboard/index.html.erb
@@ -0,0 +1 @@
+Another Backoffice section
diff --git a/test_app/app/views/layouts/backoffice.html.erb b/test_app/app/views/layouts/backoffice.html.erb
@@ -14,8 +14,8 @@
     <div id="backoffice_menu">
       <ul>
         <li><%= link_to "Public page", "/" %></li>
-        <li><%= link_to "Other backoffice section", "#" %></li>
-        <li><%= link_to "Translations", interpret_path %></li>
+        <li><%= link_to "Other backoffice section", main_app.admin_dashboard_path %></li>
+        <li><%= link_to "Translations", main_app.interpret_path %></li>
       </ul>
     </div>
     <div id="page">

diff --git a/test_app/config/routes.rb b/test_app/config/routes.rb
@@ -11,6 +11,9 @@
 
     post "toggle_edition_mode", :to => "application#toggle_edition_mode"
 
+    namespace :admin do
+      get 'dashboard', :to => "dashboard#index"
+    end
 
     root :to => "pages#index"
   end