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/11 09:22:30 UTC
[10/10] isis git commit: ISIS-537: fixes for standalone collections;
minor layout improvements
ISIS-537: fixes for standalone collections; minor layout improvements
- NPE when switch back to standalone collection (table view) after alternate view (excel)
- after switch view of one collection, the "other" collections were no longer showing the correct view (lost their state)
- remove bottom border for tables
- render bulk actions to left, not right.
- change powered by to use TM rather than (R).
- remove debug message left over
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/8b7267e6
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/8b7267e6
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/8b7267e6
Branch: refs/heads/ISIS-939
Commit: 8b7267e60e4f84ce627220c4c0e88dbf25c5bcfd
Parents: 62d77af
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Tue Nov 11 08:11:44 2014 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Tue Nov 11 08:11:44 2014 +0000
----------------------------------------------------------------------
.../CollectionContentsAsAjaxTablePanel.css | 13 ++++++
.../CollectionContentsAsAjaxTablePanel.java | 6 ---
.../CollectionContentsMultipleViewsPanel.java | 43 +++++++++++---------
.../components/scalars/ScalarPanelAbstract.java | 11 ++---
.../StandaloneCollectionPanel.html | 8 ++--
.../StandaloneCollectionPanel.java | 6 ++-
.../viewer/wicket/ui/pages/PageAbstract.html | 2 +-
.../wicket/ui/pages/bootstrap-overrides.css | 11 ++++-
8 files changed, 59 insertions(+), 41 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/8b7267e6/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.css
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.css b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.css
index 6f04938..66587b7 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.css
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.css
@@ -139,3 +139,16 @@
.collectionContentsAsAjaxTablePanel .table-responsive {
overflow-x: auto;
}
+
+.collectionContentsAsAjaxTablePanel table tbody tr:last-child td {
+ border-bottom: none;
+}
+
+.collectionContentsAsAjaxTablePanel table tfoot tr:first-child td {
+ border-top: none;
+ border-bottom: none;
+}
+
+.collectionContentsAsAjaxTablePanel .table {
+ margin-bottom: 0px;
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/8b7267e6/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.java
index 6158ba3..44669cd 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.java
@@ -45,7 +45,6 @@ import org.apache.isis.viewer.wicket.model.hints.UiHintPathSignificant;
import org.apache.isis.viewer.wicket.model.isis.WicketViewerSettings;
import org.apache.isis.viewer.wicket.model.mementos.ObjectAdapterMemento;
import org.apache.isis.viewer.wicket.model.models.EntityCollectionModel;
-import org.apache.isis.viewer.wicket.ui.components.collection.bulk.BulkActionsHelper;
import org.apache.isis.viewer.wicket.ui.components.collection.bulk.BulkActionsProvider;
import org.apache.isis.viewer.wicket.ui.components.collection.count.CollectionCountProvider;
import org.apache.isis.viewer.wicket.ui.components.collectioncontents.ajaxtable.columns.ColumnAbstract;
@@ -64,17 +63,12 @@ public class CollectionContentsAsAjaxTablePanel extends PanelAbstract<EntityColl
private static final long serialVersionUID = 1L;
private static final String ID_TABLE = "table";
- private static final String ID_ACTION_PROMPT_MODAL_WINDOW = "actionPromptModalWindow";
- private static final String ID_ENTITY_ACTIONS = "entityActions";
private IsisAjaxFallbackDataTable<ObjectAdapter,String> dataTable;
- private final BulkActionsHelper bulkActionsHelper;
-
public CollectionContentsAsAjaxTablePanel(final String id, final EntityCollectionModel model) {
super(id, model);
- bulkActionsHelper = new BulkActionsHelper(model);
}
@Override
http://git-wip-us.apache.org/repos/asf/isis/blob/8b7267e6/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/multiple/CollectionContentsMultipleViewsPanel.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/multiple/CollectionContentsMultipleViewsPanel.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/multiple/CollectionContentsMultipleViewsPanel.java
index 0a7019e..9e60554 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/multiple/CollectionContentsMultipleViewsPanel.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/multiple/CollectionContentsMultipleViewsPanel.java
@@ -33,8 +33,8 @@ import org.apache.isis.viewer.wicket.model.models.EntityCollectionModel;
import org.apache.isis.viewer.wicket.ui.ComponentFactory;
import org.apache.isis.viewer.wicket.ui.ComponentType;
import org.apache.isis.viewer.wicket.ui.components.collection.count.CollectionCountProvider;
-import org.apache.isis.viewer.wicket.ui.components.collection.selector.CollectionSelectorPanel;
import org.apache.isis.viewer.wicket.ui.components.collection.selector.CollectionSelectorHelper;
+import org.apache.isis.viewer.wicket.ui.components.collection.selector.CollectionSelectorPanel;
import org.apache.isis.viewer.wicket.ui.components.collection.selector.CollectionSelectorProvider;
import org.apache.isis.viewer.wicket.ui.panels.PanelAbstract;
import org.apache.isis.viewer.wicket.ui.panels.PanelUtil;
@@ -163,31 +163,34 @@ public class CollectionContentsMultipleViewsPanel
if(view >= 0 && view < componentFactories.size()) {
underlyingViewNum = view;
}
- } catch(NumberFormatException ex) {
- // ignore
- }
- }
- final EntityCollectionModel dummyModel = getModel().asDummy();
- for(int i=0; i<MAX_NUM_UNDERLYING_VIEWS; i++) {
- final Component component = underlyingViews[i];
- if(component == null) {
- continue;
- }
- final boolean isSelected = i == underlyingViewNum;
- applyCssVisibility(component, isSelected);
- component.setDefaultModel(isSelected? getModel(): dummyModel);
- }
- this.selectedComponentFactory = ignoreFactory;
- this.selectedComponent = underlyingViews[underlyingViewNum];
+ final EntityCollectionModel dummyModel = getModel().asDummy();
+ for(int i=0; i<MAX_NUM_UNDERLYING_VIEWS; i++) {
+ final Component component = underlyingViews[i];
+ if(component == null) {
+ continue;
+ }
+ final boolean isSelected = i == underlyingViewNum;
+ applyCssVisibility(component, isSelected);
+ component.setDefaultModel(isSelected? getModel(): dummyModel);
+ }
+
+ this.selectedComponentFactory = ignoreFactory;
+ this.selectedComponent = underlyingViews[underlyingViewNum];
- final AjaxRequestTarget target = uiHintEvent.getTarget();
- if(target != null) {
- target.add(this, selectorDropdownPanel);
+ final AjaxRequestTarget target = uiHintEvent.getTarget();
+ if(target != null) {
+ target.add(this, selectorDropdownPanel);
+ }
+
+ } catch(NumberFormatException ex) {
+ // ignore
+ }
}
+
}
http://git-wip-us.apache.org/repos/asf/isis/blob/8b7267e6/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 b67814a..6f6e6fe 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,10 +22,7 @@ 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.Lists;
-
-import org.apache.wicket.AttributeModifier;
import org.apache.wicket.Component;
import org.apache.wicket.MarkupContainer;
import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -38,7 +35,6 @@ import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.LabeledWebMarkupContainer;
import org.apache.wicket.markup.html.panel.Fragment;
import org.apache.wicket.model.Model;
-
import org.apache.isis.applib.annotation.Where;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.facets.members.cssclass.CssClassFacet;
@@ -47,8 +43,10 @@ import org.apache.isis.core.runtime.system.DeploymentType;
import org.apache.isis.core.runtime.system.context.IsisContext;
import org.apache.isis.viewer.wicket.model.links.LinkAndLabel;
import org.apache.isis.viewer.wicket.model.mementos.ObjectAdapterMemento;
-import org.apache.isis.viewer.wicket.model.models.*;
+import org.apache.isis.viewer.wicket.model.models.ActionPromptProvider;
+import org.apache.isis.viewer.wicket.model.models.EntityModel;
import org.apache.isis.viewer.wicket.model.models.EntityModel.RenderingHint;
+import org.apache.isis.viewer.wicket.model.models.ScalarModel;
import org.apache.isis.viewer.wicket.ui.components.additionallinks.AdditionalLinksPanel;
import org.apache.isis.viewer.wicket.ui.components.additionallinks.EntityActionUtil;
import org.apache.isis.viewer.wicket.ui.components.scalars.TextFieldValueModel.ScalarModelProvider;
@@ -348,9 +346,6 @@ public abstract class ScalarPanelAbstract extends PanelAbstract<ScalarModel> imp
final LabelAtFacet facet = getModel().getFacet(LabelAtFacet.class);
- // TODO mgrigorov: Remove this. It is for debugging
- scalarName.add(new AttributeModifier("title", "labelAt=" + (facet != null? facet.value(): "(null)")));
-
if (facet != null) {
switch (facet.value()) {
case LEFT:
http://git-wip-us.apache.org/repos/asf/isis/blob/8b7267e6/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/standalonecollection/StandaloneCollectionPanel.html
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/standalonecollection/StandaloneCollectionPanel.html b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/standalonecollection/StandaloneCollectionPanel.html
index f5f7f94..a86f6cc 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/standalonecollection/StandaloneCollectionPanel.html
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/standalonecollection/StandaloneCollectionPanel.html
@@ -30,11 +30,11 @@
<div class="iconAndTitle panel-heading actionPanelHeaderNew">
<span wicket:id="actionName" class="actionName panel-title">[action name]</span>
- <div class="pull-right">
+ <div class="btn-group">
+ <div wicket:id="additionalLinks"></div>
+ </div>
- <div class="btn-group">
- <div wicket:id="additionalLinks"></div>
- </div>
+ <div class="pull-right">
<div class="btn-group">
<span wicket:id="selectorDropdown"/>
</div>
http://git-wip-us.apache.org/repos/asf/isis/blob/8b7267e6/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/standalonecollection/StandaloneCollectionPanel.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/standalonecollection/StandaloneCollectionPanel.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/standalonecollection/StandaloneCollectionPanel.java
index c1206ff..c1b333d 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/standalonecollection/StandaloneCollectionPanel.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/standalonecollection/StandaloneCollectionPanel.java
@@ -65,6 +65,7 @@ public class StandaloneCollectionPanel extends PanelAbstract<EntityCollectionMod
private final ActionPromptModalWindow actionPromptModalWindow;
private final CollectionSelectorPanel selectorDropdownPanel;
private final BulkActionsHelper bulkActionsHelper;
+ private AdditionalLinksPanel additionalLinks;
/**
* note that the bulk actions components are added in {@link #configureBulkActions(org.apache.isis.viewer.wicket.ui.components.collectioncontents.ajaxtable.columns.ObjectAdapterToggleboxColumn)}.
@@ -152,6 +153,9 @@ public class StandaloneCollectionPanel extends PanelAbstract<EntityCollectionMod
@Override
public void configureBulkActions(final ObjectAdapterToggleboxColumn toggleboxColumn) {
+ if(additionalLinks != null) {
+ return;
+ }
final BulkActionsLinkFactory linkFactory =
new BulkActionsLinkFactory(getModel(), toggleboxColumn);
@@ -164,7 +168,7 @@ public class StandaloneCollectionPanel extends PanelAbstract<EntityCollectionMod
}
});
- AdditionalLinksPanel additionalLinks = new AdditionalLinksPanel(ID_ADDITIONAL_LINKS, links);
+ additionalLinks = new AdditionalLinksPanel(ID_ADDITIONAL_LINKS, links);
addOrReplace(additionalLinks);
http://git-wip-us.apache.org/repos/asf/isis/blob/8b7267e6/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.html
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.html b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.html
index b6a0c3b..90c2175 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.html
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.html
@@ -94,7 +94,7 @@
</ul>
<ul class="nav navbar-nav navbar-right">
<p class="navbar-text powered-by">Powered by:</p>
- <li><a href="http://isis.apache.org" target="_blank">Apache Isis ®</a></li>
+ <li><a href="http://isis.apache.org" target="_blank">Apache Isis ™</a></li>
<li><a wicket:id="aboutLink" class="navbar-right">About</a></li>
<li wicket:id="themePicker"></li>
</ul>
http://git-wip-us.apache.org/repos/asf/isis/blob/8b7267e6/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 5a65da7..51c53d3 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
@@ -89,7 +89,7 @@ div.label-left.form-group {
div.label-left label.control-label {
width: 30%;
float: left;
- padding-top: 7px;
+ padding-top: 2px;
padding-left: 10px;
text-align: start;
}
@@ -163,3 +163,12 @@ div.label-left .choicesPlaceholder {
.standaloneCollectionPanel .panel-heading {
padding-bottom: 15px;
}
+
+.standaloneCollectionPanel .additionalLinkList {
+ margin-left: 50px;
+}
+
+.referencePanel .entityLinkSelect2Panel .entityImage {
+ width: 20px;
+ height: 20px;
+}