From cdde5e0bd87ff4a83880c10bba545aaef9df90cb Mon Sep 17 00:00:00 2001
From: AurelioAHeckert <AurelioAHeckert@3f533792-8f58-4932-b0fe-aaf55b0a4547>
Date: Mon, 28 Apr 2008 15:20:49 +0000
Subject: [PATCH] ActionItem290: footer formated

---
 app/views/layouts/application.rhtml                          |  4 ++--
 app/views/search/_search_form.rhtml                          |  4 ++--
 public/designs/themes/default/images/logo-colivre-footer.gif | Bin 0 -> 1524 bytes
 public/designs/themes/default/images/logo-fbes-footer.gif    | Bin 0 -> 1534 bytes
 public/designs/themes/default/stylesheets/common.css         | 37 +++++++++++++++++++++++++++++++++++++
 public/javascripts/application.js                            |  4 +++-
 public/stylesheets/common.css                                | 34 ----------------------------------
 7 files changed, 44 insertions(+), 39 deletions(-)
 create mode 100644 public/designs/themes/default/images/logo-colivre-footer.gif
 create mode 100644 public/designs/themes/default/images/logo-fbes-footer.gif

diff --git a/app/views/layouts/application.rhtml b/app/views/layouts/application.rhtml
index 8101af4..356f3d9 100644
--- a/app/views/layouts/application.rhtml
+++ b/app/views/layouts/application.rhtml
@@ -134,11 +134,11 @@
 
     <div id="footer">
       <a href="http://fbes.org.br" id="footer-esq">
-        <%= _('A FBES project') %> <br/>
+        <%= _('A FBES project') %><br/>
         F&oacute;rum Brasileiro de Economia Solid&aacute;ria
       </a>
       <a href="http://colivre.coop.br" id="footer-dir">
-        <%= _('Desenvolvimento Colivre') %> <br/>
+        <%= _('Developed by Colivre') %><br/>
         Cooperativa de Tecnologias Livres
       </a>
       <%= language_chooser %>
diff --git a/app/views/search/_search_form.rhtml b/app/views/search/_search_form.rhtml
index a3cbac7..ef6e127 100644
--- a/app/views/search/_search_form.rhtml
+++ b/app/views/search/_search_form.rhtml
@@ -4,8 +4,8 @@
 
   <div class="search-field">
     <span class="formfield">
-      <%= text_field_tag 'query', @query, :id => 'popup-search-input', :size => 50 %>
-      <%= javascript_tag '$("popup-search-input").focus()' %>
+      <%= text_field_tag 'query', @query, :id => ( lightbox? ? 'popup-search-input' : '' ), :size => 50 %>
+      <%= javascript_tag '$("popup-search-input").focus()' if lightbox? %>
     </span>
     <%= submit_button(:search, _('Search')) %>
   </div>
diff --git a/public/designs/themes/default/images/logo-colivre-footer.gif b/public/designs/themes/default/images/logo-colivre-footer.gif
new file mode 100644
index 0000000..9b3bc3c
Binary files /dev/null and b/public/designs/themes/default/images/logo-colivre-footer.gif differ
diff --git a/public/designs/themes/default/images/logo-fbes-footer.gif b/public/designs/themes/default/images/logo-fbes-footer.gif
new file mode 100644
index 0000000..11b68fd
Binary files /dev/null and b/public/designs/themes/default/images/logo-fbes-footer.gif differ
diff --git a/public/designs/themes/default/stylesheets/common.css b/public/designs/themes/default/stylesheets/common.css
index e9ea6e9..3fb8a11 100644
--- a/public/designs/themes/default/stylesheets/common.css
+++ b/public/designs/themes/default/stylesheets/common.css
@@ -140,3 +140,40 @@ div.file-manager-button a:hover {
 #lightbox{
   background: #FFF url(../images/bg-top-cinza.jpg) no-repeat 50% -15px;
 }
+
+#footer {
+  background: #ffffff url("/images/bg_footer.png") repeat-x;
+  background-position: 0px 0px;
+  margin: 0px;
+  padding: 10px;
+}
+
+#footer a {
+  border-bottom: 1px dotted #777;
+}
+#footer a:hover {
+  border: 0px;
+}
+
+#footer a#footer-esq {
+  background: url(../images/logo-fbes-footer.gif) no-repeat 0% 50%;
+  padding: 5px 0px 5px 45px;
+  float: left;
+  text-align: left;
+  border: none;
+  opacity: 0.5;
+}
+
+#footer a#footer-dir {
+  background: url(../images/logo-colivre-footer.gif) no-repeat 100% 50%;
+  padding: 5px 35px 5px 0px;
+  float: right;
+  text-align: right;
+  border: none;
+  opacity: 0.5;
+}
+
+#footer a#footer-esq:hover,
+#footer a#footer-dir:hover {
+  opacity: 1;
+}
diff --git a/public/javascripts/application.js b/public/javascripts/application.js
index b724343..92eada4 100644
--- a/public/javascripts/application.js
+++ b/public/javascripts/application.js
@@ -2,11 +2,13 @@
 // This file is automatically included by javascript_include_tag :defaults
 
 function noosfero_init() {
-  focus_first_field();
+  // focus_first_field(); it is moving the page view when de form is down.
 }
 
 /* If applicable, find the first field in which the user can type and move the
  * keyboard focus to it.
+ *
+ * ToDo: focus only inside the view box to do not roll the page.
  */
 function focus_first_field() {
   form = document.forms[0];
diff --git a/public/stylesheets/common.css b/public/stylesheets/common.css
index 45f258d..40af398 100644
--- a/public/stylesheets/common.css
+++ b/public/stylesheets/common.css
@@ -93,10 +93,6 @@ div#errorExplanation h2 {
 }
 
 #footer {
-  background: #ffffff url("../images/bg_footer.png") repeat-x;
-  background-position: 0px 0px;
-  margin: 0px;
-  padding: 10px;
   text-align: center;
   clear: both;
   font-size: 10px;
@@ -106,41 +102,11 @@ div#errorExplanation h2 {
 #footer a {
   color: #777;
   text-decoration: none;
-  border-bottom: 1px dotted #777;
 }
-
 #footer a:hover {
   color: #555;
-  border: 0px;
-}
-
-#footer ul {
-  margin: 0px;
-  padding: 0px;
-}
-
-#footer li {
-  display: block;
-  float: right;
-  margin-right: 20px;
-  height: 20px;
-}
-
-#footer a#footer-esq {
-  padding: 5px 0px 0px 10px;
-  float: left;
-  text-align: left;
-  border: none;
 }
 
-#footer a#footer-dir {
-  padding: 5px 10px 0px 0px;
-  float: right;
-  text-align: right;
-  border: none;
-}
-
-
 /*********************************************************/
 
 
--
libgit2 0.21.2