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:45 UTC
[10/13] git commit: ISIS-537 Use application wide header contributor
to make sure that Bootstrap's CSS is always contributed first
ISIS-537 Use application wide header contributor to make sure that Bootstrap's CSS is always contributed first
...so it is possible to override with bootstrap-override.css
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/373e4ed6
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/373e4ed6
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/373e4ed6
Branch: refs/heads/master
Commit: 373e4ed63667d377c9e6fca6cd5559b28434e390
Parents: a3c8f25
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Mon Oct 20 15:45:02 2014 +0300
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Mon Oct 20 15:45:02 2014 +0300
----------------------------------------------------------------------
.../viewer/wicket/viewer/IsisWicketApplication.java | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/373e4ed6/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 0da6393..706acea 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
@@ -20,6 +20,7 @@
package org.apache.isis.viewer.wicket.viewer;
import de.agilecoders.wicket.core.Bootstrap;
+import de.agilecoders.wicket.core.markup.html.bootstrap.behavior.BootstrapBaseBehavior;
import de.agilecoders.wicket.core.settings.BootstrapSettings;
import de.agilecoders.wicket.core.settings.IBootstrapSettings;
import de.agilecoders.wicket.webjars.WicketWebjars;
@@ -46,6 +47,7 @@ import org.apache.wicket.core.request.mapper.MountedMapper;
import org.apache.wicket.guice.GuiceComponentInjector;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.filter.JavaScriptFilteredIntoFooterHeaderResponse;
+import org.apache.wicket.markup.html.IHeaderContributor;
import org.apache.wicket.markup.html.IHeaderResponseDecorator;
import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.request.cycle.IRequestCycleListener;
@@ -312,8 +314,16 @@ public class IsisWicketApplication extends AuthenticatedWebApplication implement
}
protected void configureWicketBootstrap() {
- IBootstrapSettings settings = new BootstrapSettings();
+ final IBootstrapSettings settings = new BootstrapSettings();
Bootstrap.install(this, settings);
+
+ getHeaderContributorListenerCollection().add(new IHeaderContributor() {
+ @Override
+ public void renderHead(IHeaderResponse response) {
+ BootstrapBaseBehavior bootstrapBaseBehavior = new BootstrapBaseBehavior();
+ bootstrapBaseBehavior.renderHead(settings, response);
+ }
+ });
}
// //////////////////////////////////////