lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: comptibility between bureau2crea theme and multicompany module

Browse Source
This commit is contained in:
Regis Houssin 2012-09-02 11:52:10 +02:00
parent b66aeabb88
commit 77688cf988
6 changed files with 29 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
htdocs/core/tpl/login.tpl.php
View File

@ -108,10 +108,12 @@ $(document).ready(function () {
<?php <?php
if (! empty($hookmanager->resArray['options'])) { if (! empty($hookmanager->resArray['options'])) {
foreach ($hookmanager->resArray['options'] as $option) foreach ($hookmanager->resArray['options'] as $format => $option)
{ {
echo '<!-- Option by hook -->'; if ($format == 'table') {
echo $option; echo '<!-- Option by hook -->';
echo $option;
}
} }
} }
?> ?>

8
htdocs/core/tpl/passwordforgotten.tpl.php
View File

@ -85,10 +85,12 @@ print '<!-- HTTP_USER_AGENT = '.$_SERVER['HTTP_USER_AGENT'].' -->
<?php <?php
if (! empty($hookmanager->resArray['options'])) { if (! empty($hookmanager->resArray['options'])) {
foreach ($hookmanager->resArray['options'] as $option) foreach ($hookmanager->resArray['options'] as $format => $option)
{ {
echo '<!-- Option by hook -->'; if ($format == 'table') {
echo $option; echo '<!-- Option by hook -->';
echo $option;
}
} }
} }
?> ?>

5
htdocs/theme/bureau2crea/style.css.php
View File

@ -2291,6 +2291,11 @@ div#infoLogin {
margin-bottom: 20px; margin-bottom: 20px;
} }
/* can be removed in 3.3 */
div.entityBox {
margin-top: 10px;
}
div.other { div.other {
margin: 10px 0px; margin: 10px 0px;
text-align: center; text-align: center;

10
htdocs/theme/bureau2crea/tpl/login.tpl.php
View File

@ -1,5 +1,5 @@
<?php <?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 * 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 * it under the terms of the GNU General Public License as published by
@ -94,10 +94,12 @@ $(document).ready(function () {
<?php <?php
if (! empty($hookmanager->resArray['options'])) { if (! empty($hookmanager->resArray['options'])) {
foreach ($hookmanager->resArray['options'] as $option) foreach ($hookmanager->resArray['options'] as $format => $option)
{ {
echo '<!-- Option by hook -->'; if ($format == 'div') {
echo $option; echo '<!-- Option by hook -->';
echo $option;
}
} }
} }
?> ?>

8
htdocs/theme/bureau2crea/tpl/passwordforgotten.tpl.php
View File

@ -76,10 +76,12 @@ print '<!-- HTTP_USER_AGENT = '.$_SERVER['HTTP_USER_AGENT'].' -->
<?php <?php
if (! empty($hookmanager->resArray['options'])) { if (! empty($hookmanager->resArray['options'])) {
foreach ($hookmanager->resArray['options'] as $option) foreach ($hookmanager->resArray['options'] as $format => $option)
{ {
echo '<!-- Option by hook -->'; if ($format == 'div') {
echo $option; echo '<!-- Option by hook -->';
echo $option;
}
} }
} }
?> ?>

3
htdocs/user/passwordforgotten.php
View File

@ -175,6 +175,9 @@ else
$conf->css = "/theme/".$conf->theme."/style.css.php?lang=".$langs->defaultlang; $conf->css = "/theme/".$conf->theme."/style.css.php?lang=".$langs->defaultlang;
$conf_css = DOL_URL_ROOT.$conf->css; $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')) 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'; $login_background = DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/login_background.png';