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 2017/06/28 09:47:48 UTC
[1/3] isis git commit: ISIS-1521: fix to bad link in docs in
simpleapp archetype
Repository: isis
Updated Branches:
refs/heads/master a39a987ee -> 0b358df4d
ISIS-1521: fix to bad link in docs in simpleapp archetype
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/63f5e2cb
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/63f5e2cb
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/63f5e2cb
Branch: refs/heads/master
Commit: 63f5e2cb2cc3ef2bdb3d445de160b767d47840c4
Parents: a39a987
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Tue Jun 27 17:52:34 2017 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Tue Jun 27 17:52:34 2017 +0100
----------------------------------------------------------------------
.../simpleapp/webapp/src/main/webapp/about/index.html | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/63f5e2cb/example/application/simpleapp/webapp/src/main/webapp/about/index.html
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/webapp/src/main/webapp/about/index.html b/example/application/simpleapp/webapp/src/main/webapp/about/index.html
index 9f42e59..d85066e 100644
--- a/example/application/simpleapp/webapp/src/main/webapp/about/index.html
+++ b/example/application/simpleapp/webapp/src/main/webapp/about/index.html
@@ -79,7 +79,7 @@ th, td {
</p>
<p>
provides access to a generic UI for end-users,
- Isis' <a href="http://isis.apache.org/guides/ugvw.html" target="_blank">Wicket Viewer</a>.
+ Apache Isis' <a href="http://isis.apache.org/guides/ugvw/ugvw.html" target="_blank">Wicket Viewer</a>.
As its name suggests, this viewer is built on top of <a href="http://wicket.apache.org" target="_blank">Apache Wicket</a>™.
</p>
</li>
@@ -92,7 +92,7 @@ th, td {
<p>
provides access to a Swagger UI which uses a subset of the framework's automatically
generated <a href="restful/">RESTful API</a> (provided by the
- <a href="http://isis.apache.org/guides/ugvro.html" target="_blank">Restful Objects viewer</a>). There are
+ <a href="http://isis.apache.org/guides/ugvro/ugvro.html" target="_blank">Restful Objects viewer</a>). There are
three versions of the Swagger spec files (that drive the UI):
<a href="restful/swagger/public">public</a> (for use by "third-party" apps),
<a href="restful/swagger/private">private</a> (for use by internal apps), and
[2/3] isis git commit: ISIS-1640, ISIS-1641,
ISIS-1642: lets breadcrumb and bookmark panels optionally be hidden,
and removes memory leak in Breadcrumbs.
Posted by da...@apache.org.
ISIS-1640, ISIS-1641, ISIS-1642: lets breadcrumb and bookmark panels optionally be hidden, and removes memory leak in Breadcrumbs.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/91ae67aa
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/91ae67aa
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/91ae67aa
Branch: refs/heads/master
Commit: 91ae67aa6a5bb531c21724e112801b5f87ccd565
Parents: 63f5e2c
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Wed Jun 28 09:50:55 2017 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Wed Jun 28 09:50:55 2017 +0100
----------------------------------------------------------------------
.../wicket/viewer/IsisWicketApplication.java | 48 +++++++++++
.../bookmarkedpages/BookmarkedPagesPanel.java | 6 ++
.../CollectionContentsAsAjaxTablePanel.java | 17 ----
.../ui/components/footer/FooterPanel.java | 10 ++-
.../scalars/reference/ReferencePanel.java | 3 -
.../widgets/breadcrumbs/BreadcrumbModel.java | 91 +++++++++++---------
.../widgets/breadcrumbs/BreadcrumbPanel.java | 32 ++++---
.../viewer/wicket/ui/pages/PageAbstract.java | 40 ++++++---
.../ui/pages/actionprompt/ActionPromptPage.java | 2 +-
.../wicket/ui/pages/entity/EntityPage.java | 9 +-
.../viewer/wicket/ui/panels/PanelAbstract.java | 4 +
.../application/manifest/isis.properties | 29 ++++++-
.../src/main/webapp/WEB-INF/translations-en.po | 2 +-
.../src/main/webapp/WEB-INF/translations-es.po | 2 +-
.../src/main/webapp/WEB-INF/translations-nl.po | 2 +-
.../src/main/webapp/WEB-INF/translations.po | 2 +-
.../webapp/WEB-INF/viewer_wicket.properties | 27 ++++++
.../src/main/webapp/WEB-INF/translations-en.po | 2 +-
.../src/main/webapp/WEB-INF/translations-es.po | 2 +-
.../src/main/webapp/WEB-INF/translations-nl.po | 2 +-
.../src/main/webapp/WEB-INF/translations.po | 2 +-
21 files changed, 235 insertions(+), 99 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/91ae67aa/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
index d677003..20ad066 100644
--- a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
+++ b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
@@ -48,6 +48,12 @@ import org.apache.wicket.authentication.strategy.DefaultAuthenticationStrategy;
import org.apache.wicket.authroles.authentication.AuthenticatedWebApplication;
import org.apache.wicket.authroles.authentication.AuthenticatedWebSession;
import org.apache.wicket.core.request.mapper.MountedMapper;
+import org.apache.wicket.devutils.debugbar.DebugBar;
+import org.apache.wicket.devutils.debugbar.InspectorDebugPanel;
+import org.apache.wicket.devutils.debugbar.PageSizeDebugPanel;
+import org.apache.wicket.devutils.debugbar.SessionSizeDebugPanel;
+import org.apache.wicket.devutils.debugbar.VersionDebugContributor;
+import org.apache.wicket.devutils.diskstore.DebugDiskDataStore;
import org.apache.wicket.guice.GuiceComponentInjector;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.filter.JavaScriptFilteredIntoFooterHeaderResponse;
@@ -58,6 +64,7 @@ import org.apache.wicket.request.cycle.IRequestCycleListener;
import org.apache.wicket.request.cycle.PageRequestHandlerTracker;
import org.apache.wicket.request.cycle.RequestCycleListenerCollection;
import org.apache.wicket.request.resource.CssResourceReference;
+import org.apache.wicket.settings.DebugSettings;
import org.apache.wicket.settings.RequestCycleSettings;
import org.apache.wicket.util.time.Duration;
import org.slf4j.Logger;
@@ -158,6 +165,18 @@ public class IsisWicketApplication
private static final String WICKET_REMEMBER_ME_COOKIE_KEY_DEFAULT = "isisWicketRememberMe";
private static final String WICKET_REMEMBER_ME_ENCRYPTION_KEY = "isis.viewer.wicket.rememberMe.encryptionKey";
+ /**
+ * A configuration setting which value determines whether debug bar and other stuff influenced by {@link DebugSettings#isDevelopmentUtilitiesEnabled()} is enabled or not.
+ *
+ * <p>
+ * By default, depends on the mode (prototyping = enabled, server = disabled). This property acts as an override.
+ * </p>
+ */
+ public static final String ENABLE_DEVELOPMENT_UTILITIES_KEY = "isis.viewer.wicket.developmentUtilities.enable";
+ public static final boolean ENABLE_DEVELOPMENT_UTILITIES_DEFAULT = false;
+
+
+
private final IsisLoggingConfigurer loggingConfigurer = new IsisLoggingConfigurer();
/**
@@ -360,6 +379,35 @@ public class IsisWicketApplication
log(mmie.getValidationErrors());
}
+ if(getDeploymentCategory().isPrototyping()) {
+ DebugDiskDataStore.register(this);
+ LOG.info("DebugDiskDataStore registered; access via ~/wicket/internal/debug/diskDataStore");
+ LOG.info("DebugDiskDataStore: eg, http://localhost:8080/wicket/wicket/internal/debug/diskDataStore");
+ }
+
+ if(!getDebugSettings().isDevelopmentUtilitiesEnabled()) {
+ boolean enableDevUtils = configuration
+ .getBoolean(ENABLE_DEVELOPMENT_UTILITIES_KEY, ENABLE_DEVELOPMENT_UTILITIES_DEFAULT);
+ if(enableDevUtils) {
+ getDebugSettings().setDevelopmentUtilitiesEnabled(true);
+
+ // copied from DebugBarInitializer
+ // this is hacky, but need to do this because IInitializer#init() called before
+ // the Application's #init() is called.
+ // an alternative, better, design might be to move Isis' own initialization into an
+ // implementation of IInitializer?
+ DebugBar.registerContributor(VersionDebugContributor.DEBUG_BAR_CONTRIB, this);
+ DebugBar.registerContributor(InspectorDebugPanel.DEBUG_BAR_CONTRIB, this);
+ DebugBar.registerContributor(SessionSizeDebugPanel.DEBUG_BAR_CONTRIB, this);
+ DebugBar.registerContributor(PageSizeDebugPanel.DEBUG_BAR_CONTRIB, this);
+ }
+ }
+
+ LOG.info("storeSettings.inmemoryCacheSize : " + getStoreSettings().getInmemoryCacheSize());
+ LOG.info("storeSettings.asynchronousQueueCapacity: " + getStoreSettings().getAsynchronousQueueCapacity());
+ LOG.info("storeSettings.maxSizePerSession : " + getStoreSettings().getMaxSizePerSession());
+ LOG.info("storeSettings.fileStoreFolder : " + getStoreSettings().getFileStoreFolder());
+
} catch(RuntimeException ex) {
// because Wicket's handling in its WicketFilter (that calls this method) does not log the exception.
LOG.error("Failed to initialize", ex);
http://git-wip-us.apache.org/repos/asf/isis/blob/91ae67aa/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/BookmarkedPagesPanel.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/BookmarkedPagesPanel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/BookmarkedPagesPanel.java
index 210ec64..5c455c2 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/BookmarkedPagesPanel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/BookmarkedPagesPanel.java
@@ -70,6 +70,12 @@ public class BookmarkedPagesPanel extends PanelAbstract<BookmarkedPagesModel> {
private static final String CLEAR_BOOKMARKS = "clearBookmarks";
+ /**
+ * A configuration setting which value determines whether the bookmarks should be available in the header
+ */
+ public static final String SHOW_BOOKMARKS_KEY = "isis.viewer.wicket.bookmarkedPages.showChooser";
+ public static final boolean SHOW_BOOKMARKS_DEFAULT = true;
+
private static final JavaScriptResourceReference SLIDE_PANEL_JS = new JavaScriptResourceReference(BookmarkedPagesPanel.class, "slide-panel.js");
@com.google.inject.Inject
http://git-wip-us.apache.org/repos/asf/isis/blob/91ae67aa/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.java
index c90e9e0..8f5541c 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.java
@@ -42,12 +42,10 @@ import org.apache.isis.core.metamodel.adapter.version.ConcurrencyException;
import org.apache.isis.core.metamodel.facets.all.hide.HiddenFacet;
import org.apache.isis.core.metamodel.facets.all.named.NamedFacet;
import org.apache.isis.core.metamodel.facets.object.grid.GridFacet;
-import org.apache.isis.core.metamodel.services.ServicesInjector;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.Contributed;
import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
import org.apache.isis.viewer.wicket.model.common.OnConcurrencyExceptionHandler;
-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.BulkActionsProvider;
@@ -275,20 +273,5 @@ public class CollectionContentsAsAjaxTablePanel
}
- //region > dependencies
-
- @com.google.inject.Inject
- private WicketViewerSettings settings;
- protected WicketViewerSettings getSettings() {
- return settings;
- }
-
-
- protected ServicesInjector getServicesInjector() {
- return getIsisSessionFactory().getServicesInjector();
- }
-
-
- //endregion
}
http://git-wip-us.apache.org/repos/asf/isis/blob/91ae67aa/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/footer/FooterPanel.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/footer/FooterPanel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/footer/FooterPanel.java
index 7da7692..83e6aca 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/footer/FooterPanel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/footer/FooterPanel.java
@@ -18,10 +18,12 @@
*/
package org.apache.isis.viewer.wicket.ui.components.footer;
+import org.apache.wicket.Component;
import org.apache.wicket.MarkupContainer;
import org.apache.wicket.markup.html.WebComponent;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.link.BookmarkablePageLink;
+import org.apache.wicket.markup.html.panel.EmptyPanel;
import org.apache.wicket.model.Model;
import org.apache.wicket.model.ResourceModel;
import org.apache.wicket.request.mapper.parameter.PageParameters;
@@ -61,7 +63,13 @@ public class FooterPanel extends PanelAbstract<Model<String>> {
}
private void addBreadcrumbs() {
- final BreadcrumbPanel breadcrumbPanel = new BreadcrumbPanel(ID_BREADCRUMBS);
+
+ boolean showBreadcrumbs = getConfiguration().getBoolean(
+ BreadcrumbPanel.SHOW_BREADCRUMBS_KEY, BreadcrumbPanel.SHOW_BREADCRUMBS_DEFAULT);
+ final Component breadcrumbPanel =
+ showBreadcrumbs
+ ? new BreadcrumbPanel(ID_BREADCRUMBS)
+ : new EmptyPanel(ID_BREADCRUMBS).setVisible(false);
addOrReplace(breadcrumbPanel);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/91ae67aa/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.java
index 4e3ebb6..ecd68ca 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.java
@@ -510,9 +510,6 @@ public class ReferencePanel extends ScalarPanelSelect2Abstract implements PanelW
@com.google.inject.Inject
WicketViewerSettings wicketViewerSettings;
- IsisConfiguration getConfiguration() {
- return getIsisSessionFactory().getConfiguration();
- }
}
http://git-wip-us.apache.org/repos/asf/isis/blob/91ae67aa/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbModel.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbModel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbModel.java
index b285744..3466a58 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbModel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbModel.java
@@ -26,9 +26,10 @@ import com.google.common.collect.Maps;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager;
+import org.apache.isis.applib.services.bookmark.Bookmark;
import org.apache.isis.core.metamodel.adapter.oid.OidMarshaller;
import org.apache.isis.core.metamodel.adapter.oid.RootOid;
+import org.apache.isis.viewer.wicket.model.mementos.ObjectAdapterMemento;
import org.apache.isis.viewer.wicket.model.mementos.PageParameterNames;
import org.apache.isis.viewer.wicket.model.models.EntityModel;
@@ -40,12 +41,17 @@ public class BreadcrumbModel implements Serializable {
private static final OidMarshaller OID_MARSHALLER = OidMarshaller.INSTANCE;
- private final Map<String, EntityModel> entityModelByOidStr = Maps.newHashMap();
- private final Map<EntityModel, String> oidStrByEntityModel = Maps.newHashMap();
- private final List<EntityModel> list = Lists.newArrayList();
+ private final Map<String, Bookmark> bookmarkByOidStr = Maps.newHashMap();
+ private final Map<Bookmark, String> oidStrByBookmark = Maps.newHashMap();
+ private final List<Bookmark> list = Lists.newArrayList();
public List<EntityModel> getList() {
- return Collections.unmodifiableList(list);
+ List<EntityModel> entityModels = Lists.newArrayList();
+ for (Bookmark bookmark : list) {
+ EntityModel entityModel = toEntityModel(bookmark);
+ entityModels.add(entityModel);
+ }
+ return Collections.unmodifiableList(entityModels);
}
public void visited(final EntityModel entityModel) {
@@ -82,70 +88,73 @@ public class BreadcrumbModel implements Serializable {
}
private void addToStart(final String oidStr, final EntityModel entityModel) {
- entityModelByOidStr.put(oidStr, entityModel);
- oidStrByEntityModel.put(entityModel, oidStr);
- list.add(0, entityModel);
+ Bookmark bookmark = toBookmark(entityModel);
+ bookmarkByOidStr.put(oidStr, bookmark);
+ oidStrByBookmark.put(bookmark, oidStr);
+ list.add(0, bookmark);
}
private void trimTo(final int size) {
if(list.size() <= size) {
return;
}
- final List<EntityModel> modelsToRemove = list.subList(size, list.size());
- for (final EntityModel model : modelsToRemove) {
- final String oidStr = oidStrByEntityModel.get(model);
- remove(oidStr, model);
+ final List<Bookmark> bookmarksToRemove = list.subList(size, list.size());
+ for (final Bookmark bookmark : bookmarksToRemove) {
+ final String oidStr = oidStrByBookmark.get(bookmark);
+ remove(oidStr, bookmark);
}
}
- public String titleFor(final EntityModel model) {
- return model.getObjectAdapterMemento().getObjectAdapter(AdapterManager.ConcurrencyChecking.NO_CHECK,
- model.getPersistenceSession(), model.getSpecificationLoader()).titleString(null);
- }
-
public EntityModel lookup(final String oidStr) {
if(oidStr == null) {
return null;
}
- return entityModelByOidStr.get(oidStr);
- }
-
- public void detach() {
- for (EntityModel entityModel : list) {
- entityModel.detach();
+ final Bookmark bookmark = bookmarkByOidStr.get(oidStr);
+ if(bookmark == null) {
+ return null;
}
+ return toEntityModel(bookmark);
}
- public RootOid getId(final EntityModel choice) {
- try {
- final PageParameters pageParameters = choice.getPageParameters();
- final String oidStr = PageParameterNames.OBJECT_OID.getStringFrom(pageParameters);
- return RootOid.deString(oidStr);
- } catch (Exception ex) {
- remove(choice);
- return null;
- }
+ public void detach() {
+ // previously list held EntityModels rather than Bookmarks
+ // this code is now redundant, I think.
+ // for (EntityModel entityModel : list) {
+ // entityModel.detach();
+ // }
}
+
void remove(final String rootOid) {
- final EntityModel existingModel = entityModelByOidStr.get(rootOid);
- if(existingModel != null) {
- remove(rootOid, existingModel);
+ Bookmark existingBookmark = bookmarkByOidStr.get(rootOid);
+ if(existingBookmark != null) {
+ remove(rootOid, existingBookmark);
}
}
public void remove(final EntityModel entityModel) {
- final String oidStr = oidStrByEntityModel.get(entityModel);
+ Bookmark bookmark = toBookmark(entityModel);
+ final String oidStr = oidStrByBookmark.get(bookmark);
if(oidStr != null) {
- remove(oidStr, entityModel);
+ remove(oidStr, bookmark);
}
}
- private void remove(final String rootOid, final EntityModel model) {
- entityModelByOidStr.remove(rootOid);
- oidStrByEntityModel.remove(model);
- list.remove(model);
+ protected Bookmark toBookmark(final EntityModel entityModel) {
+ return entityModel.getObjectAdapterMemento().asBookmark();
+ }
+
+ protected EntityModel toEntityModel(final Bookmark bookmark) {
+ RootOid rootOid = RootOid.create(bookmark);
+ ObjectAdapterMemento oam = ObjectAdapterMemento.createPersistent(rootOid);
+ return new EntityModel(oam);
+ }
+
+ private void remove(final String rootOid, final Bookmark bookmark) {
+ bookmarkByOidStr.remove(rootOid);
+ oidStrByBookmark.remove(bookmark);
+ list.remove(bookmark);
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/91ae67aa/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbPanel.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbPanel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbPanel.java
index c75a11b..90fb737 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbPanel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbPanel.java
@@ -27,15 +27,17 @@ import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.wicketstuff.select2.ChoiceProvider;
import org.wicketstuff.select2.Response;
import org.wicketstuff.select2.Select2Choice;
import org.wicketstuff.select2.Settings;
import org.apache.isis.core.commons.authentication.MessageBroker;
-import org.apache.isis.core.commons.config.IsisConfiguration;
+import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager;
import org.apache.isis.core.metamodel.adapter.oid.OidMarshaller;
import org.apache.isis.core.metamodel.adapter.oid.RootOid;
+import org.apache.isis.viewer.wicket.model.mementos.PageParameterNames;
import org.apache.isis.viewer.wicket.model.models.EntityModel;
import org.apache.isis.viewer.wicket.ui.errors.JGrowlUtil;
import org.apache.isis.viewer.wicket.ui.pages.entity.EntityPage;
@@ -49,8 +51,8 @@ public class BreadcrumbPanel extends PanelAbstract<IModel<Void>> {
/**
* A configuration setting which value determines whether the breadcrumbs should be available in the footer
*/
- private static final String SHOW_BREADCRUMBS_KEY = "isis.viewer.wicket.breadcrumbs.showChooser";
- private static final boolean SHOW_BREADCRUMBS_DEFAULT = true;
+ public static final String SHOW_BREADCRUMBS_KEY = "isis.viewer.wicket.breadcrumbs.showChooser";
+ public static final boolean SHOW_BREADCRUMBS_DEFAULT = true;
public BreadcrumbPanel(String id) {
super(id);
@@ -70,16 +72,29 @@ public class BreadcrumbPanel extends PanelAbstract<IModel<Void>> {
@Override
public String getDisplayValue(EntityModel choice) {
- return breadcrumbModel.titleFor(choice);
+ return titleFor(choice);
}
+ private String titleFor(final EntityModel model) {
+ return model.getObjectAdapterMemento().getObjectAdapter(AdapterManager.ConcurrencyChecking.NO_CHECK,
+ model.getPersistenceSession(), model.getSpecificationLoader()).titleString(null);
+ }
+
+
@Override
public String getIdValue(EntityModel choice) {
- RootOid rootOid = breadcrumbModel.getId(choice);
- String id = OidMarshaller.INSTANCE.marshal(rootOid);
- return id;
+ try {
+ final PageParameters pageParameters = choice.getPageParameters();
+ final String oidStr = PageParameterNames.OBJECT_OID.getStringFrom(pageParameters);
+ final RootOid result = RootOid.deString(oidStr);
+ return OidMarshaller.INSTANCE.marshal(result);
+ } catch (Exception ex) {
+ breadcrumbModel.remove(choice);
+ return null;
+ }
}
+
@Override
public void query(String term, int page, Response<EntityModel> response) {
final List<EntityModel> breadCrumbList = Lists.newArrayList(breadcrumbModel.getList());
@@ -140,7 +155,4 @@ public class BreadcrumbPanel extends PanelAbstract<IModel<Void>> {
setVisible(shouldShow);
}
- private IsisConfiguration getConfiguration() {
- return getIsisSessionFactory().getConfiguration();
- }
}
http://git-wip-us.apache.org/repos/asf/isis/blob/91ae67aa/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
index dfa85e2..0be0dd7 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
@@ -64,7 +64,6 @@ import org.apache.isis.applib.services.exceprecog.ExceptionRecognizer;
import org.apache.isis.applib.services.exceprecog.ExceptionRecognizerComposite;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager;
import org.apache.isis.core.metamodel.services.ServicesInjector;
import org.apache.isis.core.runtime.system.context.IsisContext;
import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
@@ -84,6 +83,8 @@ import org.apache.isis.viewer.wicket.ui.ComponentType;
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.actionprompt.ActionPromptModalWindow;
+import org.apache.isis.viewer.wicket.ui.components.bookmarkedpages.BookmarkedPagesPanel;
+import org.apache.isis.viewer.wicket.ui.components.widgets.breadcrumbs.BreadcrumbPanel;
import org.apache.isis.viewer.wicket.ui.components.widgets.favicon.Favicon;
import org.apache.isis.viewer.wicket.ui.errors.ExceptionModel;
import org.apache.isis.viewer.wicket.ui.errors.JGrowlBehaviour;
@@ -194,16 +195,11 @@ public abstract class PageAbstract extends WebPage implements ActionPromptProvid
themeDiv.add(new CssClassAppender(CssClassAppender.asCssStyle(applicationName)));
}
- DebugBar debugBar = null;
- if (getApplication().getDebugSettings().isDevelopmentUtilitiesEnabled()) {
- debugBar = newDebugBar("debugBar");
- }
- if (debugBar != null) {
- add(debugBar);
- } else {
- add(new EmptyPanel("debugBar").setVisible(false));
- }
-
+ boolean devUtilitiesEnabled = getApplication().getDebugSettings().isDevelopmentUtilitiesEnabled();
+ Component debugBar = devUtilitiesEnabled
+ ? newDebugBar("debugBar")
+ : new EmptyPanel("debugBar").setVisible(false);
+ add(debugBar);
MarkupContainer header = createPageHeader("header");
themeDiv.add(header);
@@ -417,8 +413,12 @@ public abstract class PageAbstract extends WebPage implements ActionPromptProvid
* Convenience for subclasses
*/
protected void addBookmarkedPages(final MarkupContainer container) {
- Component bookmarks = getComponentFactoryRegistry().createComponent(ComponentType.BOOKMARKED_PAGES, ID_BOOKMARKED_PAGES, getBookmarkedPagesModel());
+ boolean showBookmarks = isShowBookmarks();
+ Component bookmarks = showBookmarks
+ ? getComponentFactoryRegistry().createComponent(ComponentType.BOOKMARKED_PAGES, ID_BOOKMARKED_PAGES, getBookmarkedPagesModel())
+ : new EmptyPanel(ID_BOOKMARKED_PAGES).setVisible(false);
container.add(bookmarks);
+
bookmarks.add(new Behavior() {
@Override
public void onConfigure(Component component) {
@@ -430,7 +430,21 @@ public abstract class PageAbstract extends WebPage implements ActionPromptProvid
});
}
- protected void bookmarkPage(final BookmarkableModel<?> model) {
+ private boolean isShowBookmarks() {
+ return getConfiguration() .getBoolean(
+ BookmarkedPagesPanel.SHOW_BOOKMARKS_KEY, BookmarkedPagesPanel.SHOW_BOOKMARKS_DEFAULT);
+ }
+
+ protected boolean isShowBreadcrumbs() {
+ return getConfiguration() .getBoolean(
+ BreadcrumbPanel.SHOW_BREADCRUMBS_KEY, BreadcrumbPanel.SHOW_BREADCRUMBS_DEFAULT);
+ }
+
+ protected void bookmarkPageIfShown(final BookmarkableModel<?> model) {
+ if(!isShowBookmarks()) {
+ // no need...
+ return;
+ }
getBookmarkedPagesModel().bookmarkPage(model);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/91ae67aa/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/actionprompt/ActionPromptPage.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/actionprompt/ActionPromptPage.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/actionprompt/ActionPromptPage.java
index d3d0814..5ed2861 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/actionprompt/ActionPromptPage.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/actionprompt/ActionPromptPage.java
@@ -42,7 +42,7 @@ public class ActionPromptPage extends PageAbstract {
addChildComponents(themeDiv, model);
if(model.isBookmarkable()) {
- bookmarkPage(model);
+ bookmarkPageIfShown(model);
}
addBookmarkedPages(themeDiv);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/91ae67aa/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/entity/EntityPage.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/entity/EntityPage.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/entity/EntityPage.java
index 104109e..75e0e5a 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/entity/EntityPage.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/entity/EntityPage.java
@@ -115,7 +115,10 @@ public class EntityPage extends PageAbstract {
buildPage();
}
- private void addBreadcrumb(final EntityModel entityModel) {
+ private void addBreadcrumbIfShown(final EntityModel entityModel) {
+ if(!isShowBreadcrumbs()) {
+ return;
+ }
final BreadcrumbModelProvider session = (BreadcrumbModelProvider) getSession();
final BreadcrumbModel breadcrumbModel = session.getBreadcrumbModel();
breadcrumbModel.visited(entityModel);
@@ -179,8 +182,8 @@ public class EntityPage extends PageAbstract {
addChildComponents(entityPageContainer, model);
// bookmarks and breadcrumbs
- bookmarkPage(model);
- addBreadcrumb(model);
+ bookmarkPageIfShown(model);
+ addBreadcrumbIfShown(model);
addBookmarkedPages(entityPageContainer);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/91ae67aa/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelAbstract.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelAbstract.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelAbstract.java
index 2bb216f..47c6c30 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelAbstract.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelAbstract.java
@@ -25,6 +25,7 @@ import org.apache.wicket.model.IModel;
import org.apache.isis.applib.annotation.SemanticsOf;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
+import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
import org.apache.isis.core.metamodel.services.ServicesInjector;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
@@ -170,6 +171,9 @@ public abstract class PanelAbstract<T extends IModel<?>> extends Panel {
public PersistenceSession getPersistenceSession() {
return getIsisSessionFactory().getCurrentSession().getPersistenceSession();
}
+ protected IsisConfiguration getConfiguration() {
+ return getIsisSessionFactory().getConfiguration();
+ }
public SpecificationLoader getSpecificationLoader() {
return getIsisSessionFactory().getSpecificationLoader();
http://git-wip-us.apache.org/repos/asf/isis/blob/91ae67aa/example/application/simpleapp/application/src/main/resources/domainapp/application/manifest/isis.properties
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/application/src/main/resources/domainapp/application/manifest/isis.properties b/example/application/simpleapp/application/src/main/resources/domainapp/application/manifest/isis.properties
index c16a956..e42c965 100644
--- a/example/application/simpleapp/application/src/main/resources/domainapp/application/manifest/isis.properties
+++ b/example/application/simpleapp/application/src/main/resources/domainapp/application/manifest/isis.properties
@@ -109,12 +109,19 @@ isis.reflector.facet.cssClassFa.patterns=\
add.*:fa-plus-square,\
create.*:fa-plus,\
update.*:fa-edit,\
+ delete.*:fa-trash,\
+ save.*:fa-floppy-o,\
change.*:fa-edit,\
+ edit.*:fa-pencil-square-o,\
+ maintain.*:fa-edit,\
remove.*:fa-minus-square,\
+ copy.*:fa-copy,\
move.*:fa-exchange,\
first.*:fa-star,\
find.*:fa-search,\
lookup.*:fa-search,\
+ search.*:fa-search,\
+ view.*:fa-search,\
clear.*:fa-remove,\
previous.*:fa-step-backward,\
next.*:fa-step-forward,\
@@ -122,19 +129,37 @@ isis.reflector.facet.cssClassFa.patterns=\
all.*:fa-list, \
download.*:fa-download, \
upload.*:fa-upload, \
+ export.*:fa-download,\
+ switch.*:fa-exchange,\
+ import.*:fa-upload,\
execute.*:fa-bolt, \
run.*:fa-bolt, \
calculate.*:fa-calculator, \
verify.*:fa-check-circle, \
refresh.*:fa-refresh, \
- install.*:fa-wrench
+ install.*:fa-wrench,\
+ stop.*:fa-stop,\
+ terminate.*:fa-stop,\
+ cancel.*:fa-stop,\
+ discard.*:fa-trash-o,\
+ pause.*:fa-pause,\
+ suspend.*:fa-pause,\
+ resume.*:fa-play,\
+ renew.*:fa-repeat,\
+ reset.*:fa-repeat,\
+ categorise.*:fa-folder-open-o,\
+ assign.*:fa-hand-o-right,\
+ approve.*:fa-thumbs-o-up,\
+ decline.*:fa-thumbs-o-down
#
# patterns for applying CssClass facet (CSS styles), matching on member names
#
isis.reflector.facet.cssClass.patterns=\
- delete.*:btn-danger
+ delete.*:btn-danger,\
+ discard.*:btn-warning,\
+ remove.*:btn-warning
#
http://git-wip-us.apache.org/repos/asf/isis/blob/91ae67aa/example/application/simpleapp/webapp/src/main/webapp/WEB-INF/translations-en.po
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/webapp/src/main/webapp/WEB-INF/translations-en.po b/example/application/simpleapp/webapp/src/main/webapp/WEB-INF/translations-en.po
index 5d9f038..4e59ee2 100644
--- a/example/application/simpleapp/webapp/src/main/webapp/WEB-INF/translations-en.po
+++ b/example/application/simpleapp/webapp/src/main/webapp/WEB-INF/translations-en.po
@@ -488,7 +488,7 @@ msgstr "Remember Me"
#: org.apache.isis.viewer.wicket.ui.pages.login.WicketSignInPage
msgid "resetButtonLabel"
-msgstr "CreateSimpleObjects"
+msgstr "Reset"
#: org.wicketstuff.select2.Select2Choice
http://git-wip-us.apache.org/repos/asf/isis/blob/91ae67aa/example/application/simpleapp/webapp/src/main/webapp/WEB-INF/translations-es.po
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/webapp/src/main/webapp/WEB-INF/translations-es.po b/example/application/simpleapp/webapp/src/main/webapp/WEB-INF/translations-es.po
index 5c0f06b..d519350 100644
--- a/example/application/simpleapp/webapp/src/main/webapp/WEB-INF/translations-es.po
+++ b/example/application/simpleapp/webapp/src/main/webapp/WEB-INF/translations-es.po
@@ -487,7 +487,7 @@ msgstr "Remember Me"
#: org.apache.isis.viewer.wicket.ui.pages.login.WicketSignInPage
msgid "resetButtonLabel"
-msgstr "CreateSimpleObjects"
+msgstr "Reset"
#: org.wicketstuff.select2.Select2Choice
http://git-wip-us.apache.org/repos/asf/isis/blob/91ae67aa/example/application/simpleapp/webapp/src/main/webapp/WEB-INF/translations-nl.po
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/webapp/src/main/webapp/WEB-INF/translations-nl.po b/example/application/simpleapp/webapp/src/main/webapp/WEB-INF/translations-nl.po
index f7c3e89..af4babf 100644
--- a/example/application/simpleapp/webapp/src/main/webapp/WEB-INF/translations-nl.po
+++ b/example/application/simpleapp/webapp/src/main/webapp/WEB-INF/translations-nl.po
@@ -488,7 +488,7 @@ msgstr "Remember Me"
#: org.apache.isis.viewer.wicket.ui.pages.login.WicketSignInPage
msgid "resetButtonLabel"
-msgstr "CreateSimpleObjects"
+msgstr "Reset"
#: org.wicketstuff.select2.Select2Choice
http://git-wip-us.apache.org/repos/asf/isis/blob/91ae67aa/example/application/simpleapp/webapp/src/main/webapp/WEB-INF/translations.po
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/webapp/src/main/webapp/WEB-INF/translations.po b/example/application/simpleapp/webapp/src/main/webapp/WEB-INF/translations.po
index 52dcfb3..adae60c 100644
--- a/example/application/simpleapp/webapp/src/main/webapp/WEB-INF/translations.po
+++ b/example/application/simpleapp/webapp/src/main/webapp/WEB-INF/translations.po
@@ -487,7 +487,7 @@ msgstr "Remember Me"
#: org.apache.isis.viewer.wicket.ui.pages.login.WicketSignInPage
msgid "resetButtonLabel"
-msgstr "CreateSimpleObjects"
+msgstr "Reset"
#: org.wicketstuff.select2.Select2Choice
http://git-wip-us.apache.org/repos/asf/isis/blob/91ae67aa/example/application/simpleapp/webapp/src/main/webapp/WEB-INF/viewer_wicket.properties
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/webapp/src/main/webapp/WEB-INF/viewer_wicket.properties b/example/application/simpleapp/webapp/src/main/webapp/WEB-INF/viewer_wicket.properties
index c51e860..c6ce045 100644
--- a/example/application/simpleapp/webapp/src/main/webapp/WEB-INF/viewer_wicket.properties
+++ b/example/application/simpleapp/webapp/src/main/webapp/WEB-INF/viewer_wicket.properties
@@ -96,17 +96,44 @@ isis.viewer.wicket.maxTitleLengthInParentedTables=0
#
+# whether to show the Wicket debug bar and any other development utilities
+# (default depends on whether running in prototype mode or not; this property overrides that)
+#
+#isis.viewer.wicket.developmentUtilities.enable=true
+isis.viewer.wicket.developmentUtilities.enable=true
+
+
+
+#
+# whether to show bookmarks (defaults to true)
+#
+#isis.viewer.wicket.bookmarkedPages.showChooser=true
+isis.viewer.wicket.bookmarkedPages.showChooser=false
+
+
+
+#
# the maximum number of pages to list in bookmark (default is 15)
#
#isis.viewer.wicket.bookmarkedPages.maxSize=15
#
+# whether to show breadcrumbs (defaults to true)
+#
+#isis.viewer.wicket.breadcrumbs.showChooser=true
+isis.viewer.wicket.breadcrumbs.showChooser=false
+
+
+
+
+#
# whether to show the bootstrap theme chooser (defaults false)
#
#isis.viewer.wicket.themes.showChooser=false
isis.viewer.wicket.themes.showChooser=true
+
#
# comma-separated list of themes to choose from (default is to show all themes from bootswatch.com).
#
http://git-wip-us.apache.org/repos/asf/isis/blob/91ae67aa/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/translations-en.po
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/translations-en.po b/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/translations-en.po
index 5d9f038..4e59ee2 100644
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/translations-en.po
+++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/translations-en.po
@@ -488,7 +488,7 @@ msgstr "Remember Me"
#: org.apache.isis.viewer.wicket.ui.pages.login.WicketSignInPage
msgid "resetButtonLabel"
-msgstr "CreateSimpleObjects"
+msgstr "Reset"
#: org.wicketstuff.select2.Select2Choice
http://git-wip-us.apache.org/repos/asf/isis/blob/91ae67aa/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/translations-es.po
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/translations-es.po b/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/translations-es.po
index 5c0f06b..d519350 100644
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/translations-es.po
+++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/translations-es.po
@@ -487,7 +487,7 @@ msgstr "Remember Me"
#: org.apache.isis.viewer.wicket.ui.pages.login.WicketSignInPage
msgid "resetButtonLabel"
-msgstr "CreateSimpleObjects"
+msgstr "Reset"
#: org.wicketstuff.select2.Select2Choice
http://git-wip-us.apache.org/repos/asf/isis/blob/91ae67aa/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/translations-nl.po
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/translations-nl.po b/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/translations-nl.po
index f7c3e89..af4babf 100644
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/translations-nl.po
+++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/translations-nl.po
@@ -488,7 +488,7 @@ msgstr "Remember Me"
#: org.apache.isis.viewer.wicket.ui.pages.login.WicketSignInPage
msgid "resetButtonLabel"
-msgstr "CreateSimpleObjects"
+msgstr "Reset"
#: org.wicketstuff.select2.Select2Choice
http://git-wip-us.apache.org/repos/asf/isis/blob/91ae67aa/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/translations.po
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/translations.po b/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/translations.po
index 52dcfb3..adae60c 100644
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/translations.po
+++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/translations.po
@@ -487,7 +487,7 @@ msgstr "Remember Me"
#: org.apache.isis.viewer.wicket.ui.pages.login.WicketSignInPage
msgid "resetButtonLabel"
-msgstr "CreateSimpleObjects"
+msgstr "Reset"
#: org.wicketstuff.select2.Select2Choice
[3/3] isis git commit: ISIS-1640, ISIS-1641, ISIS-1642: updates docs
Posted by da...@apache.org.
ISIS-1640, ISIS-1641, ISIS-1642: updates docs
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/0b358df4
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/0b358df4
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/0b358df4
Branch: refs/heads/master
Commit: 0b358df4dfcefafa72977b37416902777cbf7272
Parents: 91ae67a
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Wed Jun 28 10:46:03 2017 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Wed Jun 28 10:46:03 2017 +0100
----------------------------------------------------------------------
.../ugvw/_ugvw_configuration-properties.adoc | 20 ++++++++++++++++++--
1 file changed, 18 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/0b358df4/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_configuration-properties.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_configuration-properties.adoc b/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_configuration-properties.adoc
index ab7271e..b7212bb 100644
--- a/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_configuration-properties.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_configuration-properties.adoc
@@ -39,16 +39,22 @@ If you prefer you can place all configuration properties into `WEB-INF/isis.prop
| whether the Wicket debug mode should be enabled.
|`isis.viewer.wicket.` +
-`bookmarkedPages`
+`bookmarkedPages.maxSize`
| +ve int +
(`_15_`)
| number of pages to bookmark
|`isis.viewer.wicket.` +
+`bookmarkedPages.showChooser`
+| +ve int +
+(`_15_`)
+| (`1.15.0-SNAPSHOT`) whether to show the bookmark panel (top-left in the Wicket viewer)
+
+|`isis.viewer.wicket.` +
`breadcrumbs.showChooser`
| `true`,`false` +
(`_true_`)
-| Whether to show chooser for Breadcrumbs
+| Whether to show chooser for Breadcrumbs (bottom-left in the Wicket viewer)
|`isis.viewer.wicket.` +
`datePattern`
@@ -91,6 +97,16 @@ for further details).
| For dependent choices, whether to automatically select the first dependent (eg subcategory) when the parameter on which it depends (category) changes.
|`isis.viewer.wicket.` +
+`developmentUtilities.enable`
+| `true`,`false` +
+(`_false_`)
+| (`1.15.0-SNAPSHOT`) when running in production mode, whether to show enable the Wicket development utilities anyway.
+From a UI perspective, this will cause the DebugBar to be shown (top-right).
+
+If running in prototyping mode, the development utilities (debug bar) is always enabled.
+This feature is primarily just to help track any memory leakage issues that might be suspected when running in production.
+
+|`isis.viewer.wicket.` +
`disableModalDialogs`
| `true`,`false` +
(`_false_`)