From 0743521b6b3cea1b2022b64b1c3465cd00c5d473 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur <eldy@destailleur.fr> Date: Sun, 28 Jul 2013 05:35:51 +0200 Subject: [PATCH] - No need to load css of plugin fileupload (plugin never loaded). Too much bugged to be included by default. - Vertical menu must be under horizontal menu, even if horizontal menu is wrapped. - Add an empty li at end of list to provide more options for skins. --- htdocs/core/menus/standard/auguria.lib.php | 3 +++ htdocs/core/menus/standard/eldy.lib.php | 3 +++ htdocs/core/menus/standard/empty.php | 3 +++ htdocs/main.inc.php | 9 ++++----- 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/htdocs/core/menus/standard/auguria.lib.php b/htdocs/core/menus/standard/auguria.lib.php index 2ee1c2627a7..6d04f9a1a70 100644 --- a/htdocs/core/menus/standard/auguria.lib.php +++ b/htdocs/core/menus/standard/auguria.lib.php @@ -90,6 +90,9 @@ function print_auguria_menu($db,$atarget,$type_user,&$tabMenu,&$menu,$noout=0) $menu->add($shorturl, $newTabMenu[$i]['titre'], 0, $showmode, ($newTabMenu[$i]['target']?$newTabMenu[$i]['target']:$atarget), ($newTabMenu[$i]['mainmenu']?$newTabMenu[$i]['mainmenu']:$newTabMenu[$i]['rowid']), ''); } + if (empty($noout)) print_start_menu_entry('','class="tmenuend"',$showmode); + if (empty($noout)) print_end_menu_entry($showmode); + if (empty($noout)) print_end_menu_array_auguria(); print "\n"; diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php index 7a8ac8312fe..869960854c9 100644 --- a/htdocs/core/menus/standard/eldy.lib.php +++ b/htdocs/core/menus/standard/eldy.lib.php @@ -316,6 +316,9 @@ function print_eldy_menu($db,$atarget,$type_user,&$tabMenu,&$menu,$noout=0) $menu->add($shorturl, $newTabMenu[$i]['titre'], 0, $showmode, ($newTabMenu[$i]['target']?$newTabMenu[$i]['target']:$atarget), ($newTabMenu[$i]['mainmenu']?$newTabMenu[$i]['mainmenu']:$newTabMenu[$i]['rowid']), ''); } + if (empty($noout)) print_start_menu_entry('','class="tmenuend"',$showmode); + if (empty($noout)) print_end_menu_entry($showmode); + if (empty($noout)) print_end_menu_array(); } diff --git a/htdocs/core/menus/standard/empty.php b/htdocs/core/menus/standard/empty.php index 4062708028d..13d4853f023 100644 --- a/htdocs/core/menus/standard/empty.php +++ b/htdocs/core/menus/standard/empty.php @@ -91,6 +91,9 @@ class MenuManager if (empty($noout)) print_end_menu_entry_empty($showmode); $this->menu->add(dol_buildpath('/index.php',1), $langs->trans("Home"), 0, $showmode, $this->atarget, 'home', ''); + if (empty($noout)) print_start_menu_entry('','class="tmenuend"',$showmode); + if (empty($noout)) print_end_menu_entry($showmode); + if (empty($noout)) print_end_menu_array_empty(); if ($mode == 'jmobile') diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index dd32c424fac..78d92c5ee3b 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -973,10 +973,10 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs else print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/css/'.$jquerytheme.'/jquery-ui-latest.custom.css" />'."\n"; // JQuery print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/tiptip/tipTip.css" />'."\n"; // Tooltip print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/jnotify/jquery.jnotify-alt.min.css" />'."\n"; // JNotify - if (! empty($conf->global->MAIN_USE_JQUERY_FILEUPLOAD) || (defined('REQUIRE_JQUERY_FILEUPLOAD') && constant('REQUIRE_JQUERY_FILEUPLOAD'))) // jQuery fileupload + /*if (! empty($conf->global->MAIN_USE_JQUERY_FILEUPLOAD) || (defined('REQUIRE_JQUERY_FILEUPLOAD') && constant('REQUIRE_JQUERY_FILEUPLOAD'))) // jQuery fileupload { print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/fileupload/css/jquery.fileupload-ui.css" />'."\n"; - } + }*/ if (! empty($conf->global->MAIN_USE_JQUERY_DATATABLES) || (defined('REQUIRE_JQUERY_DATATABLES') && constant('REQUIRE_JQUERY_DATATABLES'))) // jQuery datatables { //print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/datatables/css/jquery.dataTables.css" />'."\n"; @@ -1139,8 +1139,7 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/fileupload/js/jquery.fileupload-jui.js"></script>'."\n"; print '<!-- The XDomainRequest Transport is included for cross-domain file deletion for IE8+ -->'."\n"; print '<!--[if gte IE 8]><script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/fileupload/js/cors/jquery.xdr-transport.js"></script><![endif]-->'."\n"; - } - */ + }*/ // jQuery DataTables if (! empty($conf->global->MAIN_USE_JQUERY_DATATABLES) || (defined('REQUIRE_JQUERY_DATATABLES') && constant('REQUIRE_JQUERY_DATATABLES'))) { @@ -1465,7 +1464,7 @@ function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $a } if (! empty($conf->use_javascript_ajax) && ! empty($conf->global->MAIN_MENU_USE_JQUERY_LAYOUT)) print "</div><!-- End top layout -->\n"; - + print '<div style="clear: both;"></div>'; print "<!-- End top horizontal menu -->\n\n"; if (empty($conf->dol_hide_leftmenu) && (empty($conf->use_javascript_ajax) || empty($conf->global->MAIN_MENU_USE_JQUERY_LAYOUT))) print '<div id="id-container">'; -- GitLab