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

Renamed lang references, switched to zutil UserMessageManager

Browse source
This commit is contained in:
Ziver Koc 2018-08-06 18:53:40 +02:00
parent b84f583d1c
commit 9c91d96ce7
27 changed files with 245 additions and 295 deletions
Download patch file Download diff file Expand all files Collapse all files

3
WebContent/META-INF/context.xml
View file

@ -9,6 +9,9 @@
<Environment type="java.lang.String" name="SMTP_HOST" value="127.0.0.1" />
<Environment type="java.lang.String" name="DATA_PATH" value="C:\\Users\\Ziver\\Desktop\\Downloads\\zallery" />
<Environment type="java.lang.String" name="LOGGING_ZALL" value="FINEST" />
<Environment type="java.lang.String" name="LOGGING_ZUTIL" value="FINE" />
<Resource
name="jdbc/mysql"
auth="Container"

4
WebContent/WEB-INF/tags/footer.tag Normal file
View file

@ -0,0 +1,4 @@
<%@tag description="Footer template" pageEncoding="UTF-8" %>
</body>
</html>

15
WebContent/fragment_header.jsp → WebContent/WEB-INF/tags/header.tag
View file

@ -16,23 +16,12 @@
<link rel="stylesheet" href="css/register3.css">
<link rel="stylesheet" href="css/zallery.css">
<!-- Bootstrap core JavaScript -->
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js"></script>
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery.imagesloaded/3.1.8/imagesloaded.pkgd.min.js"></script>
<script src="js/masonry.pkgd.min.js"></script>
<script type="text/javascript">
$(function(){
$('.image-grid').imagesLoaded(function(){
$('.grid').masonry({
itemSelector: '.grid-item',
columnWidth: '.grid-item',
});
});
});
</script>
</head>
<body>
<body>
<jsp:include page="fragment_messages.jsp"/>

34
WebContent/WEB-INF/tags/messages.tag Normal file
View file

@ -0,0 +1,34 @@
<%@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"%>
<!-- User Messages -->
<script type="text/javascript">
$(function(){
$(".message").click(function(){
$(this).fade();
});
});
</script>
<div class="menu">
<c:forEach var="messages" var="message">
<c:if test="${message.getType() == MessageType.WARNING}">
</c:if>
if( message.getType() == MessageType.WARNING ){%>
<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;">
<center><b><%=message.getMessage() %></b></center>
</div>
<%} else if( message.getType() == MessageType.ERROR ){ %>
<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.getMessage() %></b></center>
</div>
<%} else if( message.getType() == MessageType.INFO ){ %>
<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.getMessage() %></b></center>
</div>
</c:forEach>
</div>

0
WebContent/fragment_navbar.jsp → WebContent/WEB-INF/tags/navbar.tag
View file

2
WebContent/fragment_footer.jsp
View file

@ -1,2 +0,0 @@
</body>
</html>

17
WebContent/page_gallery.jsp
View file

@ -1,9 +1,23 @@
<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
<%@page contentType="text/html" pageEncoding="UTF-8"%>
<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" tagdir="/WEB-INF/tags" %>
<jsp:include page="fragment_header.jsp"/>
<jsp:include page="fragment_navbar.jsp"/>
<script type="text/javascript">
$(function(){
$('.image-grid').imagesLoaded(function(){
$('.grid').masonry({
itemSelector: '.grid-item',
columnWidth: '.grid-item',
});
});
});
</script>
<div class="content">
<div class="gallery col-center col-md-11">
@ -33,4 +47,3 @@
<jsp:include page="fragment_footer.jsp"/>

3
WebContent/page_login.jsp
View file

@ -1,3 +1,6 @@
<%@page contentType="text/html" pageEncoding="UTF-8"%>
<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" tagdir="/WEB-INF/tags" %>
<jsp:include page="fragment_header.jsp" />
<div class="container">

3
WebContent/page_register.jsp
View file

@ -1,3 +1,6 @@
<%@page contentType="text/html" pageEncoding="UTF-8"%>
<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" tagdir="/WEB-INF/tags" %>
<jsp:include page="fragment_header.jsp" />
<div class="container">