diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/choosePreference.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/choosePreference.jsp index 1e8f8d6..95f09c8 100644 --- a/YACOSWeb/WebContent/WEB-INF/jsp/choosePreference.jsp +++ b/YACOSWeb/WebContent/WEB-INF/jsp/choosePreference.jsp @@ -1,13 +1,6 @@ -<%@ include file="/WEB-INF/jsp/include.jsp"%> -<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form"%> - - - - -<fmt:message key="title" /> - - - +<%@ include file="/WEB-INF/jsp/include.jsp"%> + +

@@ -31,7 +24,6 @@ -">Home - +">Home - \ No newline at end of file + \ No newline at end of file diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/choosePreferenceOK.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/choosePreferenceOK.jsp index a8d9401..f7cdb21 100644 --- a/YACOSWeb/WebContent/WEB-INF/jsp/choosePreferenceOK.jsp +++ b/YACOSWeb/WebContent/WEB-INF/jsp/choosePreferenceOK.jsp @@ -1,15 +1,7 @@ -<%@ page language="java" contentType="text/html; charset=ISO-8859-1" - pageEncoding="ISO-8859-1"%> -<%@ include file="/WEB-INF/jsp/include.jsp"%> -<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form"%> - - - - - -Insert title here - - +<%@ include file="/WEB-INF/jsp/include.jsp"%> +<%@ page session="false" %> + + + - - \ No newline at end of file + \ No newline at end of file diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/dispatchArticle.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/dispatchArticle.jsp index d1699b9..187928f 100644 --- a/YACOSWeb/WebContent/WEB-INF/jsp/dispatchArticle.jsp +++ b/YACOSWeb/WebContent/WEB-INF/jsp/dispatchArticle.jsp @@ -1,12 +1,7 @@ -<%@ page language="java" contentType="text/html; charset=ISO-8859-1" - pageEncoding="ISO-8859-1"%> - - - - -dispatchArticles - - - - - \ No newline at end of file +<%@ include file="/WEB-INF/jsp/include.jsp"%> +<%@ page session="false" %> + + + + DispathArticles + \ No newline at end of file diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/footer.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/footer.jsp new file mode 100644 index 0000000..3905340 --- /dev/null +++ b/YACOSWeb/WebContent/WEB-INF/jsp/footer.jsp @@ -0,0 +1,7 @@ + + +
 
+ + + + \ No newline at end of file diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/header.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/header.jsp new file mode 100644 index 0000000..ab4e7a4 --- /dev/null +++ b/YACOSWeb/WebContent/WEB-INF/jsp/header.jsp @@ -0,0 +1,19 @@ +<%@ include file="/WEB-INF/jsp/include.jsp"%> + + + + + <fmt:message key="title"/> + + + +
+
+ +
+
 
+
+ +
+
 
+
\ No newline at end of file diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/include.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/include.jsp index f55a743..cad6eaf 100644 --- a/YACOSWeb/WebContent/WEB-INF/jsp/include.jsp +++ b/YACOSWeb/WebContent/WEB-INF/jsp/include.jsp @@ -1,3 +1,5 @@ -<%@ page session="false"%> +<%@ page language="java" contentType="text/html; charset=ISO-8859-1" + pageEncoding="ISO-8859-1"%> <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> -<%@ taglib prefix="fmt" uri="http://java.sun.com/jstl/fmt" %> \ No newline at end of file +<%@ taglib prefix="fmt" uri="http://java.sun.com/jstl/fmt" %> +<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form"%> \ No newline at end of file diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/main.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/main.jsp index db7d3fe..264c339 100644 --- a/YACOSWeb/WebContent/WEB-INF/jsp/main.jsp +++ b/YACOSWeb/WebContent/WEB-INF/jsp/main.jsp @@ -1,15 +1,9 @@ <%@ include file="/WEB-INF/jsp/include.jsp"%> +<%@ page session="false" %> - + + - -<fmt:message key="title"/> - - - - ">
- ">
- ">
- - - \ No newline at end of file + Main Page + + \ No newline at end of file diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/menu.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/menu.jsp new file mode 100644 index 0000000..70b501c --- /dev/null +++ b/YACOSWeb/WebContent/WEB-INF/jsp/menu.jsp @@ -0,0 +1,22 @@ +<%@ include file="/WEB-INF/jsp/include.jsp"%> + +
\ No newline at end of file diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/patronViewCSS.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/patronViewCSS.jsp new file mode 100644 index 0000000..ef169e9 --- /dev/null +++ b/YACOSWeb/WebContent/WEB-INF/jsp/patronViewCSS.jsp @@ -0,0 +1,10 @@ +<%@ include file="/WEB-INF/jsp/include.jsp"%> + + + + + VOTRE CONTENU ICI + + \ No newline at end of file diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/submissionArticle.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/submissionArticle.jsp index e2e4465..740d359 100644 --- a/YACOSWeb/WebContent/WEB-INF/jsp/submissionArticle.jsp +++ b/YACOSWeb/WebContent/WEB-INF/jsp/submissionArticle.jsp @@ -1,10 +1,10 @@ -<%@ include file="/WEB-INF/jsp/include.jsp"%> -<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form"%> +<%@ include file="/WEB-INF/jsp/include.jsp"%> +<%@ page session="false" %> + + + + - - - -<fmt:message key="title" /> - - - +

@@ -55,6 +53,4 @@ function Supprimer(form) { ">Home - - - \ No newline at end of file + \ No newline at end of file diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/submissionArticleOK.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/submissionArticleOK.jsp index 9db5a26..98675d6 100644 --- a/YACOSWeb/WebContent/WEB-INF/jsp/submissionArticleOK.jsp +++ b/YACOSWeb/WebContent/WEB-INF/jsp/submissionArticleOK.jsp @@ -1,15 +1,7 @@ -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> -<%@ taglib prefix="fmt" uri="http://java.sun.com/jstl/fmt" %> -<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form"%> -<%@ page session="true" %> - - - - -<fmt:message key="title" /> - - - +<%@ include file="/WEB-INF/jsp/include.jsp"%> +<%@ page session="false" %> + + Soumission OK @@ -22,6 +14,4 @@ Soumission OK ">Home - - - \ No newline at end of file + \ No newline at end of file diff --git a/YACOSWeb/WebContent/WEB-INF/yacos-servlet.xml b/YACOSWeb/WebContent/WEB-INF/yacos-servlet.xml index b9bc1ba..e54dab1 100644 --- a/YACOSWeb/WebContent/WEB-INF/yacos-servlet.xml +++ b/YACOSWeb/WebContent/WEB-INF/yacos-servlet.xml @@ -1,12 +1,17 @@ - + + @@ -51,7 +56,6 @@ - + \ No newline at end of file diff --git a/YACOSWeb/WebContent/images/background.png b/YACOSWeb/WebContent/images/background.png new file mode 100644 index 0000000..493ded7 Binary files /dev/null and b/YACOSWeb/WebContent/images/background.png differ diff --git a/YACOSWeb/WebContent/images/box-content.png b/YACOSWeb/WebContent/images/box-content.png new file mode 100644 index 0000000..1791044 Binary files /dev/null and b/YACOSWeb/WebContent/images/box-content.png differ diff --git a/YACOSWeb/WebContent/images/box-footer.png b/YACOSWeb/WebContent/images/box-footer.png new file mode 100644 index 0000000..5adc801 Binary files /dev/null and b/YACOSWeb/WebContent/images/box-footer.png differ diff --git a/YACOSWeb/WebContent/images/box-header.png b/YACOSWeb/WebContent/images/box-header.png new file mode 100644 index 0000000..bda20e5 Binary files /dev/null and b/YACOSWeb/WebContent/images/box-header.png differ diff --git a/YACOSWeb/WebContent/images/minibox-content.png b/YACOSWeb/WebContent/images/minibox-content.png new file mode 100644 index 0000000..f9f1c6c Binary files /dev/null and b/YACOSWeb/WebContent/images/minibox-content.png differ diff --git a/YACOSWeb/WebContent/images/minibox-footer.png b/YACOSWeb/WebContent/images/minibox-footer.png new file mode 100644 index 0000000..473e7b8 Binary files /dev/null and b/YACOSWeb/WebContent/images/minibox-footer.png differ diff --git a/YACOSWeb/WebContent/images/minibox-header.png b/YACOSWeb/WebContent/images/minibox-header.png new file mode 100644 index 0000000..10591bb Binary files /dev/null and b/YACOSWeb/WebContent/images/minibox-header.png differ diff --git a/YACOSWeb/WebContent/images/yacos.logo.blancLQ.png b/YACOSWeb/WebContent/images/yacos.logo.blancLQ.png new file mode 100644 index 0000000..0c7539e Binary files /dev/null and b/YACOSWeb/WebContent/images/yacos.logo.blancLQ.png differ diff --git a/YACOSWeb/WebContent/stylesheets/base.css b/YACOSWeb/WebContent/stylesheets/base.css new file mode 100644 index 0000000..8a1746b --- /dev/null +++ b/YACOSWeb/WebContent/stylesheets/base.css @@ -0,0 +1,116 @@ +body { + background: url(../images/background.png) repeat-x fixed; + font: 11px 'Lucida Grande', Geneva, Arial, Verdana, sans-serif; + padding-top: 0px; + margin-top: 0px; +} + +/* @group headerBloc */ +.headerBloc { + width: 818px; + margin-left: auto; + margin-right: auto; + height: 70px; + margin-bottom: 30px; +} + +.headerBloc div.content { + background: url(../images/box-content.png) repeat-y left center; + padding-right: 25px; + padding-left: 25px; + height: inherit; + display: block; +} + +.headerBloc div.footer { + background: url(../images/box-footer.png) no-repeat left bottom; + height: 22px; +} + + +/* @end */ + +/* @group mainBloc */ +.mainBloc { + width: 818px; + margin-left: auto; + margin-right: auto; + top: 10px; + height: 500px; +} + +.mainBloc div.header { + background: url(../images/box-header.png) no-repeat left top; + height: 22px; +} + +.mainBloc div.content { + background: url(../images/box-content.png) repeat-y left center; + padding-right: 25px; + padding-left: 25px; +} + +.mainBloc div.footer { + background: url(../images/box-footer.png) left top; + height: 22px; +} + +/* @end */ + +/* @group MiniBloc */ +#menu { + width: 150px; + padding: 5px 15px 0px 0px; + display: table-cell; +} + +.miniBloc { + color: #a1642d; + margin-bottom: 10px; +} + +.miniBloc div.header { + background: url(../images/minibox-header.png) no-repeat left top; + font-weight: bold; + font-size: medium; + font-variant: small-caps; + text-align: center; +} + +.miniBloc div.content { + background: url(../images/minibox-content.png) repeat-y left; + padding: 5px; +} + +.miniBloc ul { + margin: 0; + list-style: none; + padding: 0 0 0 5px; +} + +.miniBloc li { + margin: 0; + padding: 0 0 2px; +} + +.miniBloc a { + text-transform: capitalize; + color: #893d00; + text-decoration: none; +} + +.miniBloc a:hover { + text-transform: capitalize; + color: #ff7a00; + text-decoration: none; +} + +.miniBloc div.footer { + background: url(../images/minibox-footer.png) no-repeat left top; +} + +/* @end */ + +#main_content { + display: table-cell; +}