From b5e4298dc8c175e705e66e5e75fe83e9e1f34d13 Mon Sep 17 00:00:00 2001
From: ValessioBrito <ValessioBrito@3f533792-8f58-4932-b0fe-aaf55b0a4547>
Date: Thu, 13 Dec 2007 18:50:00 +0000
Subject: [PATCH] ActionItem138: notice and wrap height fix

---
 app/views/layouts/application.rhtml                    |  7 +++----
 app/views/profile_editor/index.rhtml                   |  2 +-
 app/views/shared/categories_menu.rhtml                 |  1 +
 public/designs/templates/default/stylesheets/forms.css |  7 ++++---
 public/designs/templates/default/stylesheets/style.css | 28 +++-------------------------
 public/stylesheets/common.css                          | 14 ++++++--------
 public/stylesheets/menu.css                            |  1 +
 7 files changed, 19 insertions(+), 41 deletions(-)
diff --git a/app/views/layouts/application.rhtml b/app/views/layouts/application.rhtml
index 953980e..40793d6 100644
--- a/app/views/layouts/application.rhtml
+++ b/app/views/layouts/application.rhtml
@@ -29,9 +29,9 @@
   <body class='category<%= category_color %>'>
 
     <% unless flash[:notice].nil? %>
-      <div id='notice'>
+      <div id='notice' onClick="Element.hide('notice');">
         <%= flash[:notice] %>
-        <%= javascript_tag(visual_effect(:fade, "notice", :duration => 2.0)) %>
+        <%= javascript_tag(visual_effect(:fade, "notice", :duration => 15)) %>
       </div>
     <% end %>
 
@@ -62,8 +62,7 @@
           document.getElementById(group).style.position = posSetting
           }
           </SCRIPT>
-          <INPUT TYPE="checkbox" NAME="Fix" VALUE="0" onClick="posset(this, 'noosfero_bar')" style='float: left; font-size: 2px'><%= image_tag 'noosfero.png', :style => 'float: left;' %>
-
+          <INPUT TYPE="checkbox" NAME="Fix" VALUE="0" onClick="posset(this, 'noosfero_bar')" style='float: left;'>
           <%= render :file => 'shared/categories_menu' %>
         </div><!-- id='navigation_bar' -->
 
diff --git a/app/views/profile_editor/index.rhtml b/app/views/profile_editor/index.rhtml
index a6a83f9..7469702 100644
--- a/app/views/profile_editor/index.rhtml
+++ b/app/views/profile_editor/index.rhtml
@@ -1,6 +1,6 @@
 <h2><%= _('My profile') %></h2>
 
-<%= link_to (@profile.image ? image_tag( @profile.image.public_filename(:thumb)) : _('Put image')), :action => 'change_image'  %>
+<%= link_to (@profile.image ? image_tag( @profile.image.public_filename) : _('Put image')), :action => 'change_image'  %>
 
 <%= display_profile_info(profile) %>
 
diff --git a/app/views/shared/categories_menu.rhtml b/app/views/shared/categories_menu.rhtml
index 92084cb..3dc236e 100644
--- a/app/views/shared/categories_menu.rhtml
+++ b/app/views/shared/categories_menu.rhtml
@@ -1,3 +1,4 @@
+<%= image_tag 'noosfero.png', :style => 'float: left;' %>
 <ul>
   <li id='category'>Noosfero <ul><li><%= shortcut_header_links %></li></ul></li>
   <% @environment.display_categories.each do |item| %>
diff --git a/public/designs/templates/default/stylesheets/forms.css b/public/designs/templates/default/stylesheets/forms.css
index 64f92fd..8e1e263 100644
--- a/public/designs/templates/default/stylesheets/forms.css
+++ b/public/designs/templates/default/stylesheets/forms.css
@@ -13,10 +13,10 @@
 .formfield.text_field input,
 .formfield.password_field input,
 .formfield textarea {
-  background: transparent url("../images/input-bg.gif") top left no-repeat;
+/*  background: transparent url("../images/input-bg.gif") top left no-repeat; */
   border: 1px solid #999;
-  border-top: none;
-  border-left: none;
+/*  border-top: none;
+  border-left: none; */
   color: #585858;
 }
 .formfield input {
@@ -32,6 +32,7 @@
 
 .submit {
   border: 1px solid #777;
+  cursor: pointer;
   color: #505050;
   background: #BBB url("../images/bt-bg.png") top left repeat-x;
   padding: 0px 30px;
diff --git a/public/designs/templates/default/stylesheets/style.css b/public/designs/templates/default/stylesheets/style.css
index 91a934a..651bb7d 100644
--- a/public/designs/templates/default/stylesheets/style.css
+++ b/public/designs/templates/default/stylesheets/style.css
@@ -77,9 +77,6 @@ clear: both;
   color: #333;
   margin: 0px;
   padding: 5px;
-
-  position: absolute;
-  bottom: 0px;
 }
 
 /* Notice */ 
@@ -91,28 +88,9 @@ div#notice {
   left: 50%;
   margin-left: -200px;
   width: 400px;
-  border: 1px solid black;
-  background: #efefef;
-  padding: 0.5em;
-}
-
-div#notice .button {
-  text-align: center;
-  margin-top: 1em;
-  margin-bottom: 0.25em;
-}
-  
-div#notice .button a {
-  border: 1px solid gray;
-  background: #ddd;
-  color: black;
-  padding: 4px;
-  padding-left: 28px;
-  background-position: top left;
-  background-repeat: no-repeat;
-}
-div#notice .button a:hover {
-  background-color: #ffd;
+  border: 5px solid #545454;
+  background: #ffffa9;
+  padding: 10px;
 }
 
 
diff --git a/public/stylesheets/common.css b/public/stylesheets/common.css
index 0fd27fe..52dce6d 100644
--- a/public/stylesheets/common.css
+++ b/public/stylesheets/common.css
@@ -4,13 +4,12 @@ padding: 0px;
 }
 
 #notice {
-position: absolute;
-margin-top: 10px;
-right: 10px;
-background: #ffffa9;
-padding: 10px;
-border: 3px solid #dfdfdf;
-z-index: 9999 !important ;
+cursor: pointer;
+} 
+
+#wrap {
+height: 100%;
+margin:0px;
 }
 
 a img {
@@ -54,7 +53,6 @@ div#errorExplanation h2 {
   margin-top: -5px;
   margin-left: -5px;
   margin-right: -5px;
-
   padding: 3px;
   background: #933;
   color: white;
diff --git a/public/stylesheets/menu.css b/public/stylesheets/menu.css
index c079ef9..084b8d7 100644
--- a/public/stylesheets/menu.css
+++ b/public/stylesheets/menu.css
@@ -4,6 +4,7 @@
   height: 40px;
   padding: 0px;
   margin-left: -3px;
+  _margin-left: -0px;
   margin-top: -3px;
   font-family: Sans, Verdana, Arial;
   z-index: 9999;
--
libgit2 0.21.2

