diff --git a/htdocs/admin/system/database.php b/htdocs/admin/system/database.php index d1f6cf52ab8..33cb8a640a2 100644 --- a/htdocs/admin/system/database.php +++ b/htdocs/admin/system/database.php @@ -56,11 +56,11 @@ print ''.$langs->trans("DBSortingCharset").' print ''; // Tables -print '
'; -print ''; -print ''."\n"; -print ''."\n"; -print '
'.$langs->trans("Tables").'
'.$langs->trans("List").'
'; +print '
'; +print ''; +print ''."\n"; +print ''."\n"; +print '
'.$langs->trans("Tables").'
'.$langs->trans("List").'
'; $base=0; diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php index b164d5a0d13..99368e609d8 100644 --- a/htdocs/core/menus/standard/eldy.lib.php +++ b/htdocs/core/menus/standard/eldy.lib.php @@ -689,15 +689,15 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after) $newmenu->add("/admin/tools/index.php?mainmenu=home&leftmenu=admintools", $langs->trans("SystemTools"), 0, 1, '', $mainmenu, 'admintools'); if ($leftmenu=="admintools") { - $newmenu->add('/admin/system/dolibarr.php?mainmenu=home', $langs->trans('InfoDolibarr'), 1); - $newmenu->add('/admin/system/constall.php?mainmenu=home', $langs->trans('AllParameters'), 2); - $newmenu->add('/admin/system/modules.php?mainmenu=home', $langs->trans('Modules'), 2); - $newmenu->add('/admin/triggers.php?mainmenu=home', $langs->trans('Triggers'), 2); - $newmenu->add('/admin/system/os.php?mainmenu=home', $langs->trans('InfoOS'), 1); - $newmenu->add('/admin/system/web.php?mainmenu=home', $langs->trans('InfoWebServer'), 1); - $newmenu->add('/admin/system/phpinfo.php?mainmenu=home', $langs->trans('InfoPHP'), 1); - //if (function_exists('xdebug_is_enabled')) $newmenu->add('/admin/system/xdebug.php', $langs->trans('XDebug'),1); - $newmenu->add('/admin/system/database.php?mainmenu=home', $langs->trans('InfoDatabase'), 1); + $newmenu->add('/admin/system/dolibarr.php?mainmenu=home', $langs->trans('InfoDolibarr'), 1); + $newmenu->add('/admin/system/constall.php?mainmenu=home', $langs->trans('AllParameters'), 2); + $newmenu->add('/admin/system/modules.php?mainmenu=home', $langs->trans('Modules'), 2); + $newmenu->add('/admin/triggers.php?mainmenu=home', $langs->trans('Triggers'), 2); + $newmenu->add('/admin/system/os.php?mainmenu=home', $langs->trans('InfoOS'), 1); + $newmenu->add('/admin/system/web.php?mainmenu=home', $langs->trans('InfoWebServer'), 1); + $newmenu->add('/admin/system/phpinfo.php?mainmenu=home', $langs->trans('InfoPHP'), 1); + //if (function_exists('xdebug_is_enabled')) $newmenu->add('/admin/system/xdebug.php', $langs->trans('XDebug'),1); + $newmenu->add('/admin/system/database.php?mainmenu=home', $langs->trans('InfoDatabase'), 1); $newmenu->add("/admin/tools/dolibarr_export.php?mainmenu=home", $langs->trans("Backup"),1); $newmenu->add("/admin/tools/dolibarr_import.php?mainmenu=home", $langs->trans("Restore"),1); diff --git a/htdocs/exports/index.php b/htdocs/exports/index.php index 0cf3a0f0ef1..079fd67ceca 100644 --- a/htdocs/exports/index.php +++ b/htdocs/exports/index.php @@ -53,93 +53,93 @@ print ''; print ''; 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 '>
'; - */ -} + +// 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).'
'; - + +// 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 '
'; diff --git a/htdocs/imports/index.php b/htdocs/imports/index.php index c421dafc554..f9f6dfb9d27 100644 --- a/htdocs/imports/index.php +++ b/htdocs/imports/index.php @@ -52,84 +52,84 @@ print ''; print ''; diff --git a/htdocs/theme/auguria/style.css.php b/htdocs/theme/auguria/style.css.php index 5ee989db284..8cba8d76e4f 100644 --- a/htdocs/theme/auguria/style.css.php +++ b/htdocs/theme/auguria/style.css.php @@ -68,17 +68,17 @@ $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=''; -} +// 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"; +print 'colorbacklineimpairhover='.$colorbacklineimpairhover."\n"; +print 'colorbacklinepairhover='.$colorbacklinepairhover."\n"; print '*/'."\n"; ?>
'; -// 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").''; - //} -} +// 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).'
'; +// 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 '