diff --git a/src/main/webapp/scripts/xnat/app/eventsManager.js b/src/main/webapp/scripts/xnat/app/eventsManager.js
index db0c4e6666706755aef284595260dc82a84e573e..bddc4b324d743308f11551905bb8d98b0cca8e04 100644
--- a/src/main/webapp/scripts/xnat/app/eventsManager.js
+++ b/src/main/webapp/scripts/xnat/app/eventsManager.js
@@ -72,7 +72,7 @@ $(function(){
xmodal.message('Error', 'An error occurred retrieving event handlers for this project: [' + status + '] ' + error);
},
complete: function(){
- $('#accordion').accordion('refresh');
+ //$('#accordion').accordion('refresh');
}
});
}
diff --git a/src/main/webapp/xdat-templates/layouts/Index.vm b/src/main/webapp/xdat-templates/layouts/Index.vm
old mode 100644
new mode 100755
index b1308b5db71f1a68a89815188cc471ecb859aa98..df2ed0e26b79c6417252c591481d576e8494331b
--- a/src/main/webapp/xdat-templates/layouts/Index.vm
+++ b/src/main/webapp/xdat-templates/layouts/Index.vm
@@ -47,9 +47,6 @@ $navigation.setTemplate("/bodyOpen.vm")
</tr>
</table>
- $navigation.setTemplate("/powered_by.vm")
-
-
## insert any template-specific code here that needs to be directly before closing </body> tag
$navigation.setTemplate("/htmlClose.vm")
diff --git a/src/main/webapp/xdat-templates/layouts/Login.vm b/src/main/webapp/xdat-templates/layouts/Login.vm
old mode 100644
new mode 100755
index 21b6f2e2a7470db002ea1c9e887cc98f473aa6f8..e4bebef110f3e75b8bf6e9345292882c5facf109
--- a/src/main/webapp/xdat-templates/layouts/Login.vm
+++ b/src/main/webapp/xdat-templates/layouts/Login.vm
@@ -25,13 +25,6 @@ $navigation.setTemplate("/bodyOpen.vm")
<div id="layout_content">$screen_placeholder</div>
</td>
</tr>
- <tr>
- <td valign="bottom">
-
- $navigation.setTemplate("/powered_by.vm")
-
- </td>
- </tr>
</table>
## insert any template-specific code here that needs to be directly before closing </body> tag
diff --git a/src/main/webapp/xdat-templates/navigations/DefaultBottom.vm b/src/main/webapp/xdat-templates/navigations/DefaultBottom.vm
old mode 100644
new mode 100755
index a2a0be8599f4986f5be2dbf2a6ab53cc90ffa62b..2c337dea849d7dfe36cea8d9ea30ebeef83fa8a6
--- a/src/main/webapp/xdat-templates/navigations/DefaultBottom.vm
+++ b/src/main/webapp/xdat-templates/navigations/DefaultBottom.vm
@@ -6,7 +6,6 @@
<a target="_blank" href="http://www.nbirn.net/" onmouseover="return true;">
<img src="$content.getURI("images/small_birn_logo.png")" border=0>
</a>
- $navigation.setTemplate("/powered_by.vm")
</td>
</tr>
</table>
\ No newline at end of file
diff --git a/src/main/webapp/xdat-templates/navigations/NoMenuTop.vm b/src/main/webapp/xdat-templates/navigations/NoMenuTop.vm
index 020d6d03671407e36d3040a3bd313eb06f7d0fa6..4279a873862d239b31e192aa8e014bddfd51d69b 100644
--- a/src/main/webapp/xdat-templates/navigations/NoMenuTop.vm
+++ b/src/main/webapp/xdat-templates/navigations/NoMenuTop.vm
@@ -17,8 +17,8 @@ $page.setBgColor($ui.bgcolor)
</div><!-- /user_bar -->
-<div id="header" class="main_header">
+<div id="header" class="main_header"><div class="pad">
<a id="header_logo" href="$link.setPage("Index.vm")#if($data.getParameters().getString('par'))/par/$data.getParameters().getString('par')#end">
#parse("/screens/Logo.vm")
</a>
-</div>
+</div></div>
diff --git a/src/main/webapp/xdat-templates/navigations/NoninteractiveTop.vm b/src/main/webapp/xdat-templates/navigations/NoninteractiveTop.vm
index 2e5e31ebea668f0270dea38f75933597414a0da1..a6ace1ec48fe84f81ffd684aa4d40a98be030ab7 100644
--- a/src/main/webapp/xdat-templates/navigations/NoninteractiveTop.vm
+++ b/src/main/webapp/xdat-templates/navigations/NoninteractiveTop.vm
@@ -17,7 +17,7 @@ $page.setBgColor($ui.bgcolor)
</div>
-<div id="header" class="main_header">
+<div id="header" class="main_header"><div class="pad">
#if ($expired || $forgot)
#parse("/screens/Logo.vm")
#else
@@ -25,5 +25,5 @@ $page.setBgColor($ui.bgcolor)
#parse("/screens/Logo.vm")
</a>
#end
-</div>
+</div></div>
<!-- END NoninteractiveTop.vm -->
diff --git a/src/main/webapp/xnat-templates/layouts/ConfirmRegistration.vm b/src/main/webapp/xnat-templates/layouts/ConfirmRegistration.vm
index b5ee2cbda6b1c6dc4ee137e4930609f3e18a0a8d..26558c035cb4dd05ed0580426fdd606e1fbfb1cf 100644
--- a/src/main/webapp/xnat-templates/layouts/ConfirmRegistration.vm
+++ b/src/main/webapp/xnat-templates/layouts/ConfirmRegistration.vm
@@ -19,13 +19,6 @@ $navigation.setTemplate("/bodyOpen.vm")
<div id="layout_content">$screen_placeholder</DIV>
</td>
</tr>
- <tr>
- <td valign="bottom">
-
- $navigation.setTemplate("/powered_by.vm")
-
- </td>
- </tr>
</table>
## insert any template-specific code here that needs to be directly before closing </body> tag
diff --git a/src/main/webapp/xnat-templates/layouts/Login.vm b/src/main/webapp/xnat-templates/layouts/Login.vm
old mode 100644
new mode 100755
index cc8e2d300a09c89676bb29570d5c42cf23dc1324..94f6b4aaa73d64e7c0dd532f81adf1a84f105fd9
--- a/src/main/webapp/xnat-templates/layouts/Login.vm
+++ b/src/main/webapp/xnat-templates/layouts/Login.vm
@@ -15,8 +15,6 @@ $navigation.setTemplate("/bodyOpen.vm")
jq('#username').focus();
</script>
-$navigation.setTemplate("/powered_by.vm")
-
## insert any template-specific code here that needs to be directly before closing </body> tag
$navigation.setTemplate("/htmlClose.vm")
diff --git a/src/main/webapp/xnat-templates/layouts/Search.vm b/src/main/webapp/xnat-templates/layouts/Search.vm
old mode 100644
new mode 100755
index 34257b44336422987428b69b19e0197d0f8a7e5f..e94ed8fd54f264954e2569db2f3ab083d230dbb5
--- a/src/main/webapp/xnat-templates/layouts/Search.vm
+++ b/src/main/webapp/xnat-templates/layouts/Search.vm
@@ -7,23 +7,9 @@ $navigation.setTemplate("/bodyOpen.vm")
<!-- path: xnat-templates/layouts/Search -->
- <table border="0" id="DefaultTopTR" cellpadding="0" cellspacing="0">
- <tr>
- <td>
$navigation.setTemplate("/DefaultTop.vm")
- </td>
- </tr>
- </table>
- <table border="0" cellpadding="0" cellspacing="0">
- <tr>
- <td valign="top">
<div id="layout_content">$screen_placeholder</div>
- </td>
- </tr>
- </table>
-
- $navigation.setTemplate("/powered_by.vm")
## insert any template-specific code here that needs to be directly before closing </body> tag
diff --git a/src/main/webapp/xnat-templates/navigations/DefaultBottom.vm b/src/main/webapp/xnat-templates/navigations/DefaultBottom.vm
old mode 100644
new mode 100755
index 56ea4105ec2f662f6db1516a17abef1dfd4078d8..93bb9b2f6c8e9b01acfe1fc3a607598f0c6b6423
--- a/src/main/webapp/xnat-templates/navigations/DefaultBottom.vm
+++ b/src/main/webapp/xnat-templates/navigations/DefaultBottom.vm
@@ -2,6 +2,4 @@
<div id="mylogger"></div>
-$navigation.setTemplate("/powered_by.vm")
-
#addGlobalCustomScreens("footer")
diff --git a/src/main/webapp/xnat-templates/navigations/DefaultLeft.vm b/src/main/webapp/xnat-templates/navigations/DefaultLeft.vm
old mode 100644
new mode 100755
index db1ab2ed0547127f0c1c902ee71fe9a1ce5cd86a..d2421ac2f5f40792bb01a6c3252292fead59840f
--- a/src/main/webapp/xnat-templates/navigations/DefaultLeft.vm
+++ b/src/main/webapp/xnat-templates/navigations/DefaultLeft.vm
@@ -1,63 +1,58 @@
##Copyright 2005 Harvard University / Howard Hughes Medical Institute (HHMI) All Rights Reserved
<!-- /xnat-templates/navigations/DefaultLeft.vm -->
-##<div class="yui-skin-sam">
-## <table id="left_bar_table" style="margin:0 10px 0 0;padding:0;" cellpadding="0" cellspacing="0">
-## $navigation.setTemplate("LeftBarOptions.vm")
-## <tr>
-## <td valign="top" style="padding:10px;border:solid 1px #d0d0d0">
-## <div id="l_tv"></div>
-## <div style="width:160px"> </div>
-## </td>
-## </tr>
-## </table>
-##</div>
-##
-##<script type="text/javascript">
-## //build element_array
-## var lTV = new LeftBarTreeView({treeview: "l_tv"});
-##
-## lTV.loadNodeData = function( node, fnLoadComplete ){
-## var tabReqObject = node.data;
-## tabReqObject.label = node.label;
-## tabReqObject.node = node;
-## if (tabReqObject.URL != undefined) {
-## window.location = serverRoot + "/app/template/Search.vm/node/" + tabReqObject.ID;
-## }
-## else {
-## if (tabReqObject.ID != undefined && tabReqObject.ID == "ss") {
-## var callback = {
-## cache: false, // Turn off caching for IE
-## success: function( oResponse ){
-## var oResults = eval("(" + oResponse.responseText + ")");
-## if ((oResults.ResultSet.Result) && (oResults.ResultSet.Result.length)) {
-## for ( var ssC = 0; ssC < oResults.ResultSet.Result.length; ssC++ ) {
-## var cpNode = new YAHOO.widget.TextNode({
-## label: oResults.ResultSet.Result[ssC].brief_description,
-## ID: "ss." + oResults.ResultSet.Result[ssC].id,
-## SS_ID: oResults.ResultSet.Result[ssC].id,
-## URL: serverRoot + '/REST/search/saved/' + oResults.ResultSet.Result[ssC].id + '',
-## TITLE: oResults.ResultSet.Result[ssC].description
-## }, oResponse.argument.node, false);
-## }
-## }
-## oResponse.argument.fnLoadComplete();
-## },
-## failure: function( oResponse ){
-## oResponse.argument.fnLoadComplete();
-## },
-## argument: {"node": node, "fnLoadComplete": fnLoadComplete}
-## };
-##
-## //YAHOO.util.Connect.asyncRequest('GET',this.obj.URL,this.initCallback,null,this);
-## YAHOO.util.Connect.asyncRequest('GET', serverRoot + '/REST/search/saved?XNAT_CSRF=' + window.csrfToken + '&format=json&stamp=' + (new Date()).getTime(), callback, null);
-## }
-## else {
-## fnLoadComplete();
-## }
-## }
-## }
-##
-## lTV.init();
-##
-##</script>
+
+$navigation.setTemplate("LeftBarOptions.vm")
+
+
+<div id="l_tv" style="display:none;"></div>
+
+
+<script type="text/javascript">
+ //build element_array
+ var lTV = new LeftBarTreeView({treeview: "l_tv"});
+
+ lTV.loadNodeData = function( node, fnLoadComplete ){
+ var tabReqObject = node.data;
+ tabReqObject.label = node.label;
+ tabReqObject.node = node;
+ if (tabReqObject.URL != undefined) {
+ window.location = serverRoot + "/app/template/Search.vm/node/" + tabReqObject.ID;
+ }
+ else {
+ if (tabReqObject.ID != undefined && tabReqObject.ID == "ss") {
+ var callback = {
+ cache: false, // Turn off caching for IE
+ success: function( oResponse ){
+ var oResults = eval("(" + oResponse.responseText + ")");
+ if ((oResults.ResultSet.Result) && (oResults.ResultSet.Result.length)) {
+ for ( var ssC = 0; ssC < oResults.ResultSet.Result.length; ssC++ ) {
+ var cpNode = new YAHOO.widget.TextNode({
+ label: oResults.ResultSet.Result[ssC].brief_description,
+ ID: "ss." + oResults.ResultSet.Result[ssC].id,
+ SS_ID: oResults.ResultSet.Result[ssC].id,
+ URL: serverRoot + '/REST/search/saved/' + oResults.ResultSet.Result[ssC].id + '',
+ TITLE: oResults.ResultSet.Result[ssC].description
+ }, oResponse.argument.node, false);
+ }
+ }
+ oResponse.argument.fnLoadComplete();
+ },
+ failure: function( oResponse ){
+ oResponse.argument.fnLoadComplete();
+ },
+ argument: {"node": node, "fnLoadComplete": fnLoadComplete}
+ };
+
+ //YAHOO.util.Connect.asyncRequest('GET',this.obj.URL,this.initCallback,null,this);
+ YAHOO.util.Connect.asyncRequest('GET', serverRoot + '/REST/search/saved?XNAT_CSRF=' + window.csrfToken + '&format=json&stamp=' + (new Date()).getTime(), callback, null);
+ }
+ else {
+ fnLoadComplete();
+ }
+ }
+ }
+
+ lTV.init();
+
+</script>
<!-- end /xnat-templates/navigations/DefaultLeft.vm -->
diff --git a/src/main/webapp/xnat-templates/navigations/DefaultTop.vm b/src/main/webapp/xnat-templates/navigations/DefaultTop.vm
index e6f7c5eda8114ed93bf9e81062d2c7df7b240ac5..8eebccfb2a7dda7042c2ca847dcdb2cd636e778a 100644
--- a/src/main/webapp/xnat-templates/navigations/DefaultTop.vm
+++ b/src/main/webapp/xnat-templates/navigations/DefaultTop.vm
@@ -111,7 +111,7 @@
(function() {
// cache it
- var main_nav$ = jq('#main_nav');
+ var main_nav$ = jq('#main_nav > ul');
// function subnav(items){
// var lis = [];
@@ -223,7 +223,8 @@
</script>
<!-- end main_nav interactions -->
-<div id="header" class="main_header">
+<div id="header" class="main_header"><div class="pad">
+
#if($siteConfig.getProperty("siteWideAlertStatus","")=="2")
<div id="headNotification" class="$siteConfig.getProperty("siteWideAlertType","") hidden" style="margin-bottom: 2em;">
<span class="closeNotification"><img src="$content.getURI('images/close.gif')"></span>
@@ -246,8 +247,7 @@
#parse("/screens/Logo.vm")
</a>
-
-</div> <!-- /header -->
+</div></div> <!-- /header -->
<script type="text/javascript">
@@ -323,4 +323,7 @@
</script>
<script src="$content.getURI("scripts/timeLeft.js")"></script>
+
+<div id="tp_fm"></div>
+
<!-- END: xnat-templates/navigations/DefaultTop.vm -->
diff --git a/src/main/webapp/xnat-templates/navigations/HeaderIncludes.vm b/src/main/webapp/xnat-templates/navigations/HeaderIncludes.vm
old mode 100644
new mode 100755
index 98d3083b295fef3b489e3e50e0a72a7caa8c1bc8..9b6ebd7fb3c2371b1eca7212ce49325c740b8ead
--- a/src/main/webapp/xnat-templates/navigations/HeaderIncludes.vm
+++ b/src/main/webapp/xnat-templates/navigations/HeaderIncludes.vm
@@ -39,12 +39,10 @@
// add ?debug=true to the query string
// or #debug to the url hash to load
// the non-minified versions
- writeCSS('scripts/lib/jquery-ui/jquery-ui-xnat.css|!|v=1.7.0a1');
writeScripts([
scriptUrl('lib/loadjs/loadjs'),
scriptUrl('lib/jquery/jquery|.min'),
scriptUrl('lib/jquery/jquery-migrate-1.2.1|.min'),
- scriptUrl('lib/jquery-ui/jquery-ui|.min'),
]);
</script>
##<script type="text/javascript" src="$content.getURI('scripts/lib/loadjs/loadjs.js')"></script>
diff --git a/src/main/webapp/xnat-templates/navigations/LeftBarOptions.vm b/src/main/webapp/xnat-templates/navigations/LeftBarOptions.vm
index 2721e2744cc3a86f603e23f5e64a39eaf9877e45..132fdc06efd7622b1fab226b6385abe5e5b3f797 100644
--- a/src/main/webapp/xnat-templates/navigations/LeftBarOptions.vm
+++ b/src/main/webapp/xnat-templates/navigations/LeftBarOptions.vm
@@ -1,7 +1,3 @@
#if($siteConfig.getProperty("showapplet") && $siteConfig.getProperty("showapplet").equals("true"))
-<tr>
- <td align="center">
- <INPUT type="button" style="line-height:11px;font-size:11px;" VALUE="Launch Uploader" ONCLICK="window.location='$content.getURI("/app/template/LaunchUploadApplet.vm")';"/>
- </td>
- </tr>
+<INPUT type="button" style="line-height:11px;font-size:11px;" VALUE="Launch Uploader" ONCLICK="window.location='$content.getURI("/app/template/LaunchUploadApplet.vm")';"/>
#end
diff --git a/src/main/webapp/xnat-templates/navigations/XNATQuickSearch.vm b/src/main/webapp/xnat-templates/navigations/XNATQuickSearch.vm
old mode 100644
new mode 100755
index 8e7ff0ec3eaffb8ae71becfee37dfd552a292320..b1dd7ac250281db476c4824851aa62703e7b48f7
--- a/src/main/webapp/xnat-templates/navigations/XNATQuickSearch.vm
+++ b/src/main/webapp/xnat-templates/navigations/XNATQuickSearch.vm
@@ -33,25 +33,63 @@ function submitQuickSearch(){
</script>
<!-- end search script -->
+<style type="text/css">
+ #quickSearchForm .chosen-results {
+ max-height: 500px;
+ }
+ #quickSearchForm .chosen-results li {
+ padding-right: 20px;
+ white-space: nowrap;
+ }
+ #quickSearchForm .chosen-container .chosen-drop {
+ width: auto;
+ min-width: 180px;
+ max-width: 360px;
+ }
+ #quickSearchForm .chosen-container .chosen-drop .divider {
+ padding: 0;
+ overflow: hidden;
+ }
+</style>
+
<form id="quickSearchForm" method="post" action="$link.setAction("QuickSearchAction")">
- <input id="searchValue" name="searchValue" type="text" maxlength="40" size="25" value="$!field" />
- <button type="button" id="search_btn" class="btn2" onclick="submitQuickSearch();">Search</button>
+ <select id="stored-searches" data-placeholder="Stored Searches">
+ <option></option>
+ <optgroup>
+ <option value="$link.setPage("XDATScreen_search_wizard1.vm")">Advanced Search…</option>
+ </optgroup>
+## <option disabled class="divider">————————————————————————————————————————</option>
+ <optgroup class="stored-search-list">
+ <option disabled>(no stored searches)</option>
+ <!-- stored searches will show up here -->
+ </optgroup>
+ </select>
+ <input id="searchValue" class="clean" name="searchValue" type="text" maxlength="40" size="20" value="$!field" />
+ <button type="button" id="search_btn" class="btn2" onclick="submitQuickSearch();">Go</button>
#if($turbineUtils.toBoolean($siteConfig.getProperty("UI.allow-advanced-search","true")))
- <script>
- function advancedSearch(){
-## maybe eventually this can come up in a dialog
-## xmodal.iframe({
-## url: '$link.setPage("XDATScreen_search_wizard1.vm")/popup/true',
-## title: 'Advanced Search',
-## width: 800,
-## height: 500,
-## footer: false,
-## // scroll: false,
-## overflow: 'hidden'
-## });
- window.location.href="$link.setPage("XDATScreen_search_wizard1.vm")";
- }
+
+ <script>
+ $('#searchValue').each(function(){
+ this.value = this.value || 'search';
+ $(this).focus(function(){
+ $(this).removeClass('clean');
+ if (!this.value || this.value === 'search'){
+ this.value = '';
+ }
+ })
+ });
+ $('#stored-searches').on('change', function(){
+ if (this.value){
+ window.location.href = this.value;
+ }
+ }).chosen({
+ width: '150px',
+ disable_search_threshold: 9,
+ inherit_select_classes: true,
+ placeholder_text_single: 'Stored Searches',
+ search_contains: true
+ });
</script>
- <button type="button" id="advanced_btn" class="btn2" onclick="advancedSearch();">Advanced</button>
+## <button type="button" id="advanced_btn" class="btn2" onclick="advancedSearch();">Advanced</button>
#end
</form>
diff --git a/src/main/webapp/xnat-templates/navigations/htmlClose.vm b/src/main/webapp/xnat-templates/navigations/htmlClose.vm
index 282f7bc346d854842339e661f7defdab82e03120..3adb6943e07b11a308cd58a708ff2f20dbcd2829 100644
--- a/src/main/webapp/xnat-templates/navigations/htmlClose.vm
+++ b/src/main/webapp/xnat-templates/navigations/htmlClose.vm
@@ -1,20 +1,6 @@
<!-- path: xnat-templates/navigations/htmlClose -->
-## may not need this - container for timeout warning
-##<div id="timeout_dialog_wrapper"></div>
</div><!-- /page_wrapper -->
-##<div id="loading" class="xmask" style="z-index:20001;display:none;">
-## <div class="loading xmodal open fixed" style="display:block;width:260px;height:92px;margin-left:-133px;margin-top:-49px;">
-## <div class="title">
-## <span class="inner">Please wait...</span>
-## <div class="close button"></div>
-## </div>
-## <div class="body content" style="height:67px;">
-## <div class="inner">
-## <img src="$content.getURI('images/loading_bar.gif')" alt="loading">
-## </div>
-## </div>
-## </div>
-##</div><!-- /#loading -->
+$navigation.setTemplate("/powered_by.vm")
<script type="text/javascript" src="$content.getURI('scripts/footer.js')"></script>
</body>
</html>
\ No newline at end of file
diff --git a/src/main/webapp/xnat-templates/screens/Configuration.vm b/src/main/webapp/xnat-templates/screens/Configuration.vm
old mode 100644
new mode 100755
index bdd9ea9697244cbd4d933de8a3414d379ba88063..98a21e00d738c9ea0e7474c42f30edf7f76cb57a
--- a/src/main/webapp/xnat-templates/screens/Configuration.vm
+++ b/src/main/webapp/xnat-templates/screens/Configuration.vm
@@ -18,10 +18,7 @@
</script>
##<script type="text/javascript" src="$content.getURI("scripts/tabWrangler/tabWrangler.js")"></script>
<div class="yui-skin-sam">
-<div id="tp_fm" style="display:none"></div>
-<table style="width:98%">
- <tr>
- <td valign="top" style="width:680px;">
+##<div id="tp_fm" style="display:none"></div>
<div class="edit_header1">Configuration</div><br/>
#if($data.getSession().getAttribute("user").checkRole("Administrator"))
@@ -128,15 +125,7 @@
</script>
<!-- END TABS AND CONTENT DISPLAY: Taken from xnat_projectData_summary_tabs.vm -->
- </td>
- </tr>
- <tr>
- <td colspan="3">
#else
- </td>
- </tr>
- <tr>
- <td colspan="3">
<div id="congratsContainer" class="container" style="width:98%;margin:5px;background-color:#ff99cc;">
<div id="congratsBody" class="containerBody">
<div class="containerItem edit_header2" style="white-space:normal;line-height:18px;">Security Warning</div>
@@ -144,9 +133,6 @@
</div>
</div>
#end
- </td>
- </tr>
-</table>
<script type="text/javascript">
jq(window).load(function(){
wrangleTabs('#configurationTabs');
diff --git a/src/main/webapp/xnat-templates/screens/EditScript.vm b/src/main/webapp/xnat-templates/screens/EditScript.vm
old mode 100644
new mode 100755
index efebb3e011026607ce58476ab40d5af8494a6259..161e0523fa467611a843bbc16bd4fa017dda865c
--- a/src/main/webapp/xnat-templates/screens/EditScript.vm
+++ b/src/main/webapp/xnat-templates/screens/EditScript.vm
@@ -47,7 +47,7 @@
}
</script>
<div class="yui-skin-sam">
-<div id="tp_fm" style="display:none"></div>
+##<div id="tp_fm" style="display:none"></div>
<table style="width:98%">
<tr>
<td valign="top" style="width:680px;">
diff --git a/src/main/webapp/xnat-templates/screens/ForgotLogin.vm b/src/main/webapp/xnat-templates/screens/ForgotLogin.vm
index 6cebe84b816f64620fba910a67123e935be9424b..9709c3996af30617a6b504af5a52972dc65cd9ac 100644
--- a/src/main/webapp/xnat-templates/screens/ForgotLogin.vm
+++ b/src/main/webapp/xnat-templates/screens/ForgotLogin.vm
@@ -9,7 +9,7 @@ $page.setTitle("$siteId - Register")
## <div class="$siteConfig.getProperty("siteWideAlertType","")" style="margin-bottom: 2em;"><strong>$siteConfig.getProperty("siteWideAlertMessage","")</strong></div>
## #end
- <div id="register_box_container" style="margin-right: 60px;">
+ <div id="register_box_container">
<div id="register_box">
<form name="form2" method="post" action="$link.setAction("XDATForgotLogin")" class="friendlyForm" id="register_form">
<p>Did you forget your username? Enter your email address and the matching username will be emailed to you.</p>
diff --git a/src/main/webapp/xnat-templates/screens/Scripts.vm b/src/main/webapp/xnat-templates/screens/Scripts.vm
index d8b1df4671f3c278b7da7db8aeeadeb6d3929ccf..8a6776ca71745e32e8a9826a192b013063cea2fd 100644
--- a/src/main/webapp/xnat-templates/screens/Scripts.vm
+++ b/src/main/webapp/xnat-templates/screens/Scripts.vm
@@ -27,7 +27,7 @@
<div class="yui-skin-sam">
- <div id="tp_fm" style="display:none"></div>
+## <div id="tp_fm" style="display:none"></div>
#if($data.getSession().getAttribute("user").checkRole("Administrator"))
diff --git a/src/main/webapp/xnat-templates/screens/Search.vm b/src/main/webapp/xnat-templates/screens/Search.vm
index 39033123bf18bf3b778f7643b9b189713acce191..44765a5257a391c959e6eb8f4b3f5af5eb96b0de 100644
--- a/src/main/webapp/xnat-templates/screens/Search.vm
+++ b/src/main/webapp/xnat-templates/screens/Search.vm
@@ -1,13 +1,4 @@
##Copyright 2005 Harvard University / Howard Hughes Medical Institute (HHMI) All Rights Reserved
-##<style>
-##.ygtvlabel{
-## /* font-size:9px; */
-##}
-###search_tabs {
-## font-size:12px;
-## min-height: 300px;
-##}
-##</style>
<script type="text/javascript" src="$content.getURI("scripts/generated/xdat_stored_search.js")"></script>
<script type="text/javascript" src="$content.getURI("scripts/generated/xdat_search_field.js")"></script>
<script type="text/javascript" src="$content.getURI("scripts/generated/xdat_criteria.js")"></script>
@@ -17,36 +8,20 @@
<script type="text/javascript" src="$content.getURI("scripts/search/searchManager.js")"></script>
<script type="text/javascript" src="$content.getURI("scripts/search/dataTableSearch.js")"></script>
<script type="text/javascript" src="$content.getURI("scripts/search/dataTableStoredSearch.js")"></script>
-<div class="yui-skin-sam">
- <table id="search_results_container" cellpadding="0" cellspacing="0">
- <tr>
- #if($turbineUtils.toBoolean($siteConfig.getProperty("UI.show-left-bar","true")))
- <td class="leftBar" align="left" valign="top">
- <div id="l_tv" style="width:160px;margin-right:10px;padding:10px;border:1px solid #d0d0d0"></div>
- ## <div style="width:190px"> </div>
- </td>
- #else
- <div id="l_tv" style="display:none"></div>
- #end
- <td valign="top">
- #if ($data.message)
- <div class="error">$data.message</div>
- <br/>
- #end
- <div id="layout_content2" style="display:none;">Loading...</div>
- <div id="layout_content">
+<div id="l_tv" style="display:none"></div>
- <div id="search_tab_module">
- <div class="bd">
- <div id="search_tabs"></div>
- </div>
- </div>
- </div>
- </td>
- </tr>
- </table>
+#if ($data.message)
+<div class="error">$data.message</div>
+<br>
+#end
+
+<div id="search_tab_module">
+ <div class="bd">
+ <div id="search_tabs"></div>
+ </div>
</div>
+
#if($xss)
<textarea id="xss" style="display:none">$xss</textarea>
#end
diff --git a/src/main/webapp/xnat-templates/screens/XDATScreen_report_xnat_projectData.vm b/src/main/webapp/xnat-templates/screens/XDATScreen_report_xnat_projectData.vm
old mode 100644
new mode 100755
index a185f6a31c84af445bd7e6a189f26481f36617e0..d4619b2682595b19aa599edbffeddb6abad6eb2a
--- a/src/main/webapp/xnat-templates/screens/XDATScreen_report_xnat_projectData.vm
+++ b/src/main/webapp/xnat-templates/screens/XDATScreen_report_xnat_projectData.vm
@@ -20,7 +20,7 @@
## </STYLE>
<DIV id="project-page" class="yui-skin-sam" style="position: relative;">
- <div id="tp_fm" style="display:none"></div>
+## <div id="tp_fm" style="display:none"></div>
#addCustomScreens($om.getXSIType() "report/alerts")
#addCustomScreens($om.getXSIType() "report/errors")
diff --git a/src/main/webapp/xnat-templates/screens/xnat_projectData/xnat_projectData_summary_manage.vm b/src/main/webapp/xnat-templates/screens/xnat_projectData/xnat_projectData_summary_manage.vm
index 0da3751461b7768f1717ef6843a2af942a3d3d92..49c0abaa603f1af1c4dfd56ffbfb1a8e4ab6a27b 100644
--- a/src/main/webapp/xnat-templates/screens/xnat_projectData/xnat_projectData_summary_manage.vm
+++ b/src/main/webapp/xnat-templates/screens/xnat_projectData/xnat_projectData_summary_manage.vm
@@ -4,41 +4,55 @@
#* @vtlvariable name="turbineUtils" type="org.nrg.xdat.turbine.utils.TurbineUtils" *#
#* @vtlvariable name="project" type="org.nrg.xdat.om.XnatProjectdata" *#
##<link rel="stylesheet" href="//code.jquery.com/ui/1.11.2/themes/smoothness/jquery-ui.css">
-<link rel="stylesheet" href="$content.getURI("scripts/lib/jquery-ui/jquery-ui-xnat.css")">
+##<link rel="stylesheet" href="$content.getURI("scripts/lib/jquery-ui-accordion/jquery-ui-xnat.css")">
<style type="text/css">
-
- .ui-accordion {
- font-family: Arial, Helvetica, sans-serif;
+
+ #accordion {
+ /*display: none;*/
+ font-family: Arial, Helvetica, sans-serif;
font-size: 13px;
line-height: 17px;
}
- .ui-accordion .ui-accordion-header {
- font-size: 13px;
+ #accordion .active {
+ display: block;
+ }
+
+ #accordion h3 {
+ font-size: 13px;
font-weight: bold;
color: #222;
+ padding: 5px 10px;
+ border: 1px solid #d0d0d0;
}
-
- .ui-accordion .ui-accordion-header-active {
- background: #084FAB;
- color: #fff;
+
+ #accordion h3:hover {
+ cursor: pointer;
}
-
- .ui-accordion .ui-accordion-content { padding: 1em; }
-
- .ui-accordion .ui-widget-content a { color: #084FAB }
- .ui-accordion .ui-widget-content a:hover { text-decoration: underline; }
-
- .ui-state-active .ui-icon {
- background-image: url('$content.getURI("scripts/lib/jquery-ui/images/ui-icons_ffffff_256x240.png")');
+
+ #accordion h3.active {
+ background: #04519b;
+ color: #fff;
+ }
+
+ #accordion .content {
+ padding: 1em;
+ border: 1px solid #d0d0d0;
}
</style>
-<script type="text/javascript" src="$content.getURI("scripts/lib/jquery-ui/jquery-ui.min.js")"></script>
+##<script type="text/javascript">
+## writeScripts([
+## scriptUrl('lib/ace/ace.js'),
+## scriptUrl('seriesImportFilter.js'),
+## scriptUrl('settingsManager.js'),
+## scriptUrl('xnat/app/eventsManager.js')
+## ]);
+##</script>
+<script type="text/javascript" src="$content.getURI("scripts/lib/ace/ace.js")"></script>
<script type="text/javascript" src="$content.getURI("scripts/seriesImportFilter.js")"></script>
<script type="text/javascript" src="$content.getURI("scripts/settingsManager.js")"></script>
<script type="text/javascript" src="$content.getURI("scripts/xnat/app/eventsManager.js")"></script>
-<script type="text/javascript" src="$content.getURI("scripts/lib/ace/ace.js")"></script>
<div id="addEventHandler" class="html-template">
<table>
@@ -58,188 +72,243 @@
</div>
<div id="accordion">
-#if($turbineUtils.toBoolean($siteConfig.getProperty("UI.allow-quarantine","true")))
- <h3>Define Quarantine Settings</h3>
- <div>
- <table id="quarantine_table">
- <tr>
- <td colspan="2" class="highlighted" id="quarantine_container">
-#set($quar=$project.getArcSpecification().getQuarantineCode())
-## #if($quar=="")
-#if(!$quar)
-#set($quar=0)
-#end
- <!-- DIV style="font-weight:700;"> Define Quarantine Settings</DIV -->
- <TABLE cellpadding="5" cellspacing="0">
- <TR><TD NOWRAP><input id="yes_quarantine" type="radio" name="quarantine" value="1" #if($!quar==1)CHECKED#end/> YES</TD><TD>All new experiments (and modified experiments) are placed into a quarantine state and must be specifically activated.</TD></TR>
- <TR><TD NOWRAP><input id="no_quarantine" type="radio" name="quarantine" value="0" #if($!quar==0)CHECKED#end /> NO</TD><TD>New and modified experiments will not be placed in Quarantine.</TD></TR>
- <TR><TD COLSPAN="2"><input type="button" id="project_quarantine_save" value="Save" disabled></TD></TR>
- </TABLE>
- </td>
- </tr>
-</table>
-<script>
-window.quarantine=(new RadioSettingsManager(document.getElementById('quarantine_container'),{'URI':serverRoot+'/REST/projects/$project.getId()/quarantine_code/','radio_ids':['yes_quarantine','no_quarantine'],'current_value':'$quar','button':'project_quarantine_save'}));
-</script>
-</div>
-#end
-#if($turbineUtils.toBoolean($siteConfig.getProperty("project.allow-auto-archive","true")))
-<h3>Define Prearchive Settings</h3>
-<div>
-<table id="prearchive_table">
- <tr>
- <td colspan="2" class="highlighted" id="prearchive_container">
-#set($prearc=$project.getArcSpecification().getPrearchiveCode())
-## #if($prearc=="")
-#if(!$prearc)
-#set($prearc=0)
-#end
-## <DIV style="font-weight:700;"> Define Prearchive Settings</DIV>
- <TABLE cellpadding="5" cellspacing="0">
- <TR><TD NOWRAP><input id="0_prearchive" type="radio" name="prearchive" value="0" #if($prearc==0)CHECKED#end/></TD><TD>All image data should be placed in a temporary location (prearchive) before being manually transferred into the permanent archive.</TD></TR>
- <TR><TD NOWRAP><input id="4_prearchive" type="radio" name="prearchive" value="4" #if($prearc==4)CHECKED#end /></TD><TD>All image data will be placed into the archive automatically, but anything matching existing files will be rejected. Data which doesn't match a pre-existing $displayManager.getSingularDisplayNameForProject().toLowerCase() will be placed in an 'Unassigned' $displayManager.getSingularDisplayNameForProject().toLowerCase().</TD></TR>
- <TR><TD NOWRAP><input id="5_prearchive" type="radio" name="prearchive" value="5" #if($prearc==5)CHECKED#end /></TD><TD>All image data will be placed into the archive automatically and will overwrite existing files. Data which doesn't match a pre-existing $displayManager.getSingularDisplayNameForProject().toLowerCase() will be placed in an 'Unassigned' $displayManager.getSingularDisplayNameForProject().toLowerCase().</TD></TR>
- <TR><TD COLSPAN="2"><input type="button" id="project_prearchive_save" value="Save" disabled="disabled"/></TD></TR>
- </TABLE>
- </td>
- </tr>
-</table>
-<script>
-window.prearchive=(new RadioSettingsManager(document.getElementById('prearchive_container'),{'URI':serverRoot+'/REST/projects/$project.getId()/prearchive_code/','radio_ids':['0_prearchive','4_prearchive','5_prearchive'],'current_value':'$prearc','button':'project_prearchive_save'}));
-</script>
-</div>
-#end
-<h3>Anonymization Script</h3>
-<div>
-<table id="script_table">
- <tr>
- <td class="highlighted" id="script_container">
-## <DIV style="font-weight:700;">Anonymization Script</DIV>
- <TABLE>
- <TR>
- <TD><label for="enable_anon_script">Enable Script</label><input id="enable_anon_script" type="checkbox" name="enable_anon_script" value="true"/></TD>
- </TR>
- <TR><TD><textarea id="script_text_area" rows="20" cols="80" disabled="disabled"></textarea></TD></TR>
- <TR><TD><input type="button" id="anon_script_save" value="Save" disabled="disabled"/></TD></TR>
- </TABLE>
- </td>
- </tr>
-</table>
-<script>
- var sg = new scriptGet(document.getElementById('script_container'),
- {
- 'getStatus' : serverRoot + '/data/config/edit/projects/$project.getId()/image/dicom/status?format=json',
- 'putStatus' : serverRoot + '/data/config/edit/projects/$project.getId()/image/dicom/status?activate=',
- 'getScript' : serverRoot + '/data/config/edit/projects/$project.getId()/image/dicom/script?format=json',
- 'putScript' : serverRoot + '/data/config/edit/projects/$project.getId()/image/dicom/script?inbody=true',
- 'project' : '$project.getId()',
- 'enable_checkbox' : 'enable_anon_script',
- 'script_text_area' : 'script_text_area',
- 'save_button' : 'anon_script_save'
- });
- sg.get();
-
- var enableAnonScript = jq('#enable_anon_script');
- var anonScript = jq('#script_text_area');
- function toggleControlsOnAnonEnabled() {
- var enabled = enableAnonScript.is(':checked');
- anonScript.prop('disabled', !enabled);
- }
-
- function dirty() {
- // Add check for class manager, since setting the initial value of the radio button
- // will cause the dirty() function to be called, at which point the manager is null.
- if (window.anonymizationManager && !window.anonymizationManager.wasDirty()) {
- window.anonymizationManager.dirtyForm();
- }
- toggleControlsOnAnonEnabled();
- }
-
- anonScript.bind('input propertychange', dirty);
- enableAnonScript.change(dirty);
-
- function configurationAnonymizationTabChange(obj) {
- if(obj.newValue.get("href")=="#anonymization") {
- if(window.anonymizationManager==undefined) {
- window.anonymizationManager = new SettingsTabManager('anonymization_mgmt_div', 'anonymization');
- }
- toggleControlsOnAnonEnabled();
- }
- }
-
- function addAnonymizationMgmtMonitor(){
- if(window.configurationTabView.get("activeTab").get("href")=="#anonymization") {
- if(window.anonymizationManager==undefined) {
- window.anonymizationManager = new SettingsTabManager('anonymization_mgmt_div', 'anonymization');
- }
- } else {
- window.configurationTabView.subscribe("activeTabChange", configurationAnonymizationTabChange);
- }
- }
-
- YAHOO.util.Event.onDOMReady(addAnonymizationMgmtMonitor);
-// putConfigurationControls('anonymization', ['anonScript', 'enableAnonScript']);
-</script>
-</div>
-<h3>Series Import Filters</h3>
-<div>
-<table id="series_import_filter_table">
- <tr>
- <td colspan="2" class="highlighted" id="series_import_filter_container">
- ## WHY IS THIS IN A TABLE? C'MON MAN, IT'S 2015
- <table cellspacing="8">
- <tr>
- <td>
- This is the series import filter applied to incoming and archiving DICOM resources for your
- project. This filter can also be supplemented by the site-wide series import filter.
- </td>
- </tr>
+ #if($turbineUtils.toBoolean($siteConfig.getProperty("UI.allow-quarantine","true")))
+ <h3 class="active">Define Quarantine Settings</h3>
+ <div class="active">
+ <table id="quarantine_table">
<tr>
- <td><label for="enable_series_import_filter">Enable Filter</label><input type="checkbox" name="enable_series_import_filter" id="enable_series_import_filter" /></td>
- </tr>
- <tr>
- <td><label for="series_import_filter_mode_list">Mode</label>
- <select name="series_import_filter_mode_list" id="series_import_filter_mode_list" disabled placeholder="Enter white- or blacklisted series import filters separated by newlines, e.g. <b>localizer</b> for localizer series. Enter a modality-mapped series import filter as JSON.">
- <option value="whitelist">Whitelist</option>
- <option value="blacklist">Blacklist</option>
- <option value="modalityMap">Modality Map</option>
- </select>
+ <td colspan="2" class="highlighted" id="quarantine_container">
+ #set($quar=$project.getArcSpecification().getQuarantineCode())
+ ## #if($quar=="")
+ #if(!$quar)
+ #set($quar=0)
+ #end
+ <!-- DIV style="font-weight:700;"> Define Quarantine Settings</DIV -->
+ <TABLE cellpadding="5" cellspacing="0">
+ <TR>
+ <TD NOWRAP>
+ <input id="yes_quarantine" type="radio" name="quarantine" value="1" #if($!quar==1)CHECKED#end/> YES
+ </TD>
+ <TD>All new experiments (and modified experiments) are placed into a quarantine state and must be specifically activated.</TD>
+ </TR>
+ <TR>
+ <TD NOWRAP>
+ <input id="no_quarantine" type="radio" name="quarantine" value="0" #if($!quar==0)CHECKED#end/> NO
+ </TD>
+ <TD>New and modified experiments will not be placed in Quarantine.</TD>
+ </TR>
+ <TR>
+ <TD COLSPAN="2"><input type="button" id="project_quarantine_save" value="Save" disabled>
+ </TD>
+ </TR>
+ </TABLE>
</td>
</tr>
+ </table>
+ <script>
+ window.quarantine = (new RadioSettingsManager(document.getElementById('quarantine_container'), {
+ 'URI': serverRoot + '/REST/projects/$project.getId()/quarantine_code/',
+ 'radio_ids': ['yes_quarantine', 'no_quarantine'],
+ 'current_value': '$quar',
+ 'button': 'project_quarantine_save'
+ }));
+ </script>
+ </div>
+ #end
+ #if($turbineUtils.toBoolean($siteConfig.getProperty("project.allow-auto-archive","true")))
+ <h3>Define Prearchive Settings</h3>
+ <div>
+ <table id="prearchive_table">
<tr>
- <td>
- <div class="info">
- Creating a whitelist means that <i>only</i> DICOM series with a series description that matches one of
- series filter patterns will be considered by XNAT import tools such as the upload applet. Creating a
- blacklist means that all DICOM series will be considered <i>except</i> for series that have one of the
- specified series filter patterns. A modality map lets you specify boolean expressions in JavaScript that
- can use DICOM header values from incoming DICOM objects to decide the appropriate modality for the
- destination session.
- </div>
- </td>
- </tr>
- <tr>
- <td><textarea id="series_import_filter_text_area" rows="20" cols="80" disabled="disabled"></textarea></td>
- </tr>
- <tr>
- <td>
- <div class="info">
- The series filters can be written as exact string matches, but also can be regular expressions. The regular expressions are evaluated using the
- <a href="http://docs.oracle.com/javase/tutorial/essential/regex/" target="_blank">Java regular expression syntax</a>. These expressions are
- case-insensitive, i.e. the string "SAG LOCALIZER" will also match "Sag Localizer".
- </div>
+ <td colspan="2" class="highlighted" id="prearchive_container">
+ #set($prearc=$project.getArcSpecification().getPrearchiveCode())
+ ## #if($prearc=="")
+ #if(!$prearc)
+ #set($prearc=0)
+ #end
+ ## <DIV style="font-weight:700;"> Define Prearchive Settings</DIV>
+ <TABLE cellpadding="5" cellspacing="0">
+ <TR>
+ <TD NOWRAP>
+ <input id="0_prearchive" type="radio" name="prearchive" value="0" #if($prearc==0)CHECKED#end/>
+ </TD>
+ <TD>All image data should be placed in a temporary location (prearchive) before being manually transferred into the permanent archive.</TD>
+ </TR>
+ <TR>
+ <TD NOWRAP>
+ <input id="4_prearchive" type="radio" name="prearchive" value="4" #if($prearc==4)CHECKED#end/>
+ </TD>
+ <TD>All image data will be placed into the archive automatically, but anything matching existing files will be rejected. Data which doesn't match a pre-existing $displayManager.getSingularDisplayNameForProject().toLowerCase() will be placed in an 'Unassigned' $displayManager.getSingularDisplayNameForProject().toLowerCase().</TD>
+ </TR>
+ <TR>
+ <TD NOWRAP>
+ <input id="5_prearchive" type="radio" name="prearchive" value="5" #if($prearc==5)CHECKED#end/>
+ </TD>
+ <TD>All image data will be placed into the archive automatically and will overwrite existing files. Data which doesn't match a pre-existing $displayManager.getSingularDisplayNameForProject().toLowerCase() will be placed in an 'Unassigned' $displayManager.getSingularDisplayNameForProject().toLowerCase().</TD>
+ </TR>
+ <TR>
+ <TD COLSPAN="2">
+ <input type="button" id="project_prearchive_save" value="Save" disabled="disabled"/>
+ </TD>
+ </TR>
+ </TABLE>
</td>
</tr>
- <tr>
- <td><input type="button" id="series_import_filter_save" value="Save" disabled="disabled"/></td>
- </tr>
</table>
- </td>
- </tr>
-</table>
-<script>
- var filtersGet = new seriesImportFiltersGet(
- {
+ <script>
+ window.prearchive = (new RadioSettingsManager(document.getElementById('prearchive_container'), {
+ 'URI': serverRoot + '/REST/projects/$project.getId()/prearchive_code/',
+ 'radio_ids': ['0_prearchive', '4_prearchive', '5_prearchive'],
+ 'current_value': '$prearc',
+ 'button': 'project_prearchive_save'
+ }));
+ </script>
+ </div>
+ #end
+ <h3>Anonymization Script</h3>
+ <div>
+ <table id="script_table">
+ <tr>
+ <td class="highlighted" id="script_container">
+ ## <DIV style="font-weight:700;">Anonymization Script</DIV>
+ <TABLE>
+ <TR>
+ <TD>
+ <label for="enable_anon_script">Enable Script</label><input id="enable_anon_script" type="checkbox" name="enable_anon_script" value="true"/>
+ </TD>
+ </TR>
+ <TR>
+ <TD><textarea id="script_text_area" rows="20" cols="80" disabled="disabled"></textarea></TD>
+ </TR>
+ <TR>
+ <TD><input type="button" id="anon_script_save" value="Save" disabled="disabled"/></TD>
+ </TR>
+ </TABLE>
+ </td>
+ </tr>
+ </table>
+ <script>
+ var sg = new scriptGet(document.getElementById('script_container'),
+ {
+ 'getStatus': serverRoot + '/data/config/edit/projects/$project.getId()/image/dicom/status?format=json',
+ 'putStatus': serverRoot + '/data/config/edit/projects/$project.getId()/image/dicom/status?activate=',
+ 'getScript': serverRoot + '/data/config/edit/projects/$project.getId()/image/dicom/script?format=json',
+ 'putScript': serverRoot + '/data/config/edit/projects/$project.getId()/image/dicom/script?inbody=true',
+ 'project': '$project.getId()',
+ 'enable_checkbox': 'enable_anon_script',
+ 'script_text_area': 'script_text_area',
+ 'save_button': 'anon_script_save'
+ });
+ sg.get();
+
+ var enableAnonScript = jq('#enable_anon_script');
+ var anonScript = jq('#script_text_area');
+ function toggleControlsOnAnonEnabled(){
+ var enabled = enableAnonScript.is(':checked');
+ anonScript.prop('disabled', !enabled);
+ }
+
+ function dirty(){
+ // Add check for class manager, since setting the initial value of the radio button
+ // will cause the dirty() function to be called, at which point the manager is null.
+ if (window.anonymizationManager && !window.anonymizationManager.wasDirty()) {
+ window.anonymizationManager.dirtyForm();
+ }
+ toggleControlsOnAnonEnabled();
+ }
+
+ anonScript.bind('input propertychange', dirty);
+ enableAnonScript.change(dirty);
+
+ function configurationAnonymizationTabChange(obj){
+ if (obj.newValue.get("href") == "#anonymization") {
+ if (window.anonymizationManager == undefined) {
+ window.anonymizationManager = new SettingsTabManager('anonymization_mgmt_div', 'anonymization');
+ }
+ toggleControlsOnAnonEnabled();
+ }
+ }
+
+ function addAnonymizationMgmtMonitor(){
+ if (window.configurationTabView.get("activeTab").get("href") == "#anonymization") {
+ if (window.anonymizationManager == undefined) {
+ window.anonymizationManager = new SettingsTabManager('anonymization_mgmt_div', 'anonymization');
+ }
+ }
+ else {
+ window.configurationTabView.subscribe("activeTabChange", configurationAnonymizationTabChange);
+ }
+ }
+
+ YAHOO.util.Event.onDOMReady(addAnonymizationMgmtMonitor);
+ // putConfigurationControls('anonymization', ['anonScript', 'enableAnonScript']);
+ </script>
+ </div>
+ <h3>Series Import Filters</h3>
+ <div>
+ <table id="series_import_filter_table">
+ <tr>
+ <td colspan="2" class="highlighted" id="series_import_filter_container">
+ ## WHY IS THIS IN A TABLE? C'MON MAN, IT'S 2015
+ <table cellspacing="8">
+ <tr>
+ <td>
+ This is the series import filter applied to incoming and archiving DICOM resources for your
+ project. This filter can also be supplemented by the site-wide series import filter.
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <label for="enable_series_import_filter">Enable Filter</label><input type="checkbox" name="enable_series_import_filter" id="enable_series_import_filter"/>
+ </td>
+ </tr>
+ <tr>
+ <td><label for="series_import_filter_mode_list">Mode</label>
+ <select name="series_import_filter_mode_list" id="series_import_filter_mode_list" disabled placeholder="Enter white- or blacklisted series import filters separated by newlines, e.g. <b>localizer</b> for localizer series. Enter a modality-mapped series import filter as JSON.">
+ <option value="whitelist">Whitelist</option>
+ <option value="blacklist">Blacklist</option>
+ <option value="modalityMap">Modality Map</option>
+ </select>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <div class="info">
+ Creating a whitelist means that
+ <i>only</i> DICOM series with a series description that matches one of
+ series filter patterns will be considered by XNAT import tools such as the upload applet. Creating a
+ blacklist means that all DICOM series will be considered
+ <i>except</i> for series that have one of the
+ specified series filter patterns. A modality map lets you specify boolean expressions in JavaScript that
+ can use DICOM header values from incoming DICOM objects to decide the appropriate modality for the
+ destination session.
+ </div>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <textarea id="series_import_filter_text_area" rows="20" cols="80" disabled="disabled"></textarea>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <div class="info">
+ The series filters can be written as exact string matches, but also can be regular expressions. The regular expressions are evaluated using the
+ <a href="http://docs.oracle.com/javase/tutorial/essential/regex/" target="_blank">Java regular expression syntax</a>. These expressions are
+ case-insensitive, i.e. the string "SAG LOCALIZER" will also match "Sag Localizer".
+ </div>
+ </td>
+ </tr>
+ <tr>
+ <td><input type="button" id="series_import_filter_save" value="Save" disabled="disabled"/>
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ </table>
+ <script>
+ var filtersGet = new seriesImportFiltersGet({
'container': document.getElementById('series_import_filter_container'),
'project': '$project.getId()',
'enable_checkbox': 'enable_series_import_filter',
@@ -247,43 +316,49 @@ window.prearchive=(new RadioSettingsManager(document.getElementById('prearchive_
'filters_text_area': 'series_import_filter_text_area',
'save_button': 'series_import_filter_save'
});
- filtersGet.get();
-</script>
-</div>
-#if($turbineUtils.toBoolean($siteConfig.getProperty("enableProjectAppletScript", "false")))
-<h3>Applet Configuration Script</h3>
-<div>
- <table id="applet_script_table">
- <tr>
- <td colspan="2" class="highlighted" id="applet_script_container">
-## <DIV>Applet Configuration Script</DIV>
- <TABLE>
- <tr>
- <td><label for="enable_applet_script">Enable Applet Script</label></td>
- <td><input type="checkbox" name="enable_applet_script" id="enable_applet_script" /></td>
- </tr>
- <TR><TD></TD><TD><textarea id="applet_script_text_area" rows="20" cols="80"></textarea></TD></TR>
- <TR><TD COLSPAN="2"><input type="button" id="applet_script_save" value="Save" disabled="disabled"/></TD></TR>
- </TABLE>
- </td>
- </tr>
-</table>
-<script>
- var sgApplet = new scriptGet(document.getElementById('applet_script_container'),
- {
- 'getStatus' : serverRoot + '/data/projects/$project.getId()/config/applet/settings?format=json',
- 'putStatus' : serverRoot + '/data/projects/$project.getId()/config/applet/settings?status=',
- 'getScript' : serverRoot + '/data/projects/$project.getId()/config/applet/settings?format=json',
- 'putScript' : serverRoot + '/data/projects/$project.getId()/config/applet/settings?inbody=true',
- 'project' : '$project.getId()',
- 'enable_checkbox' : 'enable_applet_script',
- 'script_text_area' : 'applet_script_text_area',
- 'save_button' : 'applet_script_save'
- });
- sgApplet.get();
-</script>
-</div>
-#end
+ filtersGet.get();
+ </script>
+ </div>
+ #if($turbineUtils.toBoolean($siteConfig.getProperty("enableProjectAppletScript", "false")))
+ <h3>Applet Configuration Script</h3>
+ <div>
+ <table id="applet_script_table">
+ <tr>
+ <td colspan="2" class="highlighted" id="applet_script_container">
+ ## <DIV>Applet Configuration Script</DIV>
+ <TABLE>
+ <tr>
+ <td><label for="enable_applet_script">Enable Applet Script</label></td>
+ <td><input type="checkbox" name="enable_applet_script" id="enable_applet_script"/></td>
+ </tr>
+ <TR>
+ <TD></TD>
+ <TD><textarea id="applet_script_text_area" rows="20" cols="80"></textarea></TD>
+ </TR>
+ <TR>
+ <TD COLSPAN="2">
+ <input type="button" id="applet_script_save" value="Save" disabled="disabled"/></TD>
+ </TR>
+ </TABLE>
+ </td>
+ </tr>
+ </table>
+ <script>
+ var sgApplet = new scriptGet(document.getElementById('applet_script_container'),
+ {
+ 'getStatus': serverRoot + '/data/projects/$project.getId()/config/applet/settings?format=json',
+ 'putStatus': serverRoot + '/data/projects/$project.getId()/config/applet/settings?status=',
+ 'getScript': serverRoot + '/data/projects/$project.getId()/config/applet/settings?format=json',
+ 'putScript': serverRoot + '/data/projects/$project.getId()/config/applet/settings?inbody=true',
+ 'project': '$project.getId()',
+ 'enable_checkbox': 'enable_applet_script',
+ 'script_text_area': 'applet_script_text_area',
+ 'save_button': 'applet_script_save'
+ });
+ sgApplet.get();
+ </script>
+ </div>
+ #end
<h3>Event Handlers</h3>
<div id="events_list" style="min-height:120px;">
@@ -315,8 +390,28 @@ window.prearchive=(new RadioSettingsManager(document.getElementById('prearchive_
</div>
#addCustomScreens($project.getXSIType() "report/manage_tab")
+
</div><!-- /#accordion -->
-<script type="text/javascript">
- jq('#accordion').accordion({heightStyle:'content'});
+<script>
+
+ $.fn.superSimpleAccordion = function(){
+ var container = $(this).show();
+ var h3s = container.find('h3');
+ var divs = h3s.next('div');
+ divs.addClass('content').hide();
+ container.find('.active').show();
+ h3s.on('click', function(){
+ var content = $(this).next('div');
+ if (content.is(':hidden')) {
+ h3s.removeClass('active');
+ $(this).addClass('active');
+ divs.removeClass('active').slideUp();
+ content.addClass('active').slideDown();
+ }
+ });
+ };
+
+ $('#accordion').superSimpleAccordion();
+
</script>
diff --git a/src/main/webapp/xnat-templates/screens/xnat_projectData/xnat_projectData_summary_pipeline.vm b/src/main/webapp/xnat-templates/screens/xnat_projectData/xnat_projectData_summary_pipeline.vm
index 707ab8f85f7241855ac72531c6177ea0b3e84b73..8456ac31cbba66d59e6993aaedef36a89efe534e 100644
--- a/src/main/webapp/xnat-templates/screens/xnat_projectData/xnat_projectData_summary_pipeline.vm
+++ b/src/main/webapp/xnat-templates/screens/xnat_projectData/xnat_projectData_summary_pipeline.vm
@@ -1,11 +1,6 @@
<!-- Source file -->
<script type="text/javascript" src="$content.getURI("scripts/yui/build/logger/logger-min.js")"></script>
-
-<link type="text/css" rel="stylesheet" href="$content.getURI("scripts/yui/build/fonts/fonts.css")">
-<!--<link type="text/css" rel="stylesheet" href="$content.getURI("scripts/yui/build/reset/reset.css")">-->
-
<script type="text/javascript" src="$content.getURI("scripts/yui/build/animation/animation.js")"></script>
-
<script type="text/javascript" src="$content.getURI("scripts/project/pipelineMgmt.js")"></script>
<div id="waitPanel"></div>
diff --git a/src/main/webapp/xnat-templates/screens/xnat_subjectData_search.vm b/src/main/webapp/xnat-templates/screens/xnat_subjectData_search.vm
old mode 100644
new mode 100755
index 4e6e1397c2f39ab3d26a50ab3daf54684406bb26..81a26d9bd88ed84e2ff4f50fc8df8bcf857f4d32
--- a/src/main/webapp/xnat-templates/screens/xnat_subjectData_search.vm
+++ b/src/main/webapp/xnat-templates/screens/xnat_subjectData_search.vm
@@ -1,7 +1,7 @@
##Copyright 2005 Harvard University / Howard Hughes Medical Institute (HHMI) All Rights Reserved
<!-- start: screens/xnat_subjectData_search.vm -->
-<div id="mr-advanced-search" class="advanced-search-fields">
+<div id="subject-advanced-search" class="advanced-search-fields">
<a href="#!" style="position:absolute;right:0;top:0;font-size:12px;" class="link" onclick="XNAT.ui.popup('$link.setPage("SearchHelp.vm").addPathInfo("popup","true")','Help',500,600)">Help</a>