From f3395820257f1bd0336658ccc783be5dcfac183c Mon Sep 17 00:00:00 2001 From: Ziver Koc Date: Wed, 8 Aug 2018 11:35:05 +0200 Subject: [PATCH] Switched to use tags instead of include --- WebContent/WEB-INF/tags/footer.tag | 2 ++ WebContent/WEB-INF/tags/header.tag | 5 ++- WebContent/WEB-INF/tags/messages.tag | 46 +++++++++++++++------------- WebContent/WEB-INF/tags/navbar.tag | 4 +++ WebContent/css/zallery.css | 11 +++++++ WebContent/page_gallery.jsp | 13 +++----- WebContent/page_login.jsp | 8 ++--- WebContent/page_register.jsp | 8 ++--- 8 files changed, 59 insertions(+), 38 deletions(-) diff --git a/WebContent/WEB-INF/tags/footer.tag b/WebContent/WEB-INF/tags/footer.tag index aff0352..c4a9774 100644 --- a/WebContent/WEB-INF/tags/footer.tag +++ b/WebContent/WEB-INF/tags/footer.tag @@ -1,4 +1,6 @@ <%@tag description="Footer template" pageEncoding="UTF-8" %> +<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@taglib prefix="t" tagdir="/WEB-INF/tags" %> \ No newline at end of file diff --git a/WebContent/WEB-INF/tags/header.tag b/WebContent/WEB-INF/tags/header.tag index 0149df3..be1c21a 100644 --- a/WebContent/WEB-INF/tags/header.tag +++ b/WebContent/WEB-INF/tags/header.tag @@ -1,3 +1,6 @@ +<%@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" %> @@ -24,4 +27,4 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/WebContent/WEB-INF/tags/messages.tag b/WebContent/WEB-INF/tags/messages.tag index f291bc1..cc70514 100644 --- a/WebContent/WEB-INF/tags/messages.tag +++ b/WebContent/WEB-INF/tags/messages.tag @@ -1,7 +1,6 @@ <%@tag description="User message template" pageEncoding="UTF-8" %> -<%@taglib uri = "http://java.sun.com/jsp/jstl/core" prefix = "c" %> -<%@tag import="com.example.User" %> -<%@attribute name="user" required="true" type="com.example.User"%> +<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@taglib prefix="t" tagdir="/WEB-INF/tags" %>
- - - - - - if( message.getType() == MessageType.WARNING ){%> -
-
<%=message.getMessage() %>
-
- <%} else if( message.getType() == MessageType.ERROR ){ %> -
-
<%=message.getMessage() %>
-
- <%} else if( message.getType() == MessageType.INFO ){ %> -
-
<%=message.getMessage() %>
-
- + + + +
+
${message.title}
+
+ + +
+
${message.title}
+
+ + +
+
${message.title}
+
+ + +
+
${message.title}
+
+ +
\ No newline at end of file diff --git a/WebContent/WEB-INF/tags/navbar.tag b/WebContent/WEB-INF/tags/navbar.tag index a8c8f54..adcd25b 100644 --- a/WebContent/WEB-INF/tags/navbar.tag +++ b/WebContent/WEB-INF/tags/navbar.tag @@ -1,3 +1,7 @@ +<%@tag description="Navigation bar template" pageEncoding="UTF-8" %> +<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@taglib prefix="t" tagdir="/WEB-INF/tags" %> +