You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2014/11/28 18:44:58 UTC
[3/5] isis git commit: ISIS-537: deleting the defunct parts of
CssMenu panel and items etc
ISIS-537: deleting the defunct parts of CssMenu panel and items etc
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/d9a3775a
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/d9a3775a
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/d9a3775a
Branch: refs/heads/master
Commit: d9a3775a14d395a898da937ad7d7c5f3d2cb870c
Parents: de0cc86
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Fri Nov 28 11:26:18 2014 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Fri Nov 28 16:10:55 2014 +0000
----------------------------------------------------------------------
.../cssmenu/AppActionsCssMenuFactory.java | 10 +-
.../entity/header/EntityHeaderPanel.java | 12 -
.../widgets/cssmenu/ApplicationActionsPanel.css | 236 +++++++++++++++++++
.../widgets/cssmenu/CssMenuBuilder.java | 178 --------------
.../components/widgets/cssmenu/CssMenuItem.java | 26 +-
.../components/widgets/cssmenu/CssMenuPanel.css | 226 ------------------
.../widgets/cssmenu/CssMenuPanel.java | 42 +---
7 files changed, 245 insertions(+), 485 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/d9a3775a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/appactions/cssmenu/AppActionsCssMenuFactory.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/appactions/cssmenu/AppActionsCssMenuFactory.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/appactions/cssmenu/AppActionsCssMenuFactory.java
index 0c27eee..4c7d806 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/appactions/cssmenu/AppActionsCssMenuFactory.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/appactions/cssmenu/AppActionsCssMenuFactory.java
@@ -44,7 +44,6 @@ import org.apache.isis.viewer.wicket.ui.ComponentFactoryAbstract;
import org.apache.isis.viewer.wicket.ui.ComponentType;
import org.apache.isis.viewer.wicket.ui.components.widgets.cssmenu.ActionLinkFactory;
import org.apache.isis.viewer.wicket.ui.components.widgets.cssmenu.ApplicationActionsPanel;
-import org.apache.isis.viewer.wicket.ui.components.widgets.cssmenu.CssMenuBuilder;
import org.apache.isis.viewer.wicket.ui.components.widgets.cssmenu.CssMenuItem;
import org.apache.isis.viewer.wicket.ui.components.widgets.cssmenu.CssMenuItem.Builder;
import org.apache.isis.viewer.wicket.ui.components.widgets.cssmenu.CssMenuPanel;
@@ -80,7 +79,8 @@ public class AppActionsCssMenuFactory extends ComponentFactoryAbstract {
private final static ActionLinkFactory cssMenuLinkFactory = new AppActionsCssMenuLinkFactory();
public AppActionsCssMenuFactory() {
- super(ComponentType.APPLICATION_ACTIONS, CssMenuPanel.class);
+ super(ComponentType.APPLICATION_ACTIONS, ApplicationActionsPanel.class);
+ //super(ComponentType.APPLICATION_ACTIONS, CssMenuPanel.class);
}
/**
@@ -113,7 +113,7 @@ public class AppActionsCssMenuFactory extends ComponentFactoryAbstract {
// prune any service names that have no service actions
serviceNamesInOrder.retainAll(serviceActionsByName.keySet());
- return buildMenuItems(serviceNamesInOrder, serviceActionsByName, new CssMenuBuilder.CssMenuContext(cssMenuLinkFactory, appActionsModel.getActionPromptProvider()));
+ return buildMenuItems(serviceNamesInOrder, serviceActionsByName, cssMenuLinkFactory);
}
/**
@@ -122,7 +122,7 @@ public class AppActionsCssMenuFactory extends ComponentFactoryAbstract {
private List<CssMenuItem> buildMenuItems(
final Set<String> serviceNamesInOrder,
final Map<String, List<LogicalServiceAction>> serviceActionsByName,
- final CssMenuBuilder.CssMenuContext cssMenuContext) {
+ final ActionLinkFactory actionLinkFactory) {
final List<CssMenuItem> menuItems = Lists.newArrayList();
for (String serviceName : serviceNamesInOrder) {
@@ -137,7 +137,7 @@ public class AppActionsCssMenuFactory extends ComponentFactoryAbstract {
final ObjectAdapterMemento serviceAdapterMemento = logicalServiceAction.serviceAdapterMemento;
final ObjectAction objectAction = logicalServiceAction.objectAction;
final boolean separator = logicalServiceAction.separator;
- final Builder subMenuItemBuilder = serviceMenuItem.newSubMenuItem(serviceAdapterMemento, objectAction, separator, cssMenuContext);
+ final Builder subMenuItemBuilder = serviceMenuItem.newSubMenuItem(serviceAdapterMemento, objectAction, separator, actionLinkFactory);
if (subMenuItemBuilder == null) {
// not visible
continue;
http://git-wip-us.apache.org/repos/asf/isis/blob/d9a3775a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/header/EntityHeaderPanel.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/header/EntityHeaderPanel.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/header/EntityHeaderPanel.java
index 509e6a1..6edd1af 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/header/EntityHeaderPanel.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/header/EntityHeaderPanel.java
@@ -90,18 +90,6 @@ public class EntityHeaderPanel extends PanelAbstract<EntityModel> {
final List<LinkAndLabel> entityActionLinks = EntityActionUtil.asLinkAndLabelsForAdditionalLinksPanel(model, topLevelActions);
AdditionalLinksPanel.addAdditionalLinks(this, ID_ENTITY_ACTIONS, entityActionLinks, AdditionalLinksPanel.Style.INLINE_LIST);
-// if(!topLevelActions.isEmpty()) {
-//
-//
-// final ActionPromptProvider actionPromptProvider = ActionPromptProvider.Util.getFrom(this);
-// final CssMenuBuilder cssMenuBuilder = new CssMenuBuilder(
-// adapterMemento, topLevelActions, linkFactory, actionPromptProvider, null);
-// final CssMenuPanel cssMenuPanel = cssMenuBuilder.buildPanel(ID_ENTITY_ACTIONS, "Actions");
-//
-// this.addOrReplace(cssMenuPanel);
-// } else {
-// permanentlyHide(ID_ENTITY_ACTIONS);
-// }
} else {
permanentlyHide(ID_ENTITY_ACTIONS);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/d9a3775a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/ApplicationActionsPanel.css
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/ApplicationActionsPanel.css b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/ApplicationActionsPanel.css
index 9367e66..87a8864 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/ApplicationActionsPanel.css
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/ApplicationActionsPanel.css
@@ -17,6 +17,242 @@
* under the License.
*/
+
+/* copied from CssMenuPanel.css (since deleted that panel */
+
+
+
+.cssMenuPanel span.clear {
+ line-height: 3px;
+}
+
+.cssMenuPanel .menuh .small {
+ float: none;
+ display: inline;
+}
+
+.cssMenuPanel .menuh p .small {
+ float: none;
+ display: inline;
+}
+
+.menuh a,.menuh p {
+ text-align: left;
+ display: block;
+ white-space: nowrap;
+ margin: 0;
+ padding: 1px;
+ padding-right: 1.6em;
+ padding-left: 0.4em;
+ font-weight: normal;
+ cursor: default;
+}
+
+.cssMenuPanel .menuh a:hover {
+ text-decoration: underline;
+}
+
+.cssMenuPanel .menuh a.top-parent,.cssMenuPanel .menuh p.top-parent {
+ background-position: right center;
+ background-repeat: no-repeat;
+}
+
+.cssMenuPanel .menuh a.top-parent:hover,.cssMenuPanel .menuh p.top-parent:hover {
+ background-position: right center;
+ background-repeat: no-repeat;
+}
+
+.cssMenuPanel .menuh a.parent,.cssMenuPanel .menuh p.parent {
+ background-position: right center;
+ background-repeat: no-repeat;
+}
+
+.cssMenuPanel .menuh a.parent:hover,.cssMenuPanel .menuh p.parent:hover {
+ background-position: right center;
+ background-repeat: no-repeat;
+}
+
+.cssMenuPanel .menuh ul {
+ list-style: none;
+ margin: 0;
+ padding: 0;
+ float: left;
+ display: inline;
+}
+
+.cssMenuPanel .menuh li {
+ position: relative;
+ min-height: 1px;
+}
+
+.cssMenuPanel .menuh ul ul {
+ position: absolute;
+ z-index: 500;
+ top: auto;
+ display: none;
+ padding: 1em;
+ margin: -1em 0 0 -1em;
+}
+
+.cssMenuPanel .menuh ul ul ul {
+ top: 0;
+ left: 100%;
+}
+
+.cssMenuPanel span.menuh a:hover {
+ cursor: pointer;
+ z-index: 100;
+}
+
+.cssMenuPanel span.menuh li:hover ul ul,.cssMenuPanel span.menuh li li:hover ul ul,.cssMenuPanel span.menuh li li li:hover ul ul,.cssMenuPanel span.menuh li li li li:hover ul ul {
+ display: none;
+}
+
+.cssMenuPanel span.menuh li:hover ul,.cssMenuPanel span.menuh li li:hover ul,.cssMenuPanel span.menuh li li li:hover ul,.cssMenuPanel span.menuh li li li li:hover ul {
+ display: block;
+}
+
+.cssMenuPanel li.cssSubMenuItem p.disabled {
+ cursor: not-allowed;
+}
+
+.cssMenuPanel li.cssSubMenuItem {
+ margin-left:0;
+}
+
+/******** overrides for grouped actions and entity actions ***************/
+.groupedActions .cssMenuPanel li.cssMenuItemPanel>p.top-parent {
+ display: none;
+}
+
+.groupedActions .cssMenuPanel .menuh ul {
+ position: relative;
+ display: block;
+ float: right;
+ margin: 0;
+ padding: 0;
+}
+
+.groupedActions .cssMenuPanel .menuh ul ul {
+ position: relative;
+ display: block;
+ float: right;
+ margin: 0;
+ padding: 0;
+}
+
+.groupedActions .cssMenuPanel .menuh li,
+.groupedActions .cssMenuPanel .menuh li p {
+ float:left;
+ display:block;
+ margin-left:10px;
+}
+
+.groupedActions .cssMenuPanel .menuh a,.groupedActions .cssMenuPanel .menuh p
+{
+ display: inline-block;
+ border: none;
+}
+
+.groupedActions .cssMenuPanel .menuh a:link,
+.groupedActions .cssMenuPanel .menuh a:visited,
+.groupedActions .cssMenuPanel .menuh a:active,
+.groupedActions .cssMenuPanel .menuh p {
+ display: block;
+ float: left;
+ height: 30px;
+ line-height: 30px;
+ padding: 0 10px;
+ font-weight: bold;
+ /*font-size: 0.85em;*/
+ border-radius: 4px;
+ -moz-border-radius: 4px;
+ -webkit-border-radius: 4px;
+ text-decoration: none;
+}
+
+.entityActions .cssMenuPanel li.cssMenuItemPanel>p.top-parent {
+ display: none;
+}
+
+.entityActions .cssMenuPanel .menuh ul {
+ position: relative;
+ display: block;
+ float: right;
+ margin: 0 0 10px;
+ padding: 0;
+}
+
+.entityActions .cssMenuPanel .menuh ul ul {
+ position: relative;
+ display: block;
+ float: right;
+ margin: 0;
+ padding: 0;
+}
+
+.entityActions .cssMenuPanel .menuh li {
+ float:left;
+ display:block;
+ margin-left:10px;
+}
+
+.entityActions .cssMenuPanel .menuh li p {
+ float:left;
+ display:block;
+ margin-left:0;
+}
+
+.entityActions .cssMenuPanel .menuh a,
+.entityActions .cssMenuPanel .menuh p {
+ display: inline-block;
+ /*border: none;*/
+}
+
+.entityActions .cssMenuPanel .menuh a,
+.entityActions .cssMenuPanel .menuh a:link,
+.entityActions .cssMenuPanel .menuh a:visited,
+.entityActions .cssMenuPanel .menuh a:active,
+.entityActions .cssMenuPanel .menuh p {
+ display: block;
+ float: left;
+ height: 30px;
+ /*line-height: 30px;*/
+ padding: 4px 10px 0;
+ /*font-size:0.85em;*/
+ border-radius:4px;
+ -moz-border-radius:4px;
+ -webkit-border-radius:4px;
+ text-decoration:none;
+}
+
+.additionalLinkList {
+ float:left;
+ margin:0;
+ padding:0;
+ list-style:none;
+}
+
+.entityCollectionsPanel .panel-heading .additionalLinkList {
+ margin-right: 10px;
+}
+
+.additionalLinkList li {
+ float:left;
+ margin-right:10px;
+ /* margin-bottom: 2px;*/
+}
+.entityPropertiesPanel .additionalLinkList li {
+ margin-right:0px;
+}
+.entityPropertiesPanel .properties .panel-heading .additionalLinkList {
+ margin-right: -5px;
+}
+
+
+
+
+
/**
* Borrowed from http://bootsnipp.com/snippets/featured/multi-level-dropdown-menu-bs3
*/
http://git-wip-us.apache.org/repos/asf/isis/blob/d9a3775a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuBuilder.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuBuilder.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuBuilder.java
deleted file mode 100644
index 0b12d23..0000000
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuBuilder.java
+++ /dev/null
@@ -1,178 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.isis.viewer.wicket.ui.components.widgets.cssmenu;
-
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import com.google.common.base.Predicate;
-import com.google.common.base.Predicates;
-import com.google.common.collect.Collections2;
-import org.apache.isis.applib.filter.Filters;
-import org.apache.isis.core.metamodel.spec.ActionType;
-import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
-import org.apache.isis.core.metamodel.facets.actions.bulk.BulkFacet;
-import org.apache.isis.core.metamodel.facets.actions.notcontributed.NotContributedFacet;
-import org.apache.isis.core.runtime.system.context.IsisContext;
-import org.apache.isis.viewer.wicket.model.mementos.ObjectAdapterMemento;
-import org.apache.isis.viewer.wicket.model.models.ActionPromptProvider;
-import org.apache.isis.viewer.wicket.ui.components.widgets.cssmenu.CssMenuItem.Builder;
-import org.apache.isis.viewer.wicket.ui.components.widgets.cssmenu.CssMenuPanel.Style;
-
-/**
- * Used to build a {@link CssMenuItem} hierarchy from a
- * {@link ObjectAdapterMemento object adapter}'s actions and any contributed
- * actions from services.
- */
-public class CssMenuBuilder {
-
- /**
- * The target to invoke upon; may be null in case of bulk actions; not used if a contributed action.
- */
- private final ObjectAdapterMemento adapterMemento;
- private final List<ObjectAction> actions;
- private final CssMenuContext cssMenuContext;
-
- public static class CssMenuContext {
- private final ActionLinkFactory cssMenuLinkFactory;
- private final ActionPromptProvider actionPromptProvider;
- private final Predicate<ObjectAction> objectActionPredicate;
-
- public CssMenuContext(
- final ActionLinkFactory cssMenuLinkFactory,
- final ActionPromptProvider actionPromptProvider,
- final Predicate<ObjectAction> objectActionPredicate) {
- this.cssMenuLinkFactory = cssMenuLinkFactory;
- this.actionPromptProvider = actionPromptProvider;
- this.objectActionPredicate = objectActionPredicate != null? objectActionPredicate: Predicates.<ObjectAction>alwaysTrue();
- }
-
- public CssMenuContext(ActionLinkFactory cssMenuLinkFactory, ActionPromptProvider actionPromptProvider) {
- this(cssMenuLinkFactory, actionPromptProvider, null);
- }
-
- public ActionLinkFactory getCssMenuLinkFactory() {
- return cssMenuLinkFactory;
- }
- public ActionPromptProvider getActionPromptProvider() {
- return actionPromptProvider;
- }
- public Predicate<ObjectAction> getObjectActionPredicate() {
- return objectActionPredicate;
- }
- }
-
- public CssMenuBuilder(
- final ObjectAdapterMemento adapterMemento,
- final List<ObjectAction> actions,
- final ActionLinkFactory cssMenuLinkFactory,
- final ActionPromptProvider actionPromptProvider,
- final Predicate<ObjectAction> objectActionPredicate) {
- this.adapterMemento = adapterMemento; // may be null
- this.actions = actions;
- this.cssMenuContext = new CssMenuContext(cssMenuLinkFactory, actionPromptProvider, objectActionPredicate);
- }
-
- public CssMenuPanel buildPanel(
- final String wicketId,
- final String rootName) {
- final CssMenuItem root = CssMenuItem.newMenuItem(rootName).build();
- addMenuItems(root, actions);
- final CssMenuPanel cssMenuPanel = new CssMenuPanel(wicketId, Style.SMALL, Collections.singletonList(root));
- return cssMenuPanel;
- }
-
- private void addMenuItems(
- final CssMenuItem parent,
- final List<ObjectAction> actions) {
- addMenuItemsForActionsOfType(parent, actions, ActionType.USER);
- if ( isExploring() || isPrototyping()) {
- addMenuItemsForActionsOfType(parent, actions, ActionType.EXPLORATION);
- addMenuItemsForActionsOfType(parent, actions, ActionType.PROTOTYPE);
- }
- if (isDebugMode()) {
- addMenuItemsForActionsOfType(parent, actions, ActionType.DEBUG);
- }
- }
-
- public boolean isExploring() {
- return IsisContext.getDeploymentType().isExploring();
- }
- public boolean isPrototyping() {
- return IsisContext.getDeploymentType().isPrototyping();
- }
-
- /**
- * Protected so can be overridden in testing if required.
- */
- protected boolean isDebugMode() {
- // TODO: need to figure out how to switch into debug mode;
- // probably call a Debug toggle page, and stuff into
- // Session.getMetaData()
- return true;
- }
-
- private void addMenuItemsForActionsOfType(
- final CssMenuItem parent,
- final List<ObjectAction> actions,
- final ActionType type) {
- final Collection<ObjectAction> filterActionsOfType = Collections2.filter(actions, Filters.asPredicate(ObjectAction.Filters.ofType(type)));
- for (final ObjectAction action : filterActionsOfType) {
- addMenuItem(parent, action);
- }
- }
-
- private void addMenuItem(
- final CssMenuItem parent,
- final ObjectAction action) {
- addMenuItemForAction(parent, action);
- }
-
- private void addMenuItemForAction(
- final CssMenuItem parent,
- final ObjectAction action) {
-
- final NotContributedFacet notContributed = action.getFacet(NotContributedFacet.class);
- if (notContributed != null && notContributed.toActions()) {
- // skip if is an action that has been annotated to not be contributed
- return;
- }
-
- Builder subMenuItemBuilder = null;
-
- final ObjectAdapterMemento targetAdapterMemento = adapterMemento; // determineAdapterFor(action);
- if(targetAdapterMemento != null) {
- // against an entity or a service (if a contributed action)
- subMenuItemBuilder = parent.newSubMenuItem(targetAdapterMemento, action, false, cssMenuContext);
- } else {
- if (action.containsDoOpFacet(BulkFacet.class)) {
- // ignore fact have no target action;
- // we expect that the link factory is able to handle this
- // (ie will iterate through all objects from a list and invoke in bulk)
- subMenuItemBuilder = parent.newSubMenuItem(action, cssMenuContext);
- }
- }
-
- if (subMenuItemBuilder != null) {
- subMenuItemBuilder.build();
- }
- }
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/d9a3775a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuItem.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuItem.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuItem.java
index 8d8c157..88caef5 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuItem.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuItem.java
@@ -72,7 +72,7 @@ public class CssMenuItem implements Serializable {
return this;
}
- public <T extends Page> Builder link(final Class<T> pageClass) {
+ public <T extends Page> Builder link() {
final AbstractLink link = new SubmitLink(ID_MENU_LINK);
return link(link);
}
@@ -297,7 +297,7 @@ public class CssMenuItem implements Serializable {
final ObjectAdapterMemento targetAdapterMemento,
final ObjectAction objectAction,
final boolean separator,
- final CssMenuBuilder.CssMenuContext cssMenuContext) {
+ final ActionLinkFactory actionLinkFactory) {
// check visibility
final AuthenticationSession session = getAuthenticationSession();
@@ -308,7 +308,7 @@ public class CssMenuItem implements Serializable {
}
// build the link
- final LinkAndLabel linkAndLabel = cssMenuContext.getCssMenuLinkFactory().newLink(
+ final LinkAndLabel linkAndLabel = actionLinkFactory.newLink(
targetAdapterMemento, objectAction, PageAbstract.ID_MENU_LINK
);
if(linkAndLabel==null) {
@@ -339,26 +339,6 @@ public class CssMenuItem implements Serializable {
}
- /**
- * Creates a {@link Builder} for a submenu item where the provided {@link ActionLinkFactory} is able to provide the target adapter.
- */
- public Builder newSubMenuItem(
- final ObjectAction objectAction,
- final CssMenuBuilder.CssMenuContext cssMenuContext) {
-
- final LinkAndLabel linkAndLabel = cssMenuContext.getCssMenuLinkFactory().newLink(null, objectAction, PageAbstract.ID_MENU_LINK);
-
- final AbstractLink link = linkAndLabel.getLink();
- final String actionLabel = linkAndLabel.getLabel();
- Builder builder = this.newSubMenuItem(actionLabel)
- .link(link)
- .prototyping(linkAndLabel.isPrototype())
- .returnsBlobOrClob(linkAndLabel.isBlobOrClob())
- .withFacet(objectAction.getFacet(CssClassFacet.class))
- .withFacet(objectAction.getFacet(CssClassFaFacet.class));
- return builder;
- }
-
// //////////////////////////////////////////////////////////////
// Build wicket components from the menu item.
// //////////////////////////////////////////////////////////////
http://git-wip-us.apache.org/repos/asf/isis/blob/d9a3775a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuPanel.css
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuPanel.css b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuPanel.css
index 87bbf2b..eaeea17 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuPanel.css
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuPanel.css
@@ -16,229 +16,3 @@
* specific language governing permissions and limitations
* under the License.
*/
-.cssMenuPanel span.clear {
- line-height: 3px;
-}
-
-.cssMenuPanel .menuh .small {
- float: none;
- display: inline;
-}
-
-.cssMenuPanel .menuh p .small {
- float: none;
- display: inline;
-}
-
-.menuh a,.menuh p {
- text-align: left;
- display: block;
- white-space: nowrap;
- margin: 0;
- padding: 1px;
- padding-right: 1.6em;
- padding-left: 0.4em;
- font-weight: normal;
- cursor: default;
-}
-
-.cssMenuPanel .menuh a:hover {
- text-decoration: underline;
-}
-
-.cssMenuPanel .menuh a.top-parent,.cssMenuPanel .menuh p.top-parent {
- background-position: right center;
- background-repeat: no-repeat;
-}
-
-.cssMenuPanel .menuh a.top-parent:hover,.cssMenuPanel .menuh p.top-parent:hover {
- background-position: right center;
- background-repeat: no-repeat;
-}
-
-.cssMenuPanel .menuh a.parent,.cssMenuPanel .menuh p.parent {
- background-position: right center;
- background-repeat: no-repeat;
-}
-
-.cssMenuPanel .menuh a.parent:hover,.cssMenuPanel .menuh p.parent:hover {
- background-position: right center;
- background-repeat: no-repeat;
-}
-
-.cssMenuPanel .menuh ul {
- list-style: none;
- margin: 0;
- padding: 0;
- float: left;
- display: inline;
-}
-
-.cssMenuPanel .menuh li {
- position: relative;
- min-height: 1px;
-}
-
-.cssMenuPanel .menuh ul ul {
- position: absolute;
- z-index: 500;
- top: auto;
- display: none;
- padding: 1em;
- margin: -1em 0 0 -1em;
-}
-
-.cssMenuPanel .menuh ul ul ul {
- top: 0;
- left: 100%;
-}
-
-.cssMenuPanel span.menuh a:hover {
- cursor: pointer;
- z-index: 100;
-}
-
-.cssMenuPanel span.menuh li:hover ul ul,.cssMenuPanel span.menuh li li:hover ul ul,.cssMenuPanel span.menuh li li li:hover ul ul,.cssMenuPanel span.menuh li li li li:hover ul ul {
- display: none;
-}
-
-.cssMenuPanel span.menuh li:hover ul,.cssMenuPanel span.menuh li li:hover ul,.cssMenuPanel span.menuh li li li:hover ul,.cssMenuPanel span.menuh li li li li:hover ul {
- display: block;
-}
-
-.cssMenuPanel li.cssSubMenuItem p.disabled {
- cursor: not-allowed;
-}
-
-.cssMenuPanel li.cssSubMenuItem {
- margin-left:0;
-}
-
-/******** overrides for grouped actions and entity actions ***************/
-.groupedActions .cssMenuPanel li.cssMenuItemPanel>p.top-parent {
- display: none;
-}
-
-.groupedActions .cssMenuPanel .menuh ul {
- position: relative;
- display: block;
- float: right;
- margin: 0;
- padding: 0;
-}
-
-.groupedActions .cssMenuPanel .menuh ul ul {
- position: relative;
- display: block;
- float: right;
- margin: 0;
- padding: 0;
-}
-
-.groupedActions .cssMenuPanel .menuh li,
-.groupedActions .cssMenuPanel .menuh li p {
- float:left;
- display:block;
- margin-left:10px;
-}
-
-.groupedActions .cssMenuPanel .menuh a,.groupedActions .cssMenuPanel .menuh p
- {
- display: inline-block;
- border: none;
-}
-
-.groupedActions .cssMenuPanel .menuh a:link,
-.groupedActions .cssMenuPanel .menuh a:visited,
-.groupedActions .cssMenuPanel .menuh a:active,
-.groupedActions .cssMenuPanel .menuh p {
- display: block;
- float: left;
- height: 30px;
- line-height: 30px;
- padding: 0 10px;
- font-weight: bold;
- /*font-size: 0.85em;*/
- border-radius: 4px;
- -moz-border-radius: 4px;
- -webkit-border-radius: 4px;
- text-decoration: none;
-}
-
-.entityActions .cssMenuPanel li.cssMenuItemPanel>p.top-parent {
- display: none;
-}
-
-.entityActions .cssMenuPanel .menuh ul {
- position: relative;
- display: block;
- float: right;
- margin: 0 0 10px;
- padding: 0;
-}
-
-.entityActions .cssMenuPanel .menuh ul ul {
- position: relative;
- display: block;
- float: right;
- margin: 0;
- padding: 0;
-}
-
-.entityActions .cssMenuPanel .menuh li {
- float:left;
- display:block;
- margin-left:10px;
-}
-
-.entityActions .cssMenuPanel .menuh li p {
- float:left;
- display:block;
- margin-left:0;
-}
-
-.entityActions .cssMenuPanel .menuh a,
-.entityActions .cssMenuPanel .menuh p {
- display: inline-block;
- /*border: none;*/
-}
-
-.entityActions .cssMenuPanel .menuh a,
-.entityActions .cssMenuPanel .menuh a:link,
-.entityActions .cssMenuPanel .menuh a:visited,
-.entityActions .cssMenuPanel .menuh a:active,
-.entityActions .cssMenuPanel .menuh p {
- display: block;
- float: left;
- height: 30px;
- /*line-height: 30px;*/
- padding: 4px 10px 0;
- /*font-size:0.85em;*/
- border-radius:4px;
- -moz-border-radius:4px;
- -webkit-border-radius:4px;
- text-decoration:none;
-}
-
-.additionalLinkList {
- float:left;
- margin:0;
- padding:0;
- list-style:none;
-}
-
-.entityCollectionsPanel .panel-heading .additionalLinkList {
- margin-right: 10px;
-}
-
-.additionalLinkList li {
- float:left;
- margin-right:10px;
-/* margin-bottom: 2px;*/
-}
-.entityPropertiesPanel .additionalLinkList li {
- margin-right:0px;
-}
-.entityPropertiesPanel .properties .panel-heading .additionalLinkList {
- margin-right: -5px;
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/d9a3775a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuPanel.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuPanel.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuPanel.java
index 7717c68..742f343 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuPanel.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuPanel.java
@@ -24,45 +24,18 @@ import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.repeater.RepeatingView;
import org.apache.wicket.model.util.ListModel;
-import org.apache.isis.core.commons.lang.StringExtensions;
import org.apache.isis.viewer.wicket.ui.ComponentFactory;
import org.apache.isis.viewer.wicket.ui.panels.PanelAbstract;
import org.apache.isis.viewer.wicket.ui.panels.PanelUtil;
-import org.apache.isis.viewer.wicket.ui.util.CssClassAppender;
/**
* Top level panel for a CSS menu, consisting of a number of unparented
* {@link CssMenuItem}s.
- *
- * <p>
- * The {@link Style} enum allows the presentation to be altered.
*/
public class CssMenuPanel extends PanelAbstract<CssMenuPanel.ListOfCssMenuItemsModel> {
private static final long serialVersionUID = 1L;
- public enum Style {
- REGULAR {
- @Override
- public String getAppendValue() {
- return null; // ie, append nothing
- }
- },
- SMALL {
- @Override
- public String getAppendValue() {
- return toString();
- }
- };
- @Override
- public String toString() {
- return StringExtensions.toCamelCase(name());
- }
-
- public String getAppendValue() {
- return toString();
- }
- }
static class ListOfCssMenuItemsModel extends ListModel<CssMenuItem> {
@@ -73,15 +46,11 @@ public class CssMenuPanel extends PanelAbstract<CssMenuPanel.ListOfCssMenuItemsM
}
}
- private final StyleAppender styleAppender;
static final String ID_MENU_ITEMS = "menuItems";
static final String ID_MENU_ITEM = "menuItem";
- public CssMenuPanel(final String id, final Style style, final List<CssMenuItem> topLevelMenuItems) {
+ private CssMenuPanel(final String id, final List<CssMenuItem> topLevelMenuItems) {
super(id, new ListOfCssMenuItemsModel(topLevelMenuItems));
- this.styleAppender = new StyleAppender(style);
-
- //add(styleAppender);
final RepeatingView menuItemRv = new RepeatingView(CssMenuPanel.ID_MENU_ITEMS);
add(menuItemRv);
@@ -95,15 +64,6 @@ public class CssMenuPanel extends PanelAbstract<CssMenuPanel.ListOfCssMenuItemsM
}
- static final class StyleAppender extends CssClassAppender {
-
- private static final long serialVersionUID = 1L;
-
- public StyleAppender(final Style style) {
- super(style.getAppendValue());
- }
- }
-
/**
* Because there is no {@link ComponentFactory} for this component,
* its CSS must be contributed in this way instead (also meaning its CSS is not bundled).