From 917e35304ff7f4fe95b1a1486d71d1b5542458e2 Mon Sep 17 00:00:00 2001
From: Alan Garcia <a.garcia@nnx.com>
Date: Thu, 28 Feb 2013 16:56:52 +0000
Subject: [PATCH] Hop, le logo en page d'accueil deviens aussi surchargeable :)

---
 .gitattributes                     |   2 +-
 bureau/admin/{ => images}/logo.png | Bin
 bureau/admin/index.php             |   6 +++++-
 bureau/admin/menu.php              |   7 ++-----
 4 files changed, 8 insertions(+), 7 deletions(-)
 rename bureau/admin/{ => images}/logo.png (100%)

diff --git a/.gitattributes b/.gitattributes
index 4d227627..01dd5d2b 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -213,6 +213,7 @@ bureau/admin/images/help.png -text
 bureau/admin/images/home.png -text
 bureau/admin/images/ip.png -text
 bureau/admin/images/lang.png -text
+bureau/admin/images/logo.png -text
 bureau/admin/images/logo3.png -text
 bureau/admin/images/logs.png -text
 bureau/admin/images/mail.png -text
@@ -280,7 +281,6 @@ bureau/admin/js/jquery_ui/js/jquery-ui-1.8.23.custom.min.js -text
 bureau/admin/js/passwordStrengthMeter.js -text
 bureau/admin/js/prototype.js -text
 bureau/admin/login.php -text
-bureau/admin/logo.png -text
 bureau/admin/logo2.png -text
 bureau/admin/logs_download.php -text
 bureau/admin/logs_list.php -text
diff --git a/bureau/admin/logo.png b/bureau/admin/images/logo.png
similarity index 100%
rename from bureau/admin/logo.png
rename to bureau/admin/images/logo.png
diff --git a/bureau/admin/index.php b/bureau/admin/index.php
index a7cfbceb..dab65d15 100644
--- a/bureau/admin/index.php
+++ b/bureau/admin/index.php
@@ -53,8 +53,12 @@ if (!$charset) $charset="UTF-8";
   <div id="global">
 
     <div id="content" style="width:1000px;">
+      <?php
+      $logo = variable_get('logo_login', 0 ,'You can specify a logo for the login page, example /images/my_logo.png . Set 0 or empty to reset it. ');
+      if ( empty($logo) ||  ! $logo ) { $logo = 'images/logo.png'; }
+      ?>
 
-      <p id="logo">  <img src="logo.png" border="0" alt="<?php __("Web Hosting Control Panel"); ?>" title="<?php __("Web Hosting Control Panel"); ?>" /></a>
+      <p id="logo">  <img src="<?php echo $logo; ?>" border="0" alt="<?php __("Web Hosting Control Panel"); ?>" title="<?php __("Web Hosting Control Panel"); ?>" /></a>
       </p>
       <p>&nbsp;</p>
     <?php if (isset($error) && $error) echo "<div class='error'>$error</div>"; ?>
diff --git a/bureau/admin/menu.php b/bureau/admin/menu.php
index 27dbb7bb..7f42d0ff 100644
--- a/bureau/admin/menu.php
+++ b/bureau/admin/menu.php
@@ -29,11 +29,8 @@
 */
 require_once("../class/config.php");
 
-$logo = variable_get('menu_logo', 0 ,'You can specify a logo for your AlternC, example /images/my_logo.png . Set 0 or empty to reset it. ');
-
-if ( empty($logo) ||  ! $logo ) {
-  $logo = 'images/logo3.png';
-}
+$logo = variable_get('logo_menu', 0 ,'You can specify a logo for the menu, example /images/my_logo.png . Set 0 or empty to reset it. ');
+if ( empty($logo) ||  ! $logo ) { $logo = 'images/logo3.png'; }
 
 ?>
 <img src="<?php echo $logo; ?>" class="menutoplogo" border="0" alt="AlternC" alt="<?php __("AlternC"); ?>"/>