+ ${param.message}
+
+
+
">
+
+
+
diff --git a/src/main/webapp/WEB-INF/view/console.jsp b/src/main/webapp/WEB-INF/view/console.jsp
index 05a930731b..da04eac57d 100644
--- a/src/main/webapp/WEB-INF/view/console.jsp
+++ b/src/main/webapp/WEB-INF/view/console.jsp
@@ -1,23 +1,29 @@
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
-<%@ taglib prefix="security" uri="http://www.springframework.org/security/tags" %>
+<%@ taglib prefix="sec"
+ uri="http://www.springframework.org/security/tags"%>
+<%@taglib uri="http://www.springframework.org/tags" prefix="spring"%>
-
-
+
+
" rel="stylesheet">
+
-
This is the landing page for the admin
-
-
+
+
+
This is the landing page for the admin
+
This text is only visible to a user
-
-
-
-
+
+
+
This text is only visible to an admin
-
-
-
- ">Logout
- ">Administrator Page
-
+
+
+
">
">
+
+
+
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/view/emailError.jsp b/src/main/webapp/WEB-INF/view/emailError.jsp
new file mode 100644
index 0000000000..ca94dbdfb0
--- /dev/null
+++ b/src/main/webapp/WEB-INF/view/emailError.jsp
@@ -0,0 +1,19 @@
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
+<%@taglib uri="http://www.springframework.org/tags" prefix="spring"%>
+
+
+ " rel="stylesheet">
+
+
+
+
+
+
+
diff --git a/src/main/webapp/WEB-INF/view/expiredAccount.jsp b/src/main/webapp/WEB-INF/view/expiredAccount.jsp
new file mode 100644
index 0000000000..a8f732c312
--- /dev/null
+++ b/src/main/webapp/WEB-INF/view/expiredAccount.jsp
@@ -0,0 +1,23 @@
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib prefix="sec"
+ uri="http://www.springframework.org/security/tags"%>
+<%@taglib uri="http://www.springframework.org/tags" prefix="spring"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
+
+<%@ page session="true"%>
+
+
+
+ " rel="stylesheet">
+
+
+
+
+
+
+
+ ">
+
+
+
diff --git a/src/main/webapp/WEB-INF/view/home.jsp b/src/main/webapp/WEB-INF/view/home.jsp
deleted file mode 100644
index fe6e572b99..0000000000
--- a/src/main/webapp/WEB-INF/view/home.jsp
+++ /dev/null
@@ -1,13 +0,0 @@
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ page session="true" %>
-
-
- Home
-
-
-
- Welcome back home!
-
-
-
-
diff --git a/src/main/webapp/WEB-INF/view/homepage.jsp b/src/main/webapp/WEB-INF/view/homepage.jsp
deleted file mode 100644
index fab96383df..0000000000
--- a/src/main/webapp/WEB-INF/view/homepage.jsp
+++ /dev/null
@@ -1,28 +0,0 @@
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
-<%@ taglib prefix="sec" uri="http://www.springframework.org/security/tags" %>
-<%@ page session="true" %>
-
-
-
-
-
- This is the homepage for the user
-
-
- This text is only visible to a user
-
-
-
-
- This text is only visible to an admin
-
-
-
- ">Logout
- ">Home
- ">Administrator Page
-
-
-
-
-
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/view/invalidSession.jsp b/src/main/webapp/WEB-INF/view/invalidSession.jsp
index 175c498117..4e62083a52 100644
--- a/src/main/webapp/WEB-INF/view/invalidSession.jsp
+++ b/src/main/webapp/WEB-INF/view/invalidSession.jsp
@@ -1,12 +1,20 @@
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
<%@taglib uri="http://www.springframework.org/tags" prefix="spring"%>
- Home
+ " rel="stylesheet">
+
-
-
-
-
+
+
diff --git a/src/main/webapp/WEB-INF/view/login.jsp b/src/main/webapp/WEB-INF/view/login.jsp
index 95559b0455..7ffa78c777 100644
--- a/src/main/webapp/WEB-INF/view/login.jsp
+++ b/src/main/webapp/WEB-INF/view/login.jsp
@@ -4,29 +4,36 @@
<%@taglib uri="http://www.springframework.org/tags" prefix="spring"%>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
-<%@ page session="false"%>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Register
-
+<%@ page session="true"%>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+ " rel="stylesheet">
+
-
- Login
- English |
- Spanish
-