From bfa77cc72e09f99f8616e49973075713154c1050 Mon Sep 17 00:00:00 2001
From: "Mark M. Florida" <markflorida@wustl.edu>
Date: Sun, 5 Jun 2016 19:16:42 -0500
Subject: [PATCH] Added 'wrapper' tag on initial setup page.
---
src/main/webapp/setup/index.jsp | 128 ++++++++++++++++----------------
1 file changed, 65 insertions(+), 63 deletions(-)
diff --git a/src/main/webapp/setup/index.jsp b/src/main/webapp/setup/index.jsp
index aa2bf34b..7810ad1a 100644
--- a/src/main/webapp/setup/index.jsp
+++ b/src/main/webapp/setup/index.jsp
@@ -2,85 +2,87 @@
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
<%@ taglib prefix="pg" tagdir="/WEB-INF/tags/page" %>
-<pg:xnat page="setup" title="XNAT Setup">
+<pg:wrapper>
+ <pg:xnat page="setup" title="XNAT Setup">
- <div id="page-body">
- <div class="pad">
+ <div id="page-body">
+ <div class="pad">
- <div id="setup-page">
+ <div id="setup-page">
- <c:set var="message">
- <header id="content-header">
- <h2>XNAT Site Setup</h2>
- <div class="message">
- This XNAT system has not yet been configured for use.
- Please contact your site administrator to have the system set up.
- </div>
- </header>
- </c:set>
-
- <pg:restricted msg="${message}">
-
- <c:import url="/xapi/siteConfig" var="siteConfig"/>
-
- <script>
- XNAT.data = extend({}, XNAT.data, {
- siteConfig: ${siteConfig}
- });
- // get rid of the 'targetSource' property
- delete XNAT.data.siteConfig.targetSource;
- </script>
-
- <header id="content-header">
- <h2 class="pull-left">XNAT Site Setup</h2>
- <div class="hidden message pull-left">
- The settings below need to be configured before this XNAT system
- can be used. Please set the properties below and submit the form to continue.
- </div>
- <div class="clearfix"></div>
- </header>
+ <c:set var="message">
+ <header id="content-header">
+ <h2>XNAT Site Setup</h2>
+ <div class="message">
+ This XNAT system has not yet been configured for use.
+ Please contact your site administrator to have the system set up.
+ </div>
+ </header>
+ </c:set>
+
+ <pg:restricted msg="${message}">
- <!-- Setup tab container -->
- <div id="site-setup-panels">
+ <c:import url="/xapi/siteConfig" var="siteConfig"/>
+ <script>
+ XNAT.data = extend({}, XNAT.data, {
+ siteConfig: ${siteConfig}
+ });
+ // get rid of the 'targetSource' property
+ delete XNAT.data.siteConfig.targetSource;
+ </script>
- <!-- ======================== -->
- <!-- PANELS WILL SHOW UP HERE -->
- <!-- ======================== -->
+ <header id="content-header">
+ <h2 class="pull-left">XNAT Site Setup</h2>
+ <div class="hidden message pull-left">
+ The settings below need to be configured before this XNAT system
+ can be used. Please set the properties below and submit the form to continue.
+ </div>
+ <div class="clearfix"></div>
+ </header>
+ <!-- Setup tab container -->
+ <div id="site-setup-panels">
- </div>
- <!-- /#site-setup-panels -->
- <script src="<c:url value="/scripts/xnat/app/siteSetup.js"/>"></script>
+ <!-- ======================== -->
+ <!-- PANELS WILL SHOW UP HERE -->
+ <!-- ======================== -->
- <script>
-// XNAT.app.setupComplete = function(){
-// XNAT.xhr.form('#site-setup', {});
-// };
+ </div>
+ <!-- /#site-setup-panels -->
+
+ <script src="<c:url value="/scripts/xnat/app/siteSetup.js"/>"></script>
- XNAT.xhr.get({
- url: XNAT.url.rootUrl('/setup/site-setup.yaml'),
- //url: XNAT.url.rootUrl('/xapi/spawner/resolve/siteAdmin/siteSetup'),
- success: function(data){
- if (typeof data === 'string') {
- data = YAML.parse(data);
+ <script>
+
+ // XNAT.app.setupComplete = function(){
+ // XNAT.xhr.form('#site-setup', {});
+ // };
+
+ XNAT.xhr.get({
+ url: XNAT.url.rootUrl('/setup/site-setup.yaml'),
+ //url: XNAT.url.rootUrl('/xapi/spawner/resolve/siteAdmin/siteSetup'),
+ success: function (data) {
+ if (typeof data === 'string') {
+ data = YAML.parse(data);
+ }
+ var setupPanels = XNAT.spawner.spawn(data);
+ setupPanels.render('#site-setup-panels');
}
- var setupPanels = XNAT.spawner.spawn(data);
- setupPanels.render('#site-setup-panels');
- }
- });
+ });
- </script>
+ </script>
- </pg:restricted>
+ </pg:restricted>
- </div>
- <!-- /#setup-page -->
+ </div>
+ <!-- /#setup-page -->
+ </div>
</div>
- </div>
- <!-- /#page-body -->
+ <!-- /#page-body -->
-</pg:xnat>
+ </pg:xnat>
+</pg:wrapper>
\ No newline at end of file
--
GitLab