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 2015/03/06 14:58:32 UTC
isis git commit: ISIS-1077 Use the provided 'cssClass' for action
menu items
Repository: isis
Updated Branches:
refs/heads/master e1285d66c -> 021e3aa4c
ISIS-1077 Use the provided 'cssClass' for action menu items
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/021e3aa4
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/021e3aa4
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/021e3aa4
Branch: refs/heads/master
Commit: 021e3aa4c47456b727acc0007e68f297933ff848
Parents: e1285d6
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Fri Mar 6 15:55:27 2015 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Fri Mar 6 15:55:27 2015 +0200
----------------------------------------------------------------------
.../ui/components/actionmenu/serviceactions/CssMenuItem.java | 4 ++++
.../actionmenu/serviceactions/ServiceActionsPanel.java | 5 +++++
.../actionmenu/serviceactions/TertiaryActionsPanel.java | 5 +++++
3 files changed, 14 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/021e3aa4/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/CssMenuItem.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/CssMenuItem.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/CssMenuItem.java
index 8e9a6ae..830fb48 100644
--- a/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/CssMenuItem.java
+++ b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/CssMenuItem.java
@@ -248,6 +248,10 @@ class CssMenuItem implements Serializable {
this.cssClass = cssClass;
}
+ public String getCssClass() {
+ return cssClass;
+ }
+
public void setCssClassFa(String cssClassFa) {
this.cssClassFa = cssClassFa;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/021e3aa4/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionsPanel.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionsPanel.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionsPanel.java
index ac10956..25e2a69 100644
--- a/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionsPanel.java
+++ b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionsPanel.java
@@ -174,6 +174,11 @@ public class ServiceActionsPanel extends Panel {
} else {
menuItemLabel.add(new CssClassFaBehavior(cssClassFa, menuItem.getCssClassFaPosition()));
}
+
+ String cssClass = menuItem.getCssClass();
+ if (!Strings.isNullOrEmpty(cssClass)) {
+ subMenuItemLink.add(new CssClassAppender(cssClass));
+ }
} else {
leafItem = new Fragment("content", "empty", ServiceActionsPanel.this);
listItem.add(new CssClassAppender("divider"));
http://git-wip-us.apache.org/repos/asf/isis/blob/021e3aa4/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/TertiaryActionsPanel.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/TertiaryActionsPanel.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/TertiaryActionsPanel.java
index b4ab510..28ebb34 100644
--- a/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/TertiaryActionsPanel.java
+++ b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/TertiaryActionsPanel.java
@@ -167,6 +167,11 @@ public class TertiaryActionsPanel extends Panel {
} else {
menuItemLabel.add(new CssClassFaBehavior(cssClassFa, menuItem.getCssClassFaPosition()));
}
+
+ String cssClass = menuItem.getCssClass();
+ if (!Strings.isNullOrEmpty(cssClass)) {
+ subMenuItemLink.add(new CssClassAppender(cssClass));
+ }
} else {
leafItem = new Fragment("content", "empty", TertiaryActionsPanel.this);
listItem.add(new CssClassAppender("divider"));