diff --git a/htdocs/core/modules/export/modules_export.php b/htdocs/core/modules/export/modules_export.php
index 7ad5b05ebf2629993c38d6dcb57821a78308f911..ee9f06674af4f4d5777ed2a76bdaf5fbe5f09ef1 100644
--- a/htdocs/core/modules/export/modules_export.php
+++ b/htdocs/core/modules/export/modules_export.php
@@ -26,8 +26,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/commondocgenerator.class.php';
/**
- * \class ModeleExports
- * \brief Parent class for export modules
+ * Parent class for export modules
*/
class ModeleExports extends CommonDocGenerator // This class can't be abstract as there is instance propreties loaded by liste_modeles
{
@@ -41,7 +40,7 @@ class ModeleExports extends CommonDocGenerator // This class can't be abstrac
/**
- * Charge en memoire et renvoie la liste des modeles actifs
+ * Load into memory list of available export format
*
* @param DoliDB $db Database handler
* @param string $maxfilenamelength Max length of value to show
@@ -87,6 +86,9 @@ class ModeleExports extends CommonDocGenerator // This class can't be abstrac
}
closedir($handle);
}
+
+ asort($this->driverlabel);
+
return $this->driverlabel;
}
diff --git a/htdocs/exports/index.php b/htdocs/exports/index.php
index 3317554ec1c66d43391ec7c4ac8eb42f25829046..0cf3a0f0ef19b8a594df2e6ab464548382916d83 100644
--- a/htdocs/exports/index.php
+++ b/htdocs/exports/index.php
@@ -1,5 +1,5 @@
<?php
-/* Copyright (C) 2005-2010 Laurent Destailleur <eldy@users.sourceforge.net>
+/* Copyright (C) 2005-2012 Laurent Destailleur <eldy@users.sourceforge.net>
*
* 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
@@ -18,7 +18,7 @@
/**
* \file htdocs/exports/index.php
* \ingroup export
- * \brief Home page of export tools
+ * \brief Home page of export wizard
*/
require_once '../main.inc.php';
@@ -51,100 +51,101 @@ print '<br>';
print '<table class="notopnoleftnoright" width="100%">';
-print '<tr><td valign="top" width="40%" class="notopnoleft">';
-
-
-// List of available export format
-$var=true;
-print '<table class="noborder" width="100%">';
-print '<tr class="liste_titre">';
-print '<td colspan="2">'.$langs->trans("AvailableFormats").'</td>';
-print '<td>'.$langs->trans("LibraryShort").'</td>';
-print '<td align="right">'.$langs->trans("LibraryVersion").'</td>';
-print '</tr>';
-
-include_once DOL_DOCUMENT_ROOT.'/core/modules/export/modules_export.php';
-$model=new ModeleExports();
-$liste=$model->liste_modeles($db); // This is not a static method for exports because method load non static properties
-
-$var=true;
-foreach($liste as $key => $val)
-{
- $var=!$var;
- print '<tr '.$bc[$var].'>';
- print '<td width="16">'.img_picto_common($model->getDriverLabel($key),$model->getPicto($key)).'</td>';
- $text=$model->getDriverDesc($key);
- print '<td>'.$form->textwithpicto($model->getDriverLabel($key),$text).'</td>';
- print '<td>'.$model->getLibLabel($key).'</td>';
- print '<td nowrap="nowrap" align="right">'.$model->getLibVersion($key).'</td>';
- print '</tr>';
-}
-
-print '</table>';
+print '<tr><td valign="top" width="70%" class="notopnoleft">';
+
+
+// List export set
+print '<table class="noborder" width="100%">';
+print '<tr class="liste_titre">';
+print '<td>'.$langs->trans("Module").'</td>';
+print '<td>'.$langs->trans("ExportableDatas").'</td>';
+//print '<td> </td>';
+print '</tr>';
+$var=true;
+if (count($export->array_export_code))
+{
+ foreach ($export->array_export_code as $key => $value)
+ {
+ $var=!$var;
+ print '<tr '.$bc[$var].'><td>';
+ //print img_object($export->array_export_module[$key]->getName(),$export->array_export_module[$key]->picto).' ';
+ print $export->array_export_module[$key]->getName();
+ print '</td><td>';
+ print img_object($export->array_export_module[$key]->getName(),$export->array_export_icon[$key]).' ';
+ $string=$langs->trans($export->array_export_label[$key]);
+ print ($string!=$export->array_export_label[$key]?$string:$export->array_export_label[$key]);
+ print '</td>';
+ // print '<td width="24">';
+ // print '<a href="'.DOL_URL_ROOT.'/exports/export.php?step=2&datatoexport='.$export->array_export_code[$key].'&action=cleanselect">'.img_picto($langs->trans("NewExport"),'filenew').'</a>';
+ // print '</td>';
+ print '</tr>';
+
+ }
+}
+else
+{
+ print '<tr><td '.$bc[false].' colspan="2">'.$langs->trans("NoExportableData").'</td></tr>';
+}
+print '</table>';
+print '<br>';
+
+print '<center>';
+if (count($export->array_export_code))
+{
+ if ($user->rights->export->creer)
+ {
+ print '<a class="butAction" href="'.DOL_URL_ROOT.'/exports/export.php?leftmenu=export">'.$langs->trans("NewExport").'</a>';
+ }
+ else
+ {
+ print '<a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("NotEnoughPermissions")).'">'.$langs->trans("NewExport").'</a>';
+ }
+ /*
+ print '<center><form action="'.DOL_URL_ROOT.'/exports/export.php?leftmenu=export"><input type="submit" class="button" value="'.$langs->trans("NewExport").'"';
+ print ($user->rights->export->creer?'':' disabled="disabled"');
+ print '></form></center>';
+ */
+}
+print '</center>';
-print '</td><td valign="top" width="60%" class="notopnoleftnoright">';
-
-
-// Affiche les modules d'exports
-print '<table class="noborder" width="100%">';
-print '<tr class="liste_titre">';
-print '<td>'.$langs->trans("Module").'</td>';
-print '<td>'.$langs->trans("ExportableDatas").'</td>';
-//print '<td> </td>';
-print '</tr>';
-$var=true;
-if (count($export->array_export_code))
-{
- foreach ($export->array_export_code as $key => $value)
- {
- $var=!$var;
- print '<tr '.$bc[$var].'><td>';
- //print img_object($export->array_export_module[$key]->getName(),$export->array_export_module[$key]->picto).' ';
- print $export->array_export_module[$key]->getName();
- print '</td><td>';
- print img_object($export->array_export_module[$key]->getName(),$export->array_export_icon[$key]).' ';
- $string=$langs->trans($export->array_export_label[$key]);
- print ($string!=$export->array_export_label[$key]?$string:$export->array_export_label[$key]);
- print '</td>';
-// print '<td width="24">';
-// print '<a href="'.DOL_URL_ROOT.'/exports/export.php?step=2&datatoexport='.$export->array_export_code[$key].'&action=cleanselect">'.img_picto($langs->trans("NewExport"),'filenew').'</a>';
-// print '</td>';
- print '</tr>';
-
- }
-}
-else
-{
- print '<tr><td '.$bc[false].' colspan="2">'.$langs->trans("NoExportableData").'</td></tr>';
-}
-print '</table>';
-print '<br>';
-
-print '<center>';
-if (count($export->array_export_code))
-{
- if ($user->rights->export->creer)
- {
- print '<a class="butAction" href="'.DOL_URL_ROOT.'/exports/export.php?leftmenu=export">'.$langs->trans("NewExport").'</a>';
- }
- else
- {
- print '<a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("NotEnoughPermissions")).'">'.$langs->trans("NewExport").'</a>';
- }
- /*
- print '<center><form action="'.DOL_URL_ROOT.'/exports/export.php?leftmenu=export"><input type="submit" class="button" value="'.$langs->trans("NewExport").'"';
- print ($user->rights->export->creer?'':' disabled="disabled"');
- print '></form></center>';
- */
-}
-print '</center>';
+print '</td><td valign="top" width="30%" class="notopnoleftnoright">';
+
+
+// List of available export format
+$var=true;
+print '<table class="noborder" width="100%">';
+print '<tr class="liste_titre">';
+print '<td colspan="2">'.$langs->trans("AvailableFormats").'</td>';
+print '<td>'.$langs->trans("LibraryShort").'</td>';
+print '<td align="right">'.$langs->trans("LibraryVersion").'</td>';
+print '</tr>';
+
+include_once DOL_DOCUMENT_ROOT.'/core/modules/export/modules_export.php';
+$model=new ModeleExports();
+$liste=$model->liste_modeles($db); // This is not a static method for exports because method load non static properties
+
+$var=true;
+foreach($liste as $key => $val)
+{
+ $var=!$var;
+ print '<tr '.$bc[$var].'>';
+ print '<td width="16">'.img_picto_common($model->getDriverLabel($key),$model->getPicto($key)).'</td>';
+ $text=$model->getDriverDesc($key);
+ print '<td>'.$form->textwithpicto($model->getDriverLabel($key),$text).'</td>';
+ print '<td>'.$model->getLibLabel($key).'</td>';
+ print '<td nowrap="nowrap" align="right">'.$model->getLibVersion($key).'</td>';
+ print '</tr>';
+}
+
+print '</table>';
+
print '</td></tr>';
print '</table>';
-$db->close();
-
llxFooter();
+
+$db->close();
?>
diff --git a/htdocs/imports/index.php b/htdocs/imports/index.php
index 3682a8c59475061bb8e4ef37b17fddf847cb2829..c421dafc554759fa520cb16618b1b983b3e7f6ee 100644
--- a/htdocs/imports/index.php
+++ b/htdocs/imports/index.php
@@ -1,5 +1,5 @@
<?php
-/* Copyright (C) 2005-2009 Laurent Destailleur <eldy@users.sourceforge.net>
+/* Copyright (C) 2005-2012 Laurent Destailleur <eldy@users.sourceforge.net>
*
* 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
@@ -18,7 +18,7 @@
/**
* \file htdocs/imports/index.php
* \ingroup import
- * \brief Page accueil de la zone import
+ * \brief Home page of import wizard
*/
require_once '../main.inc.php';
@@ -49,87 +49,88 @@ print '<br>';
print '<table class="notopnoleftnoright" width="100%">';
-print '<tr><td valign="top" width="40%" class="notopnoleft">';
-
-
-// Liste des formats d'imports disponibles
-$var=true;
-print '<table class="noborder" width="100%">';
-print '<tr class="liste_titre">';
-print '<td colspan="2">'.$langs->trans("AvailableFormats").'</td>';
-print '<td>'.$langs->trans("LibraryShort").'</td>';
-print '<td align="right">'.$langs->trans("LibraryVersion").'</td>';
-print '</tr>';
-
-include_once DOL_DOCUMENT_ROOT.'/core/modules/import/modules_import.php';
-$model=new ModeleImports();
-$liste=$model->liste_modeles($db);
-
-foreach($liste as $key)
-{
- $var=!$var;
- print '<tr '.$bc[$var].'>';
- print '<td width="16">'.img_picto_common($model->getDriverLabel($key),$model->getPicto($key)).'</td>';
- $text=$model->getDriverDesc($key);
- print '<td>'.$form->textwithpicto($model->getDriverLabel($key),$text).'</td>';
- print '<td>'.$model->getLibLabel($key).'</td>';
- print '<td nowrap="nowrap" align="right">'.$model->getLibVersion($key).'</td>';
- print '</tr>';
-}
-
-print '</table>';
+print '<tr><td valign="top" width="70%" class="notopnoleft">';
+
+
+// List of import set
+print '<table class="noborder" width="100%">';
+print '<tr class="liste_titre">';
+print '<td>'.$langs->trans("Module").'</td>';
+print '<td>'.$langs->trans("ImportableDatas").'</td>';
+//print '<td> </td>';
+print '</tr>';
+$val=true;
+if (count($import->array_import_code))
+{
+ foreach ($import->array_import_code as $key => $value)
+ {
+ $val=!$val;
+ print '<tr '.$bc[$val].'><td>';
+ print img_object($import->array_import_module[$key]->getName(),$import->array_import_module[$key]->picto).' ';
+ print $import->array_import_module[$key]->getName();
+ print '</td><td>';
+ $string=$langs->trans($import->array_import_label[$key]);
+ print ($string!=$import->array_import_label[$key]?$string:$import->array_import_label[$key]);
+ print '</td>';
+ // print '<td width="24">';
+ // print '<a href="'.DOL_URL_ROOT.'/imports/import.php?step=2&datatoimport='.$import->array_import_code[$key].'&action=cleanselect">'.img_picto($langs->trans("NewImport"),'filenew').'</a>';
+ // print '</td>';
+ print '</tr>';
+
+ }
+}
+else
+{
+ print '<tr><td '.$bc[false].' colspan="2">'.$langs->trans("NoImportableData").'</td></tr>';
+}
+print '</table>';
+print '<br>';
+
+print '<center>';
+if (count($import->array_import_code))
+{
+ //if ($user->rights->import->run)
+ //{
+ print '<a class="butAction" href="'.DOL_URL_ROOT.'/imports/import.php?leftmenu=import">'.$langs->trans("NewImport").'</a>';
+ //}
+ //else
+ //{
+ // print '<a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("NewImport").'</a>';
+ //}
+}
+print '</center>';
-print '</td><td valign="top" width="60%" class="notopnoleftnoright">';
-
-
-// Affiche les modules d'imports
-print '<table class="noborder" width="100%">';
-print '<tr class="liste_titre">';
-print '<td>'.$langs->trans("Module").'</td>';
-print '<td>'.$langs->trans("ImportableDatas").'</td>';
-//print '<td> </td>';
-print '</tr>';
-$val=true;
-if (count($import->array_import_code))
-{
- foreach ($import->array_import_code as $key => $value)
- {
- $val=!$val;
- print '<tr '.$bc[$val].'><td>';
- print img_object($import->array_import_module[$key]->getName(),$import->array_import_module[$key]->picto).' ';
- print $import->array_import_module[$key]->getName();
- print '</td><td>';
- $string=$langs->trans($import->array_import_label[$key]);
- print ($string!=$import->array_import_label[$key]?$string:$import->array_import_label[$key]);
- print '</td>';
-// print '<td width="24">';
-// print '<a href="'.DOL_URL_ROOT.'/imports/import.php?step=2&datatoimport='.$import->array_import_code[$key].'&action=cleanselect">'.img_picto($langs->trans("NewImport"),'filenew').'</a>';
-// print '</td>';
- print '</tr>';
-
- }
-}
-else
-{
- print '<tr><td '.$bc[false].' colspan="2">'.$langs->trans("NoImportableData").'</td></tr>';
-}
-print '</table>';
-print '<br>';
+print '</td><td valign="top" width="30%" class="notopnoleftnoright">';
+
+
+// List of available import format
+$var=true;
+print '<table class="noborder" width="100%">';
+print '<tr class="liste_titre">';
+print '<td colspan="2">'.$langs->trans("AvailableFormats").'</td>';
+print '<td>'.$langs->trans("LibraryShort").'</td>';
+print '<td align="right">'.$langs->trans("LibraryVersion").'</td>';
+print '</tr>';
+
+include_once DOL_DOCUMENT_ROOT.'/core/modules/import/modules_import.php';
+$model=new ModeleImports();
+$liste=$model->liste_modeles($db);
+
+foreach($liste as $key)
+{
+ $var=!$var;
+ print '<tr '.$bc[$var].'>';
+ print '<td width="16">'.img_picto_common($model->getDriverLabel($key),$model->getPicto($key)).'</td>';
+ $text=$model->getDriverDesc($key);
+ print '<td>'.$form->textwithpicto($model->getDriverLabel($key),$text).'</td>';
+ print '<td>'.$model->getLibLabel($key).'</td>';
+ print '<td nowrap="nowrap" align="right">'.$model->getLibVersion($key).'</td>';
+ print '</tr>';
+}
+
+print '</table>';
-print '<center>';
-if (count($import->array_import_code))
-{
- //if ($user->rights->import->run)
- //{
- print '<a class="butAction" href="'.DOL_URL_ROOT.'/imports/import.php?leftmenu=import">'.$langs->trans("NewImport").'</a>';
- //}
- //else
- //{
- // print '<a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("NewImport").'</a>';
- //}
-}
-print '</center>';
print '</td></tr>';
print '</table>';
diff --git a/htdocs/theme/auguria/style.css.php b/htdocs/theme/auguria/style.css.php
index 391e9eaa0c7931dc66193e8dfb32e72e09dc197f..5ee989db284f414515a06aee314638f433f69a78 100644
--- a/htdocs/theme/auguria/style.css.php
+++ b/htdocs/theme/auguria/style.css.php
@@ -65,6 +65,22 @@ $img_liste_titre=dol_buildpath($path.'/theme/auguria/img/menus/trtitle.png',1);
$img_head=dol_buildpath($path.'/theme/auguria/img/headbg2.jpg',1);
$img_button=dol_buildpath($path.'/theme/auguria/img/button_bg.png',1);
+$colorbacklineimpairhover='210,214,217';
+$colorbacklinepairhover='210,214,217';
+
+// No hover by default, we keep only if we set var THEME_ELDY_USE_HOVER
+if ((! empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) && empty($user->conf->THEME_ELDY_USE_HOVER))
+ || (empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) && empty($conf->global->THEME_ELDY_USE_HOVER)))
+{
+ $colorbacklineimpairhover='';
+ $colorbacklinepairhover='';
+}
+
+print '/*'."\n";
+print 'colorbacklineimpairhover='.$colorbacklineimpairhover."\n";
+print 'colorbacklinepairhover='.$colorbacklinepairhover."\n";
+print '*/'."\n";
+
?>
/* ============================================================================== */
@@ -1316,28 +1332,30 @@ white-space: nowrap;
.impair:hover {
-background: #c0c4c7;
-border: 0px;
+<?php if ($colorbacklineimpairhover) { ?>
+ background: rgb(<?php print $colorbacklineimpairhover; ?>);
+<?php } ?>
+ border: 0px;
}
-.impair, table.nohover .impair:hover {
-/* background: #d0d4d7; */
-background: #F5F6F7;
-font-family: <?php print $fontlist ?>;
-border: 0px;
+.impair, .nohover .impair:hover, tr.impair td.nohover {
+ background: #F5F6F7;
+ font-family: <?php print $fontlist ?>;
+ border: 0px;
}
.pair:hover {
-background: #c0c4c7;
-border: 0px;
+<?php if ($colorbacklinepairhover) { ?>
+ background: rgb(<?php print $colorbacklinepairhover; ?>);
+<?php } ?>
+ border: 0px;
}
-.pair, table.nohover .pair:hover {
-/* background: #e6ebed; */
-background: #FBFCFC;
-font-family: <?php print $fontlist ?>;
-border: 0px;
+.pair, .nohover .pair:hover, tr.pair td.nohover {
+ background: #FBFCFC;
+ font-family: <?php print $fontlist ?>;
+ border: 0px;
}
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 7d706c3c6d12c8983ef196dd27afeccc8f987220..d9d658c20399dfbcc784b58ab39bd484ab5970b8 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -94,8 +94,10 @@ $colorbacktabcard2=($colred-15).','.($colgreen-15).','.($colblue-15);
$colorbacktabactive=($colred-15).','.($colgreen-15).','.($colblue-15);
$colorbacklineimpair1=(244+round($isred/3)).','.(244+round($isgreen/3)).','.(244+round($isblue/3)); // line impair
$colorbacklineimpair2=(250+round($isred/3)).','.(250+round($isgreen/3)).','.(250+round($isblue/3)); // line impair
+$colorbacklineimpairhover=(230+round(($isred+$isgreen+$isblue)/9)).','.(230+round(($isred+$isgreen+$isblue)/9)).','.(230+round(($isred+$isgreen+$isblue)/9)); // line impair
$colorbacklinepair1='255,255,255'; // line pair
$colorbacklinepair2='255,255,255'; // line pair
+$colorbacklinepairhover=(230+round(($isred+$isgreen+$isblue)/9)).','.(230+round(($isred+$isgreen+$isblue)/9)).','.(230+round(($isred+$isgreen+$isblue)/9));
$colorbackbody='#ffffff url('.$img_head.') 0 0 no-repeat;';
$colortext='40,40,40';
$fontsize=empty($conf->browser->phone)?'12':'14';
@@ -117,8 +119,10 @@ if (empty($conf->global->THEME_ELDY_ENABLE_PERSONALIZED))
$conf->global->THEME_ELDY_BACKBODY='#ffffff url('.$img_head.') 0 0 no-repeat;';
$conf->global->THEME_ELDY_LINEIMPAIR1='242,242,242';
$conf->global->THEME_ELDY_LINEIMPAIR2='248,248,248';
+ $conf->global->THEME_ELDY_LINEIMPAIRHOVER='238,246,252';
$conf->global->THEME_ELDY_LINEPAIR1='255,255,255';
$conf->global->THEME_ELDY_LINEPAIR2='255,255,255';
+ $conf->global->THEME_ELDY_LINEPAIRHOVER='238,246,252';
$conf->global->THEME_ELDY_BACKBODY='#ffffff url('.$img_head.') 0 0 no-repeat;';
$conf->global->THEME_ELDY_TEXT='48,102,102';
}
@@ -135,12 +139,21 @@ $colorbacktabcard2 =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty(
$colorbacktabactive =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_BACKTABACTIVE)?$colorbacktabactive:$conf->global->THEME_ELDY_BACKTABACTIVE):(empty($user->conf->THEME_ELDY_BACKTABACTIVE)?$colorbacktabactive:$user->conf->THEME_ELDY_BACKTABACTIVE);
$colorbacklineimpair1=empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_LINEIMPAIR1) ?$colorbacklineimpair1:$conf->global->THEME_ELDY_LINEIMPAIR1):(empty($user->conf->THEME_ELDY_LINEIMPAIR1)?$colorbacklineimpair1:$user->conf->THEME_ELDY_LINEIMPAIR1);
$colorbacklineimpair2=empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_LINEIMPAIR2) ?$colorbacklineimpair2:$conf->global->THEME_ELDY_LINEIMPAIR2):(empty($user->conf->THEME_ELDY_LINEIMPAIR2)?$colorbacklineimpair2:$user->conf->THEME_ELDY_LINEIMPAIR2);
+$colorbacklineimpairhover=empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_LINEIMPAIRHOVER) ?$colorbacklineimpairhover:$conf->global->THEME_ELDY_LINEIMPAIRHOVER):(empty($user->conf->THEME_ELDY_LINEIMPAIRHOVER)?$colorbacklineimpairhover:$user->conf->THEME_ELDY_LINEIMPAIRHOVER);
$colorbacklinepair1 =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_LINEPAIR1) ?$colorbacklinepair1:$conf->global->THEME_ELDY_LINEPAIR1) :(empty($user->conf->THEME_ELDY_LINEPAIR1)?$colorbacklinepair1:$user->conf->THEME_ELDY_LINEPAIR1);
$colorbacklinepair2 =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_LINEPAIR2) ?$colorbacklinepair2:$conf->global->THEME_ELDY_LINEPAIR2) :(empty($user->conf->THEME_ELDY_LINEPAIR2)?$colorbacklinepair2:$user->conf->THEME_ELDY_LINEPAIR2);
+$colorbacklinepairhover =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_LINEPAIRHOVER) ?$colorbacklinepairhover:$conf->global->THEME_ELDY_LINEPAIRHOVER) :(empty($user->conf->THEME_ELDY_LINEPAIRHOVER)?$colorbacklinepairhover:$user->conf->THEME_ELDY_LINEPAIRHOVER);
$colorbackbody =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_BACKBODY) ?$colorbackbody:$conf->global->THEME_ELDY_BACKBODY) :(empty($user->conf->THEME_ELDY_BACKBODY)?$colorbackbody:$user->conf->THEME_ELDY_BACKBODY);
$colortext =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_TEXT) ?$colortext:$conf->global->THEME_ELDY_TEXT) :(empty($user->conf->THEME_ELDY_TEXT)?$colortext:$user->conf->THEME_ELDY_TEXT);
$fontsize =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_FONT_SIZE1) ?$fontsize:$conf->global->THEME_ELDY_FONT_SIZE1) :(empty($user->conf->THEME_ELDY_FONT_SIZE1)?$fontsize:$user->conf->THEME_ELDY_FONT_SIZE1);
$fontsizesmaller =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_FONT_SIZE2) ?$fontsize:$conf->global->THEME_ELDY_FONT_SIZE2) :(empty($user->conf->THEME_ELDY_FONT_SIZE2)?$fontsize:$user->conf->THEME_ELDY_FONT_SIZE2);
+// No hover by default, we keep only if we set var THEME_ELDY_USE_HOVER
+if ((! empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) && empty($user->conf->THEME_ELDY_USE_HOVER))
+ || (empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) && empty($conf->global->THEME_ELDY_USE_HOVER)))
+{
+ $colorbacklineimpairhover='';
+ $colorbacklinepairhover='';
+}
// Set text color to black or white
$tmppart=explode(',',$colorback1);
@@ -161,8 +174,10 @@ print 'colred='.$colred.' colgreen='.$colgreen.' colblue='.$colblue."\n";
print 'isred='.$isred.' isgreen='.$isgreen.' isblue='.$isblue."\n";
print 'colorbacklineimpair1='.$colorbacklineimpair1."\n";
print 'colorbacklineimpair2='.$colorbacklineimpair2."\n";
+print 'colorbacklineimpairhover='.$colorbacklineimpairhover."\n";
print 'colorbacklinepair1='.$colorbacklinepair1."\n";
print 'colorbacklinepair2='.$colorbacklinepair2."\n";
+print 'colorbacklinepairhover='.$colorbacklinepairhover."\n";
print 'usecss3='.$usecss3."\n";
print '*/'."\n";
@@ -1598,11 +1613,15 @@ tr.liste_total td {
}
.impair:hover {
- background: #c0c4c7;
+<?php if ($colorbacklineimpairhover) { if ($usecss3) { ?>
+ background: rgb(<?php echo $colorbacklineimpairhover; ?>);
+<?php } else { ?>
+ background: #fafafa;
+<?php } } ?>
border: 0px;
}
-.impair, table.nohover .impair:hover {
+.impair, .nohover .impair:hover, tr.impair td.nohover {
<?php if ($usecss3) { ?>
background: linear-gradient(bottom, rgb(<?php echo $colorbacklineimpair1; ?>) 85%, rgb(<?php echo $colorbacklineimpair2; ?>) 100%);
background: -o-linear-gradient(bottom, rgb(<?php echo $colorbacklineimpair1; ?>) 85%, rgb(<?php echo $colorbacklineimpair2; ?>) 100%);
@@ -1619,11 +1638,15 @@ tr.liste_total td {
}
.pair:hover {
- background: #c0c4c7;
+<?php if ($colorbacklinepairhover) { if ($usecss3) { ?>
+ background: rgb(<?php echo $colorbacklinepairhover; ?>);
+<?php } else { ?>
+ background: #fafafa;
+<?php } }?>
border: 0px;
}
-.pair, table.nohover .pair:hover {
+.pair, .nohover .pair:hover, tr.pair td.nohover {
<?php if ($usecss3) { ?>
background: linear-gradient(bottom, rgb(<?php echo $colorbacklinepair1; ?>) 85%, rgb(<?php echo $colorbacklinepair2; ?>) 100%);
background: -o-linear-gradient(bottom, rgb(<?php echo $colorbacklinepair1; ?>) 85%, rgb(<?php echo $colorbacklinepair2; ?>) 100%);