From bf460736d9bf4668a06a9d0977f2c591aab7aa25 Mon Sep 17 00:00:00 2001
From: AurelioAHeckert <AurelioAHeckert@3f533792-8f58-4932-b0fe-aaf55b0a4547>
Date: Sat, 7 Jun 2008 19:43:41 +0000
Subject: [PATCH] ActionItem420: by now the footer text is a theme file

---
 app/views/layouts/application.rhtml                       | 13 ++-----------
 public/designs/themes/ecosol/footer.rhtml                 | 11 +++++++++++
 public/designs/themes/zen3/footer.rhtml                   | 12 ++++++++++++
 public/designs/themes/zen3/images/bg-footer.gif           | Bin 0 -> 781 bytes
 public/designs/themes/zen3/images/bg-footer.png           | Bin 309 -> 0 bytes
 public/designs/themes/zen3/images/favicon.ico             | Bin 0 -> 1150 bytes
 public/designs/themes/zen3/images/logo-loterie-footer.gif | Bin 0 -> 1313 bytes
 public/designs/themes/zen3/stylesheets/common.css         | 12 +++++++-----
 public/designs/themes/zen3/stylesheets/menu.css           |  4 ++++
 9 files changed, 36 insertions(+), 16 deletions(-)
 create mode 100644 public/designs/themes/ecosol/footer.rhtml
 create mode 100644 public/designs/themes/zen3/footer.rhtml
 create mode 100644 public/designs/themes/zen3/images/bg-footer.gif
 delete mode 100644 public/designs/themes/zen3/images/bg-footer.png
 create mode 100644 public/designs/themes/zen3/images/favicon.ico
 create mode 100644 public/designs/themes/zen3/images/logo-loterie-footer.gif

diff --git a/app/views/layouts/application.rhtml b/app/views/layouts/application.rhtml
index 89d0fa7..3a17088 100644
--- a/app/views/layouts/application.rhtml
+++ b/app/views/layouts/application.rhtml
@@ -9,6 +9,7 @@
     </title>
     <meta name="description" content="FIXME: Descriptions of Noosfero" />
     <meta name="keywords" content="Noosfero, Community, Open Source" />
+    <link rel="shortcut icon" href="<%= '/designs/themes/' + current_theme + '/images/favicon.ico' %>" type="image/x-icon" />
 
     <%= javascript_include_tag 'default-config' %>
     <%= javascript_include_tag :defaults %>
@@ -137,17 +138,7 @@
     </div><!-- id="wrap" -->
 
     <div id="footer">
-      <a href="http://ynternet.org" id="footer-esq">
-        <%= _('A Ynternet.org project') %><br/>
-        Communication libre pour une société libre
-      </a>
-      <a href="http://colivre.coop.br" id="footer-dir">
-        <%= _('Developed by Colivre') %><br/>
-        Free Technologies Cooperative
-      </a>
-      <%= language_chooser %>
-      <p/>
-      <%= footer %>
+      <%= render :file => ('../../public/designs/themes/' + current_theme + '/footer.rhtml' ) %>
     </div><!-- id="footer" -->
 
     <div id="helpBox" style="display:none">
diff --git a/public/designs/themes/ecosol/footer.rhtml b/public/designs/themes/ecosol/footer.rhtml
new file mode 100644
index 0000000..ac5435a
--- /dev/null
+++ b/public/designs/themes/ecosol/footer.rhtml
@@ -0,0 +1,11 @@
+<a href="http://fbes.org.br" id="footer-esq">
+  <%= _('A FBES project') %><br/>
+  F&oacute;rum Brasileiro de Economia Solid&aacute;ria
+</a>
+<a href="http://colivre.coop.br" id="footer-dir">
+  <%= _('Developed by Colivre') %><br/>
+  Cooperativa de Tecnologias Livres
+</a>
+<%= language_chooser %>
+<p/>
+<%= footer %>
diff --git a/public/designs/themes/zen3/footer.rhtml b/public/designs/themes/zen3/footer.rhtml
new file mode 100644
index 0000000..efb11ad
--- /dev/null
+++ b/public/designs/themes/zen3/footer.rhtml
@@ -0,0 +1,12 @@
+<a href="http://ynternet.org" id="footer-esq">
+  <%= _('A Ynternet.org project') %><br/>
+  Communication libre pour une société libre
+</a>
+<a href="http://www1.loterie.ch" id="footer-dir">
+  <%= _('Sponsored by Loterie Romande') %><br/>
+  lottery games in Switzerland
+</a>
+<%= language_chooser %>
+<p/>
+<%= footer %>
+
diff --git a/public/designs/themes/zen3/images/bg-footer.gif b/public/designs/themes/zen3/images/bg-footer.gif
new file mode 100644
index 0000000..38e070c
Binary files /dev/null and b/public/designs/themes/zen3/images/bg-footer.gif differ
diff --git a/public/designs/themes/zen3/images/bg-footer.png b/public/designs/themes/zen3/images/bg-footer.png
deleted file mode 100644
index afa9800..0000000
Binary files a/public/designs/themes/zen3/images/bg-footer.png and /dev/null differ
diff --git a/public/designs/themes/zen3/images/favicon.ico b/public/designs/themes/zen3/images/favicon.ico
new file mode 100644
index 0000000..8d45fad
Binary files /dev/null and b/public/designs/themes/zen3/images/favicon.ico differ
diff --git a/public/designs/themes/zen3/images/logo-loterie-footer.gif b/public/designs/themes/zen3/images/logo-loterie-footer.gif
new file mode 100644
index 0000000..2d14f41
Binary files /dev/null and b/public/designs/themes/zen3/images/logo-loterie-footer.gif differ
diff --git a/public/designs/themes/zen3/stylesheets/common.css b/public/designs/themes/zen3/stylesheets/common.css
index f7aca2b..10ce5c4 100644
--- a/public/designs/themes/zen3/stylesheets/common.css
+++ b/public/designs/themes/zen3/stylesheets/common.css
@@ -1,6 +1,6 @@
 
 body {
-  background: #BABDB6; #888A85;
+  background: #9ca09a; #A1A59F; /* #BABDB6; #888A85; */
 }
 
 #wrap {
@@ -42,7 +42,9 @@ ul li {
 /* * * Footer * * * * * * * * * * * * * * * * * * * */
 
 #footer {
-  background: url("../images/bg-footer.png") repeat-x;
+  background: url("../images/bg-footer.gif") repeat-x;
+  height: 55px;
+  max-height: 35px;
   margin: 0px;
   padding: 10px;
   color: #FFF;
@@ -72,13 +74,13 @@ ul li {
   float: left;
   text-align: left;
   background: url(../images/logo-ynternet-footer.gif) no-repeat 0% 50%;
-  padding: 5px 0px 10px 45px;
+  padding: 6px 0px 10px 45px;
 }
 #footer-dir {
   float: right;
   text-align: right;
-  background: url(../images/logo-colivre-footer.gif) no-repeat 100% 50%;
-  padding: 5px 45px 10px 0px;
+  background: url(../images/logo-loterie-footer.gif) no-repeat 100% 50%;
+  padding: 6px 45px 10px 0px;
 }
 
 #footer-esq:hover,
diff --git a/public/designs/themes/zen3/stylesheets/menu.css b/public/designs/themes/zen3/stylesheets/menu.css
index 4837b84..4502d54 100644
--- a/public/designs/themes/zen3/stylesheets/menu.css
+++ b/public/designs/themes/zen3/stylesheets/menu.css
@@ -137,6 +137,10 @@
   margin-left: -3px;
 }
 
+.action_home_index #user_box #link_login {
+  display: none; /* do not show this link in the fist page */
+}
+
 /* * * Assets Menu * * * * * * * * * * * */
 
 #assets_menu {
--
libgit2 0.21.2