You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2022/05/20 11:50:36 UTC
[isis] branch master updated: ISIS-3054: moving wicket viewer page resources into sub-packages
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/master by this push:
new 3fe1ab5610 ISIS-3054: moving wicket viewer page resources into sub-packages
3fe1ab5610 is described below
commit 3fe1ab56101f5df8e43538a26b4b12954b859540
Author: Andi Huber <ah...@apache.org>
AuthorDate: Fri May 20 13:50:26 2022 +0200
ISIS-3054: moving wicket viewer page resources into sub-packages
---
.../isis/viewer/wicket/ui/pages/PageAbstract.java | 59 ++++++----------------
.../BootstrapOverridesCssResourceReference.java | 34 ++++++++++++-
.../bootstrap/css}/bootstrap-overrides-all-v2.css | 0
.../css}/bootstrap-overrides-bootstrap-theme.css | 0
.../css}/bootstrap-overrides-cerulean.css | 0
.../bootstrap/css}/bootstrap-overrides-cosmo.css | 0
.../bootstrap/css}/bootstrap-overrides-cyborg.css | 0
.../bootstrap/css}/bootstrap-overrides-darkly.css | 0
.../bootstrap/css}/bootstrap-overrides-flatly.css | 0
.../bootstrap/css}/bootstrap-overrides-journal.css | 0
.../bootstrap/css}/bootstrap-overrides-lumen.css | 0
.../bootstrap/css}/bootstrap-overrides-paper.css | 0
.../css}/bootstrap-overrides-readable.css | 0
.../css}/bootstrap-overrides-sandstone.css | 0
.../bootstrap/css}/bootstrap-overrides-simplex.css | 0
.../bootstrap/css}/bootstrap-overrides-slate.css | 0
.../css}/bootstrap-overrides-spacelab.css | 0
.../css}/bootstrap-overrides-superhero.css | 0
.../bootstrap/css}/bootstrap-overrides-united.css | 0
.../bootstrap/css}/bootstrap-overrides-yeti.css | 0
.../js/LiveQueryJsResourceReference.java} | 26 +++++-----
.../{ => common/livequery/js}/jquery.livequery.js | 0
.../sidebar/css}/SidebarCssResourceReference.java | 2 +-
.../{ => common/sidebar/css}/simple-sidebar.css | 0
.../js/IsisWicketViewerJsResourceReference.java} | 25 +++++----
.../viewer/js}/jquery.isis.wicket.viewer.js | 0
.../org/apache/isis/viewer/wicket/ui/util/Wkt.java | 2 +-
27 files changed, 76 insertions(+), 72 deletions(-)
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
index f4c91a6fa1..fd3c2eb2ea 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
@@ -20,7 +20,6 @@ package org.apache.isis.viewer.wicket.ui.pages;
import java.util.Iterator;
import java.util.List;
-import java.util.Locale;
import java.util.Optional;
import java.util.UUID;
@@ -34,7 +33,6 @@ import org.apache.wicket.devutils.debugbar.DebugBar;
import org.apache.wicket.devutils.debugbar.IDebugBarContributor;
import org.apache.wicket.devutils.debugbar.InspectorDebugPanel;
import org.apache.wicket.event.Broadcast;
-import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.CssReferenceHeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
@@ -45,10 +43,6 @@ import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.markup.html.panel.EmptyPanel;
import org.apache.wicket.model.IModel;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-import org.apache.wicket.request.resource.CssResourceReference;
-import org.apache.wicket.request.resource.JavaScriptResourceReference;
-import org.apache.wicket.request.resource.PackageResource;
-import org.apache.wicket.request.resource.ResourceReference;
import org.apache.isis.applib.annotation.PromptStyle;
import org.apache.isis.applib.services.exceprecog.ExceptionRecognizerService;
@@ -79,6 +73,10 @@ import org.apache.isis.viewer.wicket.ui.components.widgets.breadcrumbs.Breadcrum
import org.apache.isis.viewer.wicket.ui.components.widgets.breadcrumbs.BreadcrumbModelProvider;
import org.apache.isis.viewer.wicket.ui.errors.ExceptionModel;
import org.apache.isis.viewer.wicket.ui.errors.JGrowlBehaviour;
+import org.apache.isis.viewer.wicket.ui.pages.common.bootstrap.css.BootstrapOverridesCssResourceReference;
+import org.apache.isis.viewer.wicket.ui.pages.common.livequery.js.LiveQueryJsResourceReference;
+import org.apache.isis.viewer.wicket.ui.pages.common.sidebar.css.SidebarCssResourceReference;
+import org.apache.isis.viewer.wicket.ui.pages.common.viewer.js.IsisWicketViewerJsResourceReference;
import org.apache.isis.viewer.wicket.ui.util.FontAwesomeCssReferenceWkt;
import org.apache.isis.viewer.wicket.ui.util.Wkt;
import org.apache.isis.viewer.wicket.ui.util.Wkt.EventTopic;
@@ -86,11 +84,7 @@ import org.apache.isis.viewer.wicket.ui.util.Wkt.EventTopic;
import lombok.val;
import lombok.extern.log4j.Log4j2;
-import de.agilecoders.wicket.core.Bootstrap;
-// import de.agilecoders.wicket.core.markup.html.references.BootlintHeaderItem;
import de.agilecoders.wicket.core.markup.html.references.BootstrapJavaScriptReference;
-import de.agilecoders.wicket.core.settings.IBootstrapSettings;
-import de.agilecoders.wicket.core.settings.ITheme;
/**
* Convenience adapter for {@link WebPage}s built up using {@link ComponentType}s.
@@ -102,15 +96,7 @@ implements ActionPromptProvider {
private static final long serialVersionUID = 1L;
- /**
- * @see <a href="http://github.com/brandonaaron/livequery">livequery</a>
- */
- private static final JavaScriptResourceReference JQUERY_LIVEQUERY_JS =
- new JavaScriptResourceReference(PageAbstract.class, "jquery.livequery.js");
- private static final JavaScriptResourceReference JQUERY_ISIS_WICKET_VIEWER_JS =
- new JavaScriptResourceReference(PageAbstract.class, "jquery.isis.wicket.viewer.js");
-
- // not to be confused with the bootstrap theme...
+ // not to be confused with the bootstrap theme...
// is simply a CSS class derived from the application's name
private static final String ID_THEME = "theme";
private static final String ID_BOOKMARKED_PAGES = "bookmarks";
@@ -254,17 +240,19 @@ implements ActionPromptProvider {
response.render(new PriorityHeaderItem(JavaScriptHeaderItem.forReference(getApplication().getJavaScriptLibrarySettings().getJQueryReference())));
response.render(new PriorityHeaderItem(JavaScriptHeaderItem.forReference(BootstrapJavaScriptReference.instance())));
-
response.render(FontAwesomeCssReferenceWkt.asHeaderItem());
+
response.render(BootstrapOverridesCssResourceReference.asHeaderItem());
+ BootstrapOverridesCssResourceReference
+ .contributeThemeSpecificOverrides(getApplication(), response);
+
response.render(SidebarCssResourceReference.asHeaderItem());
- contributeThemeSpecificOverrides(response);
- response.render(JavaScriptReferenceHeaderItem.forReference(JQUERY_LIVEQUERY_JS));
- response.render(JavaScriptReferenceHeaderItem.forReference(JQUERY_ISIS_WICKET_VIEWER_JS));
+ response.render(LiveQueryJsResourceReference.asHeaderItem());
+ response.render(IsisWicketViewerJsResourceReference.asHeaderItem());
- final JGrowlBehaviour jGrowlBehaviour = new JGrowlBehaviour(getCommonContext());
- jGrowlBehaviour.renderFeedbackMessages(response);
+ new JGrowlBehaviour(getCommonContext())
+ .renderFeedbackMessages(response);
getConfiguration().getViewer().getWicket().getApplication().getCss()
.ifPresent(applicationCss -> {
@@ -274,9 +262,10 @@ implements ActionPromptProvider {
getConfiguration().getViewer().getWicket().getApplication().getJs()
.ifPresent(applicationJs -> {
response.render(JavaScriptReferenceHeaderItem.forUrl(applicationJs));
- } );
+ });
- getConfiguration().getViewer().getWicket().getLiveReloadUrl().ifPresent(liveReloadUrl -> {
+ getConfiguration().getViewer().getWicket().getLiveReloadUrl()
+ .ifPresent(liveReloadUrl -> {
response.render(JavaScriptReferenceHeaderItem.forUrl(liveReloadUrl));
});
@@ -317,22 +306,6 @@ implements ActionPromptProvider {
*/
}
- /**
- * Contributes theme specific Bootstrap CSS overrides if there is such resource
- *
- * @param response The header response to contribute to
- */
- private void contributeThemeSpecificOverrides(final IHeaderResponse response) {
- final IBootstrapSettings bootstrapSettings = Bootstrap.getSettings(getApplication());
- final ITheme activeTheme = bootstrapSettings.getActiveThemeProvider().getActiveTheme();
- final String name = activeTheme.name().toLowerCase(Locale.ENGLISH);
- final String themeSpecificOverride = "bootstrap-overrides-" + name + ".css";
- final ResourceReference.Key themeSpecificOverrideKey = new ResourceReference.Key(PageAbstract.class.getName(), themeSpecificOverride, null, null, null);
- if (PackageResource.exists(themeSpecificOverrideKey)) {
- response.render(CssHeaderItem.forReference(new CssResourceReference(themeSpecificOverrideKey)));
- }
- }
-
/**
* As provided in the {@link #PageAbstract(org.apache.wicket.request.mapper.parameter.PageParameters, String, org.apache.isis.viewer.common.model.components.ComponentType...)} constructor}.
*
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/BootstrapOverridesCssResourceReference.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/common/bootstrap/css/BootstrapOverridesCssResourceReference.java
similarity index 54%
rename from viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/BootstrapOverridesCssResourceReference.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/common/bootstrap/css/BootstrapOverridesCssResourceReference.java
index 682365fa2f..aa468af21b 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/BootstrapOverridesCssResourceReference.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/common/bootstrap/css/BootstrapOverridesCssResourceReference.java
@@ -16,14 +16,24 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.viewer.wicket.ui.pages;
+package org.apache.isis.viewer.wicket.ui.pages.common.bootstrap.css;
+import java.util.Locale;
+
+import org.apache.wicket.Application;
import org.apache.wicket.markup.head.CssHeaderItem;
+import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.request.resource.CssResourceReference;
+import org.apache.wicket.request.resource.PackageResource;
+import org.apache.wicket.request.resource.ResourceReference;
import lombok.Getter;
import lombok.experimental.Accessors;
+import de.agilecoders.wicket.core.Bootstrap;
+import de.agilecoders.wicket.core.settings.IBootstrapSettings;
+import de.agilecoders.wicket.core.settings.ITheme;
+
/**
* A CSS resource reference that provides CSS rules which override the CSS rules
* provided by the currently active Bootstrap theme.
@@ -45,4 +55,26 @@ public class BootstrapOverridesCssResourceReference extends CssResourceReference
super(BootstrapOverridesCssResourceReference.class, "bootstrap-overrides-all-v2.css");
}
+ /**
+ * Contributes theme specific Bootstrap CSS overrides if there is such resource
+ *
+ * @param response The header response to contribute to
+ */
+ public static void contributeThemeSpecificOverrides(
+ final Application application,
+ final IHeaderResponse response) {
+
+ final IBootstrapSettings bootstrapSettings = Bootstrap.getSettings(application);
+
+ final ITheme activeTheme = bootstrapSettings.getActiveThemeProvider().getActiveTheme();
+ final String name = activeTheme.name().toLowerCase(Locale.ENGLISH);
+ final String themeSpecificOverride = "bootstrap-overrides-" + name + ".css";
+ final ResourceReference.Key themeSpecificOverrideKey =
+ new ResourceReference.Key(BootstrapOverridesCssResourceReference.class.getName(),
+ themeSpecificOverride, null, null, null);
+ if (PackageResource.exists(themeSpecificOverrideKey)) {
+ response.render(CssHeaderItem.forReference(new CssResourceReference(themeSpecificOverrideKey)));
+ }
+ }
+
}
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-all-v2.css b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/common/bootstrap/css/bootstrap-overrides-all-v2.css
similarity index 100%
rename from viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-all-v2.css
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/common/bootstrap/css/bootstrap-overrides-all-v2.css
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-bootstrap-theme.css b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/common/bootstrap/css/bootstrap-overrides-bootstrap-theme.css
similarity index 100%
rename from viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-bootstrap-theme.css
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/common/bootstrap/css/bootstrap-overrides-bootstrap-theme.css
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-cerulean.css b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/common/bootstrap/css/bootstrap-overrides-cerulean.css
similarity index 100%
rename from viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-cerulean.css
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/common/bootstrap/css/bootstrap-overrides-cerulean.css
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-cosmo.css b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/common/bootstrap/css/bootstrap-overrides-cosmo.css
similarity index 100%
rename from viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-cosmo.css
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/common/bootstrap/css/bootstrap-overrides-cosmo.css
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-cyborg.css b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/common/bootstrap/css/bootstrap-overrides-cyborg.css
similarity index 100%
rename from viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-cyborg.css
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/common/bootstrap/css/bootstrap-overrides-cyborg.css
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-darkly.css b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/common/bootstrap/css/bootstrap-overrides-darkly.css
similarity index 100%
rename from viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-darkly.css
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/common/bootstrap/css/bootstrap-overrides-darkly.css
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-flatly.css b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/common/bootstrap/css/bootstrap-overrides-flatly.css
similarity index 100%
rename from viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-flatly.css
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/common/bootstrap/css/bootstrap-overrides-flatly.css
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-journal.css b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/common/bootstrap/css/bootstrap-overrides-journal.css
similarity index 100%
rename from viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-journal.css
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/common/bootstrap/css/bootstrap-overrides-journal.css
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-lumen.css b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/common/bootstrap/css/bootstrap-overrides-lumen.css
similarity index 100%
rename from viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-lumen.css
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/common/bootstrap/css/bootstrap-overrides-lumen.css
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-paper.css b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/common/bootstrap/css/bootstrap-overrides-paper.css
similarity index 100%
rename from viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-paper.css
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/common/bootstrap/css/bootstrap-overrides-paper.css
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-readable.css b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/common/bootstrap/css/bootstrap-overrides-readable.css
similarity index 100%
rename from viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-readable.css
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/common/bootstrap/css/bootstrap-overrides-readable.css
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-sandstone.css b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/common/bootstrap/css/bootstrap-overrides-sandstone.css
similarity index 100%
rename from viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-sandstone.css
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/common/bootstrap/css/bootstrap-overrides-sandstone.css
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-simplex.css b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/common/bootstrap/css/bootstrap-overrides-simplex.css
similarity index 100%
rename from viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-simplex.css
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/common/bootstrap/css/bootstrap-overrides-simplex.css
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-slate.css b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/common/bootstrap/css/bootstrap-overrides-slate.css
similarity index 100%
rename from viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-slate.css
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/common/bootstrap/css/bootstrap-overrides-slate.css
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-spacelab.css b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/common/bootstrap/css/bootstrap-overrides-spacelab.css
similarity index 100%
rename from viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-spacelab.css
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/common/bootstrap/css/bootstrap-overrides-spacelab.css
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-superhero.css b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/common/bootstrap/css/bootstrap-overrides-superhero.css
similarity index 100%
rename from viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-superhero.css
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/common/bootstrap/css/bootstrap-overrides-superhero.css
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-united.css b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/common/bootstrap/css/bootstrap-overrides-united.css
similarity index 100%
rename from viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-united.css
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/common/bootstrap/css/bootstrap-overrides-united.css
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-yeti.css b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/common/bootstrap/css/bootstrap-overrides-yeti.css
similarity index 100%
rename from viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-yeti.css
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/common/bootstrap/css/bootstrap-overrides-yeti.css
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/SidebarCssResourceReference.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/common/livequery/js/LiveQueryJsResourceReference.java
similarity index 56%
copy from viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/SidebarCssResourceReference.java
copy to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/common/livequery/js/LiveQueryJsResourceReference.java
index 9d3a998d4d..8adfac1a1f 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/SidebarCssResourceReference.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/common/livequery/js/LiveQueryJsResourceReference.java
@@ -16,34 +16,34 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.viewer.wicket.ui.pages;
+package org.apache.isis.viewer.wicket.ui.pages.common.livequery.js;
-import org.apache.wicket.markup.head.CssHeaderItem;
-import org.apache.wicket.request.resource.CssResourceReference;
+import org.apache.wicket.markup.head.JavaScriptReferenceHeaderItem;
+import org.apache.wicket.request.resource.JavaScriptResourceReference;
import lombok.Getter;
import lombok.experimental.Accessors;
/**
- * A CSS resource reference that provides CSS rules which override the CSS rules
- * provided by the currently active Bootstrap theme.
- * Usually the overrides rules are about sizes and weights, but should not change any colors
+ * @see <a href="http://github.com/brandonaaron/livequery">livequery</a>
+ * @deprecated replace by webjar eventually
*/
-public class SidebarCssResourceReference extends CssResourceReference {
+@Deprecated
+public class LiveQueryJsResourceReference extends JavaScriptResourceReference {
private static final long serialVersionUID = 1L;
@Getter(lazy = true) @Accessors(fluent = true)
- private static final SidebarCssResourceReference instance =
- new SidebarCssResourceReference();
+ private static final LiveQueryJsResourceReference instance =
+ new LiveQueryJsResourceReference();
- public static CssHeaderItem asHeaderItem() {
- return CssHeaderItem.forReference(SidebarCssResourceReference.instance());
+ public static JavaScriptReferenceHeaderItem asHeaderItem() {
+ return JavaScriptReferenceHeaderItem.forReference(LiveQueryJsResourceReference.instance());
}
/**
* Private constructor.
*/
- private SidebarCssResourceReference() {
- super(SidebarCssResourceReference.class, "simple-sidebar.css");
+ private LiveQueryJsResourceReference() {
+ super(LiveQueryJsResourceReference.class, "jquery.livequery.js");
}
}
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/jquery.livequery.js b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/common/livequery/js/jquery.livequery.js
similarity index 100%
rename from viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/jquery.livequery.js
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/common/livequery/js/jquery.livequery.js
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/SidebarCssResourceReference.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/common/sidebar/css/SidebarCssResourceReference.java
similarity index 96%
copy from viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/SidebarCssResourceReference.java
copy to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/common/sidebar/css/SidebarCssResourceReference.java
index 9d3a998d4d..b01d8aad9e 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/SidebarCssResourceReference.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/common/sidebar/css/SidebarCssResourceReference.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.viewer.wicket.ui.pages;
+package org.apache.isis.viewer.wicket.ui.pages.common.sidebar.css;
import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.request.resource.CssResourceReference;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/simple-sidebar.css b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/common/sidebar/css/simple-sidebar.css
similarity index 100%
rename from viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/simple-sidebar.css
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/common/sidebar/css/simple-sidebar.css
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/SidebarCssResourceReference.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/common/viewer/js/IsisWicketViewerJsResourceReference.java
similarity index 56%
rename from viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/SidebarCssResourceReference.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/common/viewer/js/IsisWicketViewerJsResourceReference.java
index 9d3a998d4d..9fa3a985b1 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/SidebarCssResourceReference.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/common/viewer/js/IsisWicketViewerJsResourceReference.java
@@ -16,34 +16,33 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.viewer.wicket.ui.pages;
+package org.apache.isis.viewer.wicket.ui.pages.common.viewer.js;
-import org.apache.wicket.markup.head.CssHeaderItem;
-import org.apache.wicket.request.resource.CssResourceReference;
+import org.apache.wicket.markup.head.JavaScriptReferenceHeaderItem;
+import org.apache.wicket.request.resource.JavaScriptResourceReference;
import lombok.Getter;
import lombok.experimental.Accessors;
/**
- * A CSS resource reference that provides CSS rules which override the CSS rules
- * provided by the currently active Bootstrap theme.
- * Usually the overrides rules are about sizes and weights, but should not change any colors
+ * Javascript (client-side) extensions and fixes.
*/
-public class SidebarCssResourceReference extends CssResourceReference {
+public class IsisWicketViewerJsResourceReference
+extends JavaScriptResourceReference {
private static final long serialVersionUID = 1L;
@Getter(lazy = true) @Accessors(fluent = true)
- private static final SidebarCssResourceReference instance =
- new SidebarCssResourceReference();
+ private static final IsisWicketViewerJsResourceReference instance =
+ new IsisWicketViewerJsResourceReference();
- public static CssHeaderItem asHeaderItem() {
- return CssHeaderItem.forReference(SidebarCssResourceReference.instance());
+ public static JavaScriptReferenceHeaderItem asHeaderItem() {
+ return JavaScriptReferenceHeaderItem.forReference(IsisWicketViewerJsResourceReference.instance());
}
/**
* Private constructor.
*/
- private SidebarCssResourceReference() {
- super(SidebarCssResourceReference.class, "simple-sidebar.css");
+ private IsisWicketViewerJsResourceReference() {
+ super(IsisWicketViewerJsResourceReference.class, "jquery.isis.wicket.viewer.js");
}
}
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/jquery.isis.wicket.viewer.js b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/common/viewer/js/jquery.isis.wicket.viewer.js
similarity index 100%
rename from viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/jquery.isis.wicket.viewer.js
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/common/viewer/js/jquery.isis.wicket.viewer.js
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/util/Wkt.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/util/Wkt.java
index a81529da5b..880d7aa3d9 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/util/Wkt.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/util/Wkt.java
@@ -1023,7 +1023,7 @@ public class Wkt {
maxLength.get()
.ifPresent(maxLen->{
- // for TextArea in conjunction with javascript in jquery.isis.wicket.viewer.js
+ // for TextArea in conjunction with javascript in IsisWicketViewerJsResourceReference
// see http://stackoverflow.com/questions/4459610/set-maxlength-in-html-textarea
Wkt.attributeReplace(formComponent, "maxlength", maxLen);