Minor changes to site-admin-elements; removed obsolete pages.

src/main/resources/META-INF/xnat/spawner/site-admin-elements.yaml

@@ -300,7 +300,7 @@ userLoginsSessionControls:
             kind: panel.input.text
             id: inactivityBeforeLockoutSchedule
             name: inactivityBeforeLockoutSchedule
-            label: "User Inactivity Before Lockout Schedule"
+            label: User Inactivity Before Lockout Schedule
 
 passwords:
     kind: panel.form
@@ -447,7 +447,6 @@ emailServerSettings:
     action: /xapi/notifications/all
     load: # load data
         url: /xapi/siteConfig
-#        method: GET      # defaults to GET if not set
         prop: smtpServer # which root property? gets the root object if not set
 #        lookup: XNAT.data.siteConfig.smtpServer
     contentType: json
@@ -542,13 +541,13 @@ notifications:
             label: "Email Message: User Registration"
             description: "Text of message emailed to users upon registration. Link for email validation is auto-populated."
         emailMessageForgotUsernameRequest:
-            kind: panel.input.text                     # textarea
+            kind: panel.textarea                     # textarea
             id: emailMessageForgotUsernameRequest
             name: emailMessageForgotUsernameRequest
             label: "Email Message: Forgot Username Request"
             description: "Text of message emailed to users upon lost username request."
         emailMessageForgotPasswordReset:
-            kind: panel.input.text                     # textarea
+            kind: panel.textarea                     # textarea
             id: emailMessageForgotPasswordReset
             name: emailMessageForgotPasswordReset
             label: "Email Message: Password Reset"
@@ -558,7 +557,7 @@ notifications:
             id: notifyAdminUserRegistration
             name: notifyAdminUserRegistration
             label: "Notify Admin on User Registration"
-            value: true
+            value: ?? XNAT.data.siteConfig.notifyAdminUserRegistration
             description: "Whether to cc admin user on new user emails. Requires valid admin email address."
         notifyAdminPipelineEmails:
             kind: panel.input.checkbox

src/main/webapp/page/home/content.jsp

-<%@ page session="true" contentType="text/html" pageEncoding="UTF-8" language="java" %>
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-<%@ taglib prefix="pg" tagdir="/WEB-INF/tags/page" %>
-
-<c:if test="${empty hasInit}">
-    <pg:init>
-        <c:if test="${empty hasVars}">
-            <pg:jsvars/>
-        </c:if>
-    </pg:init>
-</c:if>
-
-<h1>Home</h1>

src/main/webapp/page/home/index.jsp

-<%@ page session="true" contentType="text/html" pageEncoding="UTF-8" language="java" %>
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-<%@ taglib prefix="pg" tagdir="/WEB-INF/tags/page" %>
-
-<pg:wrapper>
-    <pg:xnat>
-        <jsp:include page="content.jsp"/>
-    </pg:xnat>
-</pg:wrapper>

src/main/webapp/page/spawn/content.jsp

-<%@ page session="true" contentType="text/html" pageEncoding="UTF-8" language="java" %>
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-<%@ taglib prefix="pg" tagdir="/WEB-INF/tags/page" %>
-<%--<%@ taglib prefix="sp" tagdir="/WEB-INF/tags/spawner" %>--%>
-
-<c:if test="${empty hasInit}">
-    <pg:init>
-        <c:if test="${empty hasVars}">
-            <pg:jsvars/>
-        </c:if>
-    </pg:init>
-</c:if>
-
-<c:set var="MSG">
-    Playground clossed.
-</c:set>
-
-<pg:restricted msg="${MSG}">
-
-    <c:set var="_siteRoot" value="${sessionScope.siteRoot}"/>
-
-    <!-- playground for XNAT.spawner methods -->
-
-    <a id="show-spawn" class="link" href="#!">Show some spawn() examples below &gt;&gt;</a>
-
-    <div id="spawn-container"></div>
-
-    <script src="${_siteRoot}/scripts/lib/spawn/spawn.examples.js"></script>
-    <script src="${_siteRoot}/scripts/xnat/spawner.js"></script>
-
-    <script>
-
-        (function(){
-
-            var $showSpawn = $('#show-spawn');
-            var $spawnContainer = $('#spawn-container');
-
-            $showSpawn.click(function(e){
-                e.preventDefault();
-                $spawnContainer.spawn('hr.clear', {
-                    style: 'margin: 30px 0'
-                }, '<br>');
-                $spawnContainer.append(spawn.examples.createSpawn());
-            });
-
-        })();
-
-
-
-    </script>
-
-</pg:restricted>
\ No newline at end of file

src/main/webapp/page/spawn/index.jsp

-<%@ page session="true" contentType="text/html" pageEncoding="UTF-8" language="java" %>
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-<%@ taglib prefix="pg" tagdir="/WEB-INF/tags/page" %>
-
-<pg:wrapper>
-    <pg:xnat>
-
-        <jsp:include page="content.jsp"/>
-
-    </pg:xnat>
-</pg:wrapper>