From 0956e9784aa55130bef1efba886262911c12a46c Mon Sep 17 00:00:00 2001
From: chris2tof <chris.vilayphiou@gmail.com>
Date: Wed, 7 Sep 2011 11:53:16 +0800
Subject: [PATCH] Fix bug in layout, parser and change lib/fraisier

---
 app/assets/stylesheets/content.css.erb      | 8 ++++----
 app/views/layouts/admin.html.erb            | 2 +-
 app/views/layouts/content.html.erb          | 2 +-
 lib/fraisier/{structure.css => default.css} | 0
 lib/parser.rb                               | 2 ++
 lib/tasks/dev.rake                          | 4 ++--
 6 files changed, 10 insertions(+), 8 deletions(-)
 rename lib/fraisier/{structure.css => default.css} (100%)

diff --git a/app/assets/stylesheets/content.css.erb b/app/assets/stylesheets/content.css.erb
index 5c638f62..412b6e30 100644
--- a/app/assets/stylesheets/content.css.erb
+++ b/app/assets/stylesheets/content.css.erb
@@ -185,18 +185,18 @@ body{
 	clear: both; 
 	visibility: hidden;
 }
-#panel_header #nav{
+#panel_header #panel_nav{
 	margin:0;
 	padding:0;
 	width:100%;
 }
 
-#panel_header #nav li{
+#panel_header #panel_nav li{
     float: left;
     list-style: none outside none;
 }
 
-#panel_header #nav li a{
+#panel_header #panel_nav li a{
     background: none repeat scroll 0 0 #fff;
     border-radius: 13px 13px 13px 13px;
     border: 1px solid #D6D6D6;
@@ -208,7 +208,7 @@ body{
     text-decoration: none;
 }
 
-#panel_header #nav li a:hover{
+#panel_header #panel_nav li a:hover{
     background: none repeat scroll 0 0 #818181;
     border-radius: 13px 13px 13px 13px;
     color: #fff;
diff --git a/app/views/layouts/admin.html.erb b/app/views/layouts/admin.html.erb
index f62a2193..04241d1c 100644
--- a/app/views/layouts/admin.html.erb
+++ b/app/views/layouts/admin.html.erb
@@ -26,7 +26,7 @@
   
   <div id="panel_header">
     <h1>Orbit <%= t('admin.admin') %></h1>
-     <ul id="nav">
+     <ul id="panel_nav">
 			<li><%= link_to t('homepage'), root_path %></li>
 	    <li><%= link_to t('admin.item'), admin_items_path %></li>
 			<li><%= link_to t('admin.design'), admin_designs_path %></li>
diff --git a/app/views/layouts/content.html.erb b/app/views/layouts/content.html.erb
index ad9aab6d..9cb1f28a 100644
--- a/app/views/layouts/content.html.erb
+++ b/app/views/layouts/content.html.erb
@@ -34,7 +34,7 @@
 
   <div id="panel_header">
 		<h1>Orbit <%= t('admin.item') %></h1>
-		<ul id="nav">
+		<ul id="panel_nav">
 	    <li><%= link_to t('homepage'), root_path %></li>
 	    <li><%= link_to t('admin.item'), admin_items_path %></li>
 			<li><%= link_to t('admin.design'), admin_designs_path %></li>
diff --git a/lib/fraisier/structure.css b/lib/fraisier/default.css
similarity index 100%
rename from lib/fraisier/structure.css
rename to lib/fraisier/default.css
diff --git a/lib/parser.rb b/lib/parser.rb
index 56a70d38..cbac20b6 100644
--- a/lib/parser.rb
+++ b/lib/parser.rb
@@ -69,6 +69,7 @@ module Parser
         res << "<link href='#{page.design.default_css.url}' rel='stylesheet' type='text/css' /> "
         theme = page.design.themes.detect{ |d| d.id == page.theme_id  }
         res << "<link href='#{theme.file.url}' rel='stylesheet' type='text/css' />" if theme
+        res
       end
       c.define_tag 'javascripts' do |tag|
         res = ''
@@ -178,6 +179,7 @@ module Parser
         res << "<link href='#{page.design.default_css.url}' rel='stylesheet' type='text/css' />"
         theme = page.design.themes.detect{ |d| d.id == page.theme_id  }
         res << "<link href='#{theme.file.url}' rel='stylesheet' type='text/css' />" if theme
+        res
       end
       c.define_tag 'javascripts' do |tag|
         res = ''
diff --git a/lib/tasks/dev.rake b/lib/tasks/dev.rake
index b3d539ea..633ae2b6 100644
--- a/lib/tasks/dev.rake
+++ b/lib/tasks/dev.rake
@@ -69,7 +69,7 @@ namespace :dev do
     
     design = Design.new(:title => "Fraisier", :author => "Paul", :intro => "Strawberry cake")
     
-    design.structure_css = File.open("#{Rails.root}/lib/fraisier/structure.css")
+    design.default_css = File.open("#{Rails.root}/lib/fraisier/default.css")
     
     # image = design.images.build(:file => File.open("#{Rails.root}/lib/fraisier/img/buttons.gif"))
     # 
@@ -93,7 +93,7 @@ namespace :dev do
     
     design_1 = Design.new(:title => "Bob", :author => "Me", :intro => "Moran")
     
-    design_1.structure_css = File.open("#{Rails.root}/lib/fraisier/structure.css")
+    design_1.default_css = File.open("#{Rails.root}/lib/fraisier/default.css")
     
     # image = design.images.build(:file => File.open("#{Rails.root}/lib/fraisier/img/buttons.gif"))
     #