From 5a14fbb4efb9968c39235c5334dcf0e8d833b811 Mon Sep 17 00:00:00 2001
From: Justin Cleveland <clevelandj@wustl.edu>
Date: Fri, 3 Jun 2016 17:24:09 -0500
Subject: [PATCH] XNAT-4313 - quick cosmetic fix (until css changes again and
moves everything around) Adding hooks for better plugin classpath resource
validation (XNAT-4308)
---
.../META-INF/xnat/spawner/site-admin-elements.yaml | 2 +-
.../xnat_projectData/xnat_projectData_bundle_tabs.vm | 12 ++++++++++--
.../xnat_subjectData/xnat_subjectData_report.vm | 6 +++++-
3 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/src/main/resources/META-INF/xnat/spawner/site-admin-elements.yaml b/src/main/resources/META-INF/xnat/spawner/site-admin-elements.yaml
index 20dd472d..d0f04972 100644
--- a/src/main/resources/META-INF/xnat/spawner/site-admin-elements.yaml
+++ b/src/main/resources/META-INF/xnat/spawner/site-admin-elements.yaml
@@ -726,7 +726,7 @@ themeManagement:
label: None
value: None
after:
- - "<span style=\"position: relative; top: -49px;left: 270px;\"> <!-- <button id=\"submitThemeButton\" onclick=\"setTheme();\">Set Theme</button> --> <button id=\"removeThemeButton\" onclick=\"removeTheme();\">Remove Theme</button></span>"
+ - "<span style=\"position: relative; top: -78px;left: 270px;\"> <!-- <button id=\"submitThemeButton\" onclick=\"setTheme();\">Set Theme</button> --> <button id=\"removeThemeButton\" onclick=\"removeTheme();\">Remove Theme</button></span>"
element:
style:
min-width: 250px
diff --git a/src/main/webapp/xnat-templates/screens/xnat_projectData/xnat_projectData_bundle_tabs.vm b/src/main/webapp/xnat-templates/screens/xnat_projectData/xnat_projectData_bundle_tabs.vm
index 568292b2..a0be9f8c 100644
--- a/src/main/webapp/xnat-templates/screens/xnat_projectData/xnat_projectData_bundle_tabs.vm
+++ b/src/main/webapp/xnat-templates/screens/xnat_projectData/xnat_projectData_bundle_tabs.vm
@@ -1,4 +1,7 @@
-#parse($turbineUtils.getTemplateName("_bundle_header","xnat:projectData",$project.getId()))
+#set($path = "screens/xnat_projectData/xnat_projectData_bundle_header.vm")
+#if($turbineUtils.validateClasspathTemplate($path))
+ #parse($path)
+#end
#set($bundles = $project.getBundles())
#if($bundles.size()>0)
## <script type="text/javascript" src="$content.getURI("scripts/tabWrangler/tabWrangler.js")"></script>
@@ -58,7 +61,12 @@
window.tab_manager.init(stored_searches);
- #parse($turbineUtils.getTemplateName("_bundle_default","xnat:projectData",$project.getId()))
+ #set($path = "screens/xnat_projectData/xnat_projectData_bundle_default.vm")
+ #if($turbineUtils.validateClasspathTemplate($path))
+ #parse($path)
+ #else
+ #parse($turbineUtils.getTemplateName("_bundle_default","xnat:projectData",$project.getId()))
+ #end
var bundles = YAHOO.util.Cookie.get("${project.getId()}.open_bundle.tabs");
if (bundles !== null && bundles.length > 0) {
diff --git a/src/main/webapp/xnat-templates/screens/xnat_subjectData/xnat_subjectData_report.vm b/src/main/webapp/xnat-templates/screens/xnat_subjectData/xnat_subjectData_report.vm
index f0de96d1..40deea2b 100644
--- a/src/main/webapp/xnat-templates/screens/xnat_subjectData/xnat_subjectData_report.vm
+++ b/src/main/webapp/xnat-templates/screens/xnat_subjectData/xnat_subjectData_report.vm
@@ -96,12 +96,16 @@ function summaryTabManagerInit(){
</tr>
<TR>
<TD>
- #if($turbineUtils.getTemplates($om.getXSIType(),"report/assessor_tabs").size() == 0)
+ #if($turbineUtils.getTemplates($om.getXSIType(),"report/assessor_tabs").size() == 0)
#parse($turbineUtils.getTemplateName("_assessors","xnat:subjectData",$project))
#else
#set($useTabs=true)
#parse($turbineUtils.getTemplateName("assessors_tabs","xnat:subjectData",$project))
#end
+ #set($path = "screens/xnat_subjectData/report/assessor_tabs/Visits.vm")
+ #if($turbineUtils.validateClasspathTemplate($path))
+ #parse($path)
+ #end
</TD>
</TR>
<tr>
--
GitLab