From d17f0c57e212083563ba81d99791e9a99dbf578f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 2 Sep 2022 11:27:16 +0200
Subject: [PATCH] NEW Link "add to bookmark" always on top in the bookmark
 popup

---
 htdocs/bookmarks/bookmarks.lib.php | 33 +++++++++++++++++-------------
 htdocs/langs/en_US/bookmarks.lang  |  1 +
 htdocs/theme/eldy/dropdown.inc.php |  2 +-
 htdocs/theme/md/dropdown.inc.php   |  2 +-
 4 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/htdocs/bookmarks/bookmarks.lib.php b/htdocs/bookmarks/bookmarks.lib.php
index e5781d98561..448a5f085f1 100644
--- a/htdocs/bookmarks/bookmarks.lib.php
+++ b/htdocs/bookmarks/bookmarks.lib.php
@@ -64,11 +64,6 @@ function printDropdownBookmarksList()
 	$searchForm .= '<form id="top-menu-action-bookmark" name="actionbookmark" method="POST" action=""'.(empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? ' onsubmit="return false"' : '').'>';
 	$searchForm .= '<input type="hidden" name="token" value="'.newToken().'">';
 
-
-	// Url to list bookmark
-	$listbtn = '<a class="top-menu-dropdown-link" title="'.dol_escape_htmltag($langs->trans('Bookmarks')).'" href="'.DOL_URL_ROOT.'/bookmarks/list.php">';
-	$listbtn .= img_picto('', 'bookmark', 'class="paddingright"').$langs->trans('Bookmarks').'</a>';
-
 	// Url to go on create new bookmark page
 	$newbtn = '';
 	if (!empty($user->rights->bookmark->creer)) {
@@ -80,6 +75,10 @@ function printDropdownBookmarksList()
 		}
 	}
 
+	// Url to list/edit bookmark
+	$listbtn = '<a class="top-menu-dropdown-link" title="'.dol_escape_htmltag($langs->trans('Bookmarks')).'" href="'.DOL_URL_ROOT.'/bookmarks/list.php">';
+	$listbtn .= img_picto('', 'edit', 'class="paddingright opacitymedium"').$langs->trans('EditBookmarks').'</a>';
+
 	// Menu with list of bookmarks
 	$sql = "SELECT rowid, title, url, target FROM ".MAIN_DB_PREFIX."bookmark";
 	$sql .= " WHERE (fk_user = ".((int) $user->id)." OR fk_user is NULL OR fk_user = 0)";
@@ -171,27 +170,28 @@ function printDropdownBookmarksList()
 			';
 
 		$html .= '
-			<!-- Menu Body -->
-			<div class="bookmark-body dropdown-body">
-			'.$bookmarkList.'
-			</div>
-			';
-
-		$html .= '
-			<!-- Menu Footer-->
+			<!-- Menu bookmark tools-->
 			<div class="bookmark-footer">
 					'.$newbtn.$listbtn.'
 				<div style="clear:both;"></div>
 			</div>
 		';
 
+		$html .= '
+			<!-- Menu Body -->
+			<div class="bookmark-body dropdown-body">
+			'.$bookmarkList.'
+			<span id="top-bookmark-search-nothing-found" class="hidden-search-result opacitymedium">'.dol_escape_htmltag($langs->trans("NoBookmarkFound")).'</span>
+			</div>
+			';
+
 		$html .= '<!-- script to open/close the popup -->
 				<script>
 				$( document ).on("keyup", "#top-bookmark-search-input", function () {
+					console.log("keyup in bookmark search input");
 
 					var filter = $(this).val(), count = 0;
 					$("#dropdown-bookmarks-list .bookmark-item").each(function () {
-
 						if ($(this).text().search(new RegExp(filter, "i")) < 0) {
 							$(this).addClass("hidden-search-result");
 						} else {
@@ -200,6 +200,11 @@ function printDropdownBookmarksList()
 						}
 					});
 					$("#top-bookmark-search-filter-count").text(count);
+					if (count == 0) {
+						jQuery("#top-bookmark-search-nothing-found").removeClass("hidden-search-result");
+					} else {
+						jQuery("#top-bookmark-search-nothing-found").addClass("hidden-search-result");
+					}
 				});
 				</script>';
 	}
diff --git a/htdocs/langs/en_US/bookmarks.lang b/htdocs/langs/en_US/bookmarks.lang
index be0f2f7e25d..26551eee4f0 100644
--- a/htdocs/langs/en_US/bookmarks.lang
+++ b/htdocs/langs/en_US/bookmarks.lang
@@ -20,3 +20,4 @@ ChooseIfANewWindowMustBeOpenedOnClickOnBookmark=Choose if the linked page should
 BookmarksManagement=Bookmarks management
 BookmarksMenuShortCut=Ctrl + shift + m
 NoBookmarks=No bookmarks defined
+NoBookmarkFound=No bookmark found
\ No newline at end of file
diff --git a/htdocs/theme/eldy/dropdown.inc.php b/htdocs/theme/eldy/dropdown.inc.php
index 0ca47fbd2bb..bfde88726e9 100644
--- a/htdocs/theme/eldy/dropdown.inc.php
+++ b/htdocs/theme/eldy/dropdown.inc.php
@@ -257,7 +257,7 @@ a.top-menu-dropdown-link {
 .dropdown-menu > .user-body, .dropdown-body {
 	padding: 15px;
 	border-bottom: 1px solid #f4f4f4;
-	border-top: 1px solid #dddddd;
+	border-top: 1px solid #f0f0f0;
 	white-space: normal;
 }
 
diff --git a/htdocs/theme/md/dropdown.inc.php b/htdocs/theme/md/dropdown.inc.php
index 1f60f0b7c2a..64bebc67f79 100644
--- a/htdocs/theme/md/dropdown.inc.php
+++ b/htdocs/theme/md/dropdown.inc.php
@@ -260,7 +260,7 @@ a.top-menu-dropdown-link {
 .dropdown-menu > .user-body, .dropdown-body{
 	padding: 15px;
 	border-bottom: 1px solid #f4f4f4;
-	border-top: 1px solid #dddddd;
+	border-top: 1px solid #f0f0f0;
 	white-space: normal;
 }