include only required assets

also add a blank layout for controllers that open inside the lightbox. this allow to not use the application layout which is application wide and will be probably modified.
alepore · May 30, 2014 · 0ec3412 · 0ec3412
1 parent b9a6245
commit 0ec3412
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 5 deletions.
diff --git a/app/controllers/answers_controller.rb b/app/controllers/answers_controller.rb
@@ -1,2 +1,3 @@
 class AnswersController < ApplicationController
+  layout 'surveyor_gui_blank'
 end
diff --git a/app/controllers/dependencys_controller.rb b/app/controllers/dependencys_controller.rb
@@ -1,4 +1,5 @@
 class DependencysController < ApplicationController
+  layout 'surveyor_gui_blank'
 
   def new
     prep_variables

diff --git a/app/controllers/questions_controller.rb b/app/controllers/questions_controller.rb
@@ -1,4 +1,5 @@
 class QuestionsController < ApplicationController
+  layout 'surveyor_gui_blank'
 
   def new
     @title = "Add Question"
@@ -19,15 +20,15 @@ def edit
     @title = "Edit Question"
     @question = Question.includes(:answers).find(params[:id])
   end
-  
+
   def adjusted_text
     if @question.part_of_group?
       @question.question_group.text
     else
       @question.text
     end
   end
-  
+
   helper_method :adjusted_text
 
   def create
@@ -115,7 +116,7 @@ def render_answer_fields_partial
     end
     render :partial => 'answer_fields'
   end
-  
+
   def render_grid_partial
     if params[:id].blank?
       @questions = Question.new

diff --git a/app/controllers/survey_sections_controller.rb b/app/controllers/survey_sections_controller.rb
@@ -1,4 +1,5 @@
 class SurveySectionsController < ApplicationController
+  layout 'surveyor_gui_blank'
 
   def new
     @title = "Add Survey Section"

diff --git a/app/views/layouts/surveyor_gui_blank.html.erb b/app/views/layouts/surveyor_gui_blank.html.erb
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>SurveyorGui</title>
+    <%= stylesheet_link_tag    "surveyor_gui_all", :media => "all" %>
+    <%= javascript_include_tag "surveyor_gui_all" %>
+    <%= csrf_meta_tags %>
+  </head>
+  <body>
+    <%= yield %>
+  </body>
+</html>
diff --git a/app/views/layouts/surveyor_gui_default.html.erb b/app/views/layouts/surveyor_gui_default.html.erb
@@ -2,8 +2,8 @@
 <html>
   <head>
     <title>SurveyorGui</title>
-    <%= stylesheet_link_tag    "application", :media => "all" %>
-    <%= javascript_include_tag "application" %>
+    <%= stylesheet_link_tag    "surveyor_gui_all", :media => "all" %>
+    <%= javascript_include_tag "surveyor_gui_all" %>
     <%= csrf_meta_tags %>
   </head>
   <body>

diff --git a/lib/generators/surveyor_gui/templates/app/assets/javascripts/surveyor_gui_all.js b/lib/generators/surveyor_gui/templates/app/assets/javascripts/surveyor_gui_all.js
@@ -1,3 +1,4 @@
+//= require surveyor_all
 //= require colorbox-rails
 //= require jquery.form
 //= require surveyor_gui/jquery.validate