diff --git a/htdocs/install/mysql/migration/3.8.0-3.9.0.sql b/htdocs/install/mysql/migration/3.8.0-3.9.0.sql
index 793956527c7941e6650669a53ef440366ba18eb0..19ffb304c433a9610de9041856f8d978f488c3e6 100755
--- a/htdocs/install/mysql/migration/3.8.0-3.9.0.sql
+++ b/htdocs/install/mysql/migration/3.8.0-3.9.0.sql
@@ -26,6 +26,11 @@ ALTER TABLE llx_accountingaccount MODIFY COLUMN fk_pcg_version varchar(32);
UPDATE llx_const SET name = __ENCRYPT('ACCOUNTING_EXPORT_PREFIX_SPEC')__ WHERE __DECRYPT('name')__ = 'EXPORT_PREFIX_SPEC';
+UPDATE llx_const set MAIN_THEME = __ENCRYPT('eldy')__ WHERE __DECRYPT('MAIN_THEME')__ = 'auguria';
+UPDATE llx_const set MAIN_THEME = __ENCRYPT('eldy')__ WHERE __DECRYPT('MAIN_THEME')__ = 'bureau2crea';
+UPDATE llx_const set MAIN_THEME = __ENCRYPT('eldy')__ WHERE __DECRYPT('MAIN_THEME')__ = 'amarok';
+UPDATE llx_const set MAIN_THEME = __ENCRYPT('eldy')__ WHERE __DECRYPT('MAIN_THEME')__ = 'cameleo';
+
ALTER TABLE llx_accountingaccount RENAME TO llx_accounting_account;
ALTER TABLE llx_societe ADD COLUMN model_pdf varchar(255);
@@ -46,3 +51,5 @@ ALTER TABLE llx_payment_salary ADD COLUMN datec datetime after tms;
ALTER TABLE llx_payment_salary CHANGE COLUMN fk_user_creat fk_user_author integer;
ALTER TABLE llx_adherent ADD COLUMN pass_crypted varchar(128) after pass;
+
+
diff --git a/htdocs/theme/bureau2crea/style.css.php b/htdocs/theme/bureau2crea/style.css.php
index f74326d908dc47f5bb92c9051512c22c480387cc..436115cfb241ef9be5f3e0dcf45d540e00d18141 100644
--- a/htdocs/theme/bureau2crea/style.css.php
+++ b/htdocs/theme/bureau2crea/style.css.php
@@ -291,7 +291,7 @@ div.floatright
/* Styles to hide objects */
/* ============================================================================== */
-.hideobject { display: none; }
+.hideobject, .loginphoto { display: none; }
<?php if (! empty($dol_optimize_smallscreen)) { ?>
.hideonsmartphone { display: none; }
.noenlargeonsmartphone { width : 50px !important; display: inline !important; }
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 0c18ba10670354fa64642004b5ca9b342aa37418..f47da8120c3b6e7f78cd749383986a4be630855d 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -115,8 +115,8 @@ if (empty($conf->global->THEME_ELDY_ENABLE_PERSONALIZED))
{
// Case of option always editable
if (! isset($conf->global->THEME_ELDY_TOPMENU_BACK1)) $conf->global->THEME_ELDY_TOPMENU_BACK1='140,150,180'; // topmenu (140,160,185)
- if (! isset($conf->global->THEME_ELDY_BACKTITLE1)) $conf->global->THEME_ELDY_BACKTITLE1='140,150,180'; // title of arrays TO MATCH ELDY (140,160,185)
- //if (! isset($conf->global->THEME_ELDY_BACKTITLE1)) $conf->global->THEME_ELDY_BACKTITLE1='230,230,230'; // title of arrays TO MATCH BOOTSTRAP
+ //if (! isset($conf->global->THEME_ELDY_BACKTITLE1)) $conf->global->THEME_ELDY_BACKTITLE1='140,150,180'; // title of arrays TO MATCH ELDY (140,160,185)
+ if (! isset($conf->global->THEME_ELDY_BACKTITLE1)) $conf->global->THEME_ELDY_BACKTITLE1='230,230,230'; // title of arrays TO MATCH BOOTSTRAP
if (! isset($conf->global->THEME_ELDY_USE_HOVER)) $conf->global->THEME_ELDY_USE_HOVER=''; // color for links
// Cas of option editable if option THEME_ELDY_ENABLE_PERSONALIZED is on
@@ -130,7 +130,7 @@ if (empty($conf->global->THEME_ELDY_ENABLE_PERSONALIZED))
$conf->global->THEME_ELDY_BACKBODY='255,255,255';
$conf->global->THEME_ELDY_LINEIMPAIR1='255,255,255';
$conf->global->THEME_ELDY_LINEIMPAIR2='255,255,255';
- $conf->global->THEME_ELDY_LINEPAIR1='242,242,242';
+ $conf->global->THEME_ELDY_LINEPAIR1='250,250,250';
$conf->global->THEME_ELDY_LINEPAIR2='248,248,248';
$conf->global->THEME_ELDY_LINEPAIRHOVER='238,246,252';
$conf->global->THEME_ELDY_USE_HOVER=='238,246,252';
@@ -2323,11 +2323,11 @@ div.liste_titre, tr.liste_titre, tr.liste_titre_sel, form.liste_titre, form.list
/* TO MATCH ELDY */
background: rgb(<?php echo $colorbacktitle1; ?>);
<?php if ($usegradient) { ?>
- background-image: -o-linear-gradient(bottom, rgba(0,0,0,0.3) 0%, rgba(250,250,250,0.3) 100%);
- background-image: -moz-linear-gradient(bottom, rgba(0,0,0,0.3) 0%, rgba(250,250,250,0.3) 100%);
- background-image: -webkit-linear-gradient(bottom, rgba(0,0,0,0.3) 0%, rgba(250,250,250,0.3) 100%);
- background-image: -ms-linear-gradient(bottom, rgba(0,0,0,0.3) 0%, rgba(250,250,250,0.3) 100%);
- background-image: linear-gradient(bottom, rgba(0,0,0,0.3) 0%, rgba(250,250,250,0.3) 100%);
+ background-image: -o-linear-gradient(bottom, rgba(0,0,0,0.1) 0%, rgba(250,250,250,0.3) 100%);
+ background-image: -moz-linear-gradient(bottom, rgba(0,0,0,0.1) 0%, rgba(250,250,250,0.3) 100%);
+ background-image: -webkit-linear-gradient(bottom, rgba(0,0,0,0.1) 0%, rgba(250,250,250,0.3) 100%);
+ background-image: -ms-linear-gradient(bottom, rgba(0,0,0,0.1) 0%, rgba(250,250,250,0.3) 100%);
+ background-image: linear-gradient(bottom, rgba(0,0,0,0.1) 0%, rgba(250,250,250,0.3) 100%);
<?php } ?>
font-weight: bold;
@@ -2446,11 +2446,11 @@ tr.box_titre {
/* TO MATCH ELDY */
background: rgb(<?php echo $colorbacktitle1; ?>);
<?php if ($usegradient) { ?>
- background-image: -o-linear-gradient(bottom, rgba(0,0,0,0.3) 0%, rgba(250,250,250,0.3) 100%);
- background-image: -moz-linear-gradient(bottom, rgba(0,0,0,0.3) 0%, rgba(250,250,250,0.3) 100%);
- background-image: -webkit-linear-gradient(bottom, rgba(0,0,0,0.3) 0%, rgba(250,250,250,0.3) 100%);
- background-image: -ms-linear-gradient(bottom, rgba(0,0,0,0.3) 0%, rgba(250,250,250,0.3) 100%);
- background-image: linear-gradient(bottom, rgba(0,0,0,0.3) 0%, rgba(250,250,250,0.3) 100%);
+ background-image: -o-linear-gradient(bottom, rgba(0,0,0,0.1) 0%, rgba(250,250,250,0.3) 100%);
+ background-image: -moz-linear-gradient(bottom, rgba(0,0,0,0.1) 0%, rgba(250,250,250,0.3) 100%);
+ background-image: -webkit-linear-gradient(bottom, rgba(0,0,0,0.1) 0%, rgba(250,250,250,0.3) 100%);
+ background-image: -ms-linear-gradient(bottom, rgba(0,0,0,0.1) 0%, rgba(250,250,250,0.3) 100%);
+ background-image: linear-gradient(bottom, rgba(0,0,0,0.1) 0%, rgba(250,250,250,0.3) 100%);
<?php } ?>
color: #<?php echo $colortexttitle; ?>;
diff --git a/htdocs/theme/md_exp/.gitignore b/htdocs/theme/md/.gitignore
similarity index 100%
rename from htdocs/theme/md_exp/.gitignore
rename to htdocs/theme/md/.gitignore
diff --git a/htdocs/theme/md_exp/AUTHOR b/htdocs/theme/md/AUTHOR
similarity index 100%
rename from htdocs/theme/md_exp/AUTHOR
rename to htdocs/theme/md/AUTHOR
diff --git a/htdocs/theme/md_exp/ckeditor/config.js b/htdocs/theme/md/ckeditor/config.js
similarity index 100%
rename from htdocs/theme/md_exp/ckeditor/config.js
rename to htdocs/theme/md/ckeditor/config.js
diff --git a/htdocs/theme/md_exp/ckeditor/index.html b/htdocs/theme/md/ckeditor/index.html
similarity index 100%
rename from htdocs/theme/md_exp/ckeditor/index.html
rename to htdocs/theme/md/ckeditor/index.html
diff --git a/htdocs/theme/md_exp/graph-color.php b/htdocs/theme/md/graph-color.php
similarity index 100%
rename from htdocs/theme/md_exp/graph-color.php
rename to htdocs/theme/md/graph-color.php
diff --git a/htdocs/theme/md_exp/img/1downarrow.png b/htdocs/theme/md/img/1downarrow.png
similarity index 100%
rename from htdocs/theme/md_exp/img/1downarrow.png
rename to htdocs/theme/md/img/1downarrow.png
diff --git a/htdocs/theme/md_exp/img/1downarrow_selected.png b/htdocs/theme/md/img/1downarrow_selected.png
similarity index 100%
rename from htdocs/theme/md_exp/img/1downarrow_selected.png
rename to htdocs/theme/md/img/1downarrow_selected.png
diff --git a/htdocs/theme/md_exp/img/1leftarrow.png b/htdocs/theme/md/img/1leftarrow.png
similarity index 100%
rename from htdocs/theme/md_exp/img/1leftarrow.png
rename to htdocs/theme/md/img/1leftarrow.png
diff --git a/htdocs/theme/md_exp/img/1leftarrow_selected.png b/htdocs/theme/md/img/1leftarrow_selected.png
similarity index 100%
rename from htdocs/theme/md_exp/img/1leftarrow_selected.png
rename to htdocs/theme/md/img/1leftarrow_selected.png
diff --git a/htdocs/theme/md_exp/img/1rightarrow.png b/htdocs/theme/md/img/1rightarrow.png
similarity index 100%
rename from htdocs/theme/md_exp/img/1rightarrow.png
rename to htdocs/theme/md/img/1rightarrow.png
diff --git a/htdocs/theme/md_exp/img/1rightarrow_selected.png b/htdocs/theme/md/img/1rightarrow_selected.png
similarity index 100%
rename from htdocs/theme/md_exp/img/1rightarrow_selected.png
rename to htdocs/theme/md/img/1rightarrow_selected.png
diff --git a/htdocs/theme/md_exp/img/1uparrow.png b/htdocs/theme/md/img/1uparrow.png
similarity index 100%
rename from htdocs/theme/md_exp/img/1uparrow.png
rename to htdocs/theme/md/img/1uparrow.png
diff --git a/htdocs/theme/md_exp/img/1uparrow_selected.png b/htdocs/theme/md/img/1uparrow_selected.png
similarity index 100%
rename from htdocs/theme/md_exp/img/1uparrow_selected.png
rename to htdocs/theme/md/img/1uparrow_selected.png
diff --git a/htdocs/theme/md_exp/img/1updownarrow.png b/htdocs/theme/md/img/1updownarrow.png
similarity index 100%
rename from htdocs/theme/md_exp/img/1updownarrow.png
rename to htdocs/theme/md/img/1updownarrow.png
diff --git a/htdocs/theme/md_exp/img/addfile.png b/htdocs/theme/md/img/addfile.png
similarity index 100%
rename from htdocs/theme/md_exp/img/addfile.png
rename to htdocs/theme/md/img/addfile.png
diff --git a/htdocs/theme/md_exp/img/background.png b/htdocs/theme/md/img/background.png
similarity index 100%
rename from htdocs/theme/md_exp/img/background.png
rename to htdocs/theme/md/img/background.png
diff --git a/htdocs/theme/md_exp/img/bg-bas-rubrique.png b/htdocs/theme/md/img/bg-bas-rubrique.png
similarity index 100%
rename from htdocs/theme/md_exp/img/bg-bas-rubrique.png
rename to htdocs/theme/md/img/bg-bas-rubrique.png
diff --git a/htdocs/theme/md_exp/img/bg-rubrique.png b/htdocs/theme/md/img/bg-rubrique.png
similarity index 100%
rename from htdocs/theme/md_exp/img/bg-rubrique.png
rename to htdocs/theme/md/img/bg-rubrique.png
diff --git a/htdocs/theme/md_exp/img/bg-titre-rubrique.png b/htdocs/theme/md/img/bg-titre-rubrique.png
similarity index 100%
rename from htdocs/theme/md_exp/img/bg-titre-rubrique.png
rename to htdocs/theme/md/img/bg-titre-rubrique.png
diff --git a/htdocs/theme/md_exp/img/button_bg.png b/htdocs/theme/md/img/button_bg.png
similarity index 100%
rename from htdocs/theme/md_exp/img/button_bg.png
rename to htdocs/theme/md/img/button_bg.png
diff --git a/htdocs/theme/md_exp/img/button_edit.png b/htdocs/theme/md/img/button_edit.png
similarity index 100%
rename from htdocs/theme/md_exp/img/button_edit.png
rename to htdocs/theme/md/img/button_edit.png
diff --git a/htdocs/theme/md_exp/img/calc.png b/htdocs/theme/md/img/calc.png
similarity index 100%
rename from htdocs/theme/md_exp/img/calc.png
rename to htdocs/theme/md/img/calc.png
diff --git a/htdocs/theme/md_exp/img/calendar.png b/htdocs/theme/md/img/calendar.png
similarity index 100%
rename from htdocs/theme/md_exp/img/calendar.png
rename to htdocs/theme/md/img/calendar.png
diff --git a/htdocs/theme/md_exp/img/call.png b/htdocs/theme/md/img/call.png
similarity index 100%
rename from htdocs/theme/md_exp/img/call.png
rename to htdocs/theme/md/img/call.png
diff --git a/htdocs/theme/md_exp/img/call_out.png b/htdocs/theme/md/img/call_out.png
similarity index 100%
rename from htdocs/theme/md_exp/img/call_out.png
rename to htdocs/theme/md/img/call_out.png
diff --git a/htdocs/theme/md_exp/img/close.png b/htdocs/theme/md/img/close.png
similarity index 100%
rename from htdocs/theme/md_exp/img/close.png
rename to htdocs/theme/md/img/close.png
diff --git a/htdocs/theme/md_exp/img/close_title.png b/htdocs/theme/md/img/close_title.png
similarity index 100%
rename from htdocs/theme/md_exp/img/close_title.png
rename to htdocs/theme/md/img/close_title.png
diff --git a/htdocs/theme/md_exp/img/delete.png b/htdocs/theme/md/img/delete.png
similarity index 100%
rename from htdocs/theme/md_exp/img/delete.png
rename to htdocs/theme/md/img/delete.png
diff --git a/htdocs/theme/md_exp/img/detail.png b/htdocs/theme/md/img/detail.png
similarity index 100%
rename from htdocs/theme/md_exp/img/detail.png
rename to htdocs/theme/md/img/detail.png
diff --git a/htdocs/theme/md_exp/img/disable.png b/htdocs/theme/md/img/disable.png
similarity index 100%
rename from htdocs/theme/md_exp/img/disable.png
rename to htdocs/theme/md/img/disable.png
diff --git a/htdocs/theme/md_exp/img/edit.png b/htdocs/theme/md/img/edit.png
similarity index 100%
rename from htdocs/theme/md_exp/img/edit.png
rename to htdocs/theme/md/img/edit.png
diff --git a/htdocs/theme/md_exp/img/edit_add.png b/htdocs/theme/md/img/edit_add.png
similarity index 100%
rename from htdocs/theme/md_exp/img/edit_add.png
rename to htdocs/theme/md/img/edit_add.png
diff --git a/htdocs/theme/md_exp/img/edit_remove.png b/htdocs/theme/md/img/edit_remove.png
similarity index 100%
rename from htdocs/theme/md_exp/img/edit_remove.png
rename to htdocs/theme/md/img/edit_remove.png
diff --git a/htdocs/theme/md_exp/img/editdelete.png b/htdocs/theme/md/img/editdelete.png
similarity index 100%
rename from htdocs/theme/md_exp/img/editdelete.png
rename to htdocs/theme/md/img/editdelete.png
diff --git a/htdocs/theme/md_exp/img/error.png b/htdocs/theme/md/img/error.png
similarity index 100%
rename from htdocs/theme/md_exp/img/error.png
rename to htdocs/theme/md/img/error.png
diff --git a/htdocs/theme/md_exp/img/favicon.ico b/htdocs/theme/md/img/favicon.ico
similarity index 100%
rename from htdocs/theme/md_exp/img/favicon.ico
rename to htdocs/theme/md/img/favicon.ico
diff --git a/htdocs/theme/md_exp/img/file.png b/htdocs/theme/md/img/file.png
similarity index 100%
rename from htdocs/theme/md_exp/img/file.png
rename to htdocs/theme/md/img/file.png
diff --git a/htdocs/theme/md_exp/img/filenew.png b/htdocs/theme/md/img/filenew.png
similarity index 100%
rename from htdocs/theme/md_exp/img/filenew.png
rename to htdocs/theme/md/img/filenew.png
diff --git a/htdocs/theme/md_exp/img/filter.png b/htdocs/theme/md/img/filter.png
similarity index 100%
rename from htdocs/theme/md_exp/img/filter.png
rename to htdocs/theme/md/img/filter.png
diff --git a/htdocs/theme/md_exp/img/folder-open.png b/htdocs/theme/md/img/folder-open.png
similarity index 100%
rename from htdocs/theme/md_exp/img/folder-open.png
rename to htdocs/theme/md/img/folder-open.png
diff --git a/htdocs/theme/md_exp/img/folder.png b/htdocs/theme/md/img/folder.png
similarity index 100%
rename from htdocs/theme/md_exp/img/folder.png
rename to htdocs/theme/md/img/folder.png
diff --git a/htdocs/theme/md_exp/img/gradient.gif b/htdocs/theme/md/img/gradient.gif
similarity index 100%
rename from htdocs/theme/md_exp/img/gradient.gif
rename to htdocs/theme/md/img/gradient.gif
diff --git a/htdocs/theme/md_exp/img/grip.png b/htdocs/theme/md/img/grip.png
similarity index 100%
rename from htdocs/theme/md_exp/img/grip.png
rename to htdocs/theme/md/img/grip.png
diff --git a/htdocs/theme/md_exp/img/grip_title.png b/htdocs/theme/md/img/grip_title.png
similarity index 100%
rename from htdocs/theme/md_exp/img/grip_title.png
rename to htdocs/theme/md/img/grip_title.png
diff --git a/htdocs/theme/md_exp/img/headbg.jpg b/htdocs/theme/md/img/headbg.jpg
similarity index 100%
rename from htdocs/theme/md_exp/img/headbg.jpg
rename to htdocs/theme/md/img/headbg.jpg
diff --git a/htdocs/theme/md_exp/img/headbg2.jpg b/htdocs/theme/md/img/headbg2.jpg
similarity index 100%
rename from htdocs/theme/md_exp/img/headbg2.jpg
rename to htdocs/theme/md/img/headbg2.jpg
diff --git a/htdocs/theme/md_exp/img/help.png b/htdocs/theme/md/img/help.png
similarity index 100%
rename from htdocs/theme/md_exp/img/help.png
rename to htdocs/theme/md/img/help.png
diff --git a/htdocs/theme/md_exp/img/helpdoc.png b/htdocs/theme/md/img/helpdoc.png
similarity index 100%
rename from htdocs/theme/md_exp/img/helpdoc.png
rename to htdocs/theme/md/img/helpdoc.png
diff --git a/htdocs/theme/md_exp/img/high.png b/htdocs/theme/md/img/high.png
similarity index 100%
rename from htdocs/theme/md_exp/img/high.png
rename to htdocs/theme/md/img/high.png
diff --git a/htdocs/theme/md_exp/img/history.png b/htdocs/theme/md/img/history.png
similarity index 100%
rename from htdocs/theme/md_exp/img/history.png
rename to htdocs/theme/md/img/history.png
diff --git a/htdocs/theme/md_exp/img/index.html b/htdocs/theme/md/img/index.html
similarity index 100%
rename from htdocs/theme/md_exp/img/index.html
rename to htdocs/theme/md/img/index.html
diff --git a/htdocs/theme/md_exp/img/info.png b/htdocs/theme/md/img/info.png
similarity index 100%
rename from htdocs/theme/md_exp/img/info.png
rename to htdocs/theme/md/img/info.png
diff --git a/htdocs/theme/md_exp/img/info_black.png b/htdocs/theme/md/img/info_black.png
similarity index 100%
rename from htdocs/theme/md_exp/img/info_black.png
rename to htdocs/theme/md/img/info_black.png
diff --git a/htdocs/theme/md_exp/img/liste_titre.png b/htdocs/theme/md/img/liste_titre.png
similarity index 100%
rename from htdocs/theme/md_exp/img/liste_titre.png
rename to htdocs/theme/md/img/liste_titre.png
diff --git a/htdocs/theme/md_exp/img/liste_titre2.png b/htdocs/theme/md/img/liste_titre2.png
similarity index 100%
rename from htdocs/theme/md_exp/img/liste_titre2.png
rename to htdocs/theme/md/img/liste_titre2.png
diff --git a/htdocs/theme/md_exp/img/lock.png b/htdocs/theme/md/img/lock.png
similarity index 100%
rename from htdocs/theme/md_exp/img/lock.png
rename to htdocs/theme/md/img/lock.png
diff --git a/htdocs/theme/md_exp/img/login_background.png b/htdocs/theme/md/img/login_background.png
similarity index 100%
rename from htdocs/theme/md_exp/img/login_background.png
rename to htdocs/theme/md/img/login_background.png
diff --git a/htdocs/theme/md_exp/img/logo_setup.svg b/htdocs/theme/md/img/logo_setup.svg
similarity index 100%
rename from htdocs/theme/md_exp/img/logo_setup.svg
rename to htdocs/theme/md/img/logo_setup.svg
diff --git a/htdocs/theme/md_exp/img/logout.png b/htdocs/theme/md/img/logout.png
similarity index 100%
rename from htdocs/theme/md_exp/img/logout.png
rename to htdocs/theme/md/img/logout.png
diff --git a/htdocs/theme/md_exp/img/menus/README.md b/htdocs/theme/md/img/menus/README.md
similarity index 100%
rename from htdocs/theme/md_exp/img/menus/README.md
rename to htdocs/theme/md/img/menus/README.md
diff --git a/htdocs/theme/md_exp/img/menus/agenda.png b/htdocs/theme/md/img/menus/agenda.png
similarity index 100%
rename from htdocs/theme/md_exp/img/menus/agenda.png
rename to htdocs/theme/md/img/menus/agenda.png
diff --git a/htdocs/theme/md_exp/img/menus/agenda_over.png b/htdocs/theme/md/img/menus/agenda_over.png
similarity index 100%
rename from htdocs/theme/md_exp/img/menus/agenda_over.png
rename to htdocs/theme/md/img/menus/agenda_over.png
diff --git a/htdocs/theme/md_exp/img/menus/bank.png b/htdocs/theme/md/img/menus/bank.png
similarity index 100%
rename from htdocs/theme/md_exp/img/menus/bank.png
rename to htdocs/theme/md/img/menus/bank.png
diff --git a/htdocs/theme/md_exp/img/menus/bank_over.png b/htdocs/theme/md/img/menus/bank_over.png
similarity index 100%
rename from htdocs/theme/md_exp/img/menus/bank_over.png
rename to htdocs/theme/md/img/menus/bank_over.png
diff --git a/htdocs/theme/md_exp/img/menus/chart.png b/htdocs/theme/md/img/menus/chart.png
similarity index 100%
rename from htdocs/theme/md_exp/img/menus/chart.png
rename to htdocs/theme/md/img/menus/chart.png
diff --git a/htdocs/theme/md_exp/img/menus/commercial.png b/htdocs/theme/md/img/menus/commercial.png
similarity index 100%
rename from htdocs/theme/md_exp/img/menus/commercial.png
rename to htdocs/theme/md/img/menus/commercial.png
diff --git a/htdocs/theme/md_exp/img/menus/commercial_over.png b/htdocs/theme/md/img/menus/commercial_over.png
similarity index 100%
rename from htdocs/theme/md_exp/img/menus/commercial_over.png
rename to htdocs/theme/md/img/menus/commercial_over.png
diff --git a/htdocs/theme/md_exp/img/menus/company.png b/htdocs/theme/md/img/menus/company.png
similarity index 100%
rename from htdocs/theme/md_exp/img/menus/company.png
rename to htdocs/theme/md/img/menus/company.png
diff --git a/htdocs/theme/md_exp/img/menus/company_over.png b/htdocs/theme/md/img/menus/company_over.png
similarity index 100%
rename from htdocs/theme/md_exp/img/menus/company_over.png
rename to htdocs/theme/md/img/menus/company_over.png
diff --git a/htdocs/theme/md_exp/img/menus/ecm.png b/htdocs/theme/md/img/menus/ecm.png
similarity index 100%
rename from htdocs/theme/md_exp/img/menus/ecm.png
rename to htdocs/theme/md/img/menus/ecm.png
diff --git a/htdocs/theme/md_exp/img/menus/ecm_over.png b/htdocs/theme/md/img/menus/ecm_over.png
similarity index 100%
rename from htdocs/theme/md_exp/img/menus/ecm_over.png
rename to htdocs/theme/md/img/menus/ecm_over.png
diff --git a/htdocs/theme/md_exp/img/menus/externalsite.png b/htdocs/theme/md/img/menus/externalsite.png
similarity index 100%
rename from htdocs/theme/md_exp/img/menus/externalsite.png
rename to htdocs/theme/md/img/menus/externalsite.png
diff --git a/htdocs/theme/md_exp/img/menus/externalsite_over.png b/htdocs/theme/md/img/menus/externalsite_over.png
similarity index 100%
rename from htdocs/theme/md_exp/img/menus/externalsite_over.png
rename to htdocs/theme/md/img/menus/externalsite_over.png
diff --git a/htdocs/theme/md_exp/img/menus/ftp.png b/htdocs/theme/md/img/menus/ftp.png
similarity index 100%
rename from htdocs/theme/md_exp/img/menus/ftp.png
rename to htdocs/theme/md/img/menus/ftp.png
diff --git a/htdocs/theme/md_exp/img/menus/ftp_over.png b/htdocs/theme/md/img/menus/ftp_over.png
similarity index 100%
rename from htdocs/theme/md_exp/img/menus/ftp_over.png
rename to htdocs/theme/md/img/menus/ftp_over.png
diff --git a/htdocs/theme/md_exp/img/menus/generic1.png b/htdocs/theme/md/img/menus/generic1.png
similarity index 100%
rename from htdocs/theme/md_exp/img/menus/generic1.png
rename to htdocs/theme/md/img/menus/generic1.png
diff --git a/htdocs/theme/md_exp/img/menus/generic1_over.png b/htdocs/theme/md/img/menus/generic1_over.png
similarity index 100%
rename from htdocs/theme/md_exp/img/menus/generic1_over.png
rename to htdocs/theme/md/img/menus/generic1_over.png
diff --git a/htdocs/theme/md_exp/img/menus/generic2.png b/htdocs/theme/md/img/menus/generic2.png
similarity index 100%
rename from htdocs/theme/md_exp/img/menus/generic2.png
rename to htdocs/theme/md/img/menus/generic2.png
diff --git a/htdocs/theme/md_exp/img/menus/generic2_over.png b/htdocs/theme/md/img/menus/generic2_over.png
similarity index 100%
rename from htdocs/theme/md_exp/img/menus/generic2_over.png
rename to htdocs/theme/md/img/menus/generic2_over.png
diff --git a/htdocs/theme/md_exp/img/menus/generic3.png b/htdocs/theme/md/img/menus/generic3.png
similarity index 100%
rename from htdocs/theme/md_exp/img/menus/generic3.png
rename to htdocs/theme/md/img/menus/generic3.png
diff --git a/htdocs/theme/md_exp/img/menus/generic3_over.png b/htdocs/theme/md/img/menus/generic3_over.png
similarity index 100%
rename from htdocs/theme/md_exp/img/menus/generic3_over.png
rename to htdocs/theme/md/img/menus/generic3_over.png
diff --git a/htdocs/theme/md_exp/img/menus/generic4.png b/htdocs/theme/md/img/menus/generic4.png
similarity index 100%
rename from htdocs/theme/md_exp/img/menus/generic4.png
rename to htdocs/theme/md/img/menus/generic4.png
diff --git a/htdocs/theme/md_exp/img/menus/generic4_over.png b/htdocs/theme/md/img/menus/generic4_over.png
similarity index 100%
rename from htdocs/theme/md_exp/img/menus/generic4_over.png
rename to htdocs/theme/md/img/menus/generic4_over.png
diff --git a/htdocs/theme/md_exp/img/menus/globe.png b/htdocs/theme/md/img/menus/globe.png
similarity index 100%
rename from htdocs/theme/md_exp/img/menus/globe.png
rename to htdocs/theme/md/img/menus/globe.png
diff --git a/htdocs/theme/md_exp/img/menus/globe_over.png b/htdocs/theme/md/img/menus/globe_over.png
similarity index 100%
rename from htdocs/theme/md_exp/img/menus/globe_over.png
rename to htdocs/theme/md/img/menus/globe_over.png
diff --git a/htdocs/theme/md_exp/img/menus/holiday.png b/htdocs/theme/md/img/menus/holiday.png
similarity index 100%
rename from htdocs/theme/md_exp/img/menus/holiday.png
rename to htdocs/theme/md/img/menus/holiday.png
diff --git a/htdocs/theme/md_exp/img/menus/home.png b/htdocs/theme/md/img/menus/home.png
similarity index 100%
rename from htdocs/theme/md_exp/img/menus/home.png
rename to htdocs/theme/md/img/menus/home.png
diff --git a/htdocs/theme/md_exp/img/menus/home_over.png b/htdocs/theme/md/img/menus/home_over.png
similarity index 100%
rename from htdocs/theme/md_exp/img/menus/home_over.png
rename to htdocs/theme/md/img/menus/home_over.png
diff --git a/htdocs/theme/md_exp/img/menus/index.html b/htdocs/theme/md/img/menus/index.html
similarity index 100%
rename from htdocs/theme/md_exp/img/menus/index.html
rename to htdocs/theme/md/img/menus/index.html
diff --git a/htdocs/theme/md_exp/img/menus/mail.png b/htdocs/theme/md/img/menus/mail.png
similarity index 100%
rename from htdocs/theme/md_exp/img/menus/mail.png
rename to htdocs/theme/md/img/menus/mail.png
diff --git a/htdocs/theme/md_exp/img/menus/mail_over.png b/htdocs/theme/md/img/menus/mail_over.png
similarity index 100%
rename from htdocs/theme/md_exp/img/menus/mail_over.png
rename to htdocs/theme/md/img/menus/mail_over.png
diff --git a/htdocs/theme/md_exp/img/menus/members.png b/htdocs/theme/md/img/menus/members.png
similarity index 100%
rename from htdocs/theme/md_exp/img/menus/members.png
rename to htdocs/theme/md/img/menus/members.png
diff --git a/htdocs/theme/md_exp/img/menus/members_over.png b/htdocs/theme/md/img/menus/members_over.png
similarity index 100%
rename from htdocs/theme/md_exp/img/menus/members_over.png
rename to htdocs/theme/md/img/menus/members_over.png
diff --git a/htdocs/theme/md_exp/img/menus/money.png b/htdocs/theme/md/img/menus/money.png
similarity index 100%
rename from htdocs/theme/md_exp/img/menus/money.png
rename to htdocs/theme/md/img/menus/money.png
diff --git a/htdocs/theme/md_exp/img/menus/money_over.png b/htdocs/theme/md/img/menus/money_over.png
similarity index 100%
rename from htdocs/theme/md_exp/img/menus/money_over.png
rename to htdocs/theme/md/img/menus/money_over.png
diff --git a/htdocs/theme/md_exp/img/menus/pointofsale.png b/htdocs/theme/md/img/menus/pointofsale.png
similarity index 100%
rename from htdocs/theme/md_exp/img/menus/pointofsale.png
rename to htdocs/theme/md/img/menus/pointofsale.png
diff --git a/htdocs/theme/md_exp/img/menus/pointofsale_over.png b/htdocs/theme/md/img/menus/pointofsale_over.png
similarity index 100%
rename from htdocs/theme/md_exp/img/menus/pointofsale_over.png
rename to htdocs/theme/md/img/menus/pointofsale_over.png
diff --git a/htdocs/theme/md_exp/img/menus/products.png b/htdocs/theme/md/img/menus/products.png
similarity index 100%
rename from htdocs/theme/md_exp/img/menus/products.png
rename to htdocs/theme/md/img/menus/products.png
diff --git a/htdocs/theme/md_exp/img/menus/products_over.png b/htdocs/theme/md/img/menus/products_over.png
similarity index 100%
rename from htdocs/theme/md_exp/img/menus/products_over.png
rename to htdocs/theme/md/img/menus/products_over.png
diff --git a/htdocs/theme/md_exp/img/menus/project.png b/htdocs/theme/md/img/menus/project.png
similarity index 100%
rename from htdocs/theme/md_exp/img/menus/project.png
rename to htdocs/theme/md/img/menus/project.png
diff --git a/htdocs/theme/md_exp/img/menus/project_over.png b/htdocs/theme/md/img/menus/project_over.png
similarity index 100%
rename from htdocs/theme/md_exp/img/menus/project_over.png
rename to htdocs/theme/md/img/menus/project_over.png
diff --git a/htdocs/theme/md_exp/img/menus/shop.png b/htdocs/theme/md/img/menus/shop.png
similarity index 100%
rename from htdocs/theme/md_exp/img/menus/shop.png
rename to htdocs/theme/md/img/menus/shop.png
diff --git a/htdocs/theme/md_exp/img/menus/shop_over.png b/htdocs/theme/md/img/menus/shop_over.png
similarity index 100%
rename from htdocs/theme/md_exp/img/menus/shop_over.png
rename to htdocs/theme/md/img/menus/shop_over.png
diff --git a/htdocs/theme/md_exp/img/menus/tools.png b/htdocs/theme/md/img/menus/tools.png
similarity index 100%
rename from htdocs/theme/md_exp/img/menus/tools.png
rename to htdocs/theme/md/img/menus/tools.png
diff --git a/htdocs/theme/md_exp/img/menus/tools_over.png b/htdocs/theme/md/img/menus/tools_over.png
similarity index 100%
rename from htdocs/theme/md_exp/img/menus/tools_over.png
rename to htdocs/theme/md/img/menus/tools_over.png
diff --git a/htdocs/theme/md_exp/img/menutab-r.png b/htdocs/theme/md/img/menutab-r.png
similarity index 100%
rename from htdocs/theme/md_exp/img/menutab-r.png
rename to htdocs/theme/md/img/menutab-r.png
diff --git a/htdocs/theme/md_exp/img/nav-overlay.png b/htdocs/theme/md/img/nav-overlay.png
similarity index 100%
rename from htdocs/theme/md_exp/img/nav-overlay.png
rename to htdocs/theme/md/img/nav-overlay.png
diff --git a/htdocs/theme/md_exp/img/nav-overlay3.png b/htdocs/theme/md/img/nav-overlay3.png
similarity index 100%
rename from htdocs/theme/md_exp/img/nav-overlay3.png
rename to htdocs/theme/md/img/nav-overlay3.png
diff --git a/htdocs/theme/md_exp/img/next.png b/htdocs/theme/md/img/next.png
similarity index 100%
rename from htdocs/theme/md_exp/img/next.png
rename to htdocs/theme/md/img/next.png
diff --git a/htdocs/theme/md_exp/img/object_account.png b/htdocs/theme/md/img/object_account.png
similarity index 100%
rename from htdocs/theme/md_exp/img/object_account.png
rename to htdocs/theme/md/img/object_account.png
diff --git a/htdocs/theme/md_exp/img/object_accounting.png b/htdocs/theme/md/img/object_accounting.png
similarity index 100%
rename from htdocs/theme/md_exp/img/object_accounting.png
rename to htdocs/theme/md/img/object_accounting.png
diff --git a/htdocs/theme/md_exp/img/object_action.png b/htdocs/theme/md/img/object_action.png
similarity index 100%
rename from htdocs/theme/md_exp/img/object_action.png
rename to htdocs/theme/md/img/object_action.png
diff --git a/htdocs/theme/md_exp/img/object_action_rdv.png b/htdocs/theme/md/img/object_action_rdv.png
similarity index 100%
rename from htdocs/theme/md_exp/img/object_action_rdv.png
rename to htdocs/theme/md/img/object_action_rdv.png
diff --git a/htdocs/theme/md_exp/img/object_address.png b/htdocs/theme/md/img/object_address.png
similarity index 100%
rename from htdocs/theme/md_exp/img/object_address.png
rename to htdocs/theme/md/img/object_address.png
diff --git a/htdocs/theme/md_exp/img/object_askpricesupplier.png b/htdocs/theme/md/img/object_askpricesupplier.png
similarity index 100%
rename from htdocs/theme/md_exp/img/object_askpricesupplier.png
rename to htdocs/theme/md/img/object_askpricesupplier.png
diff --git a/htdocs/theme/md_exp/img/object_barcode.png b/htdocs/theme/md/img/object_barcode.png
similarity index 100%
rename from htdocs/theme/md_exp/img/object_barcode.png
rename to htdocs/theme/md/img/object_barcode.png
diff --git a/htdocs/theme/md_exp/img/object_bill.png b/htdocs/theme/md/img/object_bill.png
similarity index 100%
rename from htdocs/theme/md_exp/img/object_bill.png
rename to htdocs/theme/md/img/object_bill.png
diff --git a/htdocs/theme/md_exp/img/object_billa.png b/htdocs/theme/md/img/object_billa.png
similarity index 100%
rename from htdocs/theme/md_exp/img/object_billa.png
rename to htdocs/theme/md/img/object_billa.png
diff --git a/htdocs/theme/md_exp/img/object_billd.png b/htdocs/theme/md/img/object_billd.png
similarity index 100%
rename from htdocs/theme/md_exp/img/object_billd.png
rename to htdocs/theme/md/img/object_billd.png
diff --git a/htdocs/theme/md_exp/img/object_billr.png b/htdocs/theme/md/img/object_billr.png
similarity index 100%
rename from htdocs/theme/md_exp/img/object_billr.png
rename to htdocs/theme/md/img/object_billr.png
diff --git a/htdocs/theme/md_exp/img/object_book.png b/htdocs/theme/md/img/object_book.png
similarity index 100%
rename from htdocs/theme/md_exp/img/object_book.png
rename to htdocs/theme/md/img/object_book.png
diff --git a/htdocs/theme/md_exp/img/object_bookmark.png b/htdocs/theme/md/img/object_bookmark.png
similarity index 100%
rename from htdocs/theme/md_exp/img/object_bookmark.png
rename to htdocs/theme/md/img/object_bookmark.png
diff --git a/htdocs/theme/md_exp/img/object_calendar.png b/htdocs/theme/md/img/object_calendar.png
similarity index 100%
rename from htdocs/theme/md_exp/img/object_calendar.png
rename to htdocs/theme/md/img/object_calendar.png
diff --git a/htdocs/theme/md_exp/img/object_calendarday.png b/htdocs/theme/md/img/object_calendarday.png
similarity index 100%
rename from htdocs/theme/md_exp/img/object_calendarday.png
rename to htdocs/theme/md/img/object_calendarday.png
diff --git a/htdocs/theme/md_exp/img/object_calendarperuser.png b/htdocs/theme/md/img/object_calendarperuser.png
similarity index 100%
rename from htdocs/theme/md_exp/img/object_calendarperuser.png
rename to htdocs/theme/md/img/object_calendarperuser.png
diff --git a/htdocs/theme/md_exp/img/object_calendarweek.png b/htdocs/theme/md/img/object_calendarweek.png
similarity index 100%
rename from htdocs/theme/md_exp/img/object_calendarweek.png
rename to htdocs/theme/md/img/object_calendarweek.png
diff --git a/htdocs/theme/md_exp/img/object_category-expanded.png b/htdocs/theme/md/img/object_category-expanded.png
similarity index 100%
rename from htdocs/theme/md_exp/img/object_category-expanded.png
rename to htdocs/theme/md/img/object_category-expanded.png
diff --git a/htdocs/theme/md_exp/img/object_category.png b/htdocs/theme/md/img/object_category.png
similarity index 100%
rename from htdocs/theme/md_exp/img/object_category.png
rename to htdocs/theme/md/img/object_category.png
diff --git a/htdocs/theme/md_exp/img/object_commercial.png b/htdocs/theme/md/img/object_commercial.png
similarity index 100%
rename from htdocs/theme/md_exp/img/object_commercial.png
rename to htdocs/theme/md/img/object_commercial.png
diff --git a/htdocs/theme/md_exp/img/object_company.png b/htdocs/theme/md/img/object_company.png
similarity index 100%
rename from htdocs/theme/md_exp/img/object_company.png
rename to htdocs/theme/md/img/object_company.png
diff --git a/htdocs/theme/md_exp/img/object_contact.png b/htdocs/theme/md/img/object_contact.png
similarity index 100%
rename from htdocs/theme/md_exp/img/object_contact.png
rename to htdocs/theme/md/img/object_contact.png
diff --git a/htdocs/theme/md_exp/img/object_contact_all.png b/htdocs/theme/md/img/object_contact_all.png
similarity index 100%
rename from htdocs/theme/md_exp/img/object_contact_all.png
rename to htdocs/theme/md/img/object_contact_all.png
diff --git a/htdocs/theme/md_exp/img/object_contract.png b/htdocs/theme/md/img/object_contract.png
similarity index 100%
rename from htdocs/theme/md_exp/img/object_contract.png
rename to htdocs/theme/md/img/object_contract.png
diff --git a/htdocs/theme/md_exp/img/object_cron.png b/htdocs/theme/md/img/object_cron.png
similarity index 100%
rename from htdocs/theme/md_exp/img/object_cron.png
rename to htdocs/theme/md/img/object_cron.png
diff --git a/htdocs/theme/md_exp/img/object_dir.png b/htdocs/theme/md/img/object_dir.png
similarity index 100%
rename from htdocs/theme/md_exp/img/object_dir.png
rename to htdocs/theme/md/img/object_dir.png
diff --git a/htdocs/theme/md_exp/img/object_email.png b/htdocs/theme/md/img/object_email.png
similarity index 100%
rename from htdocs/theme/md_exp/img/object_email.png
rename to htdocs/theme/md/img/object_email.png
diff --git a/htdocs/theme/md_exp/img/object_energie.png b/htdocs/theme/md/img/object_energie.png
similarity index 100%
rename from htdocs/theme/md_exp/img/object_energie.png
rename to htdocs/theme/md/img/object_energie.png
diff --git a/htdocs/theme/md_exp/img/object_generic.png b/htdocs/theme/md/img/object_generic.png
similarity index 100%
rename from htdocs/theme/md_exp/img/object_generic.png
rename to htdocs/theme/md/img/object_generic.png
diff --git a/htdocs/theme/md_exp/img/object_globe.png b/htdocs/theme/md/img/object_globe.png
similarity index 100%
rename from htdocs/theme/md_exp/img/object_globe.png
rename to htdocs/theme/md/img/object_globe.png
diff --git a/htdocs/theme/md_exp/img/object_gravatar.png b/htdocs/theme/md/img/object_gravatar.png
similarity index 100%
rename from htdocs/theme/md_exp/img/object_gravatar.png
rename to htdocs/theme/md/img/object_gravatar.png
diff --git a/htdocs/theme/md_exp/img/object_group.png b/htdocs/theme/md/img/object_group.png
similarity index 100%
rename from htdocs/theme/md_exp/img/object_group.png
rename to htdocs/theme/md/img/object_group.png
diff --git a/htdocs/theme/md_exp/img/object_holiday.png b/htdocs/theme/md/img/object_holiday.png
similarity index 100%
rename from htdocs/theme/md_exp/img/object_holiday.png
rename to htdocs/theme/md/img/object_holiday.png
diff --git a/htdocs/theme/md_exp/img/object_intervention.png b/htdocs/theme/md/img/object_intervention.png
similarity index 100%
rename from htdocs/theme/md_exp/img/object_intervention.png
rename to htdocs/theme/md/img/object_intervention.png
diff --git a/htdocs/theme/md_exp/img/object_invoice.png b/htdocs/theme/md/img/object_invoice.png
similarity index 100%
rename from htdocs/theme/md_exp/img/object_invoice.png
rename to htdocs/theme/md/img/object_invoice.png
diff --git a/htdocs/theme/md_exp/img/object_label.png b/htdocs/theme/md/img/object_label.png
similarity index 100%
rename from htdocs/theme/md_exp/img/object_label.png
rename to htdocs/theme/md/img/object_label.png
diff --git a/htdocs/theme/md_exp/img/object_list.png b/htdocs/theme/md/img/object_list.png
similarity index 100%
rename from htdocs/theme/md_exp/img/object_list.png
rename to htdocs/theme/md/img/object_list.png
diff --git a/htdocs/theme/md_exp/img/object_margin.png b/htdocs/theme/md/img/object_margin.png
similarity index 100%
rename from htdocs/theme/md_exp/img/object_margin.png
rename to htdocs/theme/md/img/object_margin.png
diff --git a/htdocs/theme/md_exp/img/object_opensurvey.png b/htdocs/theme/md/img/object_opensurvey.png
similarity index 100%
rename from htdocs/theme/md_exp/img/object_opensurvey.png
rename to htdocs/theme/md/img/object_opensurvey.png
diff --git a/htdocs/theme/md_exp/img/object_order.png b/htdocs/theme/md/img/object_order.png
similarity index 100%
rename from htdocs/theme/md_exp/img/object_order.png
rename to htdocs/theme/md/img/object_order.png
diff --git a/htdocs/theme/md_exp/img/object_payment.png b/htdocs/theme/md/img/object_payment.png
similarity index 100%
rename from htdocs/theme/md_exp/img/object_payment.png
rename to htdocs/theme/md/img/object_payment.png
diff --git a/htdocs/theme/md_exp/img/object_phoning.png b/htdocs/theme/md/img/object_phoning.png
similarity index 100%
rename from htdocs/theme/md_exp/img/object_phoning.png
rename to htdocs/theme/md/img/object_phoning.png
diff --git a/htdocs/theme/md_exp/img/object_phoning_fax.png b/htdocs/theme/md/img/object_phoning_fax.png
similarity index 100%
rename from htdocs/theme/md_exp/img/object_phoning_fax.png
rename to htdocs/theme/md/img/object_phoning_fax.png
diff --git a/htdocs/theme/md_exp/img/object_product.png b/htdocs/theme/md/img/object_product.png
similarity index 100%
rename from htdocs/theme/md_exp/img/object_product.png
rename to htdocs/theme/md/img/object_product.png
diff --git a/htdocs/theme/md_exp/img/object_project.png b/htdocs/theme/md/img/object_project.png
similarity index 100%
rename from htdocs/theme/md_exp/img/object_project.png
rename to htdocs/theme/md/img/object_project.png
diff --git a/htdocs/theme/md_exp/img/object_projectpub.png b/htdocs/theme/md/img/object_projectpub.png
similarity index 100%
rename from htdocs/theme/md_exp/img/object_projectpub.png
rename to htdocs/theme/md/img/object_projectpub.png
diff --git a/htdocs/theme/md_exp/img/object_projecttask.png b/htdocs/theme/md/img/object_projecttask.png
similarity index 100%
rename from htdocs/theme/md_exp/img/object_projecttask.png
rename to htdocs/theme/md/img/object_projecttask.png
diff --git a/htdocs/theme/md_exp/img/object_propal.png b/htdocs/theme/md/img/object_propal.png
similarity index 100%
rename from htdocs/theme/md_exp/img/object_propal.png
rename to htdocs/theme/md/img/object_propal.png
diff --git a/htdocs/theme/md_exp/img/object_reduc.png b/htdocs/theme/md/img/object_reduc.png
similarity index 100%
rename from htdocs/theme/md_exp/img/object_reduc.png
rename to htdocs/theme/md/img/object_reduc.png
diff --git a/htdocs/theme/md_exp/img/object_resource.png b/htdocs/theme/md/img/object_resource.png
similarity index 100%
rename from htdocs/theme/md_exp/img/object_resource.png
rename to htdocs/theme/md/img/object_resource.png
diff --git a/htdocs/theme/md_exp/img/object_rss.png b/htdocs/theme/md/img/object_rss.png
similarity index 100%
rename from htdocs/theme/md_exp/img/object_rss.png
rename to htdocs/theme/md/img/object_rss.png
diff --git a/htdocs/theme/md_exp/img/object_sending.png b/htdocs/theme/md/img/object_sending.png
similarity index 100%
rename from htdocs/theme/md_exp/img/object_sending.png
rename to htdocs/theme/md/img/object_sending.png
diff --git a/htdocs/theme/md_exp/img/object_service.png b/htdocs/theme/md/img/object_service.png
similarity index 100%
rename from htdocs/theme/md_exp/img/object_service.png
rename to htdocs/theme/md/img/object_service.png
diff --git a/htdocs/theme/md_exp/img/object_skype.png b/htdocs/theme/md/img/object_skype.png
similarity index 100%
rename from htdocs/theme/md_exp/img/object_skype.png
rename to htdocs/theme/md/img/object_skype.png
diff --git a/htdocs/theme/md_exp/img/object_stock.png b/htdocs/theme/md/img/object_stock.png
similarity index 100%
rename from htdocs/theme/md_exp/img/object_stock.png
rename to htdocs/theme/md/img/object_stock.png
diff --git a/htdocs/theme/md_exp/img/object_task.png b/htdocs/theme/md/img/object_task.png
similarity index 100%
rename from htdocs/theme/md_exp/img/object_task.png
rename to htdocs/theme/md/img/object_task.png
diff --git a/htdocs/theme/md_exp/img/object_task_time.png b/htdocs/theme/md/img/object_task_time.png
similarity index 100%
rename from htdocs/theme/md_exp/img/object_task_time.png
rename to htdocs/theme/md/img/object_task_time.png
diff --git a/htdocs/theme/md_exp/img/object_technic.png b/htdocs/theme/md/img/object_technic.png
similarity index 100%
rename from htdocs/theme/md_exp/img/object_technic.png
rename to htdocs/theme/md/img/object_technic.png
diff --git a/htdocs/theme/md_exp/img/object_trip.png b/htdocs/theme/md/img/object_trip.png
similarity index 100%
rename from htdocs/theme/md_exp/img/object_trip.png
rename to htdocs/theme/md/img/object_trip.png
diff --git a/htdocs/theme/md_exp/img/object_user.png b/htdocs/theme/md/img/object_user.png
similarity index 100%
rename from htdocs/theme/md_exp/img/object_user.png
rename to htdocs/theme/md/img/object_user.png
diff --git a/htdocs/theme/md_exp/img/off.png b/htdocs/theme/md/img/off.png
similarity index 100%
rename from htdocs/theme/md_exp/img/off.png
rename to htdocs/theme/md/img/off.png
diff --git a/htdocs/theme/md_exp/img/on.png b/htdocs/theme/md/img/on.png
similarity index 100%
rename from htdocs/theme/md_exp/img/on.png
rename to htdocs/theme/md/img/on.png
diff --git a/htdocs/theme/md_exp/img/pdf2.png b/htdocs/theme/md/img/pdf2.png
similarity index 100%
rename from htdocs/theme/md_exp/img/pdf2.png
rename to htdocs/theme/md/img/pdf2.png
diff --git a/htdocs/theme/md_exp/img/pdf3.png b/htdocs/theme/md/img/pdf3.png
similarity index 100%
rename from htdocs/theme/md_exp/img/pdf3.png
rename to htdocs/theme/md/img/pdf3.png
diff --git a/htdocs/theme/md_exp/img/play.png b/htdocs/theme/md/img/play.png
similarity index 100%
rename from htdocs/theme/md_exp/img/play.png
rename to htdocs/theme/md/img/play.png
diff --git a/htdocs/theme/md_exp/img/previous.png b/htdocs/theme/md/img/previous.png
similarity index 100%
rename from htdocs/theme/md_exp/img/previous.png
rename to htdocs/theme/md/img/previous.png
diff --git a/htdocs/theme/md_exp/img/printer.png b/htdocs/theme/md/img/printer.png
similarity index 100%
rename from htdocs/theme/md_exp/img/printer.png
rename to htdocs/theme/md/img/printer.png
diff --git a/htdocs/theme/md_exp/img/puce.png b/htdocs/theme/md/img/puce.png
similarity index 100%
rename from htdocs/theme/md_exp/img/puce.png
rename to htdocs/theme/md/img/puce.png
diff --git a/htdocs/theme/md_exp/img/recent.png b/htdocs/theme/md/img/recent.png
similarity index 100%
rename from htdocs/theme/md_exp/img/recent.png
rename to htdocs/theme/md/img/recent.png
diff --git a/htdocs/theme/md_exp/img/redstar.png b/htdocs/theme/md/img/redstar.png
similarity index 100%
rename from htdocs/theme/md_exp/img/redstar.png
rename to htdocs/theme/md/img/redstar.png
diff --git a/htdocs/theme/md_exp/img/refresh.png b/htdocs/theme/md/img/refresh.png
similarity index 100%
rename from htdocs/theme/md_exp/img/refresh.png
rename to htdocs/theme/md/img/refresh.png
diff --git a/htdocs/theme/md_exp/img/reload.png b/htdocs/theme/md/img/reload.png
similarity index 100%
rename from htdocs/theme/md_exp/img/reload.png
rename to htdocs/theme/md/img/reload.png
diff --git a/htdocs/theme/md_exp/img/rightarrow.png b/htdocs/theme/md/img/rightarrow.png
similarity index 100%
rename from htdocs/theme/md_exp/img/rightarrow.png
rename to htdocs/theme/md/img/rightarrow.png
diff --git a/htdocs/theme/md_exp/img/search.png b/htdocs/theme/md/img/search.png
similarity index 100%
rename from htdocs/theme/md_exp/img/search.png
rename to htdocs/theme/md/img/search.png
diff --git a/htdocs/theme/md_exp/img/searchclear.png b/htdocs/theme/md/img/searchclear.png
similarity index 100%
rename from htdocs/theme/md_exp/img/searchclear.png
rename to htdocs/theme/md/img/searchclear.png
diff --git a/htdocs/theme/md_exp/img/setup.png b/htdocs/theme/md/img/setup.png
similarity index 100%
rename from htdocs/theme/md_exp/img/setup.png
rename to htdocs/theme/md/img/setup.png
diff --git a/htdocs/theme/md_exp/img/sort_asc.png b/htdocs/theme/md/img/sort_asc.png
similarity index 100%
rename from htdocs/theme/md_exp/img/sort_asc.png
rename to htdocs/theme/md/img/sort_asc.png
diff --git a/htdocs/theme/md_exp/img/sort_asc_disabled.png b/htdocs/theme/md/img/sort_asc_disabled.png
similarity index 100%
rename from htdocs/theme/md_exp/img/sort_asc_disabled.png
rename to htdocs/theme/md/img/sort_asc_disabled.png
diff --git a/htdocs/theme/md_exp/img/sort_desc.png b/htdocs/theme/md/img/sort_desc.png
similarity index 100%
rename from htdocs/theme/md_exp/img/sort_desc.png
rename to htdocs/theme/md/img/sort_desc.png
diff --git a/htdocs/theme/md_exp/img/sort_desc_disabled.png b/htdocs/theme/md/img/sort_desc_disabled.png
similarity index 100%
rename from htdocs/theme/md_exp/img/sort_desc_disabled.png
rename to htdocs/theme/md/img/sort_desc_disabled.png
diff --git a/htdocs/theme/md_exp/img/split.png b/htdocs/theme/md/img/split.png
similarity index 100%
rename from htdocs/theme/md_exp/img/split.png
rename to htdocs/theme/md/img/split.png
diff --git a/htdocs/theme/md_exp/img/star.png b/htdocs/theme/md/img/star.png
similarity index 100%
rename from htdocs/theme/md_exp/img/star.png
rename to htdocs/theme/md/img/star.png
diff --git a/htdocs/theme/md_exp/img/stats.png b/htdocs/theme/md/img/stats.png
similarity index 100%
rename from htdocs/theme/md_exp/img/stats.png
rename to htdocs/theme/md/img/stats.png
diff --git a/htdocs/theme/md_exp/img/statut0.png b/htdocs/theme/md/img/statut0.png
similarity index 100%
rename from htdocs/theme/md_exp/img/statut0.png
rename to htdocs/theme/md/img/statut0.png
diff --git a/htdocs/theme/md_exp/img/statut1.png b/htdocs/theme/md/img/statut1.png
similarity index 100%
rename from htdocs/theme/md_exp/img/statut1.png
rename to htdocs/theme/md/img/statut1.png
diff --git a/htdocs/theme/md_exp/img/statut3.png b/htdocs/theme/md/img/statut3.png
similarity index 100%
rename from htdocs/theme/md_exp/img/statut3.png
rename to htdocs/theme/md/img/statut3.png
diff --git a/htdocs/theme/md_exp/img/statut4.png b/htdocs/theme/md/img/statut4.png
similarity index 100%
rename from htdocs/theme/md_exp/img/statut4.png
rename to htdocs/theme/md/img/statut4.png
diff --git a/htdocs/theme/md_exp/img/statut5.png b/htdocs/theme/md/img/statut5.png
similarity index 100%
rename from htdocs/theme/md_exp/img/statut5.png
rename to htdocs/theme/md/img/statut5.png
diff --git a/htdocs/theme/md_exp/img/statut6.png b/htdocs/theme/md/img/statut6.png
similarity index 100%
rename from htdocs/theme/md_exp/img/statut6.png
rename to htdocs/theme/md/img/statut6.png
diff --git a/htdocs/theme/md_exp/img/statut7.png b/htdocs/theme/md/img/statut7.png
similarity index 100%
rename from htdocs/theme/md_exp/img/statut7.png
rename to htdocs/theme/md/img/statut7.png
diff --git a/htdocs/theme/md_exp/img/statut8.png b/htdocs/theme/md/img/statut8.png
similarity index 100%
rename from htdocs/theme/md_exp/img/statut8.png
rename to htdocs/theme/md/img/statut8.png
diff --git a/htdocs/theme/md_exp/img/statut9.png b/htdocs/theme/md/img/statut9.png
similarity index 100%
rename from htdocs/theme/md_exp/img/statut9.png
rename to htdocs/theme/md/img/statut9.png
diff --git a/htdocs/theme/md_exp/img/stcomm-1.png b/htdocs/theme/md/img/stcomm-1.png
similarity index 100%
rename from htdocs/theme/md_exp/img/stcomm-1.png
rename to htdocs/theme/md/img/stcomm-1.png
diff --git a/htdocs/theme/md_exp/img/stcomm0.png b/htdocs/theme/md/img/stcomm0.png
similarity index 100%
rename from htdocs/theme/md_exp/img/stcomm0.png
rename to htdocs/theme/md/img/stcomm0.png
diff --git a/htdocs/theme/md_exp/img/stcomm1.png b/htdocs/theme/md/img/stcomm1.png
similarity index 100%
rename from htdocs/theme/md_exp/img/stcomm1.png
rename to htdocs/theme/md/img/stcomm1.png
diff --git a/htdocs/theme/md_exp/img/stcomm2.png b/htdocs/theme/md/img/stcomm2.png
similarity index 100%
rename from htdocs/theme/md_exp/img/stcomm2.png
rename to htdocs/theme/md/img/stcomm2.png
diff --git a/htdocs/theme/md_exp/img/stcomm3.png b/htdocs/theme/md/img/stcomm3.png
similarity index 100%
rename from htdocs/theme/md_exp/img/stcomm3.png
rename to htdocs/theme/md/img/stcomm3.png
diff --git a/htdocs/theme/md_exp/img/stcomm4.png b/htdocs/theme/md/img/stcomm4.png
similarity index 100%
rename from htdocs/theme/md_exp/img/stcomm4.png
rename to htdocs/theme/md/img/stcomm4.png
diff --git a/htdocs/theme/md_exp/img/switch_off.png b/htdocs/theme/md/img/switch_off.png
similarity index 100%
rename from htdocs/theme/md_exp/img/switch_off.png
rename to htdocs/theme/md/img/switch_off.png
diff --git a/htdocs/theme/md_exp/img/switch_on.png b/htdocs/theme/md/img/switch_on.png
similarity index 100%
rename from htdocs/theme/md_exp/img/switch_on.png
rename to htdocs/theme/md/img/switch_on.png
diff --git a/htdocs/theme/md_exp/img/tab_background.png b/htdocs/theme/md/img/tab_background.png
similarity index 100%
rename from htdocs/theme/md_exp/img/tab_background.png
rename to htdocs/theme/md/img/tab_background.png
diff --git a/htdocs/theme/md_exp/img/tick.png b/htdocs/theme/md/img/tick.png
similarity index 100%
rename from htdocs/theme/md_exp/img/tick.png
rename to htdocs/theme/md/img/tick.png
diff --git a/htdocs/theme/md_exp/img/title.gif b/htdocs/theme/md/img/title.gif
similarity index 100%
rename from htdocs/theme/md_exp/img/title.gif
rename to htdocs/theme/md/img/title.gif
diff --git a/htdocs/theme/md_exp/img/title.png b/htdocs/theme/md/img/title.png
similarity index 100%
rename from htdocs/theme/md_exp/img/title.png
rename to htdocs/theme/md/img/title.png
diff --git a/htdocs/theme/md_exp/img/title_accountancy.png b/htdocs/theme/md/img/title_accountancy.png
similarity index 100%
rename from htdocs/theme/md_exp/img/title_accountancy.png
rename to htdocs/theme/md/img/title_accountancy.png
diff --git a/htdocs/theme/md_exp/img/title_bank.png b/htdocs/theme/md/img/title_bank.png
similarity index 100%
rename from htdocs/theme/md_exp/img/title_bank.png
rename to htdocs/theme/md/img/title_bank.png
diff --git a/htdocs/theme/md_exp/img/title_commercial.png b/htdocs/theme/md/img/title_commercial.png
similarity index 100%
rename from htdocs/theme/md_exp/img/title_commercial.png
rename to htdocs/theme/md/img/title_commercial.png
diff --git a/htdocs/theme/md_exp/img/title_companies.png b/htdocs/theme/md/img/title_companies.png
similarity index 100%
rename from htdocs/theme/md_exp/img/title_companies.png
rename to htdocs/theme/md/img/title_companies.png
diff --git a/htdocs/theme/md_exp/img/title_generic.png b/htdocs/theme/md/img/title_generic.png
similarity index 100%
rename from htdocs/theme/md_exp/img/title_generic.png
rename to htdocs/theme/md/img/title_generic.png
diff --git a/htdocs/theme/md_exp/img/title_home.png b/htdocs/theme/md/img/title_home.png
similarity index 100%
rename from htdocs/theme/md_exp/img/title_home.png
rename to htdocs/theme/md/img/title_home.png
diff --git a/htdocs/theme/md_exp/img/title_hrm.png b/htdocs/theme/md/img/title_hrm.png
similarity index 100%
rename from htdocs/theme/md_exp/img/title_hrm.png
rename to htdocs/theme/md/img/title_hrm.png
diff --git a/htdocs/theme/md_exp/img/title_products.png b/htdocs/theme/md/img/title_products.png
similarity index 100%
rename from htdocs/theme/md_exp/img/title_products.png
rename to htdocs/theme/md/img/title_products.png
diff --git a/htdocs/theme/md_exp/img/title_project.png b/htdocs/theme/md/img/title_project.png
similarity index 100%
rename from htdocs/theme/md_exp/img/title_project.png
rename to htdocs/theme/md/img/title_project.png
diff --git a/htdocs/theme/md_exp/img/title_setup.png b/htdocs/theme/md/img/title_setup.png
similarity index 100%
rename from htdocs/theme/md_exp/img/title_setup.png
rename to htdocs/theme/md/img/title_setup.png
diff --git a/htdocs/theme/md_exp/img/tmenu.jpg b/htdocs/theme/md/img/tmenu.jpg
similarity index 100%
rename from htdocs/theme/md_exp/img/tmenu.jpg
rename to htdocs/theme/md/img/tmenu.jpg
diff --git a/htdocs/theme/md_exp/img/tmenu2.jpg b/htdocs/theme/md/img/tmenu2.jpg
similarity index 100%
rename from htdocs/theme/md_exp/img/tmenu2.jpg
rename to htdocs/theme/md/img/tmenu2.jpg
diff --git a/htdocs/theme/md_exp/img/tmenu3.jpg b/htdocs/theme/md/img/tmenu3.jpg
similarity index 100%
rename from htdocs/theme/md_exp/img/tmenu3.jpg
rename to htdocs/theme/md/img/tmenu3.jpg
diff --git a/htdocs/theme/md_exp/img/tmenu_inverse.jpg b/htdocs/theme/md/img/tmenu_inverse.jpg
similarity index 100%
rename from htdocs/theme/md_exp/img/tmenu_inverse.jpg
rename to htdocs/theme/md/img/tmenu_inverse.jpg
diff --git a/htdocs/theme/md_exp/img/unlock.png b/htdocs/theme/md/img/unlock.png
similarity index 100%
rename from htdocs/theme/md_exp/img/unlock.png
rename to htdocs/theme/md/img/unlock.png
diff --git a/htdocs/theme/md_exp/img/uparrow.png b/htdocs/theme/md/img/uparrow.png
similarity index 100%
rename from htdocs/theme/md_exp/img/uparrow.png
rename to htdocs/theme/md/img/uparrow.png
diff --git a/htdocs/theme/md_exp/img/vcard.png b/htdocs/theme/md/img/vcard.png
similarity index 100%
rename from htdocs/theme/md_exp/img/vcard.png
rename to htdocs/theme/md/img/vcard.png
diff --git a/htdocs/theme/md_exp/img/view.png b/htdocs/theme/md/img/view.png
similarity index 100%
rename from htdocs/theme/md_exp/img/view.png
rename to htdocs/theme/md/img/view.png
diff --git a/htdocs/theme/md_exp/img/warning.png b/htdocs/theme/md/img/warning.png
similarity index 100%
rename from htdocs/theme/md_exp/img/warning.png
rename to htdocs/theme/md/img/warning.png
diff --git a/htdocs/theme/md_exp/img/working.gif b/htdocs/theme/md/img/working.gif
similarity index 100%
rename from htdocs/theme/md_exp/img/working.gif
rename to htdocs/theme/md/img/working.gif
diff --git a/htdocs/theme/md_exp/img/working2.gif b/htdocs/theme/md/img/working2.gif
similarity index 100%
rename from htdocs/theme/md_exp/img/working2.gif
rename to htdocs/theme/md/img/working2.gif
diff --git a/htdocs/theme/md_exp/index.html b/htdocs/theme/md/index.html
similarity index 100%
rename from htdocs/theme/md_exp/index.html
rename to htdocs/theme/md/index.html
diff --git a/htdocs/theme/md_exp/style.css.php b/htdocs/theme/md/style.css.php
similarity index 97%
rename from htdocs/theme/md_exp/style.css.php
rename to htdocs/theme/md/style.css.php
index c9787b7524fe16958118509f553bf406b4b838e8..00f5ced495ea0ab33a184589d5d497fd4f1e6b67 100644
--- a/htdocs/theme/md_exp/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -21,7 +21,7 @@
*/
/**
- * \file htdocs/theme/md_exp/style.css.php
+ * \file htdocs/theme/md/style.css.php
* \brief File for CSS style sheet Md (Material Design)
*/
@@ -102,7 +102,6 @@ $colorbacktabcard2=($colred-15).','.($colgreen-15).','.($colblue-15);
$colorbacktabactive=($colred-15).','.($colgreen-15).','.($colblue-15);
$colorbacklineimpair1='255,255,255'; // line impair
$colorbacklineimpair2='255,255,255'; // line impair
-$colorbacklineimpairhover=(230+round(($isred+$isgreen+$isblue)/9)).','.(230+round(($isred+$isgreen+$isblue)/9)).','.(230+round(($isred+$isgreen+$isblue)/9)); // line impair
$colorbacklinepair1=(244+round($isred/3)).','.(244+round($isgreen/3)).','.(244+round($isblue/3)); // line pair
$colorbacklinepair2=(250+round($isred/3)).','.(250+round($isgreen/3)).','.(250+round($isblue/3)); // line pair
$colorbacklinepairhover=(230+round(($isred+$isgreen+$isblue)/9)).','.(230+round(($isred+$isgreen+$isblue)/9)).','.(230+round(($isred+$isgreen+$isblue)/9)); // line pair
@@ -116,12 +115,13 @@ $usegradient=1;
if (empty($conf->global->THEME_ELDY_ENABLE_PERSONALIZED))
{
// Case of option always editable
- if (! isset($conf->global->THEME_ELDY_TOPMENU_BACK1)) $conf->global->THEME_ELDY_TOPMENU_BACK1='140,150,180'; // topmenu (140,160,185)
+ if (! isset($conf->global->THEME_ELDY_TOPMENU_BACK1)) $conf->global->THEME_ELDY_TOPMENU_BACK1=join(',',colorStringToArray('#37474F')); // topmenu (140,160,185)
if (! isset($conf->global->THEME_ELDY_BACKTITLE1)) $conf->global->THEME_ELDY_BACKTITLE1='140,150,180'; // title of arrays TO MATCH ELDY (140,160,185)
//if (! isset($conf->global->THEME_ELDY_BACKTITLE1)) $conf->global->THEME_ELDY_BACKTITLE1='230,230,230'; // title of arrays TO MATCH BOOTSTRAP
-
+ if (! isset($conf->global->THEME_ELDY_USE_HOVER)) $conf->global->THEME_ELDY_USE_HOVER=''; // color for links
+
+ // Cas of option editable if option THEME_ELDY_ENABLE_PERSONALIZED is on
// 90A4AE, 607D8B, 455A64, 37474F
- $conf->global->THEME_ELDY_TOPMENU_BACK1=join(',',colorStringToArray('#37474F')); // topmenu #607D8B
$conf->global->THEME_ELDY_TOPMENU_BACK2='236,236,236';
$conf->global->THEME_ELDY_VERMENU_BACK1='255,255,255'; // vmenu
$conf->global->THEME_ELDY_VERMENU_BACK2='240,240,240';
@@ -135,7 +135,8 @@ if (empty($conf->global->THEME_ELDY_ENABLE_PERSONALIZED))
$conf->global->THEME_ELDY_LINEPAIRHOVER='238,246,252';
$conf->global->THEME_ELDY_LINEIMPAIR1='255,255,255';
$conf->global->THEME_ELDY_LINEIMPAIR2='255,255,255';
- $conf->global->THEME_ELDY_LINEIMPAIRHOVER='238,246,252';
+ $conf->global->THEME_ELDY_USE_HOVER=='238,246,252';
+
$conf->global->THEME_ELDY_TEXT='50,50,130';
$conf->global->THEME_ELDY_FONT_SIZE1='13';
$conf->global->THEME_ELDY_FONT_SIZE2='11';
@@ -153,7 +154,6 @@ $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);
@@ -162,12 +162,11 @@ $colortext =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty(
$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);
-// Hover can be disabled with THEME_ELDY_USE_HOVER=0
-if ((! empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) && (isset($user->conf->THEME_ELDY_USE_HOVER) && $user->conf->THEME_ELDY_USE_HOVER == '0'))
- || (empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) && (isset($conf->global->THEME_ELDY_USE_HOVER) && $conf->global->THEME_ELDY_USE_HOVER == '0')))
+// Hover color
+$colorbacklinepairhover=((! isset($conf->global->THEME_ELDY_USE_HOVER) || (string) $conf->global->THEME_ELDY_USE_HOVER === '0')?'':($conf->global->THEME_ELDY_USE_HOVER === '1'?'edf4fb':$conf->global->THEME_ELDY_USE_HOVER));
+if (! empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED))
{
- $colorbacklineimpairhover='';
- $colorbacklinepairhover='';
+ $colorbacklinepairhover=((! isset($user->conf->THEME_ELDY_USE_HOVER) || $user->conf->THEME_ELDY_USE_HOVER === '0')?'':($user->conf->THEME_ELDY_USE_HOVER === '1'?'edf4fb':$user->conf->THEME_ELDY_USE_HOVER));
}
// Format color value to match expected format (may be 'FFFFFF' or '255,255,255')
@@ -178,6 +177,7 @@ $colorbackvmenu1=join(',',colorStringToArray($colorbackvmenu1));
$colorbackvmenu2=join(',',colorStringToArray($colorbackvmenu2));
$colorbacktabcard1=join(',',colorStringToArray($colorbacktabcard1));
$colorbacktabcard2=join(',',colorStringToArray($colorbacktabcard2));
+if ($colorbacklinepairhover != '') $colorbacklinepairhover=join(',',colorStringToArray($colorbacklinepairhover));
// Set text color to black or white
$tmppart=explode(',',$colorbackhmenu1);
@@ -207,7 +207,6 @@ print 'colorbackhmenu1='.$colorbackhmenu1."\n";
print 'colorbacktitle1='.$colorbacktitle1."\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";
@@ -1011,14 +1010,9 @@ form#login {
border:solid 1px rgba(80,80,80,.4);
border-top:solid 1px f8f8f8;
- /*
- background-color: #f8f8f8;
- background-image: -o-linear-gradient(top, rgba(250,250,250,.6) 0%, rgba(192,192,192,.3) 100%);
- background-image: -moz-linear-gradient(top, rgba(250,250,250,.6) 0%, rgba(192,192,192,.3) 100%);
- background-image: -webkit-linear-gradient(top, rgba(250,250,250,.6) 0%, rgba(192,192,192,.3) 100%);
- background-image: -ms-linear-gradient(top, rgba(250,250,250,.6) 0%, rgba(192,192,192,.3) 100%);
- background-image: linear-gradient(top, rgba(250,250,250,.6) 0%, rgba(192,192,192,.3) 100%);
- */
+}
+.login_main_message {
+ text-align: center;
}
div#login_left, div#login_right {
display: inline-block;
@@ -1944,6 +1938,16 @@ table.liste td {
.tagtd, .table-border-col, .table-key-border-col, .table-val-border-col { display: table-cell; }
/* Pagination */
+div.refidpadding {
+ padding-top: <?php print empty($conf->dol_use_jmobile)?'8':'12'; ?>px;
+}
+div.refid {
+ padding-top: <?php print empty($conf->dol_use_jmobile)?'5':'12'; ?>px;
+ font-weight: bold;
+ color: #766;
+ font-size: 120%;
+}
+
div.pagination {
float: right;
}
@@ -1962,8 +1966,10 @@ div.pagination li {
display: inline-block;
padding-left: 0px;
padding-right: 0px;
+<?php if (empty($conf->dol_use_jmobile)) { ?>
padding-top: 6px;
- padding-bottom: 6px;
+ padding-bottom: 5px;
+<?php } ?>
}
.pagination {
display: inline-block;
@@ -1971,15 +1977,46 @@ div.pagination li {
border-radius: 4px;
}
-div.pagination li a,
-div.pagination li span {
- /*position: relative;*/
- /*float: left;*/
+div.pagination li.pagination a,
+div.pagination li.pagination span {
+<?php if (empty($conf->dol_use_jmobile)) { ?>
padding: 6px 12px;
margin-left: -1px;
line-height: 1.42857143;
color: #000;
text-decoration: none;
+
+ background-color: #f5f5f5;
+ background-image: -moz-linear-gradient(top, #ffffff, #e6e6e6);
+ background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#e6e6e6));
+ background-image: -webkit-linear-gradient(top, #ffffff, #e6e6e6);
+ background-image: -o-linear-gradient(top, #ffffff, #e6e6e6);
+ background-image: linear-gradient(to bottom, #ffffff, #e6e6e6);
+ background-repeat: repeat-x;
+<?php } ?>
+}
+div.pagination li.pagination span.inactive {
+ cursor: default;
+}
+div.pagination li.litext a {
+border: none;
+ padding-right: 10px;
+ padding-left: 4px;
+ font-weight: bold;
+}
+<?php if (! empty($conf->dol_use_jmobile)) { ?>
+div.pagination li.litext {
+ padding-top: 13px;
+ vertical-align: top;
+}
+<?php } ?>
+<?php if (empty($conf->dol_use_jmobile)) { ?>
+div.pagination li.noborder a:hover {
+ border: none;
+ background-color: transparent;
+}
+div.pagination li a,
+div.pagination li span {
background-color: #fff;
border: 1px solid #ddd;
}
@@ -2025,6 +2062,7 @@ div.pagination .disabled a:focus {
background-color: #fff;
border-color: #ddd;
}
+<?php } ?>
div.pagination li.pagination .active {
text-decoration: underline;
}
@@ -2062,10 +2100,10 @@ div.pagination li.paginationafterarrows {
/* Set the color for hover lines */
.odd:hover, .impair:hover, .even:hover, .pair:hover, .even:hover, .pair:hover, table.dataTable tr.even:hover, table.dataTable tr.odd:hover, .box_pair:hover, .box_impair:hover
{
-<?php if ($colorbacklineimpairhover) { ?>
- background: rgb(<?php echo $colorbacklineimpairhover; ?>) !important;
+<?php if ($colorbacklinepairhover) { ?>
+ background: rgb(<?php echo $colorbacklinepairhover; ?>) !important;
<?php } else { ?>
- background: rgba(0, 0, 0, 0.05) !important;
+ /* background: rgba(0, 0, 0, 0.05) !important; */
<?php } ?>
}
diff --git a/htdocs/theme/md_exp/tpl/README b/htdocs/theme/md/tpl/README
similarity index 100%
rename from htdocs/theme/md_exp/tpl/README
rename to htdocs/theme/md/tpl/README
diff --git a/htdocs/theme/md_exp/tpl/index.html b/htdocs/theme/md/tpl/index.html
similarity index 100%
rename from htdocs/theme/md_exp/tpl/index.html
rename to htdocs/theme/md/tpl/index.html