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/10/19 13:40:45 UTC
[68/78] [abbrv] git commit: ISIS-537: styling fixes. Have also
commented out the entity/icon/copy link panel
ISIS-537: styling fixes. Have also commented out the entity/icon/copy link panel
... want to reinstate for the entity header, but not elsewhere
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/9d5977ec
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/9d5977ec
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/9d5977ec
Branch: refs/heads/master
Commit: 9d5977ec901fecbeba0488936c813436c7d4fff7
Parents: cd19f02
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Fri Oct 17 16:50:27 2014 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Fri Oct 17 16:50:27 2014 +0100
----------------------------------------------------------------------
.../wicket/viewer/IsisWicketApplication.java | 26 +++++++++++++++++---
.../ComponentFactoryRegistrarDefault.java | 3 +--
.../isis/viewer/wicket/ui/ComponentType.java | 8 +++---
.../ui/components/actions/ActionPanel.html | 2 +-
.../ajaxtable/IsisAjaxHeadersToolbar.html | 2 +-
.../collections/EntityCollectionsPanel.html | 4 +--
.../entity/header/EntityHeaderPanel.html | 2 +-
.../entity/header/EntityHeaderPanel.java | 3 ++-
.../EntityIconTitleAndCopyLinkPanelFactory.java | 3 ++-
.../properties/EntityPropertiesPanel.html | 14 +++++------
.../scalars/reference/ReferencePanel.html | 2 +-
.../scalars/reference/ReferencePanel.java | 9 ++++---
.../StandaloneCollectionPanel.html | 2 +-
.../entitysimplelink/EntityLinkSimplePanel.html | 2 +-
.../entitysimplelink/EntityLinkSimplePanel.java | 3 ++-
.../ui/errors/ExceptionStackTracePanel.html | 4 +--
.../viewer/wicket/ui/pages/value/ValuePage.html | 2 +-
.../ui/pages/voidreturn/VoidReturnPage.html | 2 +-
.../isis/viewer/wicket/ui/tabs/TabAbstract.html | 2 +-
19 files changed, 59 insertions(+), 36 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/9d5977ec/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 8c22562..0da6393 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
@@ -131,7 +131,10 @@ public class IsisWicketApplication extends AuthenticatedWebApplication implement
private static final Logger LOG = LoggerFactory.getLogger(IsisWicketApplication.class);
private static final String STRIP_WICKET_TAGS_KEY = "isis.viewer.wicket.stripWicketTags";
-
+ private static final boolean STRIP_WICKET_TAGS_DEFAULT = true;
+ private static final String AJAX_DEBUG_MODE_KEY = "isis.viewer.wicket.ajaxDebugMode";
+ private static final boolean AJAX_DEBUG_MODE_DEFAULT = false;
+
private final IsisLoggingConfigurer loggingConfigurer = new IsisLoggingConfigurer();
/**
@@ -228,7 +231,7 @@ public class IsisWicketApplication extends AuthenticatedWebApplication implement
getRequestCycleListeners().add(newWebRequestCycleForIsis());
getResourceSettings().setParentFolderPlaceholder("$up$");
-
+
determineDeploymentTypeIfRequired();
final IsisConfigurationBuilder isisConfigurationBuilder = createConfigBuilder();
@@ -239,7 +242,9 @@ public class IsisWicketApplication extends AuthenticatedWebApplication implement
final IsisConfiguration configuration = isisConfigurationBuilder.getConfiguration();
this.getMarkupSettings().setStripWicketTags(determineStripWicketTags(configuration));
-
+
+ getDebugSettings().setAjaxDebugModeEnabled(determineAjaxDebugModeEnabled(configuration));
+
initWicketComponentInjection(injector);
// must be done after injected componentFactoryRegistry into the app itself
@@ -593,12 +598,25 @@ public class IsisWicketApplication extends AuthenticatedWebApplication implement
* the tags because they may break some CSS rules.
*/
private boolean determineStripWicketTags(IsisConfiguration configuration) {
- final boolean strip = configuration.getBoolean(STRIP_WICKET_TAGS_KEY, true);
+ final boolean strip = configuration.getBoolean(STRIP_WICKET_TAGS_KEY, STRIP_WICKET_TAGS_DEFAULT);
return strip;
}
// //////////////////////////////////////
+ /**
+ * Whether the Ajax debug should be shown, as specified by configuration settings.
+ *
+ * <p>
+ * If the <tt>isis.viewer.wicket.ajaxDebugMode</tt> is set, then this is used, otherwise the default is to disable.
+ */
+ private boolean determineAjaxDebugModeEnabled(IsisConfiguration configuration) {
+ final boolean debugMode = configuration.getBoolean(AJAX_DEBUG_MODE_KEY, AJAX_DEBUG_MODE_DEFAULT);
+ return debugMode;
+ }
+
+ // //////////////////////////////////////
+
@Override
protected void onDestroy() {
try {
http://git-wip-us.apache.org/repos/asf/isis/blob/9d5977ec/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/components/ComponentFactoryRegistrarDefault.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/components/ComponentFactoryRegistrarDefault.java b/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/components/ComponentFactoryRegistrarDefault.java
index 21a3f2c..b70d111 100644
--- a/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/components/ComponentFactoryRegistrarDefault.java
+++ b/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/components/ComponentFactoryRegistrarDefault.java
@@ -40,7 +40,6 @@ import org.apache.isis.viewer.wicket.ui.components.entity.collections.EntityColl
import org.apache.isis.viewer.wicket.ui.components.entity.combined.EntityCombinedPanelFactory;
import org.apache.isis.viewer.wicket.ui.components.entity.header.EntityHeaderPanelFactory;
import org.apache.isis.viewer.wicket.ui.components.entity.icontitle.EntityIconAndTitlePanelFactory;
-import org.apache.isis.viewer.wicket.ui.components.entity.icontitle.EntityIconTitleAndCopyLinkPanelFactory;
import org.apache.isis.viewer.wicket.ui.components.entity.properties.EntityPropertiesPanelFactory;
import org.apache.isis.viewer.wicket.ui.components.entity.selector.links.EntityLinksSelectorPanelFactory;
import org.apache.isis.viewer.wicket.ui.components.scalars.isisapplib.*;
@@ -139,7 +138,7 @@ public class ComponentFactoryRegistrarDefault implements ComponentFactoryRegistr
// lower-level
componentFactories.add(new EntityIconAndTitlePanelFactory());
- componentFactories.add(new EntityIconTitleAndCopyLinkPanelFactory());
+ // componentFactories.add(new EntityIconTitleAndCopyLinkPanelFactory());
componentFactories.add(new EntityHeaderPanelFactory());
componentFactories.add(new EntityPropertiesPanelFactory());
componentFactories.add(new EntityCollectionsPanelFactory());
http://git-wip-us.apache.org/repos/asf/isis/blob/9d5977ec/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/ComponentType.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/ComponentType.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/ComponentType.java
index c91c753..ebc41de 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/ComponentType.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/ComponentType.java
@@ -60,10 +60,10 @@ public enum ComponentType {
* Icon and title for a single entity.
*/
ENTITY_ICON_AND_TITLE,
- /**
- * Icon, title and a copy link for a single entity.
- */
- ENTITY_ICON_TITLE_AND_COPYLINK,
+// /**
+// * Icon, title and a copy link for a single entity.
+// */
+// ENTITY_ICON_TITLE_AND_COPYLINK,
/**
* Title, icon and action list for a single entity.
*/
http://git-wip-us.apache.org/repos/asf/isis/blob/9d5977ec/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionPanel.html
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionPanel.html b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionPanel.html
index 9958f4d..c5cec84 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionPanel.html
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionPanel.html
@@ -26,7 +26,7 @@
<wicket:panel>
<div class="actionPanel actionComponentType">
<div class="myBlockContainer">
- <div class="iconAndTitle panel actionPanelHeaderNew">
+ <div class="iconAndTitle panel panel-default actionPanelHeaderNew">
<wicket:container wicket:id="entityIconAndTitle">[icon and title]</wicket:container>
<h3 wicket:id="actionName" class="actionName">[action name]</h3>
</div>
http://git-wip-us.apache.org/repos/asf/isis/blob/9d5977ec/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxHeadersToolbar.html
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxHeadersToolbar.html b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxHeadersToolbar.html
index 8e4ccb2..0b6c27e 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxHeadersToolbar.html
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxHeadersToolbar.html
@@ -16,7 +16,7 @@
limitations under the License.
-->
<wicket:panel xmlns:wicket="http://wicket.apache.org">
- <tr class="headers bg-primary">
+ <tr class="headers">
<wicket:container wicket:id="headers">
<th wicket:id="header">
<div>
http://git-wip-us.apache.org/repos/asf/isis/blob/9d5977ec/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/collections/EntityCollectionsPanel.html
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/collections/EntityCollectionsPanel.html b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/collections/EntityCollectionsPanel.html
index 0225ca2..71e2095 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/collections/EntityCollectionsPanel.html
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/collections/EntityCollectionsPanel.html
@@ -22,8 +22,8 @@
<wicket:panel>
<div class="entityCollectionsPanel entityCollectionsComponentType">
<div wicket:id="collections" class="myBlockContainer">
- <div wicket:id="collectionGroup" class="panel">
- <div wicket:id="collectionName" class="panel-heading bg-primary">[collection name]</div>
+ <div wicket:id="collectionGroup" class="panel panel-default">
+ <div wicket:id="collectionName" class="panel-heading">[collection name]</div>
<div wicket:id="collection" class="collection panel-body">
[collection]
</div>
http://git-wip-us.apache.org/repos/asf/isis/blob/9d5977ec/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/header/EntityHeaderPanel.html
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/header/EntityHeaderPanel.html b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/header/EntityHeaderPanel.html
index 4e8b3dc..2ed59dc 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/header/EntityHeaderPanel.html
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/header/EntityHeaderPanel.html
@@ -22,7 +22,7 @@
<wicket:panel>
<div class="entityHeaderPanel panel">
<div class="iconAndTitle panel-heading">
- <div wicket:id="entityIconTitleAndCopylink" class="panel-title">[icon and title]</div>
+ <div wicket:id="entityIconAndTitle" class="panel-title">[icon and title]</div>
</div>
<span class="entityActions" wicket:id="entityActions"></span>
<div class="clearfix"></div>
http://git-wip-us.apache.org/repos/asf/isis/blob/9d5977ec/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 8ee749c..1eb89a1 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
@@ -86,7 +86,8 @@ public class EntityHeaderPanel extends PanelAbstract<EntityModel> {
}
private void addOrReplaceIconAndTitle() {
- final ComponentFactory componentFactory = getComponentFactoryRegistry().findComponentFactory(ComponentType.ENTITY_ICON_TITLE_AND_COPYLINK, getEntityModel());
+ //final ComponentFactory componentFactory = getComponentFactoryRegistry().findComponentFactory(ComponentType.ENTITY_ICON_TITLE_AND_COPYLINK, getEntityModel());
+ final ComponentFactory componentFactory = getComponentFactoryRegistry().findComponentFactory(ComponentType.ENTITY_ICON_AND_TITLE, getEntityModel());
final Component component = componentFactory.createComponent(getEntityModel());
addOrReplace(component);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/9d5977ec/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/icontitle/EntityIconTitleAndCopyLinkPanelFactory.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/icontitle/EntityIconTitleAndCopyLinkPanelFactory.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/icontitle/EntityIconTitleAndCopyLinkPanelFactory.java
index a13e1dd..91870e3 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/icontitle/EntityIconTitleAndCopyLinkPanelFactory.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/icontitle/EntityIconTitleAndCopyLinkPanelFactory.java
@@ -33,7 +33,8 @@ public class EntityIconTitleAndCopyLinkPanelFactory extends EntityComponentFacto
private static final long serialVersionUID = 1L;
public EntityIconTitleAndCopyLinkPanelFactory() {
- super(ComponentType.ENTITY_ICON_TITLE_AND_COPYLINK, EntityIconTitleAndCopyLinkPanel.class);
+ //super(ComponentType.ENTITY_ICON_TITLE_AND_COPYLINK, EntityIconTitleAndCopyLinkPanel.class);
+ super(ComponentType.ENTITY_ICON_AND_TITLE, EntityIconTitleAndCopyLinkPanel.class);
}
@Override
http://git-wip-us.apache.org/repos/asf/isis/blob/9d5977ec/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 e554813..2b08c71 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
@@ -26,8 +26,8 @@
<div wicket:id="leftColumn">
<div class="inputFormTable properties">
<fieldset wicket:id="memberGroup" class="memberGroup myBlockContainer">
- <div class="panel">
- <div wicket:id="memberGroupName" class="panel-heading bg-primary">[group name]</div>
+ <div class="panel panel-default">
+ <div wicket:id="memberGroupName" class="panel-heading">[group name]</div>
<div wicket:id="properties" class="panel-body">
<div wicket:id="property" class="property">[property]</div>
</div>
@@ -45,9 +45,9 @@
</div>
<div wicket:id="middleColumn">
<div class="inputFormTable properties">
- <fieldset wicket:id="memberGroup" class="memberGroup myBlockContainer">
- <div class="panel">
- <div wicket:id="memberGroupName" class="panel-heading bg-primary">[group name]</div>
+ <fieldset wicket:id="memberGroup" class="memberGroup myBlockContainer panel panel-default">
+ <div class="DANH-REMOVE-panel">
+ <div wicket:id="memberGroupName" class="panel-heading">[group name]</div>
<div wicket:id="properties" class="panel-body">
<div wicket:id="property" class="property">[property]</div>
</div>
@@ -58,8 +58,8 @@
<div wicket:id="rightColumn">
<div class="inputFormTable properties">
<fieldset wicket:id="memberGroup" class="memberGroup myBlockContainer">
- <div class="panel">
- <div wicket:id="memberGroupName" class="panel-heading bg-primary">[group name]</div>
+ <div class="panel panel-default">
+ <div wicket:id="memberGroupName" class="panel-heading">[group name]</div>
<div wicket:id="properties" class="panel-body">
<div wicket:id="property" class="property">[property]</div>
</div>
http://git-wip-us.apache.org/repos/asf/isis/blob/9d5977ec/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 4eb7a4b..85286ad 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
@@ -34,7 +34,7 @@
<div class="wrapper">
<span class="autoCompletePlaceholder">
<span wicket:id="entityLink">link or drop down</span>
- <span wicket:id="entityIconTitleAndCopylink">[icon and title]</span>
+ <span wicket:id="entityIconAndTitle">[icon and title]</span>
</span>
<div class="clearfix"></div>
</div>
http://git-wip-us.apache.org/repos/asf/isis/blob/9d5977ec/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.java
index 816a3a0..d6bc22f 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.java
@@ -67,7 +67,8 @@ public class ReferencePanel extends ScalarPanelAbstract {
private static final String ID_SCALAR_NAME = "scalarName";
private static final String ID_AUTO_COMPLETE = "autoComplete";
- private static final String ID_ENTITY_ICON_TITLE_AND_COPYLINK = "entityIconTitleAndCopylink";
+ private static final String ID_ENTITY_ICON_TITLE = "entityIconAndTitle";
+// private static final String ID_ENTITY_ICON_TITLE_AND_COPYLINK = "entityIconTitleAndCopylink";
private static final String ID_SCALAR_IF_COMPACT = "scalarIfCompact";
@@ -218,7 +219,9 @@ public class ReferencePanel extends ScalarPanelAbstract {
entityModelForLink.setRenderingHint(getModel().getRenderingHint());
final ComponentFactory componentFactory =
- getComponentFactoryRegistry().findComponentFactory(ComponentType.ENTITY_ICON_TITLE_AND_COPYLINK, entityModelForLink);
+ getComponentFactoryRegistry().findComponentFactory(ComponentType.ENTITY_ICON_AND_TITLE, entityModelForLink);
+// final ComponentFactory componentFactory =
+// getComponentFactoryRegistry().findComponentFactory(ComponentType.ENTITY_ICON_TITLE_AND_COPYLINK, entityModelForLink);
final Component component = componentFactory.createComponent(entityModelForLink);
((MarkupContainer)getComponentForRegular()).addOrReplace(component);
@@ -283,7 +286,7 @@ public class ReferencePanel extends ScalarPanelAbstract {
// called by syncWithInput
private void permanentlyHideEntityIconAndTitleIfInRegularMode() {
if(getComponentForRegular() != null) {
- Components.permanentlyHide((MarkupContainer)getComponentForRegular(), ID_ENTITY_ICON_TITLE_AND_COPYLINK);
+ Components.permanentlyHide((MarkupContainer)getComponentForRegular(), ID_ENTITY_ICON_TITLE);
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/9d5977ec/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 04d8372..78632c6 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
@@ -24,7 +24,7 @@
lang="en">
<body>
<wicket:panel>
- <div class="standaloneCollectionPanel actionComponentType myBlockContainer panel">
+ <div class="standaloneCollectionPanel actionComponentType myBlockContainer panel panel-default">
<div class="iconAndTitle panel-heading actionPanelHeaderNew">
<div wicket:id="actionName" class="actionName panel-title">[action name]</div>
</div>
http://git-wip-us.apache.org/repos/asf/isis/blob/9d5977ec/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/entitysimplelink/EntityLinkSimplePanel.html
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/entitysimplelink/EntityLinkSimplePanel.html b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/entitysimplelink/EntityLinkSimplePanel.html
index e61ecc0..e72e0b7 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/entitysimplelink/EntityLinkSimplePanel.html
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/entitysimplelink/EntityLinkSimplePanel.html
@@ -31,7 +31,7 @@
<wicket:panel>
<div class="entityLinkSimplePanel entityLinkComponentType">
<div>
- <div wicket:id="entityIconTitleAndCopylink">[icon and title]</div>
+ <div wicket:id="entityIconAndTitle">[icon and title]</div>
<span wicket:id="entityTitleNull">(null)</span>
<div class="clearfix"></div>
</div>
http://git-wip-us.apache.org/repos/asf/isis/blob/9d5977ec/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/entitysimplelink/EntityLinkSimplePanel.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/entitysimplelink/EntityLinkSimplePanel.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/entitysimplelink/EntityLinkSimplePanel.java
index c348efb..090e59e 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/entitysimplelink/EntityLinkSimplePanel.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/entitysimplelink/EntityLinkSimplePanel.java
@@ -69,7 +69,8 @@ public class EntityLinkSimplePanel extends FormComponentPanelAbstract<ObjectAdap
entityModelForLink.setContextAdapterIfAny(getEntityModel().getContextAdapterIfAny());
entityModelForLink.setRenderingHint(getEntityModel().getRenderingHint());
- final ComponentFactory componentFactory = getComponentFactoryRegistry().findComponentFactory(ComponentType.ENTITY_ICON_TITLE_AND_COPYLINK, entityModelForLink);
+ final ComponentFactory componentFactory = getComponentFactoryRegistry().findComponentFactory(ComponentType.ENTITY_ICON_AND_TITLE, entityModelForLink);
+ //final ComponentFactory componentFactory = getComponentFactoryRegistry().findComponentFactory(ComponentType.ENTITY_ICON_TITLE_AND_COPYLINK, entityModelForLink);
final Component component = componentFactory.createComponent(entityModelForLink);
addOrReplace(component);
http://git-wip-us.apache.org/repos/asf/isis/blob/9d5977ec/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/ExceptionStackTracePanel.html
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/ExceptionStackTracePanel.html b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/ExceptionStackTracePanel.html
index 073a6d6..2d61e32 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/ExceptionStackTracePanel.html
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/ExceptionStackTracePanel.html
@@ -32,8 +32,8 @@
<div class="exceptionStackTracePanel">
<div class="errorInfo clear">
<h4 wicket:id="mainMessage" class="mainMessage">[main message text]</h4>
- <div class="errorDetail panel" wicket:id="exceptionDetail">
- <div class="heading panel-heading bg-primary"><span class="panel-title">Show detail</span></div>
+ <div class="errorDetail panel panel-default" wicket:id="exceptionDetail">
+ <div class="heading panel-heading"><span class="panel-title">Show detail</span></div>
<div class="content panel-body">
<div class="exceptionStackTrace">
<h3>Stack trace:</h3>
http://git-wip-us.apache.org/repos/asf/isis/blob/9d5977ec/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/value/ValuePage.html
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/value/ValuePage.html b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/value/ValuePage.html
index 9ebeb6c..7fee76e 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/value/ValuePage.html
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/value/ValuePage.html
@@ -27,7 +27,7 @@
<div class="valuePage">
<div wicket:id="bookmarks"></div>
<div class="myBlockContainer">
- <div class="iconAndTitle panel actionPanelHeaderNew">
+ <div class="iconAndTitle panel panel-default actionPanelHeaderNew">
<h3 wicket:id="actionName" class="actionName">[action name]</h3>
</div>
<div wicket:id="value"></div>
http://git-wip-us.apache.org/repos/asf/isis/blob/9d5977ec/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/voidreturn/VoidReturnPage.html
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/voidreturn/VoidReturnPage.html b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/voidreturn/VoidReturnPage.html
index 1b4cbae..5f94423 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/voidreturn/VoidReturnPage.html
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/voidreturn/VoidReturnPage.html
@@ -27,7 +27,7 @@
<div class="voidReturnPage">
<div wicket:id="bookmarks"></div>
<div class="myBlockContainer">
- <div class="iconAndTitle panel actionPanelHeaderNew">
+ <div class="iconAndTitle panel panel-default actionPanelHeaderNew">
<h3 wicket:id="actionName" class="actionName">[action name]</h3>
</div>
<div wicket:id="voidReturn"></div>
http://git-wip-us.apache.org/repos/asf/isis/blob/9d5977ec/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/tabs/TabAbstract.html
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/tabs/TabAbstract.html b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/tabs/TabAbstract.html
index be52503..b6ed139 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/tabs/TabAbstract.html
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/tabs/TabAbstract.html
@@ -19,7 +19,7 @@
-->
<html xmlns="http://www.w3.org/1999/xhtml" >
<wicket:panel>
- <div class="tab panel">
+ <div class="tab panel panel-default">
<wicket:child/>
</div>
</wicket:panel>