diff --git a/YACOSWeb/WebContent/WEB-INF/classes/messages.properties b/YACOSWeb/WebContent/WEB-INF/classes/messages.properties index 0502f62..a617f10 100644 --- a/YACOSWeb/WebContent/WEB-INF/classes/messages.properties +++ b/YACOSWeb/WebContent/WEB-INF/classes/messages.properties @@ -20,7 +20,8 @@ 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 : +connected.noconference.warning=You must choose a conference to access all your features : +article.post.noconference=You must choose a conference before post or edit an article. conference.detail.description=Description conference.detail.other=Others informations @@ -158,6 +159,23 @@ form.submitArticle.noFile=You have to send the file of the article. form.addConference.invitationsHeader=Invitations +################### +# FORM ¨POST EDIT ARTICLE +form.article.information=Article's information +form.article.author.information=Author's information +form.article.submit.info=Article for submission +form.article.file=File + + + +#Validation messages for errors +submissionArticle.title=The title should not be null +submissionArticle.theme=The theme should not be null +submissionArticle.abstractText=The Abstract text should not be null +submissionArticle.mainauthor=The main author should not be null, insert example "toto" +submissionArticle.file=Please choose an article to submit + + button.add=Add button.browse=Browse button.reset=Reset @@ -228,12 +246,7 @@ evaluation.choose=Choose a article to evaluate invitation.send=Send an invitation -#Validation messages for errors -submissionArticle.title=The title should not be null -submissionArticle.theme=The theme should not be null -submissionArticle.abstractText=The Abstract text should not be null -submissionArticle.mainauthor=the main author should not be null, insert example "toto" -submissionArticle.file=please choose an article to submit + #valider les articles diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/main.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/main.jsp index 6ce5416..3b5e9b8 100644 --- a/YACOSWeb/WebContent/WEB-INF/jsp/main.jsp +++ b/YACOSWeb/WebContent/WEB-INF/jsp/main.jsp @@ -23,7 +23,7 @@ ${currentConference.otherInformations } - +

diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/submissionArticle.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/submissionArticle.jsp index 06f82cc..3edf0b3 100644 --- a/YACOSWeb/WebContent/WEB-INF/jsp/submissionArticle.jsp +++ b/YACOSWeb/WebContent/WEB-INF/jsp/submissionArticle.jsp @@ -10,70 +10,91 @@ -

+

+ -

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
:${currentUser.firstName} ${currentUser.lastName}
- "> - -
-
- - -
${secAuthor}
- - -
- " />
File
 " /> - " />
- - - -">Home - + +

+ + + +
+ + "> +
+ + + + + +

+ +
+
+ + * + +
+
+ + * + +
+
+ + *
+ +
+
+ +

+ +
+
+ + ${currentUser.firstName} ${currentUser.lastName}
+
+
+ + + "> +
+
+ + +
${secAuthor}
+ + +
+ " /> +
+
+ +

+ +
+
+ + * + +
+
+ + + " /> + + + + + diff --git a/YACOSWeb/WebContent/images/button_back_32x32.gif b/YACOSWeb/WebContent/images/button_back_32x32.gif deleted file mode 100644 index c3abb5f..0000000 Binary files a/YACOSWeb/WebContent/images/button_back_32x32.gif and /dev/null differ diff --git a/YACOSWeb/WebContent/images/button_back_32x32.png b/YACOSWeb/WebContent/images/button_back_32x32.png new file mode 100644 index 0000000..4f92322 Binary files /dev/null and b/YACOSWeb/WebContent/images/button_back_32x32.png differ diff --git a/YACOSWeb/WebContent/stylesheets/base.css b/YACOSWeb/WebContent/stylesheets/base.css index db7edac..f74c0e0 100644 --- a/YACOSWeb/WebContent/stylesheets/base.css +++ b/YACOSWeb/WebContent/stylesheets/base.css @@ -494,7 +494,7 @@ a.manage_link:hover { a.back_link { text-decoration: none; padding-left: 50px; - background: url(../images/button_back_32x32.gif) no-repeat left top; + background: url(../images/button_back_32x32.png) no-repeat left top; padding-top: 10px; padding-bottom: 10px; color: #008281;