+ * The children context menu is to show all the immediate children that this model object owns,
+ * thereby providing quicker navigation to ancestors' siblings in the breadcrumb.
+ *
+ * @author Jan Faracik
+ * @see ModelObjectWithContextMenu
+ * @since ????
+ */
+public interface ModelObjectWithPageMenu extends ModelObject {
+ default ContextMenu doPageMenu(StaplerRequest request, StaplerResponse response) throws Exception {
+ ContextMenu contextMenu = new ContextMenu();
+
+ if (Functions.isModelWithContextMenu(this)) {
+ ModelObjectWithContextMenu modelObjectWithContextMenu = (ModelObjectWithContextMenu) this;
+ contextMenu.items.addAll(modelObjectWithContextMenu.doContextMenu(request, response).items);
+ }
+
+ if (Functions.isModelWithChildren(this)) {
+ ModelObjectWithChildren modelObjectWithChildren = (ModelObjectWithChildren) this;
+ ContextMenu childrenMenu = modelObjectWithChildren.doChildrenContextMenu(request, response);
+
+ if (!contextMenu.items.isEmpty() && !childrenMenu.items.isEmpty()) {
+ contextMenu.addSeparator();
+ }
+
+ contextMenu.items.addAll(childrenMenu.items);
+ }
+
+ return contextMenu;
+ }
+}
diff --git a/core/src/main/resources/lib/layout/breadcrumbs.js b/core/src/main/resources/lib/layout/breadcrumbs.js
index b33ff30c2c31..8e8a7c578270 100644
--- a/core/src/main/resources/lib/layout/breadcrumbs.js
+++ b/core/src/main/resources/lib/layout/breadcrumbs.js
@@ -128,17 +128,18 @@ var breadcrumbs = (function() {
if (e.items) {// use what's already loaded
showMenu(e.items());
} else {
- var items = []
// fetch menu on demand
- xhr = new Ajax.Request(combinePath(e.getAttribute("href"), "contextMenu"), {
+ xhr = new Ajax.Request(combinePath(e.getAttribute("href"), "pageMenu"), {
onComplete:function (x) {
- items = x.responseText.evalJSON().items;
+ var items = x.responseText.evalJSON().items;
function fillMenuItem(e) {
- if (e.header) {
+ if (e.type === "HEADER") {
e.text = makeMenuHtml(e.icon, "" + e.displayName + "");
+ } else if (e.type === "SEPARATOR") {
+ e.text = "-------------------------";
} else {
- e.text = makeMenuHtml(e.icon, e.displayName);
+ e.text = makeMenuHtml(e.icon, e.displayName);
}
if (e.subMenu!=null)
e.subMenu = {id:"submenu"+(iota++), itemdata:e.subMenu.items.each(fillMenuItem)};
@@ -151,37 +152,10 @@ var breadcrumbs = (function() {
}
}
items.each(fillMenuItem);
+ e.items = function() { return items };
+ showMenu(items);
}
});
-
- // items.append("")
-
- // fetch menu on demand
- xhr2 = new Ajax.Request(combinePath(e.getAttribute("href"), "childrenContextMenu"), {
- onComplete:function (x) {
- tempItems = x.responseText.evalJSON().items;
- function fillMenuItem(e) {
- if (e.header) {
- e.text = makeMenuHtml(e.icon, "" + e.displayName + "");
- } else {
- e.text = makeMenuHtml(e.icon, e.displayName);
- }
- if (e.subMenu!=null)
- e.subMenu = {id:"submenu"+(iota++), itemdata:e.subMenu.items.each(fillMenuItem)};
- if (e.requiresConfirmation) {
- e.onclick = {fn: requireConfirmation, obj: {url: e.url, displayName: e.displayName, post: e.post}};
- delete e.url;
- } else if (e.post) {
- e.onclick = {fn: postRequest, obj: e.url};
- delete e.url;
- }
- }
- tempItems.each(fillMenuItem);
- }
- });
-
- e.items = function() { return [...items, ...tempItems] };
- showMenu([...items, ...tempItems]);
}
return false;
diff --git a/war/src/main/less/modules/breadcrumbs.less b/war/src/main/less/modules/breadcrumbs.less
index b0c39c421a0e..418dccaeafd9 100644
--- a/war/src/main/less/modules/breadcrumbs.less
+++ b/war/src/main/less/modules/breadcrumbs.less
@@ -35,7 +35,7 @@
justify-content: center;
padding: 0.2rem 0.4rem;
font-weight: 600;
- font-size: 0.9rem;
+ font-size: 0.85rem;
border-radius: 6px;
color: var(--text-color);
z-index: 0;
From 8abb6c3f828e414b9d62af1c558160044657b468 Mon Sep 17 00:00:00 2001
From: Jan Faracik <43062514+janfaracik@users.noreply.github.com>
Date: Sun, 2 Jan 2022 19:01:40 +0000
Subject: [PATCH 17/37] Fix config page breadcrumb dropdown, adjust js doc
---
.../lib/form/breadcrumb-config-outline.jelly | 4 ++--
.../lib/form/breadcrumb-config-outline/init.js | 6 +++++-
core/src/main/resources/lib/layout/breadcrumb.jelly | 4 ++--
core/src/main/resources/lib/layout/breadcrumbs.js | 11 ++++++-----
4 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/core/src/main/resources/lib/form/breadcrumb-config-outline.jelly b/core/src/main/resources/lib/form/breadcrumb-config-outline.jelly
index 19434e0f843c..83e3d1e1bec5 100644
--- a/core/src/main/resources/lib/form/breadcrumb-config-outline.jelly
+++ b/core/src/main/resources/lib/form/breadcrumb-config-outline.jelly
@@ -29,5 +29,5 @@ THE SOFTWARE.
- * The children context menu is to show all the immediate children that this model object owns,
- * thereby providing quicker navigation to ancestors' siblings in the breadcrumb.
+ * The page context menu is accessible to the user via the breadcrumb bar or via a link
+ * to the object's page. The page menu combines the page's contextMenu and childrenContextMenu,
+ * making it easier for users to navigate to all the ancestor objects this model object owns,
+ * and its children.
*
- * @author Jan Faracik
+ * @author Jan Faracik, Lewis Birks
* @see ModelObjectWithContextMenu
- * @since ????
+ * @since TODO - Provide version
*/
public interface ModelObjectWithPageMenu extends ModelObject {
default ContextMenu doPageMenu(StaplerRequest request, StaplerResponse response) throws Exception {
From d4eafef3b127a5fe50620808985455dd71d08abf Mon Sep 17 00:00:00 2001
From: Jan Faracik <43062514+janfaracik@users.noreply.github.com>
Date: Mon, 3 Jan 2022 13:00:30 +0000
Subject: [PATCH 19/37] Fix breadcrumb link
---
.../src/main/resources/lib/form/breadcrumb-config-outline.jelly | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/core/src/main/resources/lib/form/breadcrumb-config-outline.jelly b/core/src/main/resources/lib/form/breadcrumb-config-outline.jelly
index 83e3d1e1bec5..14a23b312304 100644
--- a/core/src/main/resources/lib/form/breadcrumb-config-outline.jelly
+++ b/core/src/main/resources/lib/form/breadcrumb-config-outline.jelly
@@ -29,5 +29,5 @@ THE SOFTWARE.
- * The page context menu is accessible to the user via the breadcrumb bar or via a link
- * to the object's page. The page menu combines the page's contextMenu and childrenContextMenu,
- * making it easier for users to navigate to all the ancestor objects this model object owns,
- * and its children.
- *
- * @author Jan Faracik, Lewis Birks
- * @see ModelObjectWithContextMenu
- * @since TODO - Provide version
- */
-public interface ModelObjectWithPageMenu extends ModelObject {
- default ContextMenu doPageMenu(StaplerRequest request, StaplerResponse response) throws Exception {
- ContextMenu contextMenu = new ContextMenu();
-
- if (Functions.isModelWithContextMenu(this)) {
- ModelObjectWithContextMenu modelObjectWithContextMenu = (ModelObjectWithContextMenu) this;
- contextMenu.items.addAll(modelObjectWithContextMenu.doContextMenu(request, response).items);
- }
-
- if (Functions.isModelWithChildren(this)) {
- ModelObjectWithChildren modelObjectWithChildren = (ModelObjectWithChildren) this;
- ContextMenu childrenMenu = modelObjectWithChildren.doChildrenContextMenu(request, response);
-
- if (!contextMenu.items.isEmpty() && !childrenMenu.items.isEmpty()) {
- contextMenu.addSeparator();
- }
-
- contextMenu.items.addAll(childrenMenu.items);
- }
-
- return contextMenu;
- }
-}
diff --git a/core/src/main/resources/lib/layout/breadcrumbBar.jelly b/core/src/main/resources/lib/layout/breadcrumbBar.jelly
index 62940e069b91..770e4ee15beb 100644
--- a/core/src/main/resources/lib/layout/breadcrumbBar.jelly
+++ b/core/src/main/resources/lib/layout/breadcrumbBar.jelly
@@ -43,7 +43,7 @@ THE SOFTWARE.
${%offline})
- ${%offline})
+