From 830a783fa1e40d8087b8b8bc2d9b63bfd392d676 Mon Sep 17 00:00:00 2001
From: Alan Garcia <a.garcia@nnx.com>
Date: Fri, 11 Mar 2011 10:51:47 +0000
Subject: [PATCH] =?UTF-8?q?Bug=20dans=20la=20conf=20apache=20Menulang=20ca?=
 =?UTF-8?q?ch=C3=A9=20par=20default?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bureau/admin/menu_lang.php                | 11 ++++++++---
 etc/alternc/apache2-ssl.conf              |  4 ++--
 etc/alternc/templates/alternc/bureau.conf |  1 +
 etc/alternc/templates/apache2/panel.conf  |  1 +
 4 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/bureau/admin/menu_lang.php b/bureau/admin/menu_lang.php
index a10f1277..1afcb674 100644
--- a/bureau/admin/menu_lang.php
+++ b/bureau/admin/menu_lang.php
@@ -1,7 +1,7 @@
 <div class="menu-box">
  <div class="menu-title">
-  <img src="/admin/images/lang.png" alt="<?php __("Langues"); ?>" />&nbsp;<?php __("Langues"); ?></div>
- <div class="menu-content" id="menu-lang">
+  <img src="/admin/images/lang.png" alt="<?php __("Langues"); ?>" />&nbsp;<a href="javascript:menulang_show();"><?php __("Langues"); ?></a></div>
+  <div class="menu-content" id="menu-lang">
   <ul>
    <?php foreach($locales as $l) { ?>
     <li><a href="/admin/login.php?setlang=<?php echo $l; ?>" target="_top"><?php __($l); ?></a></li>
@@ -9,4 +9,9 @@
   </ul>
  </div>
 </div>
-
+<script type="text/javascript">
+  $("#menu-lang").hide();
+  function menulang_show() {
+    $("#menu-lang").show();
+  }
+</script>
diff --git a/etc/alternc/apache2-ssl.conf b/etc/alternc/apache2-ssl.conf
index a41fe05e..33f42009 100644
--- a/etc/alternc/apache2-ssl.conf
+++ b/etc/alternc/apache2-ssl.conf
@@ -1,7 +1,7 @@
 <VirtualHost *:443>
 	SSLEngine on
-        SSLCertificateFile /etc/alternc/apache.pem
-        SSLCaCertificatePath /etc/ssl/certs
+  SSLCertificateFile /etc/alternc/apache.pem
+  SSLCaCertificatePath /etc/ssl/certs
 	DocumentRoot /var/alternc/bureau
 	Include /etc/alternc/bureau.conf
 </VirtualHost>
diff --git a/etc/alternc/templates/alternc/bureau.conf b/etc/alternc/templates/alternc/bureau.conf
index fab13769..d5bb5a42 100644
--- a/etc/alternc/templates/alternc/bureau.conf
+++ b/etc/alternc/templates/alternc/bureau.conf
@@ -1,6 +1,7 @@
 <VirtualHost *:80>
   DocumentRoot /var/alternc/bureau
   ServerName %%fqdn%%
+  RedirectMatch ^/$ /admin/
   
   alias /admin/sql        /usr/share/phpmyadmin
   alias /webmail          /usr/share/squirrelmail
diff --git a/etc/alternc/templates/apache2/panel.conf b/etc/alternc/templates/apache2/panel.conf
index 0729e96d..a8ffa22e 100644
--- a/etc/alternc/templates/apache2/panel.conf
+++ b/etc/alternc/templates/apache2/panel.conf
@@ -1,6 +1,7 @@
 <VirtualHost *:80>
   DocumentRoot /var/alternc/bureau
   ServerName %%fqdn%%
+  RedirectMatch ^/$ /admin/
   
   alias /admin/sql        /usr/share/phpmyadmin
   alias /webmail          /usr/share/squirrelmail