From a7a5c821fbd8641ea195786f21aeaa2ea86856c4 Mon Sep 17 00:00:00 2001
From: rjy7 <rjy7@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Wed, 3 Nov 2010 02:26:48 +0000
Subject: [PATCH] Combine addition of scripts and stylesheets into a single
 macro in the login widget

---
 .../templates/freemarker/widgets/widget-login.ftl  | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/webapp/web/templates/freemarker/widgets/widget-login.ftl b/webapp/web/templates/freemarker/widgets/widget-login.ftl
index 9a64d980d..ae2cf602b 100644
--- a/webapp/web/templates/freemarker/widgets/widget-login.ftl
+++ b/webapp/web/templates/freemarker/widgets/widget-login.ftl
@@ -2,18 +2,12 @@
 
 <#-- Login widget -->
 
-<#-- Question for Nick and Manolo: can we use this in Vitro, where html 5 is not being used, or should it be moved
-to the wilma theme? Please do whatever's appropriate. -->
-
-<#macro styles>
+<#macro assets>
     <#if ! loginName??>
         ${stylesheets.add("/css/login.css")}
-    </#if>
-</#macro>
-
-<#macro scripts>
-    <#if ! loginName??>
-        <#-- define any js files needed for the login widget -->
+        <#-- define any js files needed for the login widget 
+        ${scripts.add("")}
+        ${headScripts.add("")} -->
     </#if>
 </#macro>