From 77688cf988fdcf313d27251c60e099714045a3c4 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Sun, 2 Sep 2012 11:52:10 +0200
Subject: [PATCH] Fix: comptibility between bureau2crea theme and multicompany
 module

---
 htdocs/core/tpl/login.tpl.php                          |  8 +++++---
 htdocs/core/tpl/passwordforgotten.tpl.php              |  8 +++++---
 htdocs/theme/bureau2crea/style.css.php                 |  5 +++++
 htdocs/theme/bureau2crea/tpl/login.tpl.php             | 10 ++++++----
 htdocs/theme/bureau2crea/tpl/passwordforgotten.tpl.php |  8 +++++---
 htdocs/user/passwordforgotten.php                      |  3 +++
 6 files changed, 29 insertions(+), 13 deletions(-)

diff --git a/htdocs/core/tpl/login.tpl.php b/htdocs/core/tpl/login.tpl.php
index 49950cc315a..b359b033740 100644
--- a/htdocs/core/tpl/login.tpl.php
+++ b/htdocs/core/tpl/login.tpl.php
@@ -108,10 +108,12 @@ $(document).ready(function () {
 
 <?php
 if (! empty($hookmanager->resArray['options'])) {
-	foreach ($hookmanager->resArray['options'] as $option)
+	foreach ($hookmanager->resArray['options'] as $format => $option)
 	{
-		echo '<!-- Option by hook -->';
-		echo $option;
+		if ($format == 'table') {
+			echo '<!-- Option by hook -->';
+			echo $option;
+		}
 	}
 }
 ?>
diff --git a/htdocs/core/tpl/passwordforgotten.tpl.php b/htdocs/core/tpl/passwordforgotten.tpl.php
index 4b75f4a91b6..ca8645c98a7 100644
--- a/htdocs/core/tpl/passwordforgotten.tpl.php
+++ b/htdocs/core/tpl/passwordforgotten.tpl.php
@@ -85,10 +85,12 @@ print '<!-- HTTP_USER_AGENT = '.$_SERVER['HTTP_USER_AGENT'].' -->
 
 <?php
 if (! empty($hookmanager->resArray['options'])) {
-	foreach ($hookmanager->resArray['options'] as $option)
+	foreach ($hookmanager->resArray['options'] as $format => $option)
 	{
-		echo '<!-- Option by hook -->';
-		echo $option;
+		if ($format == 'table') {
+			echo '<!-- Option by hook -->';
+			echo $option;
+		}
 	}
 }
 ?>
diff --git a/htdocs/theme/bureau2crea/style.css.php b/htdocs/theme/bureau2crea/style.css.php
index df90863d786..2255b839f77 100644
--- a/htdocs/theme/bureau2crea/style.css.php
+++ b/htdocs/theme/bureau2crea/style.css.php
@@ -2291,6 +2291,11 @@ div#infoLogin {
     margin-bottom: 20px;
 }
 
+/* can be removed in 3.3 */
+div.entityBox {
+	margin-top: 10px;
+}
+
 div.other {
 	margin: 10px 0px;
     text-align: center;
diff --git a/htdocs/theme/bureau2crea/tpl/login.tpl.php b/htdocs/theme/bureau2crea/tpl/login.tpl.php
index dcef09b8bb3..ec2f973cf81 100644
--- a/htdocs/theme/bureau2crea/tpl/login.tpl.php
+++ b/htdocs/theme/bureau2crea/tpl/login.tpl.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2009-2010 Regis Houssin <regis@dolibarr.fr>
+/* Copyright (C) 2009-2012 Regis Houssin <regis@dolibarr.fr>
  *
  * 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
@@ -94,10 +94,12 @@ $(document).ready(function () {
 
 	<?php
 	if (! empty($hookmanager->resArray['options'])) {
-		foreach ($hookmanager->resArray['options'] as $option)
+		foreach ($hookmanager->resArray['options'] as $format => $option)
 		{
-			echo '<!-- Option by hook -->';
-			echo $option;
+			if ($format == 'div') {
+				echo '<!-- Option by hook -->';
+				echo $option;
+			}
 		}
 	}
 	?>
diff --git a/htdocs/theme/bureau2crea/tpl/passwordforgotten.tpl.php b/htdocs/theme/bureau2crea/tpl/passwordforgotten.tpl.php
index 2a13143055b..f6545a8c57b 100644
--- a/htdocs/theme/bureau2crea/tpl/passwordforgotten.tpl.php
+++ b/htdocs/theme/bureau2crea/tpl/passwordforgotten.tpl.php
@@ -76,10 +76,12 @@ print '<!-- HTTP_USER_AGENT = '.$_SERVER['HTTP_USER_AGENT'].' -->
 
 	<?php
 	if (! empty($hookmanager->resArray['options'])) {
-		foreach ($hookmanager->resArray['options'] as $option)
+		foreach ($hookmanager->resArray['options'] as $format => $option)
 		{
-			echo '<!-- Option by hook -->';
-			echo $option;
+			if ($format == 'div') {
+				echo '<!-- Option by hook -->';
+				echo $option;
+			}
 		}
 	}
 	?>
diff --git a/htdocs/user/passwordforgotten.php b/htdocs/user/passwordforgotten.php
index 0202950e90d..8daa2c470c0 100644
--- a/htdocs/user/passwordforgotten.php
+++ b/htdocs/user/passwordforgotten.php
@@ -175,6 +175,9 @@ else
 $conf->css  = "/theme/".$conf->theme."/style.css.php?lang=".$langs->defaultlang;
 $conf_css = DOL_URL_ROOT.$conf->css;
 
+$jquerytheme = 'smoothness';
+if (! empty($conf->global->MAIN_USE_JQUERY_THEME)) $jquerytheme = $conf->global->MAIN_USE_JQUERY_THEME;
+
 if (file_exists(DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/img/login_background.png'))
 {
     $login_background = DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/login_background.png';