From 6bf4c60d458104de36c0ba3805508014b2f506cf Mon Sep 17 00:00:00 2001
From: Christophe Vilayphiou <chris.vilayphiou@gmail.com>
Date: Thu, 26 Apr 2012 01:49:02 +0800
Subject: [PATCH] Changes for js and ccs load for site's pages

---
 app/helpers/application_helper.rb    | 23 +++++++++++++++++------
 app/views/admin/pages/_show.html.erb |  4 ++--
 2 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index b1d190ec..52ad71c0 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -124,11 +124,13 @@ module ApplicationHelper
     "<title>#{page.title ? page.title[I18n.locale] : page.i18n_variable[I18n.locale]}</title>\n"
   end  
 
-  def page_stylesheets(page)
+  def page_stylesheets(page, edit=nil)
     stylesheets = ''
-    stylesheets << "<link href='/assets/bootstrap.css' rel='stylesheet' type='text/css' />\n"
-    stylesheets << "<link href='/assets/bootstrap-orbit.css' rel='stylesheet' type='text/css' />\n"
-    stylesheets << "<link href='/assets/style.css' rel='stylesheet' type='text/css' />\n"
+    unless edit
+      stylesheets << "<link href='/assets/bootstrap.css' rel='stylesheet' type='text/css' />\n" 
+      stylesheets << "<link href='/assets/bootstrap-orbit.css' rel='stylesheet' type='text/css' />\n"
+      stylesheets << "<link href='/assets/style.css' rel='stylesheet' type='text/css' />\n"
+    end
     stylesheets << "<link href='#{page.design.reset_css.file.url}' rel='stylesheet' type='text/css' />\n" if page.design.reset_css
     stylesheets << "<link href='#{page.design.default_css.file.url}' rel='stylesheet' type='text/css' />\n" if page.design.default_css
     theme = page.design.themes.detect{ |d| d.id == page.theme_id }
@@ -136,9 +138,18 @@ module ApplicationHelper
     stylesheets
   end
 
-  def page_javascripts(page)
+  def page_javascripts(page, edit=nil)
     javascripts = ''
-    javascripts << "<script type='text/javascript' src='/static/jquery.cycle.all.latest.js'></script>\n"
+    unless edit
+      javascripts << "<script type='text/javascript' src='/static/jquery.js'></script>\n"
+      javascripts << "<script type='text/javascript' src='/static/jquery.cycle.all.latest.js'></script>\n"
+      javascripts << "<script type='text/javascript' src='/assets/bootstrap.js'></script>\n"
+      javascripts << "<script type='text/javascript' src='/assets/jquery.tinyscrollbar.min.js'></script>\n"
+      javascripts << "<script type='text/javascript' src='/assets/jquery.isotope.min.js'></script>\n"
+      javascripts << "<script type='text/javascript' src='/assets/orbit-bar-member.js'></script>\n"
+      javascripts << "<script type='text/javascript' src='/assets/orbit-bar-search.js'></script>\n"
+      javascripts << "<script type='text/javascript' src='/assets/orbit_bar.js'></script>\n"
+    end
     javascripts << "<script type='text/javascript' src='/static/kernel.js'></script>\n"
     javascripts << "<script type='text/javascript' src='/assets/event.js'></script>\n"
     page.design.javascripts.each do |js|
diff --git a/app/views/admin/pages/_show.html.erb b/app/views/admin/pages/_show.html.erb
index ba9bcf48..29d532fb 100644
--- a/app/views/admin/pages/_show.html.erb
+++ b/app/views/admin/pages/_show.html.erb
@@ -1,7 +1,7 @@
 <%= flash_messages %>
 
 
-<%= page_stylesheets(@item).html_safe %> 
-<%= page_javascripts(@item).html_safe %> 
+<%= page_stylesheets(@item, true).html_safe %> 
+<%= page_javascripts(@item, true).html_safe %> 
 
 <%= parse_page_edit_noko(@item).html_safe %>
\ No newline at end of file