From 1fafef06ba51fe1b3a1fd3ff75529a5a7e5c186c Mon Sep 17 00:00:00 2001
From: nac26 <nac26@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Tue, 8 Feb 2011 13:23:59 +0000
Subject: [PATCH] Added test for $currentPage. If login widget is being
 rendered on the home page, don't use the <noscript> element. Will need to
 update the test once Rebecca resolves NIHVIVO-2051 to ensure currentPage
 value is consistent for home page requests.

---
 .../templates/freemarker/widgets/widget-login.ftl | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/webapp/web/templates/freemarker/widgets/widget-login.ftl b/webapp/web/templates/freemarker/widgets/widget-login.ftl
index c00e7be1d..27f97e8a5 100644
--- a/webapp/web/templates/freemarker/widgets/widget-login.ftl
+++ b/webapp/web/templates/freemarker/widgets/widget-login.ftl
@@ -15,12 +15,15 @@
 </#macro>
 
 <#macro loginForm>
-    <noscript>
-        <section id="error-alert">
-            <img src="${urls.images}/iconAlertBig.png" alt="Alert Icon"/>
-            <p>In order to edit VIVO content, you'll need to enable JavaScript.</p>
-        </section>
-    </noscript>
+    <#-- Don't display the JavaScript required to edit message on the home page even if JavaScript is unavailable -->
+    <#if ( currentPage != 'home' && currentPage != 'index.jsp')>
+        <noscript>
+            <section id="error-alert">
+                <img src="${urls.images}/iconAlertBig.png" alt="Alert Icon"/>
+                <p>In order to edit VIVO content, you'll need to enable JavaScript.</p>
+            </section>
+        </noscript>
+    </#if>
 
     <section id="login" class="hidden">
         <h2>Log in</h2>