ziver/zallery
1
0
Fork 0
Code Pull requests Releases Activity

Switched to use tags instead of include

Browse source
This commit is contained in:
Ziver Koc 2018-08-08 11:35:05 +02:00
parent 5065c24f39
commit f339582025
8 changed files with 59 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

2
WebContent/WEB-INF/tags/footer.tag
View file

@ -1,4 +1,6 @@
<%@tag description="Footer template" pageEncoding="UTF-8" %> <%@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" %>
</body> </body>
</html> </html>

5
WebContent/WEB-INF/tags/header.tag
View file

@ -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" %>
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en">
<head> <head>
@ -24,4 +27,4 @@
</head> </head>
<body> <body>
<jsp:include page="fragment_messages.jsp"/> <t:messages />

46
WebContent/WEB-INF/tags/messages.tag
View file

@ -1,7 +1,6 @@
<%@tag description="User message template" pageEncoding="UTF-8" %> <%@tag description="User message template" pageEncoding="UTF-8" %>
<%@taglib uri = "http://java.sun.com/jsp/jstl/core" prefix = "c" %> <%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
<%@tag import="com.example.User" %> <%@taglib prefix="t" tagdir="/WEB-INF/tags" %>
<%@attribute name="user" required="true" type="com.example.User"%>
<!-- User Messages --> <!-- User Messages -->
<script type="text/javascript"> <script type="text/javascript">
@ -12,23 +11,28 @@
}); });
</script> </script>
<div class="menu"> <div class="menu">
<c:forEach var="messages" var="message"> <c:forEach items="${param.messages}" var="message">
<c:if test="${message.getType() == MessageType.WARNING}"> <c:choose>
</c:if> <c:when test="${message.isInfo()}">
<div class="message" style="border: 2px solid #039C00; padding: 0px; margin: 5px; background: #9BFB66 none repeat scroll 0%; font-size: 11px; color: black; border-radius: 7px;">
<center><b>${message.title}</b></center>
if( message.getType() == MessageType.WARNING ){%> </div>
<div class="message" style="border: 2px solid #E6E600; padding: 0px; margin: 5px; background: #FFFF99 none repeat scroll 0%; font-size: 11px; color: black; border-radius: 7px;"> </c:when>
<center><b><%=message.getMessage() %></b></center> <c:when test="${message.isSuccess()}">
</div> <div class="message" style="border: 2px solid #039C00; padding: 0px; margin: 5px; background: #9BFB66 none repeat scroll 0%; font-size: 11px; color: black; border-radius: 7px;">
<%} else if( message.getType() == MessageType.ERROR ){ %> <center><b>${message.title}</b></center>
<div class="message" style="border: 2px solid #FF0000; padding: 0px; margin: 5px; background: #FFDDCC none repeat scroll 0%; font-size: 11px; color: black; border-radius: 7px;"> </div>
<center><b><%=message.getMessage() %></b></center> </c:when>
</div> <c:when test="${message.isWarning()}">
<%} else if( message.getType() == MessageType.INFO ){ %> <div class="message" style="border: 2px solid #E6E600; padding: 0px; margin: 5px; background: #FFFF99 none repeat scroll 0%; font-size: 11px; color: black; border-radius: 7px;">
<div class="message" style="border: 2px solid #039C00; padding: 0px; margin: 5px; background: #9BFB66 none repeat scroll 0%; font-size: 11px; color: black; border-radius: 7px;"> <center><b>${message.title}</b></center>
<center><b><%=message.getMessage() %></b></center> </div>
</div> </c:when>
<c:when test="${message.isError()}">
<div class="message" style="border: 2px solid #FF0000; padding: 0px; margin: 5px; background: #FFDDCC none repeat scroll 0%; font-size: 11px; color: black; border-radius: 7px;">
<center><b>${message.title}</b></center>
</div>
</c:when>
</c:choose>
</c:forEach> </c:forEach>
</div> </div>

4
WebContent/WEB-INF/tags/navbar.tag
View file

@ -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" %>
<!-- Static navbar --> <!-- Static navbar -->
<nav class="navbar navbar-default"> <nav class="navbar navbar-default">
<div class="navbar-header"> <div class="navbar-header">

11
WebContent/css/zallery.css
View file

@ -1,6 +1,17 @@
body{ body{
margin-bottom: 200px; margin-bottom: 200px;
} }
/***** Msg *******/
.messageXX {
border: 2px solid #039C00;
padding: 0px;
margin: 5px;
background: #9BFB66 none repeat scroll 0%;
font-size: 11px;
color: black;
border-radius: 7px;
}
/***** Nav *******/ /***** Nav *******/

13
WebContent/page_gallery.jsp
View file

@ -1,11 +1,9 @@
<%@page contentType="text/html" pageEncoding="UTF-8"%> <%@page contentType="text/html" pageEncoding="UTF-8"%>
<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" tagdir="/WEB-INF/tags" %> <%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
<%@taglib prefix="t" tagdir="/WEB-INF/tags" %>
<t:header />
<jsp:include page="fragment_header.jsp"/>
<jsp:include page="fragment_navbar.jsp"/>
<t:navbar />
<script type="text/javascript"> <script type="text/javascript">
$(function(){ $(function(){
@ -45,5 +43,4 @@ $(function(){
</div> <!-- /content --> </div> <!-- /content -->
<t:footer />
<jsp:include page="fragment_footer.jsp"/>

8
WebContent/page_login.jsp
View file

@ -1,7 +1,7 @@
<%@page contentType="text/html" pageEncoding="UTF-8"%> <%@page contentType="text/html" pageEncoding="UTF-8"%>
<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" tagdir="/WEB-INF/tags" %> <%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
<%@taglib prefix="t" tagdir="/WEB-INF/tags" %>
<jsp:include page="fragment_header.jsp" /> <t:header />
<div class="container"> <div class="container">
<div class="row"> <div class="row">
@ -37,4 +37,4 @@
</div> <!-- /container --> </div> <!-- /container -->
<jsp:include page="fragment_footer.jsp" /> <t:footer />

8
WebContent/page_register.jsp
View file

@ -1,7 +1,7 @@
<%@page contentType="text/html" pageEncoding="UTF-8"%> <%@page contentType="text/html" pageEncoding="UTF-8"%>
<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" tagdir="/WEB-INF/tags" %> <%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
<%@taglib prefix="t" tagdir="/WEB-INF/tags" %>
<jsp:include page="fragment_header.jsp" /> <t:header />
<div class="container"> <div class="container">
<div class="row"> <div class="row">
@ -52,4 +52,4 @@
</div> <!-- /container --> </div> <!-- /container -->
<jsp:include page="fragment_footer.jsp" /> <t:footer />