diff --git a/.classpath b/.classpath index a275a3c..7d79d2a 100644 --- a/.classpath +++ b/.classpath @@ -2,16 +2,6 @@ - - - - - - - - - - @@ -19,5 +9,11 @@ + + + + + + diff --git a/WebContent/WEB-INF/jsp/about-us.jsp b/WebContent/WEB-INF/jsp/about-us.jsp new file mode 100644 index 0000000..9c57f3b --- /dev/null +++ b/WebContent/WEB-INF/jsp/about-us.jsp @@ -0,0 +1,10 @@ +<%@ page language="java" contentType="text/html; charset=UTF-8" + pageEncoding="UTF-8"%> + +<%@ taglib prefix="t" tagdir="/WEB-INF/tags"%> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> + + + + + \ No newline at end of file diff --git a/WebContent/WEB-INF/jsp/all-orders.jsp b/WebContent/WEB-INF/jsp/all-orders.jsp new file mode 100644 index 0000000..cda5ad6 --- /dev/null +++ b/WebContent/WEB-INF/jsp/all-orders.jsp @@ -0,0 +1,42 @@ +<%@ page language="java" contentType="text/html; charset=UTF-8" + pageEncoding="UTF-8"%> + +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> +<%@ taglib prefix="t" tagdir="/WEB-INF/tags"%> + + +
+

+ + + + + + + + + + + + + + + + + + + + + + + + + + + +
#
${order.id}${order.topic}${order.customer.firstName} ${order.customer.lastName}${order.customer.company}${order.date}
+ +
+ + \ No newline at end of file diff --git a/WebContent/WEB-INF/jsp/contacts.jsp b/WebContent/WEB-INF/jsp/contacts.jsp new file mode 100644 index 0000000..319f69e --- /dev/null +++ b/WebContent/WEB-INF/jsp/contacts.jsp @@ -0,0 +1,18 @@ +<%@ page language="java" contentType="text/html; charset=UTF-8" + pageEncoding="UTF-8"%> + +<%@ taglib prefix="t" tagdir="/WEB-INF/tags"%> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> + + +

+ : 7 Gogol str. +

+

+ : 8-7869-35-643-69 +

+

+ : postus@devteam.com +

+ + \ No newline at end of file diff --git a/WebContent/WEB-INF/jsp/create-account.jsp b/WebContent/WEB-INF/jsp/create-account.jsp new file mode 100644 index 0000000..8acafaa --- /dev/null +++ b/WebContent/WEB-INF/jsp/create-account.jsp @@ -0,0 +1,64 @@ +<%@ page language="java" contentType="text/html; charset=UTF-8" + pageEncoding="UTF-8"%> + +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> +<%@ taglib prefix="t" tagdir="/WEB-INF/tags"%> + + +
+
+
+ + + +

+ + + + + +

+

+ + + + + +

+

+ +

+ + +

+ +

+ + + + + + + +
+
+
+ + \ No newline at end of file diff --git a/WebContent/WEB-INF/jsp/create-order.jsp b/WebContent/WEB-INF/jsp/create-order.jsp index 9004081..9de7e8a 100644 --- a/WebContent/WEB-INF/jsp/create-order.jsp +++ b/WebContent/WEB-INF/jsp/create-order.jsp @@ -1,50 +1,91 @@ <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> <%@ taglib prefix="t" tagdir="/WEB-INF/tags"%> -<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> - + + -

New Order

- +

+ +

- Customer Info - First Name: ${user.firstName}
- Last Name: ${user.lastName}
- Company: ${user.company}
- Position: ${user.position}
- Email: ${user.email}
- Phone: ${user.phone}
- Address: ${user.address}
+ + + + : ${user.firstName}
+ : ${user.lastName}
+ : ${user.company}
+ : ${user.position}
+ : ${user.email}
+ : ${user.phone}
+ : ${user.address}
+ enctype="multipart/form-data" >

- +

- - + + +

- - + + +

- - + + +

- + +
diff --git a/WebContent/WEB-INF/jsp/customer-orders.jsp b/WebContent/WEB-INF/jsp/customer-orders.jsp new file mode 100644 index 0000000..fc8f5a2 --- /dev/null +++ b/WebContent/WEB-INF/jsp/customer-orders.jsp @@ -0,0 +1,51 @@ +<%@ page language="java" contentType="text/html; charset=UTF-8" + pageEncoding="UTF-8"%> + +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> +<%@ taglib prefix="t" tagdir="/WEB-INF/tags"%> + + +
+

+ + + + + + + + + + + + + + + + + + + + + + + + + +
#
${order.id}${order.topic}${order.date} + + + + + + + + + + +
+ +
+ + \ No newline at end of file diff --git a/WebContent/WEB-INF/jsp/edit-account.jsp b/WebContent/WEB-INF/jsp/edit-account.jsp new file mode 100644 index 0000000..41fb418 --- /dev/null +++ b/WebContent/WEB-INF/jsp/edit-account.jsp @@ -0,0 +1,172 @@ +<%@ page language="java" contentType="text/html; charset=UTF-8" + pageEncoding="UTF-8"%> + +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> +<%@ taglib prefix="t" tagdir="/WEB-INF/tags"%> + + +
+
+ + +
+

+ + +

+

+ + +

+

+ + +

+
+ + +
+

+ + +

+

+ + +

+
+ + +
+

+ + + +

+ + +
+

+
+ +

+
+
+

+ + +

+

+ + +

+
+ + +
+ + + +
+ + + + + + + +
+ +
+
+ +

+ + + + + +

+

+ + + + + +

+

+ + +

+ + +
+
+
+ + \ No newline at end of file diff --git a/WebContent/WEB-INF/jsp/edit-order.jsp b/WebContent/WEB-INF/jsp/edit-order.jsp new file mode 100644 index 0000000..aa07b23 --- /dev/null +++ b/WebContent/WEB-INF/jsp/edit-order.jsp @@ -0,0 +1,109 @@ +<%@ page language="java" contentType="text/html; charset=UTF-8" + pageEncoding="UTF-8"%> + +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> +<%@ taglib prefix="t" tagdir="/WEB-INF/tags"%> + + + +

+ #${order.id} +

+

+ : ${order.date}
+ : + +

+
+
+ + + + : ${user.firstName}
+ : ${user.lastName}
+ : ${user.company}
+ : ${user.position}
+ : ${user.email}
+ : ${user.phone}
+ : ${user.address}
+
+
+
+
+ +

+ + +

+

+ + + +

+

+ + + +

+ +

+ + ${order.fileName} +

+ +

+ + +
+

+ + +
+
+ + diff --git a/WebContent/WEB-INF/jsp/error.jsp b/WebContent/WEB-INF/jsp/error.jsp index 4cb4f66..8aca2b9 100644 --- a/WebContent/WEB-INF/jsp/error.jsp +++ b/WebContent/WEB-INF/jsp/error.jsp @@ -1,16 +1,17 @@ <%@ page language="java" contentType="text/html; charset=UTF-8" - pageEncoding="UTF-8"%> + errorPage="true" 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"%> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> <%@ taglib prefix="t" tagdir="/WEB-INF/tags"%> -
-
-

- -

-
+
+

+ +

+ +
\ No newline at end of file diff --git a/WebContent/WEB-INF/jsp/main.jsp b/WebContent/WEB-INF/jsp/main.jsp index ccd7190..82153b6 100644 --- a/WebContent/WEB-INF/jsp/main.jsp +++ b/WebContent/WEB-INF/jsp/main.jsp @@ -2,46 +2,33 @@ pageEncoding="UTF-8"%> <%@ taglib prefix="t" tagdir="/WEB-INF/tags"%> - +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> + -

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus - sem est, bibendum ac purus sit amet, aliquam bibendum mi. Sed feugiat - dapibus nibh quis egestas. Sed dapibus velit vestibulum eros mattis - sodales. Aenean diam ante, porta eu sem ut, sagittis laoreet ante. - Pellentesque urna nibh, blandit nec odio iaculis, blandit semper - turpis. Pellentesque eu augue ullamcorper, adipiscing tortor ut, - vestibulum purus. Fusce consectetur sollicitudin nisi sed ultricies. - Quisque vel diam et dolor placerat sagittis quis eget purus. Praesent - magna tortor, viverra in semper non, viverra ac dui. Donec at quam - ipsum. Nunc congue, urna nec pretium pellentesque, magna felis - elementum libero, ac venenatis purus nunc in odio. Morbi vel dui - rutrum eros placerat dapibus eu quis dui. Quisque egestas vitae est - vel semper. Etiam mattis vulputate nibh. Curabitur in risus gravida, - interdum metus id, accumsan mauris. Integer consectetur, magna eu - venenatis varius, ante lorem tincidunt nisl, sed ornare nibh mauris - non quam. Nulla aliquet sit amet ipsum eget cursus. Cras id massa mi. - Maecenas eget nisl vel velit ultrices tempor ut vel mauris. Vivamus - sem tellus, semper sed scelerisque in, porta a odio. Sed porttitor - urna et felis posuere volutpat. Suspendisse luctus, lorem non porta - sodales, enim ipsum iaculis tortor, volutpat faucibus justo elit id - orci. Suspendisse potenti. Curabitur sed condimentum tortor, nec - molestie orci. Morbi a bibendum sapien. Nunc eu tempus purus, vel - ullamcorper erat. Nullam eget metus lobortis, vehicula lorem sed, - dignissim purus. Integer non luctus metus. Nulla facilisi. Nulla - tempus eget purus sed cursus. Aenean sed purus magna. Mauris porta mi - non ipsum cursus, sed consectetur quam volutpat. Fusce et suscipit - libero. Duis vel dui varius, venenatis risus ac, sollicitudin est. - Nullam pharetra a neque vel rutrum. Pellentesque habitant morbi - tristique senectus et netus et malesuada fames ac turpis egestas. - Morbi quis purus vel felis blandit lobortis. Maecenas dignissim - venenatis lorem. Vivamus hendrerit rhoncus dui, a placerat erat - aliquet a. Vivamus cursus, velit at consectetur faucibus, leo purus - laoreet arcu, ut aliquet risus metus at ipsum. In quam nisl, mollis ut - lacinia nec, pretium eget mauris. Nulla aliquam blandit arcu, ac - porttitor mi pulvinar vitae. Donec velit nibh, tempus eget nisi sit - amet, pharetra sollicitudin metus. In ligula felis, sodales ac viverra - sit amet, feugiat nec urna. Morbi vel est porttitor, pellentesque diam - vel, posuere nulla. Donec consectetur quam quis fringilla semper. - Curabitur tempor convallis lacus, eu vestibulum sem rutrum id.

+

+ +

+
+ +
+
+ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Cras molestie ultrices diam, vel adipiscing est auctor eu. Nulla egestas ultrices lectus, ut cursus risus semper at. Aliquam vulputate lectus id ligula dapibus porttitor. Aliquam scelerisque elit nec lacus bibendum fermentum. Integer placerat est tortor. Pellentesque cursus eu orci non suscipit. +
+

+ +

+
Sed fermentum mauris porta lacinia rhoncus. Duis sit amet odio id leo ullamcorper cursus vel at nunc. In id libero dignissim leo elementum placerat in at ante. Donec lacinia, ligula eu venenatis elementum, arcu mauris feugiat tellus, sit amet lacinia orci felis sed elit. Cras at purus a ligula dictum fermentum. Proin condimentum aliquet sodales. Ut felis nisi, porttitor in tellus sed, bibendum pellentesque neque. Ut egestas mi vel enim consequat, vitae rhoncus lacus pulvinar. Vestibulum tempus dolor ligula. In vitae odio lectus. Donec consequat libero eget ipsum tincidunt lobortis. Nulla tincidunt velit sed nisi lacinia ornare. Sed vel mollis quam. Duis pretium quam mauris, eu sagittis mi eleifend at.
+
+ +
+

+ +

+
+ +
+
+ Pellentesque cursus sapien fermentum, consectetur nisi faucibus, porttitor nibh. Duis tempor, mauris ut dignissim convallis, enim mauris pellentesque risus, vel consectetur purus elit ut diam. In luctus purus nec mauris congue volutpat. Suspendisse feugiat consectetur imperdiet. Aliquam bibendum, quam sed fringilla commodo, nisl tortor adipiscing felis, in rutrum tellus velit quis nisl. Donec non purus adipiscing, consectetur felis ut, euismod lorem. Integer viverra sit amet felis et aliquet. Integer id ipsum bibendum, aliquet mauris in, rutrum velit. Sed eu sem felis. Vestibulum tortor ipsum, accumsan sit amet risus vitae, tempor euismod nulla. Ut sagittis imperdiet metus, nec blandit felis consequat quis. Nunc sit amet odio id neque fringilla eleifend. +
\ No newline at end of file diff --git a/WebContent/WEB-INF/jsp/manage-account.jsp b/WebContent/WEB-INF/jsp/manage-account.jsp deleted file mode 100644 index 767ef4d..0000000 --- a/WebContent/WEB-INF/jsp/manage-account.jsp +++ /dev/null @@ -1,11 +0,0 @@ -<%@ page language="java" contentType="text/html; charset=UTF-8" - pageEncoding="UTF-8"%> -<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> -<%@ taglib prefix="t" tagdir="/WEB-INF/tags"%> - - -
- -
- - \ No newline at end of file diff --git a/WebContent/WEB-INF/jsp/manage-accounts.jsp b/WebContent/WEB-INF/jsp/manage-accounts.jsp index 52e7c2a..57b1300 100644 --- a/WebContent/WEB-INF/jsp/manage-accounts.jsp +++ b/WebContent/WEB-INF/jsp/manage-accounts.jsp @@ -1,47 +1,60 @@ <%@ page language="java" contentType="text/html; charset=UTF-8" 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"%> <%@ taglib prefix="t" tagdir="/WEB-INF/tags"%> - +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> + -
-

Create User

- -
-
- -

Edit Users

-
- +

+ +

+
- - - - - - + + + + + + - - - - - - - - - - - - - -
IdEmailFirst NameLast NameRoleIs ActiveRegistration Date
${user.id}${user.email}${user.firstName}${user.lastName}${user.role}${user.active}${user.registrationDate}
- -
- -
+ + + + + ${user.id} + ${user.email} + ${user.firstName} + ${user.lastName} + + ${user.registrationDate} + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/WebContent/WEB-INF/jsp/order.jsp b/WebContent/WEB-INF/jsp/order.jsp new file mode 100644 index 0000000..765fcee --- /dev/null +++ b/WebContent/WEB-INF/jsp/order.jsp @@ -0,0 +1,105 @@ +<%@ page language="java" contentType="text/html; charset=UTF-8" + pageEncoding="UTF-8"%> + +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> +<%@ taglib prefix="t" tagdir="/WEB-INF/tags"%> + + +

+ #${order.id} +

+

+ : ${order.date}
+ : + +
+

+
+
+ + + + + : + ${isCustomer ? user.firstName : order.customer.firstName}
+ : + ${isCustomer ? user.lastName : order.customer.lastName}
+ : + ${isCustomer ? user.company : order.customer.company}
+ : + ${isCustomer ? user.position : order.customer.position}
+ : + ${isCustomer ? user.email : order.customer.email}
+ : + ${isCustomer ? user.phone : order.customer.phone}
+ : + ${isCustomer ? user.address : order.customer.address}
+
+
+
+

+ + " /> +

+

+ + +

+

+ + +

+ +

+ + ${order.fileName} +

+ +
+ + + +
+
+ + +
+
+
+
+ + +
+
+ + +
+ + +
+ + + + + + + + + diff --git a/WebContent/WEB-INF/jsp/process-order.jsp b/WebContent/WEB-INF/jsp/process-order.jsp new file mode 100644 index 0000000..eab25fa --- /dev/null +++ b/WebContent/WEB-INF/jsp/process-order.jsp @@ -0,0 +1,64 @@ +<%@ page language="java" contentType="text/html; charset=UTF-8" + pageEncoding="UTF-8"%> + +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> +<%@ taglib prefix="t" tagdir="/WEB-INF/tags"%> + + + + +

+ +

+
+ +

+ + +

+

+ + + +

+

+ + + +

+ +
+ + + diff --git a/WebContent/WEB-INF/jsp/success.jsp b/WebContent/WEB-INF/jsp/success.jsp index 4cb4f66..d37b26a 100644 --- a/WebContent/WEB-INF/jsp/success.jsp +++ b/WebContent/WEB-INF/jsp/success.jsp @@ -1,16 +1,20 @@ <%@ page language="java" contentType="text/html; charset=UTF-8" - pageEncoding="UTF-8"%> + errorPage="true" 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"%> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> <%@ taglib prefix="t" tagdir="/WEB-INF/tags"%> - + -
-
-

- -

-
+
+

+ + +
+ Click here + +

\ No newline at end of file diff --git a/WebContent/WEB-INF/jsp/user-account.jsp b/WebContent/WEB-INF/jsp/user-account.jsp deleted file mode 100644 index adedeb8..0000000 --- a/WebContent/WEB-INF/jsp/user-account.jsp +++ /dev/null @@ -1,21 +0,0 @@ -<%@ page language="java" contentType="text/html; charset=UTF-8" - pageEncoding="UTF-8"%> - -<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> -<%@ taglib prefix="t" tagdir="/WEB-INF/tags"%> - - - - -
- -
- - -
- -
- - - - \ No newline at end of file diff --git a/WebContent/WEB-INF/tags/account-create.tag b/WebContent/WEB-INF/tags/account-create.tag deleted file mode 100644 index 372524e..0000000 --- a/WebContent/WEB-INF/tags/account-create.tag +++ /dev/null @@ -1,42 +0,0 @@ -<%@ tag language="java" pageEncoding="UTF-8"%> -<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> -<%@ taglib prefix="t" tagdir="/WEB-INF/tags"%> -
-
- -
-
-
- - User* - -

- -

-

- -

-

- -

- - -

- -

- - - - - - -
-
-
\ No newline at end of file diff --git a/WebContent/WEB-INF/tags/account-edit.tag b/WebContent/WEB-INF/tags/account-edit.tag deleted file mode 100644 index eeb96d0..0000000 --- a/WebContent/WEB-INF/tags/account-edit.tag +++ /dev/null @@ -1,101 +0,0 @@ -<%@ tag language="java" pageEncoding="UTF-8"%> -<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> -<%@ taglib prefix="t" tagdir="/WEB-INF/tags"%> -<%@ attribute name="localAccount" required="true" - type="com.epam.devteam.entity.User"%> -
-
- -
-
- -
- - Name* - -
- -
-
- -
-
- - -
- - Company & Position* - -
- -
-
- -
-
- - -
- - Birth Date & Qualification* - -
- -
-
- -
-
- - -
- - Address & Phone* - -
- -
-
- -
-
-
- - Status & Role* - - - -
- -
-
- -
- - - - -
${localAccount.active ? 'Active' : 'Not Active'}
-
${localAccount.role}
- - -
- -
-
-
diff --git a/WebContent/WEB-INF/tags/account.tag b/WebContent/WEB-INF/tags/account.tag index 3a63ece..bd4bc4f 100644 --- a/WebContent/WEB-INF/tags/account.tag +++ b/WebContent/WEB-INF/tags/account.tag @@ -1,27 +1,38 @@ <%@ tag language="java" 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"%> +<%@taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> <%@ taglib prefix="t" tagdir="/WEB-INF/tags"%>
- ${user.role} + + +

- ${user.firstName} ${user.lastName} + ${user.firstName} ${user.lastName}

- ${user.company} + ${user.company}

- ${user.position} + ${user.position}

- +
-
- + + +
@@ -29,18 +40,24 @@
- Sign in - + + + +

- + +

- +

- - Create account + + +
diff --git a/WebContent/WEB-INF/tags/administrator-tools.tag b/WebContent/WEB-INF/tags/administrator-tools.tag index c786e23..46c9776 100644 --- a/WebContent/WEB-INF/tags/administrator-tools.tag +++ b/WebContent/WEB-INF/tags/administrator-tools.tag @@ -1,8 +1,20 @@ <%@ tag language="java" pageEncoding="UTF-8"%> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
- Administration tools + + + +
+ +
- + + +
diff --git a/WebContent/WEB-INF/tags/customer-tools.tag b/WebContent/WEB-INF/tags/customer-tools.tag index daa8aa0..a20760e 100644 --- a/WebContent/WEB-INF/tags/customer-tools.tag +++ b/WebContent/WEB-INF/tags/customer-tools.tag @@ -1,7 +1,19 @@ <%@ tag language="java" pageEncoding="UTF-8"%> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
- Customer tools + + +
- + +
+
+ + +
\ No newline at end of file diff --git a/WebContent/WEB-INF/tags/date.tag b/WebContent/WEB-INF/tags/date.tag index 1fc7d1e..1f2b9ce 100644 --- a/WebContent/WEB-INF/tags/date.tag +++ b/WebContent/WEB-INF/tags/date.tag @@ -1,157 +1,32 @@ +<%@tag import="java.text.AttributedCharacterIterator.Attribute"%> <%@ tag language="java" pageEncoding="UTF-8"%> +<%@ attribute name="date" required="true" type="java.sql.Date"%> + +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> + + + \ No newline at end of file diff --git a/WebContent/WEB-INF/tags/error-info.tag b/WebContent/WEB-INF/tags/error-info.tag new file mode 100644 index 0000000..91718e5 --- /dev/null +++ b/WebContent/WEB-INF/tags/error-info.tag @@ -0,0 +1,9 @@ +<%@ tag language="java" pageEncoding="UTF-8"%> +<%@ attribute name="error" required="true"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> +<%@taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> + +
+ +
+ diff --git a/WebContent/WEB-INF/tags/feedback-info.tag b/WebContent/WEB-INF/tags/feedback-info.tag new file mode 100644 index 0000000..0664f2d --- /dev/null +++ b/WebContent/WEB-INF/tags/feedback-info.tag @@ -0,0 +1,34 @@ +<%@ tag language="java" pageEncoding="UTF-8"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> +<%@ taglib prefix="t" tagdir="/WEB-INF/tags"%> +<%@ attribute name="feedback" required="true" type="com.epam.devteam.entity.feedback.Feedback"%> +

+ +

+
+
+ + + + : ${feedback.manager.firstName}
+ : ${feedback.manager.lastName}
+ : ${feedback.manager.email}
+ : ${feedback.manager.phone}
+ : ${feedback.manager.address}
+
+
+
+

+ + +

+

+ + ${feedback.fileName} +

+
\ No newline at end of file diff --git a/WebContent/WEB-INF/tags/footer.tag b/WebContent/WEB-INF/tags/footer.tag index 0c186e8..f5c406a 100644 --- a/WebContent/WEB-INF/tags/footer.tag +++ b/WebContent/WEB-INF/tags/footer.tag @@ -1,6 +1,17 @@ <%@ tag language="java" pageEncoding="UTF-8"%> - \ No newline at end of file +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> +
+ This site was developed by Andrey Kovalskiy for JavaLab + courses. +
+
+ +
+ +
+
diff --git a/WebContent/WEB-INF/tags/genericpage.tag b/WebContent/WEB-INF/tags/genericpage.tag index cbb3409..86ee389 100644 --- a/WebContent/WEB-INF/tags/genericpage.tag +++ b/WebContent/WEB-INF/tags/genericpage.tag @@ -2,9 +2,11 @@ <%@ attribute name="sidebar" required="true"%> <%@ attribute name="title" required="true"%> <%@ attribute name="body" fragment="true"%> -<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> <%@ taglib prefix="t" tagdir="/WEB-INF/tags"%> - +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> + + ${title} @@ -14,9 +16,9 @@ media="print"> -
+
-