From 74e07f090b0908f4e82dafe309e2ccc72c160e16 Mon Sep 17 00:00:00 2001
From: plegall <plg@piwigo.org>
Date: Mon, 22 Mar 2010 09:03:00 +0000
Subject: [PATCH] move the logo outside the text, to make the text easier to
 read.

The footer logo was going outside the footer (the footer is 46px in height,
the logo is 45px, it has to be sticked to bottom)

git-svn-id: http://piwigo.org/svn/trunk@5246 68402e56-0260-453c-a942-63ccdbb3a9ee
---
 admin/images/index.php                        |  30 ------------------
 admin/themes/default/default-layout.css       |   6 ++--
 .../default/images/logo.png}                  | Bin
 admin/themes/default/template/footer.tpl      |   4 +--
 4 files changed, 4 insertions(+), 36 deletions(-)
 delete mode 100644 admin/images/index.php
 rename admin/{images/piwigo-logo-simply-45.png => themes/default/images/logo.png} (100%)

diff --git a/admin/images/index.php b/admin/images/index.php
deleted file mode 100644
index 17747c927..000000000
--- a/admin/images/index.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-// +-----------------------------------------------------------------------+
-// | Piwigo - a PHP based picture gallery                                  |
-// +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2010 Piwigo Team                  http://piwigo.org |
-// | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
-// | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
-// +-----------------------------------------------------------------------+
-// | This program is free software; you can redistribute it and/or modify  |
-// | it under the terms of the GNU General Public License as published by  |
-// | the Free Software Foundation                                          |
-// |                                                                       |
-// | This program is distributed in the hope that it will be useful, but   |
-// | WITHOUT ANY WARRANTY; without even the implied warranty of            |
-// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU      |
-// | General Public License for more details.                              |
-// |                                                                       |
-// | You should have received a copy of the GNU General Public License     |
-// | along with this program; if not, write to the Free Software           |
-// | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
-// | USA.                                                                  |
-// +-----------------------------------------------------------------------+
-
-// Recursive call
-$url = '../';
-header( 'Request-URI: '.$url );
-header( 'Content-Location: '.$url );
-header( 'Location: '.$url );
-exit();
-?>
diff --git a/admin/themes/default/default-layout.css b/admin/themes/default/default-layout.css
index a24ef72b5..1fb8aadb5 100644
--- a/admin/themes/default/default-layout.css
+++ b/admin/themes/default/default-layout.css
@@ -553,6 +553,7 @@ html, body {height:100%; margin:0; padding:0;}
   bottom:0;
   width:100%;
   height:46px;
+  background: url(images/logo.png) no-repeat bottom left;
   background-color:#464646;
   color:#aaa;
   line-height:46px;
@@ -573,12 +574,9 @@ html, body {height:100%; margin:0; padding:0;}
 #adminHome A {display:block; font-size:1.1em; font-weight:bold;}
 #adminHome A {border:none;}
 
-#piwigoInfos {float:left; margin-left:10px;}
+#piwigoInfos {float:left; margin-left:100px;}
 #pageInfos {float:right; margin-right:10px;}
 
-.PiwigoLogo { vertical-align: middle; margin-top:-20px; }
-#footer A.PiwigoLogo:hover { border-bottom:0px solid #fff; }
-
 /* TipTip CSS - Version 1.2 */
 
 #tiptip_holder {
diff --git a/admin/images/piwigo-logo-simply-45.png b/admin/themes/default/images/logo.png
similarity index 100%
rename from admin/images/piwigo-logo-simply-45.png
rename to admin/themes/default/images/logo.png
diff --git a/admin/themes/default/template/footer.tpl b/admin/themes/default/template/footer.tpl
index 42208fe5a..3b6b8af43 100644
--- a/admin/themes/default/template/footer.tpl
+++ b/admin/themes/default/template/footer.tpl
@@ -22,8 +22,8 @@
   *}
 
   {'Powered by'|@translate}
-  <a class="PiwigoLogo" href="{$PHPWG_URL}" title="Visit Piwigo project website">
-  <img class="PiwigoLogo" alt="Piwigo" src="{$ROOT_URL}admin/images/piwigo-logo-simply-45.png"></a>
+  <a href="{$PHPWG_URL}" title="Visit Piwigo project website">
+  <span class="Piwigo">Piwigo</span></a>
   {$VERSION}
   | <a class="external" href="{$pwgmenu.WIKI}" title="Read Piwigo Documentation" onclick="window.open(this.href, ''); return false;">{'Documentation'|@translate}</a>
   | <a class="external" href="{$pwgmenu.FORUM}" title="Get Support on Piwigo Forum" onclick="window.open(this.href, ''); return false;">{'Support'|@translate}</a>