From 44f201ee16553696a36a270e838af0e8779cb9d8 Mon Sep 17 00:00:00 2001
From: Nicolas Michard <nicolas.michard@gmail.com>
Date: Thu, 7 Feb 2008 15:52:22 +0000
Subject: [PATCH] Fin du CSS / menu et barre de menu dans le main content

---
 .../WEB-INF/decorators/usermenu.jsp           |  19 ++----
 .../WebContent/WEB-INF/jsp/addConference.jsp  |   3 +-
 .../WebContent/WEB-INF/jsp/addConference2.jsp |   2 +-
 .../WebContent/WEB-INF/jsp/addConference3.jsp |   2 +-
 .../WebContent/WEB-INF/jsp/addConference4.jsp |   2 +-
 .../WebContent/WEB-INF/jsp/addConference5.jsp |   2 +-
 .../WEB-INF/jsp/choosePreference.jsp          |   3 +-
 .../WEB-INF/jsp/choosePreferenceOK.jsp        |   2 +-
 .../WebContent/WEB-INF/jsp/createReport.jsp   |   4 +-
 .../WEB-INF/jsp/dispatchArticle.jsp           |   2 +-
 .../WebContent/WEB-INF/jsp/evaluation.jsp     |   7 +--
 .../WebContent/WEB-INF/jsp/listArticle.jsp    |   2 +-
 .../WebContent/WEB-INF/jsp/listConference.jsp |   2 +-
 .../WebContent/WEB-INF/jsp/listEvaluation.jsp |   4 +-
 .../WebContent/WEB-INF/jsp/listReport.jsp     |   4 +-
 YACOSWeb/WebContent/WEB-INF/jsp/loginFull.jsp |   1 +
 YACOSWeb/WebContent/WEB-INF/jsp/main.jsp      |   2 +-
 .../WebContent/WEB-INF/jsp/registerUser.jsp   |   2 +-
 .../WEB-INF/jsp/submissionArticle.jsp         |   2 +-
 .../WEB-INF/jsp/submissionArticleOK.jsp       |   2 +-
 .../WEB-INF/jsp/validateArticle.jsp           |   4 +-
 .../images/menu-background-repeat-hover.png   | Bin 0 -> 214 bytes
 .../images/menu-background-repeat.png         | Bin 0 -> 126 bytes
 YACOSWeb/WebContent/images/menu-bottom.png    | Bin 0 -> 340 bytes
 YACOSWeb/WebContent/images/title-big.png      | Bin 0 -> 787 bytes
 YACOSWeb/WebContent/images/title-small.png    | Bin 0 -> 319 bytes
 YACOSWeb/WebContent/stylesheets/base.css      |  59 ++++++++++++++----
 27 files changed, 79 insertions(+), 53 deletions(-)
 create mode 100644 YACOSWeb/WebContent/images/menu-background-repeat-hover.png
 create mode 100644 YACOSWeb/WebContent/images/menu-background-repeat.png
 create mode 100644 YACOSWeb/WebContent/images/menu-bottom.png
 create mode 100644 YACOSWeb/WebContent/images/title-big.png
 create mode 100644 YACOSWeb/WebContent/images/title-small.png

diff --git a/YACOSWeb/WebContent/WEB-INF/decorators/usermenu.jsp b/YACOSWeb/WebContent/WEB-INF/decorators/usermenu.jsp
index 57747a1..ce8fc88 100644
--- a/YACOSWeb/WebContent/WEB-INF/decorators/usermenu.jsp
+++ b/YACOSWeb/WebContent/WEB-INF/decorators/usermenu.jsp
@@ -7,20 +7,6 @@
 <!-- Differents role : ROLE_CHAIRMAN, ROLE_PCMEMBER, ROLE_REFEREE, ROLE_AUTHOR, ROLE_ANONYMOUS -->
 
 <div id="mainmenu">
-
-	<!-- POUR DEBUG ACCES RAPIDE -->
-	<div id="mainmenubloc">
-		<h4>Debug Menu</h4>
-			<ul>
-				<li><a href="<c:url value="listArticle.htm"/>"><fmt:message key="listarticle.title" /></a></li>
-				<li><a href="<c:url value="addConference.htm"/>"><fmt:message key="menu.chairman.conference.create" /></a></li>
-				<li><a href="<c:url value="dispatchArticle.htm"/>"><fmt:message key="menu.chairman.article.dispatch" /></a></li>
-				<li><a href="<c:url value="choosePreference.htm"/>"><fmt:message key="menu.pcmember.article.preference" /></a></li>
-				<li><a href="<c:url value="listEvaluation.htm"/>"><fmt:message key="menu.referee.article.evaluation" /></a></li>
-				<li><a href="<c:url value="submissionArticle.htm"/>"><fmt:message key="menu.author.article.submission" /></a></li>
-			    <li><a href="<c:url value="validateArticle.htm"/>"><fmt:message key="menu.pcmember.article.validation" /></a></li>
-			</ul>
-	</div>
 	
 	<!-- On affiche les menus seulement si une conference est deja active -->
 	
@@ -36,6 +22,7 @@
 					<li><a href="<c:url value="dispatchArticle.htm"/>"><fmt:message key="menu.chairman.article.dispatch" /></a></li>
 					<li><a href="<c:url value="#"/>"><fmt:message key="menu.chairman.article.validate" /></a></li>
 				</ul>
+				<div id="footer"></div>
 		</div>
 	</authz:authorize>
 	
@@ -50,6 +37,7 @@
 					<li><a href="<c:url value="#"/>"><fmt:message key="menu.pcmember.article.evaluation.modify" /></a></li>
 					<li><a href="<c:url value="#"/>"><fmt:message key="menu.pcmember.article.discussion" /></a></li>
 				</ul>
+				<div id="footer"></div>
 		</div>
 	</authz:authorize>
 	
@@ -61,6 +49,7 @@
 					<li><a href="<c:url value="evaluation.htm"/>"><fmt:message key="menu.referee.article.evaluation" /></a></li>
 					<li><a href="<c:url value="#"/>"><fmt:message key="menu.referee.article.evaluation.modify" /></a></li>
 				</ul>
+				<div id="footer"></div>
 		</div>
 	</authz:authorize>
 	
@@ -72,6 +61,7 @@
 					<li><a href="<c:url value="submissionArticle.htm"/>"><fmt:message key="menu.author.article.submission" /></a></li>
 					<li><a href="<c:url value="#"/>"><fmt:message key="menu.author.article.modify" /></a></li>
 				</ul>
+				<div id="footer"></div>
 		</div>
 	</authz:authorize>
 	
@@ -82,6 +72,7 @@
 				<ul>
 					<li><a href="<c:url value="submissionArticle.htm"/>"><fmt:message key="menu.anonymous.article.submission" /></a></li>
 				</ul>
+				<div id="footer"></div>
 		</div>
 	</authz:authorize>
 	
diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/addConference.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/addConference.jsp
index 7bd4a7a..ad7346e 100644
--- a/YACOSWeb/WebContent/WEB-INF/jsp/addConference.jsp
+++ b/YACOSWeb/WebContent/WEB-INF/jsp/addConference.jsp
@@ -4,8 +4,7 @@
 <head></head>
 <body>
 
-<h2 align="center"><fmt:message key="conference.titleMenu" /></h2>
-
+<h4 class="title"><fmt:message key="conference.titleMenu" /></h4>
 <form:form commandName="formConference" name="monForm">
 
 	<fmt:message key="conference.title" />  <form:input path="title"/> <form:errors path="title" /> <br/><br />
diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/addConference2.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/addConference2.jsp
index 1df1548..a20c05e 100644
--- a/YACOSWeb/WebContent/WEB-INF/jsp/addConference2.jsp
+++ b/YACOSWeb/WebContent/WEB-INF/jsp/addConference2.jsp
@@ -8,7 +8,7 @@
 <body>
 
 
-<h2 align="center"><fmt:message key="conference.titleMenu" /></h2>
+<h4 class="title"><fmt:message key="conference.titleMenu" /></h4>
 
 <form:form commandName="formConference" name="monForm">
 	
diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/addConference3.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/addConference3.jsp
index 8e24bec..bbaac2d 100644
--- a/YACOSWeb/WebContent/WEB-INF/jsp/addConference3.jsp
+++ b/YACOSWeb/WebContent/WEB-INF/jsp/addConference3.jsp
@@ -5,7 +5,7 @@
 <body>
 
 
-<h2 align="center"><fmt:message key="conference.titleMenu" /></h2>
+<h4 class="title"><fmt:message key="conference.titleMenu" /></h4>
 
 <form:form commandName="formConference" name="monForm">
 
diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/addConference4.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/addConference4.jsp
index 0eade89..60b6f1d 100644
--- a/YACOSWeb/WebContent/WEB-INF/jsp/addConference4.jsp
+++ b/YACOSWeb/WebContent/WEB-INF/jsp/addConference4.jsp
@@ -80,7 +80,7 @@ function clearPerson() {
 <body>
 
 
-<h2 align="center"><fmt:message key="conference.titleMenu" /></h2>
+<h4 class="title"><fmt:message key="conference.titleMenu" /></h4>
 
 <form:form commandName="formConference" name="monForm">
 
diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/addConference5.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/addConference5.jsp
index cf67a6a..806503a 100644
--- a/YACOSWeb/WebContent/WEB-INF/jsp/addConference5.jsp
+++ b/YACOSWeb/WebContent/WEB-INF/jsp/addConference5.jsp
@@ -116,7 +116,7 @@ function filterUser(el, value) {
 </head>
 <body>
 
-<h2 align="center"><fmt:message key="conference.titleMenu" /></h2>
+<h4 class="title"><fmt:message key="conference.titleMenu" /></h4>
 
 <form:form commandName="formConference" name="monForm">
 
diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/choosePreference.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/choosePreference.jsp
index 0c93c84..5f4dcfd 100644
--- a/YACOSWeb/WebContent/WEB-INF/jsp/choosePreference.jsp
+++ b/YACOSWeb/WebContent/WEB-INF/jsp/choosePreference.jsp
@@ -5,7 +5,8 @@
 <body>
 
 
-<h2 align="center"><fmt:message key="preference.title" /></h2>
+
+<h4 class="title"><fmt:message key="preference.title" /></h4>
 
 <c:if test="${message}">
 <fmt:message key="message"/>
diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/choosePreferenceOK.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/choosePreferenceOK.jsp
index 3053491..79c17b4 100644
--- a/YACOSWeb/WebContent/WEB-INF/jsp/choosePreferenceOK.jsp
+++ b/YACOSWeb/WebContent/WEB-INF/jsp/choosePreferenceOK.jsp
@@ -4,7 +4,7 @@
 <head></head>
 <body>
 
-
+<h4 class="title"><fmt:message key="preference.title" /></h4>
 
 
 <fmt:message key="preference.ok"/>
diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/createReport.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/createReport.jsp
index f91917f..5535d93 100644
--- a/YACOSWeb/WebContent/WEB-INF/jsp/createReport.jsp
+++ b/YACOSWeb/WebContent/WEB-INF/jsp/createReport.jsp
@@ -3,8 +3,8 @@
 <html>
 <head></head>
 <body>
-    
-    <H2><fmt:message key="evaluation.headPage"/></H2>
+    
+    <h4 class="title"><fmt:message key="evaluation.headPage" /></h4>
    <table>
    
    <tr>
diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/dispatchArticle.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/dispatchArticle.jsp
index 6ceac53..1a7ec09 100644
--- a/YACOSWeb/WebContent/WEB-INF/jsp/dispatchArticle.jsp
+++ b/YACOSWeb/WebContent/WEB-INF/jsp/dispatchArticle.jsp
@@ -4,7 +4,7 @@
 <head></head>
 <body>
 
-
+<h4 class="title">NO NAME</h4>
 <form:form commandName="formDispatcher">
 <table>
 	<tr>
diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/evaluation.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/evaluation.jsp
index 408055a..f04719a 100644
--- a/YACOSWeb/WebContent/WEB-INF/jsp/evaluation.jsp
+++ b/YACOSWeb/WebContent/WEB-INF/jsp/evaluation.jsp
@@ -3,12 +3,11 @@
 <html>
 <head></head>
 <body>
-
-
+
+<h4 class="title"><fmt:message key="evaluation.title"/>: ${evaluationForm.title}</h4>
 
 <form:form method="post" commandName="evaluationForm">
- <h4 align="center"><fmt:message key="evaluation.title"/>: ${evaluationForm.title}</h4>
- <br>
+
 	<table>
     <c:forEach items="${evaluationForm.simpleRatings}" var="criterion" varStatus="j">
     
diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/listArticle.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/listArticle.jsp
index e34d308..ac596dc 100644
--- a/YACOSWeb/WebContent/WEB-INF/jsp/listArticle.jsp
+++ b/YACOSWeb/WebContent/WEB-INF/jsp/listArticle.jsp
@@ -3,7 +3,7 @@
 <html>
 <head></head>
 <body>
-
+<h4 class="title">NO NAME</h4>
 <c:forEach items="${listArticle}" var="article">
 	<ul class="article">
 		<li class="title"><b>${article.title}</b></li>
diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/listConference.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/listConference.jsp
index a3bea73..47b9549 100644
--- a/YACOSWeb/WebContent/WEB-INF/jsp/listConference.jsp
+++ b/YACOSWeb/WebContent/WEB-INF/jsp/listConference.jsp
@@ -4,7 +4,7 @@
 <head></head>
 <body>
 
-<h2 align="center">Choose a conference</h2>
+<h4 class="title">NO NAME</h4>
 
 	<c:if test="${errorMessage != null}">
 		<span class="formError">
diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/listEvaluation.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/listEvaluation.jsp
index 7f9afdd..be9b6b6 100644
--- a/YACOSWeb/WebContent/WEB-INF/jsp/listEvaluation.jsp
+++ b/YACOSWeb/WebContent/WEB-INF/jsp/listEvaluation.jsp
@@ -3,7 +3,9 @@
 <html>
 <head></head>
 <body>
-<h2 align="center"><fmt:message key="evaluation.choose"/></h2>
+
+<h4 class="title"><fmt:message key="evalutation.choose" /></h4>
+
 <c:forEach items="${listArticle}" var="article">
 	<ul class="article">
 		<li class="title">Title: <a href="<c:url value="${article.URL_article}"/>">${article.title}</a></li>
diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/listReport.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/listReport.jsp
index 3b1d86e..0e94ff3 100644
--- a/YACOSWeb/WebContent/WEB-INF/jsp/listReport.jsp
+++ b/YACOSWeb/WebContent/WEB-INF/jsp/listReport.jsp
@@ -3,8 +3,8 @@
 <html>
 <head></head>
 <body>
-    
-    <H2><fmt:message key="report.headPage"/></H2>
+    
+    <h4 class="title"><fmt:message key="report.headPage" /></h4>
     
     <c:forEach  items="${listReport}" var="report">
    <table>
diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/loginFull.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/loginFull.jsp
index ee08454..be2287a 100644
--- a/YACOSWeb/WebContent/WEB-INF/jsp/loginFull.jsp
+++ b/YACOSWeb/WebContent/WEB-INF/jsp/loginFull.jsp
@@ -3,6 +3,7 @@
 <html>
 <head></head>
 <body>
+<h4 class="title">NON NAME</h4>
 
 	<c:if test="${not empty param.login_error}">
 		<div class="login_error">
diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/main.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/main.jsp
index 983671e..d65aca1 100644
--- a/YACOSWeb/WebContent/WEB-INF/jsp/main.jsp
+++ b/YACOSWeb/WebContent/WEB-INF/jsp/main.jsp
@@ -3,7 +3,7 @@
 <html>
 <head></head>
 <body>
-
+<h4 class="title">NO NAME</h4>
 <c:choose>
 
 	<c:when test="${currentConferenceId != null}">
diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/registerUser.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/registerUser.jsp
index 4d10b85..a5b4e02 100644
--- a/YACOSWeb/WebContent/WEB-INF/jsp/registerUser.jsp
+++ b/YACOSWeb/WebContent/WEB-INF/jsp/registerUser.jsp
@@ -4,7 +4,7 @@
 <head></head>
 <body>
 
-<h1><fmt:message key="register.title" /></h1>
+<h4 class="title"><fmt:message key="register.title" /></h4>
 <form:form method="post" commandName="registerUser">
 	<form:hidden path="isNew"/>
 
diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/submissionArticle.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/submissionArticle.jsp
index 4affcbc..ba1c1fa 100644
--- a/YACOSWeb/WebContent/WEB-INF/jsp/submissionArticle.jsp
+++ b/YACOSWeb/WebContent/WEB-INF/jsp/submissionArticle.jsp
@@ -16,7 +16,7 @@ function Supprimer(form) {
 <body>
 
 
-<h2 align="center"><fmt:message key="submission.title" /></h2>
+<h4 class="title"><fmt:message key="submission.title" /></h4>
 <form:form method="post" enctype="multipart/form-data" commandName="submissionArticle">
 
 
diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/submissionArticleOK.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/submissionArticleOK.jsp
index d18ae40..36c002a 100644
--- a/YACOSWeb/WebContent/WEB-INF/jsp/submissionArticleOK.jsp
+++ b/YACOSWeb/WebContent/WEB-INF/jsp/submissionArticleOK.jsp
@@ -3,7 +3,7 @@
 <html>
 <head></head>
 <body>
-
+<h4 class="title">NO NAME</h4>
 Soumission OK
 <br />
 
diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/validateArticle.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/validateArticle.jsp
index 83934f1..64a2059 100644
--- a/YACOSWeb/WebContent/WEB-INF/jsp/validateArticle.jsp
+++ b/YACOSWeb/WebContent/WEB-INF/jsp/validateArticle.jsp
@@ -2,8 +2,8 @@
 
 <html>
 <head></head>
-<body>
-  <H2 align="center">Validate the articles of a PC member</H2>
+<body>
+  <h4 class="title">NO NAME</h4>
   <br>
 <c:forEach items="${listArticleValidate}" var="article">
 	<ul class="article">
diff --git a/YACOSWeb/WebContent/images/menu-background-repeat-hover.png b/YACOSWeb/WebContent/images/menu-background-repeat-hover.png
new file mode 100644
index 0000000000000000000000000000000000000000..4339e615819f852086a9a65d98d34e3e72e3f63b
GIT binary patch
literal 214
zcmeAS@N?(olHy`uVBq!ia0vp^3xQaSg9%8g|H;+?Qj#UE5hcO-X(i=}MX3yqDfvmM
z3ZA)%>8U}fi7AzZCsS>JiYh!^978H@y}5Oo^MHbgOCYo6k$<x<S$%4ca5+=(?$p<q
zdp07|uSKohsxal=?_Y9yku1hC^P4!zYo<F3d@Md=c>ICH=l73eA?zQUA3dy??6M>I
zcSN}I!Hw(6%A3})9sjX!_1@HH=M9g`G$)^Ve<OZ=iX0;w!~7favkrV-bP?zV22WQ%
Jmvv4FO#n_VS%&}s

literal 0
HcmV?d00001

diff --git a/YACOSWeb/WebContent/images/menu-background-repeat.png b/YACOSWeb/WebContent/images/menu-background-repeat.png
new file mode 100644
index 0000000000000000000000000000000000000000..7018f7dc0929bcabcaf708778c30a8a8968ac7d6
GIT binary patch
literal 126
zcmeAS@N?(olHy`uVBq!ia0vp^3xSx4g9%9P->nVeNS3%plmzFem6RtIr7}3C<R_&n
zc;+Uirv{}arc@T5Otk?jQt)(f45_%4w5R_6zNRLo!x|FH9vp0D_gTEq;0>cg10#d)
XG}eWj!JeCeY8gCT{an^LB{Ts5VQD6D

literal 0
HcmV?d00001

diff --git a/YACOSWeb/WebContent/images/menu-bottom.png b/YACOSWeb/WebContent/images/menu-bottom.png
new file mode 100644
index 0000000000000000000000000000000000000000..d671b500601eebb87f22338eba6fae6cd458f41e
GIT binary patch
literal 340
zcmV-a0jvIrP)<h;3K|Lk000e1NJLTq005x?000OG1^@s6kwTx40000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUy_DMuRRCwC#mp!V3KoG}g*Z7gbCWr)5
zd4@nPkuG;Jot33`d0il9c#v8UL=c2UC5?#Rnw<wZg1%;cFwJZ?{FwPKi{p5490wR<
zKoDE9EDIz_0=#Wo7{`$&LTnCt*L5B6vMjT@uK%ngh%L7udRG*M;AxsZvn+$AX-Gt3
zGXc>z^iKNs*a;!-VHjSgX*$}r4TfO==bSPkv5I{2JOf6+JkKGDB7y!fd<cTzVp-OY
ztdnV)psFfKNUS2^Fbq&t6<`dMb#q<!mwivL@B4dQ*RPtUofSnn(8!22kQeve_x($L
mNFJW&HP~a61Bw6UBftPbWr^+25H^4S0000<MNUMnLSTaG{fguO

literal 0
HcmV?d00001

diff --git a/YACOSWeb/WebContent/images/title-big.png b/YACOSWeb/WebContent/images/title-big.png
new file mode 100644
index 0000000000000000000000000000000000000000..23b4c8322139145584e722dde7ac11032b0de049
GIT binary patch
literal 787
zcmeAS@N?(olHy`uVBq!ia0y~yVCDg`JvrEb<OHULmOx6f#5JNMI6tkVJh3R1!7(L2
zDOJHUH!(dmC^a#qvhZZ84FdzyR!<klkcwMx?(WYL2^2Z-@NSA%;`{><FS$9g4jeMS
zD83<7QGdd{b6)qAmc}}K;MH-NeK&~X&AB({_TJOpojCK(Zh??b?|(mVnDnW{{@j_A
zJNs+RqO3hW>z$o!((lf|a3J=x>DlQf$E%MoxBn!6>~%uL)MvG`s>@gy7|QQO&bqEC
zW!D#;KhMs8e~sVfe0`vXsQJ%ag`F*gxPfekyq3jk#|kpU85kT6CJH;vxWUZ85MXe!
zUnLU6Fv@q*mtbIMShS9F;dY?M7ijE1oB-74a57T3N*pAxB7ac=FeJ4090rnCniqbb
zssa=h<Iw{Kmc!9I)*#CFxwa>en))B4<_#AcSfd!vzDYngUTIRSQsHD^Si#y{4zj5$
z-nZvrvn@~|>-}SwUz#kFmwOif=CRb$JEwn7V<=$uwfnn;<-xX!3D2sN`LADIJo%gu
zL*9a$Icb~+)^18?1)7im)XM^NyaLcThJ!#1iZKTRAft(qfk6Q1Ah;4Z<3oPaLVw}4
zObiSXFNzJ;ya6hdIN{!!%GdVvL@SW9BV#Kk(3FPULTiZ_kTVkvN-QO;K&Fd;j9&m&
z1v2|UJd1NSC^Qu%ZprX;Pvi!=q#$tjP6L+RK*ighEIxDyWFT1S(&mSMCaQo8;b}ey
z69v2JpS!`2HCn(3;Az_#3zTn7n6Vq=gRKc4_<#mtdM#XvCzr1+45X$tAtI;gV0tJc
z$dy~<Jb|7nV{=vqxw`2yD2y4l?F6Z_ZeA!13k<!t{sua%K$8t7NGJY`ZeV1XV*Z%#
Tprc+AP$7e-tDnm{r-UW|WUKkc

literal 0
HcmV?d00001

diff --git a/YACOSWeb/WebContent/images/title-small.png b/YACOSWeb/WebContent/images/title-small.png
new file mode 100644
index 0000000000000000000000000000000000000000..eb0ef364a0f28ad274b04485127f6dfdf2290b1a
GIT binary patch
literal 319
zcmV-F0l@x=P)<h;3K|Lk000e1NJLTq005x?000*V1^@s6W5O@q0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUy;Ymb6RCwC#*f9#iKoEuDUENj!wsz?S
z!Nyd26whE|>;tCqMiy39Uco@XW9+OmhcHw4e=sDZ93HbfiKUcaq;2;4IB9LQRsr~p
zkJd};HtU}c`w%UJ8o*ZHuk;5KyJ!&mn9n<#fOoAqJ;B7X)*<O6><A#7Snj%1MAq~I
zjy5_8rJ@gTR3#Ci4RB@0F<pRf2qhCjc!y9jU4VB8nS^jZj+un;UQ7rfxD(><Lzvl)
z!6XECLhgiMI|d=-KOwjif)KJD!+kN~IEJIRScWt<$57Wb-GGbtFodrF0{|o6ROH*v
R9t{8h002ovPDHLkV1l`2fZG57

literal 0
HcmV?d00001

diff --git a/YACOSWeb/WebContent/stylesheets/base.css b/YACOSWeb/WebContent/stylesheets/base.css
index 693a400..9e1b5d1 100644
--- a/YACOSWeb/WebContent/stylesheets/base.css
+++ b/YACOSWeb/WebContent/stylesheets/base.css
@@ -138,7 +138,6 @@ body {
 }
 
 #maincontent {
-	padding: 18px 20px;
 	position: relative;
 	color: #333;
 }
@@ -146,46 +145,80 @@ body {
 /* @group mainmenu */
 
 #main #mainmenu {
-	background-color: #edffe2;
+
 	width: 150px;
 	float: left;
 }
 
 #main #mainmenu #mainmenubloc {
-	width: 120px;
-	background-color: #ffef9e;
 	margin: 10px auto;
+	width: 161px;
+	background: url(../images/title-small.png) no-repeat left top;
 }
 
 #main #mainmenu #mainmenubloc h4 {
-	color: #ff0e00;
+	color: #fff;
 	font-weight: bold;
+	text-align: center;
+	height: 23px;
+	position: relative;
+	top: 2px;
 }
 
 #main #mainmenu #mainmenubloc ul {
-	
+	background: url(../images/menu-background-repeat.png) repeat-y;
+	padding-top: 5px;
 }
 
 #main #mainmenu #mainmenubloc ul li {
-	
+	background: url(../images/menu-background-repeat.png) repeat-y;
+	height: 22px;
+	padding-left: 5px;
+	padding-right: 5px;
 }
 
-#main #mainmenu #mainmenubloc ul li a {
+#main #mainmenu #mainmenubloc ul li:hover {
+	background-image: url(../images/menu-background-repeat-hover.png);
+	height: 22px;
+}
+
+#main #mainmenu #mainmenubloc a {
 	text-decoration: none;
-	color: #007d1b;
+	color: #8d0000;
+	text-align: left;
+	font-size: 11px;
 }
 
-#main #mainmenu #mainmenubloc ul li a:hover {
-	color: #80ff3a;
+#main #mainmenu #mainmenubloc a:hover {
+	color: #ff7a00;
+	font-size: 11px;
 }
 
+#main #mainmenu #mainmenubloc #footer {
+	background-image: url(../images/menu-bottom.png);
+	width: 161px;
+	height: 6px;
+}
 /* @end */
 
 /* @group maincontent */
 
 #main #maincontent {
-	/*background-color: #f5e5ff;*/
-	margin-left: 160px;
+	margin-left: 200px;
+	width: 780px;
+	background: url(../images/title-big.png) no-repeat left top;
+	margin-top: 10px;
+	padding-left: 10px;
+	padding-right: 10px;
+}
+
+#main #maincontent h4.title {
+	color: #fff;
+	font-weight: bold;
+	height: 23px;
+	position: relative;
+	top: 2px;
+	margin-bottom: 6px;
 }
 
 /* @end */