From 6f1eb97ace60caa97c2563818c919b53e20921eb Mon Sep 17 00:00:00 2001
From: Christophe Vilayphiou <chris.vilayphiou@gmail.com>
Date: Wed, 25 Apr 2012 18:41:38 +0800
Subject: [PATCH] Fix for structure js and css

---
 app/assets/javascripts/site_editor.js      | 9 ++++++++-
 app/assets/stylesheets/site_editor.css.erb | 8 +++++++-
 app/helpers/application_helper.rb          | 7 -------
 app/views/admin/pages/show.html.erb        | 4 ----
 4 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/app/assets/javascripts/site_editor.js b/app/assets/javascripts/site_editor.js
index 4c22acbd..4451accb 100644
--- a/app/assets/javascripts/site_editor.js
+++ b/app/assets/javascripts/site_editor.js
@@ -4,5 +4,12 @@
 // It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
 // the compiled file.
 //
-//= require new_admin
+//= require jquery
+//= require jquery_ujs
+//= require bootstrap
+//= require jquery.isotope.min
+//= require jquery.tinyscrollbar.min
+//= require orbit-1.0
+//= require orbit-bar-search
+//= require side_bar_history
 //= require page_edit
\ No newline at end of file
diff --git a/app/assets/stylesheets/site_editor.css.erb b/app/assets/stylesheets/site_editor.css.erb
index fa439d09..e36d0b7b 100644
--- a/app/assets/stylesheets/site_editor.css.erb
+++ b/app/assets/stylesheets/site_editor.css.erb
@@ -2,7 +2,13 @@
  *This is a manifest file that'll automatically include all the stylesheets available in this directory
  *and any sub-directories. You're free to add application-wide styles to this file and they'll appear at
  *the top of the compiled file, but it's generally better to create a new file per style scope.
- *= require new_admin
+ *= require reset
+ *= require_self
+ *= require message
+ *= require bootstrap
+ *= require style
+ *= require bootstrap-orbit
+ *= require scroll_style
  *= require site_items
  *= require sidebar
 */
\ No newline at end of file
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 7337b274..b1d190ec 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -138,15 +138,8 @@ module ApplicationHelper
 
   def page_javascripts(page)
     javascripts = ''
-    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='/static/kernel.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"
     javascripts << "<script type='text/javascript' src='/assets/event.js'></script>\n"
     page.design.javascripts.each do |js|
       # javascripts << "<script type='text/javascript' src='#{js.file.url}'></script>"
diff --git a/app/views/admin/pages/show.html.erb b/app/views/admin/pages/show.html.erb
index d6b6a8a2..3e1160c7 100644
--- a/app/views/admin/pages/show.html.erb
+++ b/app/views/admin/pages/show.html.erb
@@ -1,5 +1 @@
-<% content_for :sidebar do %>
-	<%= render 'admin/items/site_map_left_bar' %>
-<% end -%>
-
 <%= render 'show' %>
\ No newline at end of file