From 54eb759b74e136992d0ed6807bb459aeec8ccc8c Mon Sep 17 00:00:00 2001 From: Jan Faracik <43062514+janfaracik@users.noreply.github.com> Date: Tue, 25 Apr 2023 08:41:05 +0100 Subject: [PATCH] Update link dropdown menus to use new Tippy dropdowns (#7474) * Squashed commit of the following: commit 0fafc6f2b50c817c11a6149fb4374bfb1a1d486a Merge: 9046da814f d3d1c88d29 Author: Jan Faracik <43062514+janfaracik@users.noreply.github.com> Date: Sun Dec 4 21:31:15 2022 +0000 Merge branch 'master' into add-model-link-dropdowns commit 9046da814f3aa26ec19ece970b25a29375377bfa Author: Jan Faracik <43062514+janfaracik@users.noreply.github.com> Date: Sun Dec 4 21:31:09 2022 +0000 Reset commit 5f81d254112c7179f9c83e7dd3650aa9ba0b0c37 Author: Jan Faracik <43062514+janfaracik@users.noreply.github.com> Date: Sat Nov 26 00:56:02 2022 +0000 Update prototype.js commit dab47993c6c5f9bd77e83d392c737f3d6d3ba830 Merge: b166f016a3 221ff946b3 Author: Jan Faracik <43062514+janfaracik@users.noreply.github.com> Date: Fri Nov 25 22:32:28 2022 +0000 Merge branch 'master' into add-model-link-dropdowns commit b166f016a3e81b3787702e061cb7793a79295a49 Author: Jan Faracik <43062514+janfaracik@users.noreply.github.com> Date: Fri Nov 25 20:11:45 2022 +0000 Add support for breadcrumb-config-outline commit cc05b743192bdfbf68d1399f77a32583f2a65182 Author: Jan Faracik <43062514+janfaracik@users.noreply.github.com> Date: Wed Nov 23 23:03:40 2022 +0000 Imports commit d23b82247e9e2defb5501622f4c3a2b3c4ee95c7 Author: Jan Faracik <43062514+janfaracik@users.noreply.github.com> Date: Wed Nov 23 23:02:25 2022 +0000 Tidy up JS commit a578f6aa1f1b35db83a3543417b87381f636c3c7 Merge: f48e7ef370 51e084a01a Author: Jan Faracik <43062514+janfaracik@users.noreply.github.com> Date: Wed Nov 23 11:13:00 2022 +0000 Merge branch 'master' into add-model-link-dropdowns commit f48e7ef370b7e807689b2edea81d137ca1e7dddb Author: Jan Faracik <43062514+janfaracik@users.noreply.github.com> Date: Wed Nov 23 09:57:41 2022 +0000 Update dropdowns.less commit 8e54b2d9f17afd8c9d7ccf9f481ad1c571ed43d2 Author: Jan Faracik <43062514+janfaracik@users.noreply.github.com> Date: Wed Nov 23 00:54:33 2022 +0000 Init commit 0a161523b2e195dc89c75296111a0be0a9f9319e Author: Jan Faracik <43062514+janfaracik@users.noreply.github.com> Date: Mon Nov 21 19:56:48 2022 +0000 Update yarn.lock commit 8aa08f0fc1ac4e5d2c082e3e9b96344cb255257b Author: Jan Faracik <43062514+janfaracik@users.noreply.github.com> Date: Mon Nov 21 19:40:26 2022 +0000 Fix commit 7a2668ccfde9ec79dfb1fd20d0da70fb4817b1d7 Merge: faf3888e27 df89aa6855 Author: Jan Faracik <43062514+janfaracik@users.noreply.github.com> Date: Mon Nov 21 19:39:51 2022 +0000 Merge branch 'master' into add-dropdown-button commit faf3888e279e5ffb2ec99f47506548c435659c76 Author: Jan Faracik <43062514+janfaracik@users.noreply.github.com> Date: Fri Sep 23 23:57:35 2022 +0100 Update overflowButton.jelly commit 2c33dee5ec1f6cbcad335f12db58e84966af1ade Author: Jan Faracik <43062514+janfaracik@users.noreply.github.com> Date: Fri Sep 23 23:55:31 2022 +0100 Remove unused method, fix docs commit ed8c2b02e13306e810da721c69486011cfd80308 Author: Jan Faracik <43062514+janfaracik@users.noreply.github.com> Date: Fri Sep 23 23:48:51 2022 +0100 Fix link appearance commit 9d04e8092ff8bab60b76bdfb41d2431a6737ce6c Author: Jan Faracik <43062514+janfaracik@users.noreply.github.com> Date: Fri Sep 23 23:45:40 2022 +0100 Fix up commit 109dda954e29d8f85d5dcbaf9b630ce02d17648b Author: Jan Faracik <43062514+janfaracik@users.noreply.github.com> Date: Fri Sep 23 23:22:10 2022 +0100 Small cleanup commit 0f27194eba82073f513b205da991b6a729b40bb0 Author: Jan Faracik <43062514+janfaracik@users.noreply.github.com> Date: Fri Sep 23 23:19:39 2022 +0100 Lint commit e63c95620cec8f26fca33605389e5bac751471ac Merge: dccceff218 7cb5eb78c0 Author: Jan Faracik <43062514+janfaracik@users.noreply.github.com> Date: Fri Sep 23 23:18:39 2022 +0100 Merge branch 'master' into add-dropdown-button commit dccceff2185fb4870f1c4639579d472866975cb7 Author: Jan Faracik <43062514+janfaracik@users.noreply.github.com> Date: Wed Jul 27 19:21:39 2022 +0100 Update dropdowns.less commit 373b8d90a056453ebb8ccdbe613a8d2eb5c0be51 Author: Jan Faracik <43062514+janfaracik@users.noreply.github.com> Date: Wed Jul 27 19:20:40 2022 +0100 Update table.jelly commit 62dff833f3593981c093c0a2a63291cae0adda26 Author: Jan Faracik <43062514+janfaracik@users.noreply.github.com> Date: Wed Jul 27 19:19:51 2022 +0100 Update index.jelly commit 9bacedaac4b02d0b7786d22e06277903c2556c62 Author: Jan Faracik <43062514+janfaracik@users.noreply.github.com> Date: Wed Jul 27 19:19:32 2022 +0100 Update rowSelectionController.jelly commit 06591b1e01f6eb51721edce588f9f818ee9a4cad Author: Jan Faracik <43062514+janfaracik@users.noreply.github.com> Date: Wed Jul 27 19:18:30 2022 +0100 Update row selection controller to use new dropdown component commit 21b5844fde72cf81d0ff4a57358a9e35d98c8afb Author: Jan Faracik <43062514+janfaracik@users.noreply.github.com> Date: Wed Jul 27 19:02:52 2022 +0100 Restyle commit 9966fe79472fdd7b9229143089d4161a6ddf0ab6 Author: Jan Faracik <43062514+janfaracik@users.noreply.github.com> Date: Wed Jul 27 18:49:06 2022 +0100 WB commit 81b073a7143256b6369470794f947b6d989bd957 Merge: 8b58f7234b 315b2f410c Author: Jan Faracik <43062514+janfaracik@users.noreply.github.com> Date: Wed Jul 27 18:29:11 2022 +0100 Merge branch 'master' into add-dropdown-button commit 8b58f7234b96acb0263f02d54cffc3e1fe4705e1 Author: Jan Faracik <43062514+janfaracik@users.noreply.github.com> Date: Wed Jul 20 08:41:48 2022 +0100 Replace icon with hand made divs commit 22908c71d286dbb907acc52df1cea49f7966c5d9 Merge: fb89bc5891 b3320ca766 Author: Jan Faracik <43062514+janfaracik@users.noreply.github.com> Date: Tue Jul 19 23:28:58 2022 +0100 Merge branch 'new-buttons-1-dashboard' into add-dropdown-button commit fb89bc5891ba15558fef93ddad30e881c7a08175 Author: Jan Faracik <43062514+janfaracik@users.noreply.github.com> Date: Tue Jul 19 23:28:37 2022 +0100 Init commit b3320ca7665bb2fdbada03ae382a36449b979854 Merge: 1fa24ea550 f52d99a0e5 Author: Jan Faracik <43062514+janfaracik@users.noreply.github.com> Date: Thu Jul 14 09:50:06 2022 +0100 Merge branch 'master' into new-buttons-1-dashboard commit 1fa24ea55051077c7824a3640dcb3d8b7f72f616 Merge: 8598f99f00 a990ebcda4 Author: Jan Faracik <43062514+janfaracik@users.noreply.github.com> Date: Wed Jul 13 00:02:33 2022 +0100 Merge branch 'master' into new-buttons-1-dashboard commit 8598f99f003ee071b662fe01338c3e3e0b6c56c7 Author: Alexander Brandes Date: Mon Jul 11 15:11:36 2022 +0200 style: Address stylelint violations commit fd4da119c40628ac18c7b5765ffc5b723e6df28a Merge: 0480268a50 aba1c17ede Author: Alexander Brandes Date: Sun Jul 10 23:30:55 2022 +0200 Merge branch 'master' into new-buttons-1-dashboard commit 0480268a50ab185b183e79e34dd48f2d921da832 Merge: 9b145b1ae4 ab0bb84958 Author: Jan Faracik <43062514+janfaracik@users.noreply.github.com> Date: Sat Jul 9 21:52:43 2022 +0100 Merge branch 'master' into new-buttons-1-dashboard commit 9b145b1ae48e17f55d5891186e833857f0949152 Merge: 418ab063b2 03617e0b43 Author: Jan Faracik <43062514+janfaracik@users.noreply.github.com> Date: Fri Jul 8 19:44:20 2022 +0100 Merge branch 'master' into new-buttons-1-dashboard commit 418ab063b251dc00e300b4fadf917fb0ade1957d Author: Jan Faracik <43062514+janfaracik@users.noreply.github.com> Date: Thu Jul 7 22:41:32 2022 +0100 Update buttons-deprecated.less commit 2798afa6df0cad852abe5ec024ac9efe25524c28 Merge: 296e309afc 6de288f424 Author: Jan Faracik <43062514+janfaracik@users.noreply.github.com> Date: Thu Jul 7 22:40:35 2022 +0100 Merge branch 'master' into new-buttons-1-dashboard commit 296e309afc4117c82577408e0324e71299f424cf Merge: 1e646ff7ee 22dcefcd8f Author: Jan Faracik <43062514+janfaracik@users.noreply.github.com> Date: Thu Jul 7 14:50:14 2022 +0100 Merge branch 'master' into new-buttons-1-dashboard commit 1e646ff7ee52ecbbca3d7957b65fb4edfd39d653 Author: Jan Faracik <43062514+janfaracik@users.noreply.github.com> Date: Wed Jul 6 22:59:13 2022 +0100 Use rem, fix cursor for dashboard icon size commit 21d4c73d9e0a653769004540cecf580dce82dd48 Author: Jan Faracik <43062514+janfaracik@users.noreply.github.com> Date: Wed Jul 6 22:56:05 2022 +0100 Update with master, make minor changes commit 1d59bd4a2114d75b149a0253e68dd4e1bb68f606 Merge: f6fc19bd3e 644a261e78 Author: Jan Faracik <43062514+janfaracik@users.noreply.github.com> Date: Wed Jul 6 22:48:59 2022 +0100 Merge branch 'master' into new-buttons-1-dashboard commit f6fc19bd3ef85797cb255b345409951a9f67848a Author: Jan Faracik <43062514+janfaracik@users.noreply.github.com> Date: Sun Jun 26 22:58:12 2022 +0100 Update dashboard.less commit 665daa0b85ab31f934f5bf766e777bc92309c256 Merge: a57f13ac88 c60ea9210c Author: Jan Faracik <43062514+janfaracik@users.noreply.github.com> Date: Sun Jun 26 22:52:33 2022 +0100 Merge branch 'master' into new-buttons-1-dashboard commit a57f13ac88dec3f99db86c9480143a550a8daca1 Author: Jan Faracik <43062514+janfaracik@users.noreply.github.com> Date: Mon Jun 20 19:01:18 2022 +0100 Update simple-page.less commit 2d3695d1639d0ebf639ee64cda2a8365885ad9a5 Author: Jan Faracik <43062514+janfaracik@users.noreply.github.com> Date: Sun Jun 19 22:24:32 2022 +0100 Update theme.less commit 361f06c7efd33a06ce484cda2778bb41060abbf6 Author: Jan Faracik <43062514+janfaracik@users.noreply.github.com> Date: Sun Jun 19 22:22:48 2022 +0100 Split out vars commit 205336fe9ff4f660f70c7b3216f1283806db8da5 Author: Jan Faracik <43062514+janfaracik@users.noreply.github.com> Date: Sun Jun 19 21:48:33 2022 +0100 Move files about, fix focus state, fix colors commit 204bafbef1a5857b3cf17e5c7dc88a42745a1150 Author: Jan Faracik <43062514+janfaracik@users.noreply.github.com> Date: Sun Jun 19 21:00:57 2022 +0100 Update buttons to support colors commit 1d4be07f5208aa260375801a7c9f80b947c26504 Merge: c4075772f0 2391319f45 Author: Jan Faracik <43062514+janfaracik@users.noreply.github.com> Date: Sun Jun 19 20:01:19 2022 +0100 Merge branch 'move-manage-jenkins-less' into new-buttons-1-dashboard commit c4075772f0a457fdad9469b4ccb6ae3678f18572 Merge: 0c8d538242 65fcda1350 Author: Jan Faracik <43062514+janfaracik@users.noreply.github.com> Date: Sun Jun 19 20:01:02 2022 +0100 Merge branch 'master' into new-buttons-1-dashboard commit 2391319f456ab48cee33edc6832d4d160dc692db Merge: c9e2823d4a ac66b476d9 Author: Jan Faracik <43062514+janfaracik@users.noreply.github.com> Date: Thu Jun 16 17:47:45 2022 +0100 Merge branch 'master' into move-manage-jenkins-less commit c9e2823d4a688fcdd1450d682a425e59142678a0 Author: Jan Faracik <43062514+janfaracik@users.noreply.github.com> Date: Thu Jun 16 17:35:37 2022 +0100 Update colors commit c78dfd6b509821a23a0d1416f14b4d98048510fe Author: Jan Faracik <43062514+janfaracik@users.noreply.github.com> Date: Thu Jun 16 17:33:47 2022 +0100 Update theme.less commit 0996e759d6879c4f304603d08a0465dad49dbc10 Author: Jan Faracik <43062514+janfaracik@users.noreply.github.com> Date: Thu Jun 16 17:32:52 2022 +0100 Update theme.less commit e57bc28553bfd42fa1101332bc2e168fca99bb81 Author: Jan Faracik <43062514+janfaracik@users.noreply.github.com> Date: Thu Jun 16 17:29:15 2022 +0100 Update theme.less commit 69c1633e1e5c7f8f2aa5840f128427b71545536a Author: Jan Faracik <43062514+janfaracik@users.noreply.github.com> Date: Thu Jun 16 17:00:06 2022 +0100 Update style.less commit e21d4e7ccb85171c96372e368147730ac0b33060 Author: Jan Faracik <43062514+janfaracik@users.noreply.github.com> Date: Wed Jun 15 19:03:50 2022 +0100 Update breadcrumbs to use new item mixin commit 90fc4ba1470b17d08f0b170761f489e1f2e30045 Author: Jan Faracik <43062514+janfaracik@users.noreply.github.com> Date: Wed Jun 15 18:57:51 2022 +0100 Rename mixin commit 28d06386cee2dd4a377bb570b594be01f6b94648 Merge: d1f42acfd5 65fcda1350 Author: Jan Faracik <43062514+janfaracik@users.noreply.github.com> Date: Tue Jun 14 23:35:10 2022 +0100 Merge branch 'master' into move-manage-jenkins-less commit d1f42acfd5edb6659d800dd78eb4412f4ae66909 Author: Jan Faracik <43062514+janfaracik@users.noreply.github.com> Date: Fri Jun 10 11:13:58 2022 +0100 Update table.less commit 13d572989206124655a5aa9034ebff68fe9c92e2 Author: Jan Faracik <43062514+janfaracik@users.noreply.github.com> Date: Thu Jun 9 10:03:01 2022 +0100 Move from px to rem commit 68f5425a7b67b5f13a9b14007c81dd752c71cae7 Author: Jan Faracik <43062514+janfaracik@users.noreply.github.com> Date: Wed Jun 8 16:40:41 2022 +0100 Update theme.less commit 929e2d5e5abcffc833e74a5346494789c2bf2c51 Author: Jan Faracik <43062514+janfaracik@users.noreply.github.com> Date: Wed Jun 8 16:28:06 2022 +0100 Update mixins.less commit 8c4b4662a25657494b934ea9d9f8f7aba79f091d Merge: 8b22270188 77a36fcee9 Author: Jan Faracik <43062514+janfaracik@users.noreply.github.com> Date: Wed Jun 8 16:27:25 2022 +0100 Merge branch 'master' into move-manage-jenkins-less commit 8b2227018877e49f9fc013567ac910be4cd159d0 Author: Jan Faracik <43062514+janfaracik@users.noreply.github.com> Date: Wed Jun 8 16:19:42 2022 +0100 Update theme.less commit e925490722e5a0c256b3436f006107e69de95223 Author: Jan Faracik <43062514+janfaracik@users.noreply.github.com> Date: Wed Jun 8 16:17:02 2022 +0100 Add mixin for items commit 0c8d5382424e1779999dd6bda6da65ddd6c1b684 Author: Jan Faracik <43062514+janfaracik@users.noreply.github.com> Date: Sat Jun 4 00:15:05 2022 +0100 Update button styling commit 45c9d078bec881c3550781a2945cf2607edd0e3c Merge: e9cb78a924 77a36fcee9 Author: Jan Faracik <43062514+janfaracik@users.noreply.github.com> Date: Fri Jun 3 23:38:49 2022 +0100 Merge branch 'master' into new-buttons-1-dashboard commit d579dc5ae2142c96f47f4de496a8f1c973fb1831 Author: Jan Faracik <43062514+janfaracik@users.noreply.github.com> Date: Tue May 17 00:52:29 2022 +0100 Update section.less commit 43e4f5c48a888d181b294b9fbc3653a06a6644db Author: Jan Faracik <43062514+janfaracik@users.noreply.github.com> Date: Tue May 17 00:29:22 2022 +0100 Init commit e9cb78a924871cabef2ee2a229573c8d1e666cb5 Author: Jan Faracik <43062514+janfaracik@users.noreply.github.com> Date: Wed Apr 20 21:01:06 2022 +0100 Add backplate to table size toggles commit 8cbfe005613f46f2585f6fa15e55766d881c0c4c Merge: 41d45b5e1f b28d225d61 Author: Jan Faracik <43062514+janfaracik@users.noreply.github.com> Date: Wed Apr 20 20:30:39 2022 +0100 Merge branch 'master' into new-buttons-1-dashboard commit 41d45b5e1f18a2826b99e5d64a92ac4e400bb4d7 Author: Jan Faracik <43062514+janfaracik@users.noreply.github.com> Date: Mon Apr 18 12:50:17 2022 +0100 Initial * Remove old import * Simplify code * Update rowSelectionController.jelly * Update inpage-jumplist.js * Escape menu item labels * Temp commenting out * More HTMLUnit fixes * Revert "Temp commenting out" This reverts commit d61d94332fa1293c0b40572ce1c545a733d995a3. * Add support for left/right keyboard nav in menus, fix keyboard priority in submenus, add scroll into view, remove old menu target element * Send error to console rather than displaying it in dropdown * Use 'auto' for overscroll-y * Remove Util.escape(...) from withDisplayName builder * Remove unused import * Show 'No items' placeholder for menus with no items * Keep dropdown parent links active when expanded * Update jumplists.js * Potential fix for failing tests * Update utils.js * Update utils.js * Add badge support to dropdown menus * Remove font weight from badge * Merge master --------- Co-authored-by: Daniel Beck <1831569+daniel-beck@users.noreply.github.com> --- .../model/ModelObjectWithContextMenu.java | 3 +- .../lib/form/breadcrumb-config-outline.jelly | 1 - .../form/breadcrumb-config-outline/init.css | 7 - .../form/breadcrumb-config-outline/init.js | 24 -- .../resources/lib/layout/breadcrumbBar.jelly | 6 +- .../main/resources/lib/layout/breadcrumbs.js | 343 ------------------ war/src/main/js/app.js | 2 + war/src/main/js/components/dropdowns/index.js | 9 + .../components/dropdowns/inpage-jumplist.js | 26 ++ .../main/js/components/dropdowns/jumplists.js | 123 +++++++ .../main/js/components/dropdowns/templates.js | 103 ++++++ war/src/main/js/components/dropdowns/utils.js | 135 +++++++ war/src/main/js/util/behavior-shim.js | 7 +- war/src/main/js/util/keyboard.js | 29 +- war/src/main/js/util/path.js | 21 ++ war/src/main/scss/modules/breadcrumbs.scss | 11 +- war/src/main/scss/modules/dropdowns.scss | 222 ++++++++++++ war/src/main/scss/styles.scss | 1 + 18 files changed, 679 insertions(+), 394 deletions(-) delete mode 100644 core/src/main/resources/lib/form/breadcrumb-config-outline/init.css delete mode 100644 core/src/main/resources/lib/form/breadcrumb-config-outline/init.js delete mode 100644 core/src/main/resources/lib/layout/breadcrumbs.js create mode 100644 war/src/main/js/components/dropdowns/index.js create mode 100644 war/src/main/js/components/dropdowns/inpage-jumplist.js create mode 100644 war/src/main/js/components/dropdowns/jumplists.js create mode 100644 war/src/main/js/components/dropdowns/templates.js create mode 100644 war/src/main/js/components/dropdowns/utils.js create mode 100644 war/src/main/js/util/path.js create mode 100644 war/src/main/scss/modules/dropdowns.scss diff --git a/core/src/main/java/jenkins/model/ModelObjectWithContextMenu.java b/core/src/main/java/jenkins/model/ModelObjectWithContextMenu.java index 52b49131ad..69e1e236ca 100644 --- a/core/src/main/java/jenkins/model/ModelObjectWithContextMenu.java +++ b/core/src/main/java/jenkins/model/ModelObjectWithContextMenu.java @@ -2,7 +2,6 @@ package jenkins.model; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import hudson.Functions; -import hudson.Util; import hudson.model.Action; import hudson.model.Actionable; import hudson.model.BallColor; @@ -414,7 +413,7 @@ public interface ModelObjectWithContextMenu extends ModelObject { } public MenuItem withDisplayName(String displayName) { - this.displayName = Util.escape(displayName); + this.displayName = displayName; return this; } 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 41770e17da..7a5f4d3b20 100644 --- a/core/src/main/resources/lib/form/breadcrumb-config-outline.jelly +++ b/core/src/main/resources/lib/form/breadcrumb-config-outline.jelly @@ -32,6 +32,5 @@ THE SOFTWARE. - diff --git a/core/src/main/resources/lib/form/breadcrumb-config-outline/init.css b/core/src/main/resources/lib/form/breadcrumb-config-outline/init.css deleted file mode 100644 index dc5faf8d53..0000000000 --- a/core/src/main/resources/lib/form/breadcrumb-config-outline/init.css +++ /dev/null @@ -1,7 +0,0 @@ -A.section-anchor { - position: relative; - top: -2em; - visibility: hidden; - display: inline-block; - width: 0px; -} diff --git a/core/src/main/resources/lib/form/breadcrumb-config-outline/init.js b/core/src/main/resources/lib/form/breadcrumb-config-outline/init.js deleted file mode 100644 index 74523e37d9..0000000000 --- a/core/src/main/resources/lib/form/breadcrumb-config-outline/init.js +++ /dev/null @@ -1,24 +0,0 @@ -Event.observe(window, "load", function () { - /** @type section.SectionNode */ - var outline = section.buildTree(); - var menu = new breadcrumbs.ContextMenu(); - $A(outline.children).each(function (e) { - var id = "section" + iota++; // TODO: use human-readable ID - var caption = e.getHTML(); - var cur = $(e.section).down("A.section-anchor"); - if (cur != null) { - id = cur.id; - caption = caption.substring(caption.indexOf("</a>") + 4); - } else { - $(e.section).insert({ - top: "#", - }); - } - menu.add("#" + id, null, caption); - }); - var inpageNav = document.getElementById("inpage-nav"); - var chevron = document.createElement("li"); - chevron.classList.add("children"); - inpageNav.parentNode.insertBefore(chevron, inpageNav.nextSibling); - breadcrumbs.attachMenu(chevron, menu); -}); diff --git a/core/src/main/resources/lib/layout/breadcrumbBar.jelly b/core/src/main/resources/lib/layout/breadcrumbBar.jelly index 9be0ca3d49..a77723e50f 100644 --- a/core/src/main/resources/lib/layout/breadcrumbBar.jelly +++ b/core/src/main/resources/lib/layout/breadcrumbBar.jelly @@ -35,8 +35,6 @@ THE SOFTWARE. ]]> - - @@ -51,7 +49,7 @@ THE SOFTWARE. hasMenu="${h.isModelWithContextMenu(anc.object)}" /> -
  • +
    • @@ -67,6 +65,4 @@ THE SOFTWARE. - -