You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by mg...@apache.org on 2015/01/06 09:13:31 UTC
isis git commit: ISIS-987 Contribute bootstrap.js in account
management pages (signin, signup,
password_reset) to fix Alert messages' close button (x)
Repository: isis
Updated Branches:
refs/heads/ISIS-1000-CssClassFacetMethod 6011d6e49 -> 0aff5894f
ISIS-987 Contribute bootstrap.js in account management pages (signin, signup, password_reset) to fix Alert messages' close button (x)
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/0aff5894
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/0aff5894
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/0aff5894
Branch: refs/heads/ISIS-1000-CssClassFacetMethod
Commit: 0aff5894fabb9e74d12d3ddd7bd5af14be4625d8
Parents: 6011d6e
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Tue Jan 6 10:12:23 2015 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Tue Jan 6 10:12:23 2015 +0200
----------------------------------------------------------------------
.../ui/pages/accmngt/AccountManagementPageAbstract.html | 3 +++
.../ui/pages/accmngt/AccountManagementPageAbstract.java | 8 +++++++-
2 files changed, 10 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/0aff5894/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/AccountManagementPageAbstract.html
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/AccountManagementPageAbstract.html b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/AccountManagementPageAbstract.html
index b59b636..5e64dbe 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/AccountManagementPageAbstract.html
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/AccountManagementPageAbstract.html
@@ -58,5 +58,8 @@
</div>
<div wicket:id="exceptionStackTrace" class="exceptionStackTrace"></div>
</div>
+ <div class="javascriptInFooter">
+ <wicket:container wicket:id="footerJS"/>
+ </div>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/isis/blob/0aff5894/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/AccountManagementPageAbstract.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/AccountManagementPageAbstract.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/AccountManagementPageAbstract.java
index 77a7aef..0d0b893 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/AccountManagementPageAbstract.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/AccountManagementPageAbstract.java
@@ -19,6 +19,8 @@
package org.apache.isis.viewer.wicket.ui.pages.accmngt;
+import de.agilecoders.wicket.core.markup.html.bootstrap.behavior.BootstrapJavascriptBehavior;
+
import com.google.inject.Inject;
import com.google.inject.name.Named;
import org.apache.wicket.Application;
@@ -28,6 +30,7 @@ import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.markup.head.JavaScriptReferenceHeaderItem;
import org.apache.wicket.markup.head.PriorityHeaderItem;
+import org.apache.wicket.markup.head.filter.HeaderResponseContainer;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.markup.html.basic.Label;
@@ -97,6 +100,9 @@ public class AccountManagementPageAbstract extends WebPage {
} else {
add(new WebMarkupContainer(ID_EXCEPTION_STACK_TRACE).setVisible(false));
}
+
+ add(new HeaderResponseContainer("footerJS", "footerJS"));
+ BootstrapJavascriptBehavior.addTo(this);
}
private MarkupContainer addPageTitle() {
@@ -111,7 +117,7 @@ public class AccountManagementPageAbstract extends WebPage {
public void renderHead(IHeaderResponse response) {
super.renderHead(response);
response.render(new PriorityHeaderItem(JavaScriptHeaderItem.forReference(Application.get().getJavaScriptLibrarySettings().getJQueryReference())));
-
+
if(applicationCss != null) {
response.render(CssReferenceHeaderItem.forUrl(applicationCss));
}