From 35770e59e56e1c8ddc203814cfa99ab922d93391 Mon Sep 17 00:00:00 2001
From: AurelioAHeckert <AurelioAHeckert@3f533792-8f58-4932-b0fe-aaf55b0a4547>
Date: Thu, 1 May 2008 13:42:10 +0000
Subject: [PATCH] ActionItem358: ups... i forget the conf on YAML.load_file(conf) :-p

---
 app/helpers/application_helper.rb                   |  2 +-
 public/designs/themes/ecosol/stylesheets/common.css | 13 +++++++++++++
 public/designs/themes/ecosol/stylesheets/menu.css   |  5 +++++
 public/stylesheets/common.css                       | 16 ----------------
 public/stylesheets/menu.css                         |  4 ++--
 5 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 8fa1a93..0c6f1fc 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -498,7 +498,7 @@ module ApplicationHelper
            '/public/designs/themes/' +
            current_theme.to_s() +
            '/theme.yml'
-    js = File.exists?(conf) ? YAML.load_file(  )['js'] : []
+    js = File.exists?(conf) ? YAML.load_file(conf)['js'] : []
     html = []
     js.each do |file|
       file = '/designs/themes/'+ current_theme.to_s() +
diff --git a/public/designs/themes/ecosol/stylesheets/common.css b/public/designs/themes/ecosol/stylesheets/common.css
index fa9e332..ee75826 100644
--- a/public/designs/themes/ecosol/stylesheets/common.css
+++ b/public/designs/themes/ecosol/stylesheets/common.css
@@ -13,6 +13,19 @@ body.noosfero {
   background-position: 50% 22px;
   background-repeat: repeat-x;
   background-image: url(../images/bg-top-azul.png);
+  border: 3px solid #2A5896;
+}
+body.category1 #wrap {
+  border-color: #E26B00;
+}
+body.category2 #wrap {
+  border-color: #58A80A;
+}
+body.category3 #wrap {
+  border-color: #694371;
+}
+body.category4 #wrap {
+  border-color: #B80000;
 }
 
 body.category1 #wrap { background-image: url("../images/bg-top-laranja.png");  }
diff --git a/public/designs/themes/ecosol/stylesheets/menu.css b/public/designs/themes/ecosol/stylesheets/menu.css
index 5ab8906..0ade769 100644
--- a/public/designs/themes/ecosol/stylesheets/menu.css
+++ b/public/designs/themes/ecosol/stylesheets/menu.css
@@ -13,6 +13,11 @@ body.category2 #menu_link_to_envhome { background-image: url(../images/ico-fbes-
 body.category3 #menu_link_to_envhome { background-image: url(../images/ico-fbes-fundo-lilas.gif)    }
 body.category4 #menu_link_to_envhome { background-image: url(../images/ico-fbes-fundo-vermelho.gif) }
 
+#noosfero_bar {
+  left: 3px;
+  right: 3px;
+}
+
 body.category1  #noosfero_bar { background-color: #E26B00 }
 #category1       .linkSubMenu,
 #category1       ul           { background-color: #F57900 }
diff --git a/public/stylesheets/common.css b/public/stylesheets/common.css
index 40af398..30bb63d 100644
--- a/public/stylesheets/common.css
+++ b/public/stylesheets/common.css
@@ -32,22 +32,6 @@ body {
   cursor: pointer;
 }
 
-#wrap {
-  border: 3px solid #2A5896;
-}
-body.category1 #wrap {
-  border-color: #E26B00;
-}
-body.category2 #wrap {
-  border-color: #58A80A;
-}
-body.category3 #wrap {
-  border-color: #694371;
-}
-body.category4 #wrap {
-  border-color: #B80000;
-}
-
 #environment_identification {
   position: absolute !important;
   background: url("../images/bg_blue_logo.png") 5px no-repeat !important;
diff --git a/public/stylesheets/menu.css b/public/stylesheets/menu.css
index 45db99b..236cdff 100644
--- a/public/stylesheets/menu.css
+++ b/public/stylesheets/menu.css
@@ -9,8 +9,8 @@
 
 #noosfero_bar {
   position: absolute;
-  left: 3px;
-  right: 3px;
+  left: 0px;
+  right: 0px;
   height: 22px;
   z-index: 100;
   font-size: 11px;
--
libgit2 0.21.2