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 @@
-
-
-
-
Debug Menu
-
- - ">
- - ">
- - ">
- - ">
- - ">
- - ">
- - ">
-
-
@@ -36,6 +22,7 @@
">
">
+
@@ -50,6 +37,7 @@
">
">
+
@@ -61,6 +49,7 @@
">
">
+
@@ -72,6 +61,7 @@
">
">
+
@@ -82,6 +72,7 @@
+
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 @@
-
-
+
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 @@
-
+
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 @@
-
+
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() {
-
+
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) {
-
+
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 @@
-
+
+
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 @@
-
+
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 @@
-
-
+
+
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 @@
-
+NO NAME
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 @@
-
-
+
+: ${evaluationForm.title}
- : ${evaluationForm.title}
-
+
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 @@
-
+NO NAME
- ${article.title}
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 @@
-Choose a conference
+NO NAME
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 @@
-
+
+
+
- Title: ">${article.title}
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 @@
-
-
+
+
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 @@
+NON NAME
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 @@
-
+
NO NAME
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 @@
-
+
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) {
-
+
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 @@
-
+NO NAME
Soumission OK
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 @@
-
- Validate the articles of a PC member
+
+ NO NAME
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 0000000..4339e61
Binary files /dev/null and b/YACOSWeb/WebContent/images/menu-background-repeat-hover.png differ
diff --git a/YACOSWeb/WebContent/images/menu-background-repeat.png b/YACOSWeb/WebContent/images/menu-background-repeat.png
new file mode 100644
index 0000000..7018f7d
Binary files /dev/null and b/YACOSWeb/WebContent/images/menu-background-repeat.png differ
diff --git a/YACOSWeb/WebContent/images/menu-bottom.png b/YACOSWeb/WebContent/images/menu-bottom.png
new file mode 100644
index 0000000..d671b50
Binary files /dev/null and b/YACOSWeb/WebContent/images/menu-bottom.png differ
diff --git a/YACOSWeb/WebContent/images/title-big.png b/YACOSWeb/WebContent/images/title-big.png
new file mode 100644
index 0000000..23b4c83
Binary files /dev/null and b/YACOSWeb/WebContent/images/title-big.png differ
diff --git a/YACOSWeb/WebContent/images/title-small.png b/YACOSWeb/WebContent/images/title-small.png
new file mode 100644
index 0000000..eb0ef36
Binary files /dev/null and b/YACOSWeb/WebContent/images/title-small.png differ
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 */