diff --git a/YACOSWeb/WebContent/WEB-INF/classes/messages.properties b/YACOSWeb/WebContent/WEB-INF/classes/messages.properties
index 239606e..c493037 100644
--- a/YACOSWeb/WebContent/WEB-INF/classes/messages.properties
+++ b/YACOSWeb/WebContent/WEB-INF/classes/messages.properties
@@ -1,4 +1,5 @@
-title=Yacos
+title=YACOS
+title.detail=Yet Another Conference Organisation System
button.remove=Remove
button.removeSelected=Remove selected
@@ -7,6 +8,30 @@ button.removeSelected=Remove selected
disclaimer.text=Copyrights © 2008. Yacos Team. All rights reserved.
disclaimer.link.about=About
+###################
+# MAIN PAGE YACOS
+home.whatis=What is it ?
+home.whatis.txt=YACOS is a university project for manage all international conference. This tool is developped by 5 members team with the technology J2EE.
+home.author=I am author and I want post an article. How ?
+home.author.txt=Simple ! With Yacos you can take a look on all current conference : view title, subject, details on limit date and many others...
If you want participate at one conference (or many) and post an article for this, just create an account on Yacos and post your article, no more simple. The comity program note your article, return some comments on this and accept or not !
+home.referee=I am in comity program. How Yacos can help me ?
+home.referee.txt=If you are chairman, PC member or simple a refereea, thanks to yacos you can follow the articles posted by authors.
For the chairman, you can distribute articles throught your members for review and notation, manage your conference, date...
For the PC member and others, you can review an article, post your comments and note on this, exprimate your preference for review,...
+home.youknow=So now you know...
+home.link.choose=Choose one conference
+
+connected.noconference.title=No conference selectionned
+connected.noconference.warning=You must choose a conference to access all your features :
+
+conference.detail.description=Description
+conference.detail.other=Others informations
+conference.detail.nosuppl=No supplementary informations.
+conference.detail.date.title=Important dates
+conference.detail.date.start=Conference start :
+conference.detail.date.end=Conference end :
+conference.detail.date.article=Limit for submission of articles :
+conference.detail.date.evaluation=Limit for evaluation of articles :
+conference.detail.link.submit=Submit an article
+
###################
# LOGIN FORM
login.title=Create an user or log in
@@ -95,7 +120,8 @@ form.field.personal=Personal details
form.field.necessary=* Required informations
message.account.validate=Account created successfully. You can now connect at this.
message.account.maj=Your account was indeed updated.
-
+form.edit.title=Edit your account
+form.edit.txt=Access and edit all your personal informations.
###################
# FORGOT USER
diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/main.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/main.jsp
index 57d36ba..6ce5416 100644
--- a/YACOSWeb/WebContent/WEB-INF/jsp/main.jsp
+++ b/YACOSWeb/WebContent/WEB-INF/jsp/main.jsp
@@ -3,20 +3,65 @@
-NO NAME
+
- PAGE ACCUEIL CONFERENCE COURANTE : ${currentConference.title}
+
+ ${currentConference.title}
+ ${currentConference.title}
+
+
+ ${currentConference.description }
+
+
+
+
+
+
+
+
+ ${currentConference.otherInformations }
+
+
+
+
+
+
+
+
+
+
+ " class="submitLink">
-
-
- Choose a conference to access your features:
- ">
+
+
+
+
+
- PAGE ACCUEIL YACOS (NON CONNECTE)
+
+ :
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ " class="register_link"> !
diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/registerUser.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/registerUser.jsp
index 04d2831..fcd3650 100644
--- a/YACOSWeb/WebContent/WEB-INF/jsp/registerUser.jsp
+++ b/YACOSWeb/WebContent/WEB-INF/jsp/registerUser.jsp
@@ -4,13 +4,22 @@
-
+
+
+
+
+
+
+ " />
+
+
+
+
+
+
+
+
-
-
-
-
-" />
diff --git a/YACOSWeb/WebContent/images/cc-karm-64x64.png b/YACOSWeb/WebContent/images/cc-karm-64x64.png
new file mode 100755
index 0000000..71ac657
Binary files /dev/null and b/YACOSWeb/WebContent/images/cc-karm-64x64.png differ
diff --git a/YACOSWeb/WebContent/images/cc-wp-64x64.png b/YACOSWeb/WebContent/images/cc-wp-64x64.png
new file mode 100755
index 0000000..d45fd1d
Binary files /dev/null and b/YACOSWeb/WebContent/images/cc-wp-64x64.png differ
diff --git a/YACOSWeb/WebContent/images/news_subscribe-48x48.png b/YACOSWeb/WebContent/images/news_subscribe-48x48.png
new file mode 100755
index 0000000..aac05e3
Binary files /dev/null and b/YACOSWeb/WebContent/images/news_subscribe-48x48.png differ
diff --git a/YACOSWeb/WebContent/images/news_unsubscribe-48x48.png b/YACOSWeb/WebContent/images/news_unsubscribe-48x48.png
new file mode 100755
index 0000000..20c73db
Binary files /dev/null and b/YACOSWeb/WebContent/images/news_unsubscribe-48x48.png differ
diff --git a/YACOSWeb/WebContent/images/warning_logo_64x64.png b/YACOSWeb/WebContent/images/warning_logo_64x64.png
new file mode 100644
index 0000000..8c17cb2
Binary files /dev/null and b/YACOSWeb/WebContent/images/warning_logo_64x64.png differ
diff --git a/YACOSWeb/WebContent/stylesheets/base.css b/YACOSWeb/WebContent/stylesheets/base.css
index 5765779..db7edac 100644
--- a/YACOSWeb/WebContent/stylesheets/base.css
+++ b/YACOSWeb/WebContent/stylesheets/base.css
@@ -36,6 +36,52 @@ a:hover{
font-size: 10px;
}
+div.warningBox{
+ background: #fff7dc url(../images/warning_logo_64x64.png) no-repeat 10px center;
+ border: 1px solid #ffe895;
+ margin-top: auto;
+ padding: 32px 10px 32px 80px;
+}
+
+div.textBox{
+ border: 1px solid #ffe3b3;
+ background-color: #fffbd5;
+ padding: 10px;
+}
+
+h3.descriptionTitle{
+ font-weight: bold;
+ background: url(../images/cc-wp-64x64.png) no-repeat left center;
+ padding-top: 35px;
+ padding-bottom: 35px;
+ padding-left: 80px;
+ color: #ff941c;
+ font-size: 16px;
+}
+
+h3.dateTitle{
+ font-weight: bold;
+ background: url(../images/cc-karm-64x64.png) no-repeat left center;
+ padding-top: 35px;
+ padding-bottom: 35px;
+ padding-left: 80px;
+ color: #ff941c;
+ font-size: 16px;
+}
+
+a.submitLink{
+ text-decoration: none;
+ padding-left: 60px;
+ background: url(../images/news_subscribe-48x48.png) no-repeat left top;
+ padding-top: 15px;
+ padding-bottom: 50px;
+ color: #008281;
+ font-weight: bold;
+}
+a.submitLink:hover{
+ color: #003e82;
+}
+
form {
display: block;
}
@@ -95,6 +141,18 @@ form > table > thead th {
list-style-position: inside;
list-style-image: url(../images/error_bullet.png);
}
+.maintitle{
+ font-weight: bold;
+ font-size: 40px;
+ margin-top: 30px;
+ margin-bottom: 20px;
+ color: #ff5600;
+}
+
+.subtitle{
+ font-weight: bold;
+ font-size: 14px;
+}
/* @group Login */
@@ -422,7 +480,7 @@ a.manage_link:hover {
font-family: Verdana, Geneva, Arial, Helvetica, sans-serif;
color:#847d6e;
font-size:11px;
- width:130px;
+ width:180px;
}
#account_data input:focus {