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/21 07:57:46 UTC
[11/13] git commit: ISIS-537 Introduce
BootstrapOverridesCssResourceReference - a CSS reference that contributes
Isis' overrides of Bootstrap CSS rules
ISIS-537 Introduce BootstrapOverridesCssResourceReference - a CSS reference that contributes Isis' overrides of Bootstrap CSS rules
The reference could be used by application overrides as a dependency
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/cf1e505f
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/cf1e505f
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/cf1e505f
Branch: refs/heads/master
Commit: cf1e505f173746ac7970afd5c4c5f034c2664d27
Parents: 373e4ed
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Mon Oct 20 15:49:34 2014 +0300
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Mon Oct 20 15:49:34 2014 +0300
----------------------------------------------------------------------
.../BootstrapOverridesCssResourceReference.java | 15 +++++++++++++++
.../isis/viewer/wicket/ui/pages/PageAbstract.java | 6 +-----
2 files changed, 16 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/cf1e505f/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/BootstrapOverridesCssResourceReference.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/BootstrapOverridesCssResourceReference.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/BootstrapOverridesCssResourceReference.java
new file mode 100644
index 0000000..1a464b0
--- /dev/null
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/BootstrapOverridesCssResourceReference.java
@@ -0,0 +1,15 @@
+package org.apache.isis.viewer.wicket.ui.pages;
+
+import org.apache.wicket.request.resource.CssResourceReference;
+
+/**
+ * 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
+ */
+public class BootstrapOverridesCssResourceReference extends CssResourceReference {
+
+ public BootstrapOverridesCssResourceReference() {
+ super(BootstrapOverridesCssResourceReference.class, "bootstrap-overrides.css");
+ }
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/cf1e505f/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
index d8ea4e2..4bb7630 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
@@ -19,7 +19,6 @@
package org.apache.isis.viewer.wicket.ui.pages;
-import de.agilecoders.wicket.core.markup.html.bootstrap.behavior.BootstrapBaseBehavior;
import de.agilecoders.wicket.core.markup.html.references.BootlintJavaScriptReference;
import de.agilecoders.wicket.extensions.markup.html.bootstrap.icon.FontAwesomeCssReference;
@@ -51,7 +50,6 @@ import org.apache.wicket.protocol.http.ClientProperties;
import org.apache.wicket.protocol.http.WebSession;
import org.apache.wicket.protocol.http.request.WebClientInfo;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-import org.apache.wicket.request.resource.CssResourceReference;
import org.apache.wicket.request.resource.JavaScriptResourceReference;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -191,8 +189,6 @@ public abstract class PageAbstract extends WebPage implements ActionPromptProvid
// ensure that all collected JavaScript contributions are loaded at the page footer
add(new HeaderResponseContainer("footerJS", "footerJS"));
- BootstrapBaseBehavior.addTo(this);
-
} catch(RuntimeException ex) {
LOG.error("Failed to construct page, going back to sign in page", ex);
@@ -257,7 +253,7 @@ public abstract class PageAbstract extends WebPage implements ActionPromptProvid
response.render(new PriorityHeaderItem(JavaScriptHeaderItem.forReference(getApplication().getJavaScriptLibrarySettings().getJQueryReference())));
response.render(CssHeaderItem.forReference(FontAwesomeCssReference.instance()));
- response.render(CssHeaderItem.forReference(new CssResourceReference(PageAbstract.class, "bootstrap-overrides.css")));
+ response.render(CssHeaderItem.forReference(new BootstrapOverridesCssResourceReference()));
PanelUtil.renderHead(response, PageAbstract.class);
response.render(JavaScriptReferenceHeaderItem.forReference(JQUERY_LIVEQUERY_JS));