ISIS-537: entity actions positioned on panel are now rendered. Also: - renaming IDs in ScalarPanelAbstract for associated entity actions, and updating HTML - deleting unused (empty) CSS files.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/9517e5b5 Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/9517e5b5 Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/9517e5b5 Branch: refs/heads/master Commit: 9517e5b5451fb63e9ed1efe63e3b577e260f87b1 Parents: fd7be2a Author: Dan Haywood <[email protected]> Authored: Thu Nov 27 13:41:49 2014 +0000 Committer: Dan Haywood <[email protected]> Committed: Thu Nov 27 14:12:04 2014 +0000 ---------------------------------------------------------------------- .../wicket/viewer/IsisWicketApplication.java | 14 +++++++++---- .../viewer/wicket/model/links/LinkAndLabel.java | 13 ++++++++++-- .../entity/properties/EntityPropertiesForm.css | 18 ---------------- .../entity/properties/EntityPropertiesForm.java | 22 +++++++++++--------- .../entity/properties/EntityPropertiesPanel.css | 18 ---------------- .../properties/EntityPropertiesPanel.html | 9 +++++--- .../properties/EntityPropertiesPanel.java | 10 +-------- .../components/scalars/ScalarPanelAbstract.html | 4 ++-- .../components/scalars/ScalarPanelAbstract.java | 18 +++++++--------- .../isisapplib/IsisBlobOrClobPanelAbstract.html | 4 ++-- .../scalars/primitive/BooleanPanel.html | 4 ++-- .../scalars/reference/ReferencePanel.html | 4 ++-- .../valuechoices/ValueChoicesSelect2Panel.html | 4 ++-- .../wicket/ui/pages/bootstrap-overrides.css | 7 +++++++ 14 files changed, 64 insertions(+), 85 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/isis/blob/9517e5b5/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java ---------------------------------------------------------------------- diff --git a/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java b/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java index 706acea..e1ea9f0 100644 --- a/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java +++ b/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java @@ -28,7 +28,10 @@ import de.agilecoders.wicket.webjars.settings.IWebjarsSettings; import de.agilecoders.wicket.webjars.settings.WebjarsSettings; import net.ftlines.wicketsource.WicketSource; -import java.util.*; +import java.util.Collections; +import java.util.List; +import java.util.ServiceLoader; +import java.util.Set; import javax.servlet.ServletContext; import com.google.common.base.Function; import com.google.common.base.Throwables; @@ -40,7 +43,12 @@ import com.google.inject.Inject; import com.google.inject.Injector; import com.google.inject.Module; import com.vaynberg.wicket.select2.ApplicationSettings; -import org.apache.wicket.*; +import org.apache.wicket.Application; +import org.apache.wicket.ConverterLocator; +import org.apache.wicket.IConverterLocator; +import org.apache.wicket.Page; +import org.apache.wicket.RuntimeConfigurationType; +import org.apache.wicket.SharedResources; import org.apache.wicket.authroles.authentication.AuthenticatedWebApplication; import org.apache.wicket.authroles.authentication.AuthenticatedWebSession; import org.apache.wicket.core.request.mapper.MountedMapper; @@ -85,7 +93,6 @@ import org.apache.isis.viewer.wicket.ui.ComponentFactory; import org.apache.isis.viewer.wicket.ui.app.registry.ComponentFactoryRegistry; import org.apache.isis.viewer.wicket.ui.app.registry.ComponentFactoryRegistryAccessor; import org.apache.isis.viewer.wicket.ui.components.additionallinks.AdditionalLinksPanel; -import org.apache.isis.viewer.wicket.ui.components.entity.properties.EntityPropertiesForm; import org.apache.isis.viewer.wicket.ui.components.scalars.string.MultiLineStringPanel; import org.apache.isis.viewer.wicket.ui.components.widgets.cssmenu.CssMenuItemPanel; import org.apache.isis.viewer.wicket.ui.components.widgets.cssmenu.CssSubMenuItemsPanel; @@ -490,7 +497,6 @@ public class IsisWicketApplication extends AuthenticatedWebApplication implement references.add(PanelUtil.cssResourceReferenceFor(AdditionalLinksPanel.class)); references.add(PanelUtil.cssResourceReferenceFor(CssSubMenuItemsPanel.class)); references.add(PanelUtil.cssResourceReferenceFor(CssMenuItemPanel.class)); - references.add(PanelUtil.cssResourceReferenceFor(EntityPropertiesForm.class)); // non-conforming component factories references.add(PanelUtil.cssResourceReferenceFor(MultiLineStringPanel.class)); http://git-wip-us.apache.org/repos/asf/isis/blob/9517e5b5/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/links/LinkAndLabel.java ---------------------------------------------------------------------- diff --git a/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/links/LinkAndLabel.java b/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/links/LinkAndLabel.java index 0c73f23..658317c 100644 --- a/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/links/LinkAndLabel.java +++ b/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/links/LinkAndLabel.java @@ -19,15 +19,24 @@ package org.apache.isis.viewer.wicket.model.links; import java.io.Serializable; - +import java.util.List; import com.google.common.base.Predicate; +import com.google.common.collect.Iterables; +import com.google.common.collect.Lists; import org.apache.wicket.markup.html.link.AbstractLink; import org.apache.isis.applib.annotation.ActionLayout; public class LinkAndLabel implements Serializable { private static final long serialVersionUID = 1L; - + + public static List<LinkAndLabel> positioned( + final List<LinkAndLabel> entityActionLinks, + final ActionLayout.Position position) { + return Lists.newArrayList(Iterables.filter(entityActionLinks, Predicates.positioned(position))); + } + + private final AbstractLink link; private final String label; private final String disabledReasonIfAny; http://git-wip-us.apache.org/repos/asf/isis/blob/9517e5b5/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/properties/EntityPropertiesForm.css ---------------------------------------------------------------------- diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/properties/EntityPropertiesForm.css b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/properties/EntityPropertiesForm.css deleted file mode 100644 index eaeea17..0000000 --- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/properties/EntityPropertiesForm.css +++ /dev/null @@ -1,18 +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. - */ http://git-wip-us.apache.org/repos/asf/isis/blob/9517e5b5/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/properties/EntityPropertiesForm.java ---------------------------------------------------------------------- diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/properties/EntityPropertiesForm.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/properties/EntityPropertiesForm.java index 8474e4f..bad729d 100644 --- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/properties/EntityPropertiesForm.java +++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/properties/EntityPropertiesForm.java @@ -44,6 +44,7 @@ import org.apache.wicket.request.Response; import org.apache.wicket.util.string.Strings; import org.apache.wicket.util.visit.IVisit; import org.apache.wicket.util.visit.IVisitor; +import org.apache.isis.applib.annotation.ActionLayout; import org.apache.isis.applib.annotation.MemberGroupLayout.ColumnSpans; import org.apache.isis.applib.annotation.Where; import org.apache.isis.applib.filter.Filter; @@ -91,7 +92,8 @@ public class EntityPropertiesForm extends FormAbstract<ObjectAdapter> implements private static final String ID_MEMBER_GROUP = "memberGroup"; private static final String ID_MEMBER_GROUP_NAME = "memberGroupName"; - public static final String ID_ADDITIONAL_LINKS = "additionalLinks"; + private static final String ID_ASSOCIATED_ACTION_LINKS_PANEL = "associatedActionLinksPanel"; + private static final String ID_ASSOCIATED_ACTION_LINKS_PANEL_DROPDOWN = "associatedActionLinksPanelDropDown"; private static final String ID_LEFT_COLUMN = "leftColumn"; private static final String ID_MIDDLE_COLUMN = "middleColumn"; @@ -245,12 +247,17 @@ public class EntityPropertiesForm extends FormAbstract<ObjectAdapter> implements addPropertyToForm(entityModel, (OneToOneAssociation) association, propertyRvContainer, memberGroupActions); } - // TODO: suppressing until sort out markup and figure out which should contribute etc via Facets. - memberGroupActions.clear(); + final List<LinkAndLabel> actionsPanel = LinkAndLabel.positioned(memberGroupActions, ActionLayout.Position.PANEL); + final List<LinkAndLabel> actionsPanelDropDown = LinkAndLabel.positioned(memberGroupActions, ActionLayout.Position.PANEL_DROPDOWN); + AdditionalLinksPanel.addAdditionalLinks( - memberGroupRvContainer, ID_ADDITIONAL_LINKS, - memberGroupActions, + memberGroupRvContainer, ID_ASSOCIATED_ACTION_LINKS_PANEL, + actionsPanel, AdditionalLinksPanel.Style.INLINE_LIST); + AdditionalLinksPanel.addAdditionalLinks( + memberGroupRvContainer, ID_ASSOCIATED_ACTION_LINKS_PANEL_DROPDOWN, + actionsPanelDropDown, + AdditionalLinksPanel.Style.DROPDOWN); } addClassForSpan(markupContainer, span); @@ -283,11 +290,6 @@ public class EntityPropertiesForm extends FormAbstract<ObjectAdapter> implements } } -// protected void addAdditionalLinksTo(final MarkupContainer labelIfRegular) { -// // ... and add them to the panel -// AdditionalLinksPanel.addAdditionalLinks(labelIfRegular, ID_ADDITIONAL_LINKS, entityActions); -// } - private List<ObjectAssociation> visibleProperties(final ObjectAdapter adapter, final ObjectSpecification objSpec, Where where) { return objSpec.getAssociations(Contributed.INCLUDED, visiblePropertyFilter(adapter, where)); http://git-wip-us.apache.org/repos/asf/isis/blob/9517e5b5/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/properties/EntityPropertiesPanel.css ---------------------------------------------------------------------- diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/properties/EntityPropertiesPanel.css b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/properties/EntityPropertiesPanel.css deleted file mode 100644 index eaeea17..0000000 --- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/properties/EntityPropertiesPanel.css +++ /dev/null @@ -1,18 +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. - */ http://git-wip-us.apache.org/repos/asf/isis/blob/9517e5b5/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/properties/EntityPropertiesPanel.html ---------------------------------------------------------------------- diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/properties/EntityPropertiesPanel.html b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/properties/EntityPropertiesPanel.html index 36f8e01..e65c157 100644 --- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/properties/EntityPropertiesPanel.html +++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/properties/EntityPropertiesPanel.html @@ -30,7 +30,8 @@ <div class="panel-heading"> <span wicket:id="memberGroupName" class="panel-title">[group name]</span> <div class="pull-right additionalLinks"> - <div wicket:id="additionalLinks"></div> + <div wicket:id="associatedActionLinksPanel"></div> + <div wicket:id="associatedActionLinksPanelDropDown"></div> </div> </div> <div class="properties panel-body"> @@ -57,7 +58,8 @@ <div class="panel-heading"> <span wicket:id="memberGroupName" class="panel-title">[group name]</span> <div class="pull-right additionalLinks"> - <div wicket:id="additionalLinks"></div> + <div wicket:id="associatedActionLinksPanel"></div> + <div wicket:id="associatedActionLinksPanelDropDown"></div> </div> </div> <div class="properties panel-body"> @@ -76,7 +78,8 @@ <div class="panel-heading"> <span wicket:id="memberGroupName" class="panel-title">[group name]</span> <div class="pull-right additionalLinks"> - <div wicket:id="additionalLinks"></div> + <div wicket:id="associatedActionLinksPanel"></div> + <div wicket:id="associatedActionLinksPanelDropDown"></div> </div> </div> <div class="properties panel-body"> http://git-wip-us.apache.org/repos/asf/isis/blob/9517e5b5/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/properties/EntityPropertiesPanel.java ---------------------------------------------------------------------- diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/properties/EntityPropertiesPanel.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/properties/EntityPropertiesPanel.java index 63ad60b..0f49919 100644 --- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/properties/EntityPropertiesPanel.java +++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/properties/EntityPropertiesPanel.java @@ -19,7 +19,6 @@ package org.apache.isis.viewer.wicket.ui.components.entity.properties; -import org.apache.wicket.markup.head.IHeaderResponse; import org.apache.isis.core.metamodel.adapter.ObjectAdapter; import org.apache.isis.viewer.wicket.model.models.EntityModel; import org.apache.isis.viewer.wicket.ui.panels.PanelAbstract; @@ -42,16 +41,10 @@ public class EntityPropertiesPanel extends PanelAbstract<EntityModel> { form.toViewMode(null); } - @Override - public void renderHead(IHeaderResponse response) { - super.renderHead(response); - - //PanelUtil.renderHead(response, getClass()); - } private void buildGui() { buildEntityPropertiesAndOrCollectionsGui(); - setOutputMarkupId(true); // so can repaint via ajax + setOutputMarkupId(true); } private void buildEntityPropertiesAndOrCollectionsGui() { @@ -64,5 +57,4 @@ public class EntityPropertiesPanel extends PanelAbstract<EntityModel> { permanentlyHide(ID_ENTITY_PROPERTIES); } } - } http://git-wip-us.apache.org/repos/asf/isis/blob/9517e5b5/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.html ---------------------------------------------------------------------- diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.html b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.html index d4eee10..d03b88b 100644 --- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.html +++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.html @@ -30,9 +30,9 @@ <span class="scalarValueWrapper"> <wicket:child/> <span wicket:id="feedback" class="help-block"></span> - <span wicket:id="additionalLinksBelow"></span> + <span wicket:id="associatedActionLinksBelow"></span> </span> - <span wicket:id="additionalLinksRight"></span> + <span wicket:id="associatedActionLinksRight"></span> </div> <wicket:container wicket:id="scalarIfCompact"></wicket:container> </div> http://git-wip-us.apache.org/repos/asf/isis/blob/9517e5b5/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java ---------------------------------------------------------------------- diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java index 18ec1f8..c391f44 100644 --- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java +++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java @@ -22,7 +22,6 @@ package org.apache.isis.viewer.wicket.ui.components.scalars; import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel; import java.util.List; -import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import org.apache.wicket.Component; import org.apache.wicket.MarkupContainer; @@ -67,9 +66,10 @@ public abstract class ScalarPanelAbstract extends PanelAbstract<ScalarModel> imp protected static final String ID_SCALAR_IF_COMPACT = "scalarIfCompact"; + private static final String ID_ASSOCIATED_ACTION_LINKS_BELOW = "associatedActionLinksBelow"; + private static final String ID_ASSOCIATED_ACTION_LINKS_RIGHT = "associatedActionLinksRight"; + protected static final String ID_ADDITIONAL_LINK = "additionalLink"; - protected static final String ID_ADDITIONAL_LINKS_BELOW = "additionalLinksBelow"; - protected static final String ID_ADDITIONAL_LINKS_RIGHT = "additionalLinksRight"; private static final String ID_FEEDBACK = "feedback"; @@ -324,15 +324,11 @@ public abstract class ScalarPanelAbstract extends PanelAbstract<ScalarModel> imp } protected void addEntityActionLinksBelowAndRight(final MarkupContainer labelIfRegular, final List<LinkAndLabel> entityActions) { - final List<LinkAndLabel> entityActionsBelow = positioned(entityActions, ActionLayout.Position.BELOW); - AdditionalLinksPanel.addAdditionalLinks(labelIfRegular, ID_ADDITIONAL_LINKS_BELOW, entityActionsBelow, AdditionalLinksPanel.Style.INLINE_LIST); - - final List<LinkAndLabel> entityActionsRight = positioned(entityActions, ActionLayout.Position.RIGHT); - AdditionalLinksPanel.addAdditionalLinks(labelIfRegular, ID_ADDITIONAL_LINKS_RIGHT, entityActionsRight, AdditionalLinksPanel.Style.DROPDOWN); - } + final List<LinkAndLabel> entityActionsBelow = LinkAndLabel.positioned(entityActions, ActionLayout.Position.BELOW); + AdditionalLinksPanel.addAdditionalLinks(labelIfRegular, ID_ASSOCIATED_ACTION_LINKS_BELOW, entityActionsBelow, AdditionalLinksPanel.Style.INLINE_LIST); - private static List<LinkAndLabel> positioned(final List<LinkAndLabel> entityActionLinks, final ActionLayout.Position position) { - return Lists.newArrayList(Iterables.filter(entityActionLinks, LinkAndLabel.Predicates.positioned(position))); + final List<LinkAndLabel> entityActionsRight = LinkAndLabel.positioned(entityActions, ActionLayout.Position.RIGHT); + AdditionalLinksPanel.addAdditionalLinks(labelIfRegular, ID_ASSOCIATED_ACTION_LINKS_RIGHT, entityActionsRight, AdditionalLinksPanel.Style.DROPDOWN); } private static String determineLabelAtCss(ScalarModel model) { http://git-wip-us.apache.org/repos/asf/isis/blob/9517e5b5/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisBlobOrClobPanelAbstract.html ---------------------------------------------------------------------- diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisBlobOrClobPanelAbstract.html b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisBlobOrClobPanelAbstract.html index e7119d7..bd5724c 100644 --- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisBlobOrClobPanelAbstract.html +++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisBlobOrClobPanelAbstract.html @@ -36,9 +36,9 @@ <span class="fileName" wicket:id="fileName"></span> </span> <span wicket:id="feedback" class="help-block"></span> - <span wicket:id="additionalLinksBelow"></span> + <span wicket:id="associatedActionLinksBelow"></span> </span> - <span wicket:id="additionalLinksRight"></span> + <span wicket:id="associatedActionLinksRight"></span> </div> <span wicket:id="scalarIfCompact"> http://git-wip-us.apache.org/repos/asf/isis/blob/9517e5b5/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanel.html ---------------------------------------------------------------------- diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanel.html b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanel.html index 66eb735..b637358 100644 --- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanel.html +++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanel.html @@ -30,9 +30,9 @@ <span class="scalarValueWrapper"> <input type="checkbox" name="scalarValue" class="form-control scalarValue" wicket:id="scalarValue" /> <span wicket:id="feedback" class="help-block"></span> - <span wicket:id="additionalLinksBelow"></span> + <span wicket:id="associatedActionLinksBelow"></span> </span> - <span wicket:id="additionalLinksRight"></span> + <span wicket:id="associatedActionLinksRight"></span> </div> <input type="checkbox" wicket:id="scalarIfCompact" /> </div> http://git-wip-us.apache.org/repos/asf/isis/blob/9517e5b5/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.html ---------------------------------------------------------------------- diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.html b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.html index 680ec67..0b92105 100644 --- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.html +++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.html @@ -41,9 +41,9 @@ </div> </span> <span wicket:id="feedback" class="help-block"></span> - <span wicket:id="additionalLinksBelow"></span> + <span wicket:id="associatedActionLinksBelow"></span> </span> - <span wicket:id="additionalLinksRight"></span> + <span wicket:id="associatedActionLinksRight"></span> </div> <div wicket:id="scalarIfCompact" class="scalarIfCompact"> <div class="scalarValue"> http://git-wip-us.apache.org/repos/asf/isis/blob/9517e5b5/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesSelect2Panel.html ---------------------------------------------------------------------- diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesSelect2Panel.html b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesSelect2Panel.html index 81cbc9e..f1ef0d8 100644 --- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesSelect2Panel.html +++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesSelect2Panel.html @@ -32,9 +32,9 @@ <input wicket:id="scalarValue" type="hidden" class="choices form-control input-sm select2-remote" style="width: 99.8%;"/> </div> <span wicket:id="feedback" class="help-block"></span> - <span wicket:id="additionalLinksBelow"></span> + <span wicket:id="associatedActionLinksBelow"></span> </div> - <span wicket:id="additionalLinksRight"></span> + <span wicket:id="associatedActionLinksRight"></span> </div> <span wicket:id="scalarIfCompact"></span> </div> http://git-wip-us.apache.org/repos/asf/isis/blob/9517e5b5/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides.css ---------------------------------------------------------------------- diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides.css b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides.css index 2c68090..ce753b7 100644 --- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides.css +++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides.css @@ -225,4 +225,11 @@ div.label-left .choicesPlaceholder { padding-top: 20px; } +.additionalLinks.pull-right { + margin-right: 5px; +} +.additionalLinks.pull-right div { + display: inline-block; + margin-left: 5px; +}
