diff --git a/dev/skeletons/modMyModule.class.php b/dev/skeletons/modMyModule.class.php index 50676b17ec4..b57124da396 100644 --- a/dev/skeletons/modMyModule.class.php +++ b/dev/skeletons/modMyModule.class.php @@ -77,7 +77,7 @@ class modMyModule extends DolibarrModules // 'login' => 0, // Set this to 1 if module has its own login method directory (core/login) // 'substitutions' => 0, // Set this to 1 if module has its own substitution function file (core/substitutions) // 'menus' => 0, // Set this to 1 if module has its own menus handler directory (core/menus) - // 'theme' => 0, // Set this to 1 if module has its own theme directory (core/theme) + // 'theme' => 0, // Set this to 1 if module has its own theme directory (theme) // 'tpl' => 0, // Set this to 1 if module overwrite template dir (core/tpl) // 'barcode' => 0, // Set this to 1 if module has its own barcode directory (core/modules/barcode) // 'models' => 0, // Set this to 1 if module has its own models directory (core/modules/xxx) diff --git a/htdocs/core/lib/usergroups.lib.php b/htdocs/core/lib/usergroups.lib.php index 041234bf206..2b01ce15413 100644 --- a/htdocs/core/lib/usergroups.lib.php +++ b/htdocs/core/lib/usergroups.lib.php @@ -78,13 +78,13 @@ function user_prepare_head($object) $head[$h][2] = 'clicktodial'; $h++; } - + // Show more tabs from modules // Entries must be declared in modules descriptor with line // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to add new tab // $this->tabs = array('entity:-tabname); to remove a tab complete_head_from_modules($conf,$langs,$object,$head,$h,'user'); - + //Info on users is visible only by internal user if (empty($user->societe_id)) { @@ -164,17 +164,17 @@ function user_admin_prepare_head() $langs->load("users"); $h=0; - + $head[$h][0] = DOL_URL_ROOT.'/admin/user.php'; $head[$h][1] = $langs->trans("Parameters"); $head[$h][2] = 'card'; $h++; - + $head[$h][0] = DOL_URL_ROOT.'/user/admin/user_extrafields.php'; $head[$h][1] = $langs->trans("ExtraFields"); $head[$h][2] = 'attributes'; $h++; - + // Show more tabs from modules // Entries must be declared in modules descriptor with line // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to add new tab @@ -234,7 +234,8 @@ function show_theme($fuser,$edit=0,$foruserprofile=false) } } $dirthemes=array_unique($dirthemes); - + // Now dir_themes=array('/themes') or dir_themes=array('/theme','/mymodule/theme') + $selected_theme=''; if (empty($foruserprofile)) $selected_theme=$conf->global->MAIN_THEME; else $selected_theme=empty($fuser->conf->MAIN_THEME)?'':$fuser->conf->MAIN_THEME; @@ -290,10 +291,10 @@ function show_theme($fuser,$edit=0,$foruserprofile=false) print ''; $i=0; - foreach($dirthemes as $dir) { - $dirtheme=dol_buildpath($dir,0); + //print $dirroot.$dir;exit; + $dirtheme=dol_buildpath($dir,0); // This include loop on $conf->file->dol_document_root $urltheme=dol_buildpath($dir,1); if (is_dir($dirtheme))