You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by mg...@apache.org on 2014/12/16 22:11:58 UTC
isis git commit: ISIS-980 Do not render empty sub-menu sections in
the tertiary actions menu panel
Repository: isis
Updated Branches:
refs/heads/master 5a252cbbe -> ef797b1f0
ISIS-980 Do not render empty sub-menu sections in the tertiary actions menu panel
Show the divider only if there are custom sub menu items
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/ef797b1f
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/ef797b1f
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/ef797b1f
Branch: refs/heads/master
Commit: ef797b1f035b39cc867f42965b6a1f617300f61c
Parents: 5a252cb
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Tue Dec 16 23:09:46 2014 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Tue Dec 16 23:09:46 2014 +0200
----------------------------------------------------------------------
.../serviceactions/TertiaryActionsPanel.html | 3 ++-
.../serviceactions/TertiaryActionsPanel.java | 18 +++++++++++++++---
2 files changed, 17 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/ef797b1f/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/TertiaryActionsPanel.html
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/TertiaryActionsPanel.html b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/TertiaryActionsPanel.html
index 94b4870..3bdef47 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/TertiaryActionsPanel.html
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/TertiaryActionsPanel.html
@@ -7,7 +7,8 @@
<wicket:container wicket:id="content"></wicket:container>
</li>
- <li class="divider"></li>
+ <li class="divider" wicket:id="divider"></li>
+
<li>
<a class="menuLink" wicket:id="logoutLink" >
<span class="fontAwesomeIcon fa fa-fw fa-sign-out"></span>
http://git-wip-us.apache.org/repos/asf/isis/blob/ef797b1f/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/TertiaryActionsPanel.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/TertiaryActionsPanel.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/TertiaryActionsPanel.java
index 94402ca..86c7378 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/TertiaryActionsPanel.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/TertiaryActionsPanel.java
@@ -10,6 +10,7 @@ import org.apache.wicket.MarkupContainer;
import org.apache.wicket.Page;
import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse;
+import org.apache.wicket.markup.html.WebComponent;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.link.AbstractLink;
import org.apache.wicket.markup.html.link.Link;
@@ -39,9 +40,9 @@ public class TertiaryActionsPanel extends Panel {
addLogoutLink(this);
- List<CssMenuItem> subMenuItems = flatten(menuItems);
+ final List<CssMenuItem> subMenuItems = flatten(menuItems);
- ListView<CssMenuItem> subMenuItemsView = new ListView<CssMenuItem>("subMenuItems", subMenuItems) {
+ final ListView<CssMenuItem> subMenuItemsView = new ListView<CssMenuItem>("subMenuItems", subMenuItems) {
@Override
protected void populateItem(ListItem<CssMenuItem> listItem) {
CssMenuItem subMenuItem = listItem.getModelObject();
@@ -53,7 +54,18 @@ public class TertiaryActionsPanel extends Panel {
}
}
};
- add(subMenuItemsView);
+
+ WebComponent divider = new WebComponent("divider") {
+ @Override
+ protected void onConfigure() {
+ super.onConfigure();
+
+ subMenuItemsView.configure();
+ setVisible(!subMenuItems.isEmpty());
+ }
+ };
+
+ add(subMenuItemsView, divider);
}
protected List<CssMenuItem> flatten(List<CssMenuItem> menuItems) {