Welcome screen logo

src/main/webapp/xnat-templates/screens/Login.vm

@@ -34,23 +34,6 @@ $page.setTitle("$siteId - Please Login")
 
 #if($turbineUtils.GetPassedParameter("par",$data))
 ## create custom layout when parameters are passed to the login page from an external link.
-    <div id="login_welcome">
-        #if($siteConfig.getProperty("siteDescriptionType","")=="Text")
-            <div id="siteDescription"></div>
-            <textarea id="siteDescriptionMd" style="display: none;">$siteConfig.getProperty("siteDescriptionText","")</textarea>
-            <script>
-                var mdtext = jq('#siteDescriptionMd').text();
-                var markedText = marked(mdtext);
-                jq('#siteDescription').html(markedText);
-            </script>
-        #else
-            #if($turbineUtils.resourceExists($siteConfig.getProperty("siteDescriptionPage","/screens/site_description.vm")))
-                #parse($siteConfig.getProperty("siteDescriptionPage","/screens/site_description.vm"))
-            #else
-                <p>Custom site description page not found!</p>
-            #end
-        #end
-    </div>
 
     #if($data.getMessage())
     <div class="warning">
@@ -107,6 +90,28 @@ $page.setTitle("$siteId - Please Login")
         </div>
     </div>
 
+    <div id="welcome_logo" >
+       #parse("screens/Logo_Welcome.vm")
+    </div>
+
+#*    <div id="login_welcome">
+        #if($siteConfig.getProperty("siteDescriptionType","")=="Text")
+            <div id="siteDescription"></div>
+            <textarea id="siteDescriptionMd" style="display: none;">$siteConfig.getProperty("siteDescriptionText","")</textarea>
+            <script>
+                var mdtext = jq('#siteDescriptionMd').text();
+                var markedText = marked(mdtext);
+                jq('#siteDescription').html(markedText);
+            </script>
+        #else
+            #if($turbineUtils.resourceExists($siteConfig.getProperty("siteDescriptionPage","/screens/site_description.vm")))
+                #parse($siteConfig.getProperty("siteDescriptionPage","/screens/site_description.vm"))
+            #else
+                <p>Custom site description page not found!</p>
+            #end
+        #end
+    </div>*#
+
     <div class="clear"></div>
 
     <script>
@@ -124,25 +129,7 @@ $page.setTitle("$siteId - Please Login")
 #else
 ## standard layout for login page
 
-    <div id="login_welcome">
-        #if($siteConfig.getProperty("siteDescriptionType","")=="Text")
-            <div id="siteDescription"></div>
-            <div id="siteDescriptionMd" style="display: none;">$siteConfig.getProperty("siteDescriptionText","")</div>
-            <script>
-                var mdtext = jq('#siteDescriptionMd').text();
-                var markedText = marked(mdtext);
-                jq('#siteDescription').html(markedText);
-            </script>
-        #else
-            #if($turbineUtils.resourceExists($siteConfig.getProperty("siteDescriptionPage","/screens/site_description.vm")))
-                #parse($siteConfig.getProperty("siteDescriptionPage","/screens/site_description.vm"))
-            #else
-                <p>Custom site description page not found!</p>
-            #end
-        #end
-    </div>
-
-    <div id="login_box">
+    <div id="login_box" >
 
         #if($data.getMessage())
         <div class="message" style="border-bottom: 0">
@@ -180,6 +167,28 @@ $page.setTitle("$siteId - Please Login")
         </form>
     </div>
 
+    <div id="welcome_logo" align="right">
+        #parse("/screens/Logo_Welcome.vm")
+    </div>
+
+#*    <div id="login_welcome">
+        #if($siteConfig.getProperty("siteDescriptionType","")=="Text")
+            <div id="siteDescription"></div>
+            <div id="siteDescriptionMd" style="display: none;">$siteConfig.getProperty("siteDescriptionText","")</div>
+            <script>
+                var mdtext = jq('#siteDescriptionMd').text();
+                var markedText = marked(mdtext);
+                jq('#siteDescription').html(markedText);
+            </script>
+        #else
+            #if($turbineUtils.resourceExists($siteConfig.getProperty("siteDescriptionPage","/screens/site_description.vm")))
+                #parse($siteConfig.getProperty("siteDescriptionPage","/screens/site_description.vm"))
+            #else
+                <p>Custom site description page not found!</p>
+            #end
+        #end
+    </div>*#
+
     <div class="clear"></div>
 
     #end

src/main/webapp/xnat-templates/screens/Logo_Welcome.vm

+<img class="welcome_img" src="$content.getURI("images/brain_cropped.jpg")" style="padding: 5px;">
\ No newline at end of file