From 239c38b3c3966c430ac1f31d2e67b58bbf44e10b Mon Sep 17 00:00:00 2001
From: mb863 <mb863@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Wed, 17 Nov 2010 23:16:59 +0000
Subject: [PATCH] NIHVIVO-1361: clean up, added login.css to stylesheets.ftl

---
 webapp/web/css/login.css                       | 18 +++++++++++++++++-
 .../freemarker/page/partials/stylesheets.ftl   |  6 ++++--
 .../freemarker/widgets/widget-login.ftl        |  6 ++++--
 3 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/webapp/web/css/login.css b/webapp/web/css/login.css
index 41d673b39..6550c4565 100644
--- a/webapp/web/css/login.css
+++ b/webapp/web/css/login.css
@@ -148,4 +148,20 @@ p.passwordNote {
 .or {
   display:inline;
   vertical-align:middle;
-}
\ No newline at end of file
+}
+/* WILMA THEME ------>  */
+#error-alert{
+    width:260px;
+    position:relative;
+}
+#error-alert img{
+    padding-left:38px;
+}
+#error-alert p.error-message{
+    position:absolute;
+    width:200px;
+    top:8px;
+    left:82px;
+    font-size:0.7em;
+    color:#b30d1c;
+}
diff --git a/webapp/web/templates/freemarker/page/partials/stylesheets.ftl b/webapp/web/templates/freemarker/page/partials/stylesheets.ftl
index 9a393dc10..457b1d335 100644
--- a/webapp/web/templates/freemarker/page/partials/stylesheets.ftl
+++ b/webapp/web/templates/freemarker/page/partials/stylesheets.ftl
@@ -2,7 +2,9 @@
 
 <#-- Template for loading stylesheets in the head -->
 
-<link rel="stylesheet" type="text/css" href="${stylesheetPath}/screen.css" media="screen"/>
-<link rel="stylesheet" type="text/css" href="${stylesheetPath}/print.css" media="print"/>
+
+${stylesheets.add("/css/edit.css")} <#-- temporary until edit controller can include this when needed -->
+${stylesheets.add("/css/menupage/menupage.css")} <#-- we need to call it from the theme until freemarker controller and menupage.ftl are created -->
+${stylesheets.add("/css/individual/individual.css")} <#-- we need to call it from the theme until freemarker controller and individual.ftl are created -->
 
 ${stylesheets.tags}
\ No newline at end of file
diff --git a/webapp/web/templates/freemarker/widgets/widget-login.ftl b/webapp/web/templates/freemarker/widgets/widget-login.ftl
index 25140f00b..6d5deb00b 100644
--- a/webapp/web/templates/freemarker/widgets/widget-login.ftl
+++ b/webapp/web/templates/freemarker/widgets/widget-login.ftl
@@ -31,8 +31,10 @@
         </#if>
        
         <#if errorMessage??>
-            <section id="errorAlert"><img src="${urls.siteIcons}/iconAlert.png"  alert="Error alert icon"/>
-                <p>${errorMessage}</p>
+            <section id="error-alert" role='region'>
+                <img src="${urls.siteIcons}/iconAlert.png"  alert="Error alert icon" />
+                
+                <p class="error-message">${errorMessage}</p>
             </section>
         </#if>