From e0624abb2c177ad4f5b5cd7b4bee5934ba486f3c Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 9 Sep 2012 14:49:20 +0200 Subject: [PATCH] Added option THEME_ELDY_USE_HOVER to enable mouse hover, because when using software a lot, it becomes annoying. So we let user choose (choice possible only with eldy theme for the moment). --- htdocs/core/modules/export/modules_export.php | 8 +- htdocs/exports/index.php | 181 +++++++++--------- htdocs/imports/index.php | 161 ++++++++-------- htdocs/theme/auguria/style.css.php | 46 +++-- htdocs/theme/eldy/style.css.php | 31 ++- 5 files changed, 236 insertions(+), 191 deletions(-) diff --git a/htdocs/core/modules/export/modules_export.php b/htdocs/core/modules/export/modules_export.php index 7ad5b05ebf2..ee9f06674af 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 3317554ec1c..0cf3a0f0ef1 100644 --- a/htdocs/exports/index.php +++ b/htdocs/exports/index.php @@ -1,5 +1,5 @@ +/* Copyright (C) 2005-2012 Laurent Destailleur * * 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 '
'; print ''; -print ''; print '
'; +print '
'; - -// List of available export format -$var=true; -print ''; -print ''; -print ''; -print ''; -print ''; -print ''; - -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 ''; - print ''; - $text=$model->getDriverDesc($key); - print ''; - print ''; - print ''; - print ''; -} - -print '
'.$langs->trans("AvailableFormats").''.$langs->trans("LibraryShort").''.$langs->trans("LibraryVersion").'
'.img_picto_common($model->getDriverLabel($key),$model->getPicto($key)).''.$form->textwithpicto($model->getDriverLabel($key),$text).''.$model->getLibLabel($key).''.$model->getLibVersion($key).'
'; - - -print '		'; - - -// Affiche les modules d'exports -print ''; -print ''; -print ''; -print ''; -//print ''; -print ''; -$var=true; -if (count($export->array_export_code)) -{ - foreach ($export->array_export_code as $key => $value) - { - $var=!$var; - print ''; -// print ''; - print ''; - - } -} -else -{ - print ''; -} -print '
'.$langs->trans("Module").''.$langs->trans("ExportableDatas").' 
'; - //print img_object($export->array_export_module[$key]->getName(),$export->array_export_module[$key]->picto).' '; - print $export->array_export_module[$key]->getName(); - print ''; - 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 ''; -// print ''.img_picto($langs->trans("NewExport"),'filenew').''; -// print '
'.$langs->trans("NoExportableData").'
'; -print '
'; - -print '
'; -if (count($export->array_export_code)) -{ - if ($user->rights->export->creer) - { - print ''.$langs->trans("NewExport").''; - } - else - { - print ''.$langs->trans("NewExport").''; - } - /* - print '
rights->export->creer?'':' disabled="disabled"'); - print '>
'; - */ -} + +// List export set +print ''; +print ''; +print ''; +print ''; +//print ''; +print ''; +$var=true; +if (count($export->array_export_code)) +{ + foreach ($export->array_export_code as $key => $value) + { + $var=!$var; + print ''; + // print ''; + print ''; + + } +} +else +{ + print ''; +} +print '
'.$langs->trans("Module").''.$langs->trans("ExportableDatas").' 
'; + //print img_object($export->array_export_module[$key]->getName(),$export->array_export_module[$key]->picto).' '; + print $export->array_export_module[$key]->getName(); + print ''; + 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 ''; + // print ''.img_picto($langs->trans("NewExport"),'filenew').''; + // print '
'.$langs->trans("NoExportableData").'
'; +print '
'; + +print '
'; +if (count($export->array_export_code)) +{ + if ($user->rights->export->creer) + { + print ''.$langs->trans("NewExport").''; + } + else + { + print ''.$langs->trans("NewExport").''; + } + /* + print '
rights->export->creer?'':' disabled="disabled"'); + print '>
'; + */ +} print '
'; + +print '
'; + + +// List of available export format +$var=true; +print ''; +print ''; +print ''; +print ''; +print ''; +print ''; + +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 ''; + print ''; + $text=$model->getDriverDesc($key); + print ''; + print ''; + print ''; + print ''; +} + +print '
'.$langs->trans("AvailableFormats").''.$langs->trans("LibraryShort").''.$langs->trans("LibraryVersion").'
'.img_picto_common($model->getDriverLabel($key),$model->getPicto($key)).''.$form->textwithpicto($model->getDriverLabel($key),$text).''.$model->getLibLabel($key).''.$model->getLibVersion($key).'
'; + + print '
'; -$db->close(); - llxFooter(); + +$db->close(); ?> diff --git a/htdocs/imports/index.php b/htdocs/imports/index.php index 3682a8c5947..c421dafc554 100644 --- a/htdocs/imports/index.php +++ b/htdocs/imports/index.php @@ -1,5 +1,5 @@ +/* Copyright (C) 2005-2012 Laurent Destailleur * * 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,88 +49,89 @@ print '
'; print ''; -print ''; print '
'; +print '
'; -// Liste des formats d'imports disponibles -$var=true; -print ''; -print ''; -print ''; -print ''; -print ''; -print ''; - -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 ''; - print ''; - $text=$model->getDriverDesc($key); - print ''; - print ''; - print ''; - print ''; -} - -print '
'.$langs->trans("AvailableFormats").''.$langs->trans("LibraryShort").''.$langs->trans("LibraryVersion").'
'.img_picto_common($model->getDriverLabel($key),$model->getPicto($key)).''.$form->textwithpicto($model->getDriverLabel($key),$text).''.$model->getLibLabel($key).''.$model->getLibVersion($key).'
'; - - -print '		'; - - -// Affiche les modules d'imports -print ''; -print ''; -print ''; -print ''; -//print ''; -print ''; -$val=true; -if (count($import->array_import_code)) -{ - foreach ($import->array_import_code as $key => $value) - { - $val=!$val; - print ''; -// print ''; - print ''; - - } -} -else -{ - print ''; -} -print '
'.$langs->trans("Module").''.$langs->trans("ImportableDatas").' 
'; - print img_object($import->array_import_module[$key]->getName(),$import->array_import_module[$key]->picto).' '; - print $import->array_import_module[$key]->getName(); - print ''; - $string=$langs->trans($import->array_import_label[$key]); - print ($string!=$import->array_import_label[$key]?$string:$import->array_import_label[$key]); - print ''; -// print ''.img_picto($langs->trans("NewImport"),'filenew').''; -// print '
'.$langs->trans("NoImportableData").'
'; -print '
'; - -print '
'; -if (count($import->array_import_code)) -{ - //if ($user->rights->import->run) - //{ - print ''.$langs->trans("NewImport").''; - //} - //else - //{ - // print ''.$langs->trans("NewImport").''; - //} -} +// List of import set +print ''; +print ''; +print ''; +print ''; +//print ''; +print ''; +$val=true; +if (count($import->array_import_code)) +{ + foreach ($import->array_import_code as $key => $value) + { + $val=!$val; + print ''; + // print ''; + print ''; + + } +} +else +{ + print ''; +} +print '
'.$langs->trans("Module").''.$langs->trans("ImportableDatas").' 
'; + print img_object($import->array_import_module[$key]->getName(),$import->array_import_module[$key]->picto).' '; + print $import->array_import_module[$key]->getName(); + print ''; + $string=$langs->trans($import->array_import_label[$key]); + print ($string!=$import->array_import_label[$key]?$string:$import->array_import_label[$key]); + print ''; + // print ''.img_picto($langs->trans("NewImport"),'filenew').''; + // print '
'.$langs->trans("NoImportableData").'
'; +print '
'; + +print '
'; +if (count($import->array_import_code)) +{ + //if ($user->rights->import->run) + //{ + print ''.$langs->trans("NewImport").''; + //} + //else + //{ + // print ''.$langs->trans("NewImport").''; + //} +} print '
'; + +print '
'; + + +// List of available import format +$var=true; +print ''; +print ''; +print ''; +print ''; +print ''; +print ''; + +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 ''; + print ''; + $text=$model->getDriverDesc($key); + print ''; + print ''; + print ''; + print ''; +} + +print '
'.$langs->trans("AvailableFormats").''.$langs->trans("LibraryShort").''.$langs->trans("LibraryVersion").'
'.img_picto_common($model->getDriverLabel($key),$model->getPicto($key)).''.$form->textwithpicto($model->getDriverLabel($key),$text).''.$model->getLibLabel($key).''.$model->getLibVersion($key).'
'; + + print '
'; diff --git a/htdocs/theme/auguria/style.css.php b/htdocs/theme/auguria/style.css.php index 391e9eaa0c7..5ee989db284 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; + + background: rgb(); + + border: 0px; } -.impair, table.nohover .impair:hover { -/* background: #d0d4d7; */ -background: #F5F6F7; -font-family: ; -border: 0px; +.impair, .nohover .impair:hover, tr.impair td.nohover { + background: #F5F6F7; + font-family: ; + border: 0px; } .pair:hover { -background: #c0c4c7; -border: 0px; + + background: rgb(); + + border: 0px; } -.pair, table.nohover .pair:hover { -/* background: #e6ebed; */ -background: #FBFCFC; -font-family: ; -border: 0px; +.pair, .nohover .pair:hover, tr.pair td.nohover { + background: #FBFCFC; + font-family: ; + border: 0px; } diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index 7d706c3c6d1..d9d658c2039 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; + + background: rgb(); + + background: #fafafa; + border: 0px; } -.impair, table.nohover .impair:hover { +.impair, .nohover .impair:hover, tr.impair td.nohover { background: linear-gradient(bottom, rgb() 85%, rgb() 100%); background: -o-linear-gradient(bottom, rgb() 85%, rgb() 100%); @@ -1619,11 +1638,15 @@ tr.liste_total td { } .pair:hover { - background: #c0c4c7; + + background: rgb(); + + background: #fafafa; + border: 0px; } -.pair, table.nohover .pair:hover { +.pair, .nohover .pair:hover, tr.pair td.nohover { background: linear-gradient(bottom, rgb() 85%, rgb() 100%); background: -o-linear-gradient(bottom, rgb() 85%, rgb() 100%);