diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php index c0014074d75..c898550a3cb 100644 --- a/htdocs/core/class/conf.class.php +++ b/htdocs/core/class/conf.class.php @@ -46,7 +46,9 @@ class Conf //! Used to store current currency var $monnaie; //! Used to store current css (from theme) - var $css; + var $theme; // Contains current theme ("eldy", "auguria", ...) + var $css; // Contains full path of css page ("/theme/eldy/style.css.php", ...) + //! Used to store current menu handlers var $top_menu; var $left_menu; diff --git a/htdocs/includes/menus/barre_top/eldy.lib.php b/htdocs/includes/menus/barre_top/eldy.lib.php index ea9311923e6..c1979bf96ab 100644 --- a/htdocs/includes/menus/barre_top/eldy.lib.php +++ b/htdocs/includes/menus/barre_top/eldy.lib.php @@ -56,8 +56,8 @@ function print_eldy_menu($db,$atarget,$hideifnotallowed) } $idsel='home'; print_start_menu_entry($idsel); - print ''; - print '
'; + print ''; + print '
'; print ''; print ''; print_text_menu_entry($langs->trans("Home")); @@ -86,8 +86,8 @@ function print_eldy_menu($db,$atarget,$hideifnotallowed) || ($conf->fournisseur->enabled && $user->rights->fournisseur->lire)) { print_start_menu_entry($idsel); - print ''; - print '
'; + print ''; + print '
'; print ''; print ''; print_text_menu_entry($langs->trans("ThirdParties")); @@ -132,8 +132,8 @@ function print_eldy_menu($db,$atarget,$hideifnotallowed) if ($user->rights->produit->lire || $user->rights->service->lire) { print_start_menu_entry($idsel); - print ''; - print '
'; + print ''; + print '
'; print ''; print ''; print_text_menu_entry($chaine); @@ -173,8 +173,8 @@ function print_eldy_menu($db,$atarget,$hideifnotallowed) if($user->rights->societe->lire || $user->rights->societe->contact->lire) { print_start_menu_entry($idsel); - print ''; - print '
'; + print ''; + print '
'; print ''; print ''; print_text_menu_entry($langs->trans("Commercial")); @@ -216,8 +216,8 @@ function print_eldy_menu($db,$atarget,$hideifnotallowed) || $user->rights->facture->lire || $user->rights->banque->lire) { print_start_menu_entry($idsel); - print ''; - print '
'; + print ''; + print '
'; print ''; print ''; print_text_menu_entry($langs->trans("MenuFinancial")); @@ -258,8 +258,8 @@ function print_eldy_menu($db,$atarget,$hideifnotallowed) if ($user->rights->banque->lire) { print_start_menu_entry($idsel); - print ''; - print '
'; + print ''; + print '
'; print ''; print ''; print_text_menu_entry($langs->trans("MenuBankCash")); @@ -299,8 +299,8 @@ function print_eldy_menu($db,$atarget,$hideifnotallowed) if ($user->rights->projet->lire) { print_start_menu_entry($idsel); - print ''; - print '
'; + print ''; + print '
'; print ''; print ''; print_text_menu_entry($langs->trans("Projects")); @@ -340,8 +340,8 @@ function print_eldy_menu($db,$atarget,$hideifnotallowed) if ($user->rights->mailing->lire || $user->rights->bookmark->lire || $user->rights->export->lire || $user->rights->import->run) { print_start_menu_entry($idsel); - print ''; - print '
'; + print ''; + print '
'; print ''; print ''; print_text_menu_entry($langs->trans("Tools")); @@ -379,8 +379,8 @@ function print_eldy_menu($db,$atarget,$hideifnotallowed) $idsel='shop'; print_start_menu_entry($idsel); - print ''; - print '
'; + print ''; + print '
'; print ''; print ''; print_text_menu_entry($langs->trans("OSCommerce")); @@ -407,8 +407,8 @@ function print_eldy_menu($db,$atarget,$hideifnotallowed) if ($user->rights->adherent->lire) { print_start_menu_entry($idsel); - print ''; - print '
'; + print ''; + print '
'; print ''; print ''; print_text_menu_entry($langs->trans("MenuMembers")); @@ -468,8 +468,8 @@ function print_eldy_menu($db,$atarget,$hideifnotallowed) else $classname='class="tmenu"'; print_start_menu_entry($idsel); - print ''; - print '
'; + print ''; + print '
'; print ''; print ''; print_text_menu_entry($tabMenu[$i]['titre']); @@ -481,7 +481,7 @@ function print_eldy_menu($db,$atarget,$hideifnotallowed) if (! $hideifnotallowed) { print_start_menu_entry($idsel); - print '
'; + print '
'; print ''; print_text_menu_entry($tabMenu[$i]['titre']); print ''; diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index 36affbacc21..e177bd1a22d 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -331,7 +331,7 @@ if (! defined('NOLOGIN')) // Fin appel triggers } } - + // Validation of third party module login method if (is_array($conf->login_method_modules) && !empty($conf->login_method_modules)) { @@ -801,13 +801,13 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs print ''."\n"; // Output style sheets (optioncss='print' or '') - print ''."\n"; + print ''."\n"; // CSS forced by modules (relative url starting with /) if (is_array($conf->css_modules)) { foreach($conf->css_modules as $cssfile) { // cssfile is an absolute path - print ''."\n"; + print ''."\n"; } } // CSS forced by page in top_htmlhead call (relative url starting with /) @@ -815,7 +815,7 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs { foreach($arrayofcss as $cssfile) { - print ''."\n"; + print ''."\n"; } } @@ -1256,23 +1256,23 @@ function printSearchForm($urlaction,$urlobject,$title,$htmlmodesearch='search',$ function getLoginMethod() { global $conf,$langs; - + $login = ''; foreach($conf->login_method_modules as $dir) { // Check if directory exists if (!is_dir($dir)) continue; - + $handle=opendir($dir); - + while (($file = readdir($handle))!==false) { if (is_readable($dir.'/'.$file) && preg_match('/^functions_([^_]+)\.php/',$file,$reg)) { $authfile = $dir.'/'.$file; $mode = $reg[1]; - + $result=include_once($authfile); if ($result) { diff --git a/htdocs/theme/auguria/style.css.php b/htdocs/theme/auguria/style.css.php index f3fa90937ed..0cca470373a 100644 --- a/htdocs/theme/auguria/style.css.php +++ b/htdocs/theme/auguria/style.css.php @@ -401,6 +401,12 @@ foreach($mainmenuusedarray as $key => $val) .tmenudisabled { color: #D0D0D0 !important; } + +.tmenuimage { + padding:0 0 0 0 !important; + margin:0 0px 0 0 !important; +} + /* --- end nav --- */ diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index bee23a175c6..eca05d12f1d 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -334,6 +334,10 @@ div.mainmenu.tools { background-image: url(); } +div.mainmenu.ftp { + background-image: url(); +} + div.mainmenu.members { background-image: url(); } @@ -421,6 +425,13 @@ foreach($mainmenuusedarray as $key => $val) } // End test if not phone ?> +.tmenuimage { + padding:0 0 0 0 !important; + margin:0 0px 0 0 !important; +} + + + /* Login */ a.login