diff --git a/WebContent/WEB-INF/tags/header.tag b/WebContent/WEB-INF/tags/header.tag index 57b52fc..9fac7d4 100644 --- a/WebContent/WEB-INF/tags/header.tag +++ b/WebContent/WEB-INF/tags/header.tag @@ -1,7 +1,7 @@ -<%@tag description="Header template" pageEncoding="UTF-8" %> -<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> -<%@taglib prefix="t" tagdir="/WEB-INF/tags" %> -<%@attribute name=”showMessages” %> +<%@ tag description="Header template" pageEncoding="UTF-8" %> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="t" tagdir="/WEB-INF/tags" %> +<%@ attribute name="showMessages" required="false" %> @@ -10,24 +10,24 @@ - ${WEBSITE_NAME} + ${WEBSITE_TITLE} - - + + - - - - - + + + - \ No newline at end of file + + + \ No newline at end of file diff --git a/WebContent/WEB-INF/tags/navbar.tag b/WebContent/WEB-INF/tags/navbar.tag index adcd25b..4ceab58 100644 --- a/WebContent/WEB-INF/tags/navbar.tag +++ b/WebContent/WEB-INF/tags/navbar.tag @@ -11,7 +11,7 @@ - Project name + ${WEBSITE_NAME}
diff --git a/WebContent/page_gallery.jsp b/WebContent/page_gallery.jsp index 5f86769..06a8d27 100755 --- a/WebContent/page_gallery.jsp +++ b/WebContent/page_gallery.jsp @@ -1,46 +1,50 @@ <%@page contentType="text/html" pageEncoding="UTF-8"%> <%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> <%@taglib prefix="t" tagdir="/WEB-INF/tags" %> + - +
+ - + -
+
-
-
-
- -
- ${subFolder.getName()} -
- +
+
+
+ +
+ ${subFolder.getName()} +
+ +
+ +
- -
-
-
-
- -
- -
- +
+
+ +
+ +
+ +
-
-
+
-
+
+ +
diff --git a/WebContent/page_login.jsp b/WebContent/page_login.jsp index 1b6d1e2..f3a12b0 100755 --- a/WebContent/page_login.jsp +++ b/WebContent/page_login.jsp @@ -1,7 +1,11 @@ <%@page contentType="text/html" pageEncoding="UTF-8"%> <%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> <%@taglib prefix="t" tagdir="/WEB-INF/tags" %> - + + + + +
diff --git a/WebContent/page_register.jsp b/WebContent/page_register.jsp index 4170a2f..f02bdf0 100755 --- a/WebContent/page_register.jsp +++ b/WebContent/page_register.jsp @@ -1,7 +1,11 @@ <%@page contentType="text/html" pageEncoding="UTF-8"%> <%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> <%@taglib prefix="t" tagdir="/WEB-INF/tags" %> - + + + + +
diff --git a/src/zall/ZalleryConstants.java b/src/zall/ZalleryConstants.java index 46ad31c..403e4ee 100644 --- a/src/zall/ZalleryConstants.java +++ b/src/zall/ZalleryConstants.java @@ -9,13 +9,14 @@ public interface ZalleryConstants { /** Session Constants **/ - public static String ENV_KEY_WEBSITE_NAME = "WEBSITE_NAME"; - public static String ENV_KEY_WEBSITE_URL = "WEBSITE_URL"; - public static String ENV_KEY_ADMIN_EMAIL = "ADMIN_EMAIL"; - public static String ENV_KEY_ADMIN_NAME = "ADMIN_NAME"; - public static String ENV_KEY_SMTP_HOST = "SMTP_HOST"; - public static String ENV_KEY_ROOT_PATH = "ROOT_PATH"; - public static String ENV_KEY_DATA_PATH = "DATA_PATH"; + public static String ENV_KEY_WEBSITE_TITLE = "WEBSITE_TITLE"; + public static String ENV_KEY_WEBSITE_NAME = "WEBSITE_NAME"; + public static String ENV_KEY_WEBSITE_URL = "WEBSITE_URL"; + public static String ENV_KEY_ADMIN_EMAIL = "ADMIN_EMAIL"; + public static String ENV_KEY_ADMIN_NAME = "ADMIN_NAME"; + public static String ENV_KEY_SMTP_HOST = "SMTP_HOST"; + public static String ENV_KEY_ROOT_PATH = "ROOT_PATH"; + public static String ENV_KEY_DATA_PATH = "DATA_PATH"; /** Session Constants **/ diff --git a/src/zall/ZalleryServlet.java b/src/zall/ZalleryServlet.java index d3b2ce8..f033359 100644 --- a/src/zall/ZalleryServlet.java +++ b/src/zall/ZalleryServlet.java @@ -23,10 +23,11 @@ public abstract class ZalleryServlet extends HttpServlet { public final void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException { DBConnection db = null; try { - request.setAttribute(ENV_KEY_WEBSITE_NAME, Zallery.WEBSITE_NAME); - request.setAttribute(ENV_KEY_WEBSITE_URL, Zallery.WEBSITE_URL); - request.setAttribute(ENV_KEY_ADMIN_NAME, Zallery.ADMIN_NAME); - request.setAttribute(ENV_KEY_ADMIN_EMAIL, Zallery.ADMIN_EMAIL); + request.setAttribute(ENV_KEY_WEBSITE_TITLE, Zallery.WEBSITE_NAME); + request.setAttribute(ENV_KEY_WEBSITE_NAME, Zallery.WEBSITE_NAME); + request.setAttribute(ENV_KEY_WEBSITE_URL, Zallery.WEBSITE_URL); + request.setAttribute(ENV_KEY_ADMIN_NAME, Zallery.ADMIN_NAME); + request.setAttribute(ENV_KEY_ADMIN_EMAIL, Zallery.ADMIN_EMAIL); UserMessageManager msgs = Zallery.getUserMessage(request.getSession()); request.setAttribute(ZalleryConstants.SESSION_KEY_USER_MSG, msgs);