diff --git a/productMods/WEB-INF/web.xml b/productMods/WEB-INF/web.xml
index 3a74b483..aaf12737 100644
--- a/productMods/WEB-INF/web.xml
+++ b/productMods/WEB-INF/web.xml
@@ -389,7 +389,16 @@
SiteAdminController
/siteAdmin.jsp
-
+
+
+ EmptyController
+ edu.cornell.mannlib.vitro.webapp.controller.freemarker.EmptyController
+
+
+ EmptyController
+ /login
+
+
RevisionInfoController
edu.cornell.mannlib.vitro.webapp.controller.freemarker.RevisionInfoController
@@ -1292,10 +1301,12 @@
authenticate
/authenticate
+
loginShibbolethSetup
/loginShibboleth
diff --git a/themes/wilma/css/wilma.css b/themes/wilma/css/wilma.css
index 3eb7bd0d..a558e233 100644
--- a/themes/wilma/css/wilma.css
+++ b/themes/wilma/css/wilma.css
@@ -222,7 +222,6 @@ ul#main-nav {
}
/* LOG IN------> */
#log-in {
- float:right;
width:314px;
height:390px;
border:1px solid #e8ece9;
@@ -231,6 +230,10 @@ ul#main-nav {
padding-bottom:30px;
margin-bottom:30px;
}
+/* Login container on home page */
+#login-container {
+ float: right;
+}
#log-in h2 {
font-size: 22px;
color: #2485ae;
diff --git a/themes/wilma/site_icons/iconAlert.png b/themes/wilma/site_icons/iconAlert.png
new file mode 100644
index 00000000..219e28c6
Binary files /dev/null and b/themes/wilma/site_icons/iconAlert.png differ
diff --git a/themes/wilma/site_icons/iconAlertBig.png b/themes/wilma/site_icons/iconAlertBig.png
new file mode 100644
index 00000000..219e28c6
Binary files /dev/null and b/themes/wilma/site_icons/iconAlertBig.png differ
diff --git a/themes/wilma/templates/page-home.ftl b/themes/wilma/templates/page-home.ftl
index b57c2ee5..ca55314a 100644
--- a/themes/wilma/templates/page-home.ftl
+++ b/themes/wilma/templates/page-home.ftl
@@ -1,8 +1,6 @@
<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
-<#import "lib-list.ftl" as l>
-<#import "widget-login.ftl" as login>
-<@login.assets />
+<@widget name="login" include="assets" />
@@ -112,9 +110,11 @@
+
+
+ <@widget name="login" />
+
- <@login.markup />
-