diff --git a/htdocs/bookmarks/bookmarks.lib.php b/htdocs/bookmarks/bookmarks.lib.php index 2e7d105af34..5c93eaa1a95 100644 --- a/htdocs/bookmarks/bookmarks.lib.php +++ b/htdocs/bookmarks/bookmarks.lib.php @@ -197,7 +197,7 @@ function printDropdownBookmarksList($aDb, $aLangs) $searchForm = ''."\n"; $searchForm.= '
'; - $searchForm.= ''; + $searchForm.= ''; $searchForm.= '
'; // Url to list bookmark @@ -217,23 +217,75 @@ function printDropdownBookmarksList($aDb, $aLangs) } - $html = ' + $bookmarkList=''; + $html= ''; + if (! empty($conf->global->BOOKMARKS_SHOW_IN_MENU)) { + $html.= '
- '.$searchForm.' + ' . $searchForm . '
+ '; + } + $html.= ' -
+
+ '.$bookmarkList.' +
+ '; + $html.= ' '; + + '; + if (! empty($conf->global->BOOKMARKS_SHOW_IN_MENU)) { + $html .= ''; + } return $html; diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index 1584bded9f7..bba6c05a7af 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -1933,9 +1933,9 @@ function top_menu_bookmark(User $user, Translate $langs) $html.= '