diff --git a/YACOSWeb/WebContent/WEB-INF/classes/messages.properties b/YACOSWeb/WebContent/WEB-INF/classes/messages.properties index 08b4ce0..bbb1c32 100644 --- a/YACOSWeb/WebContent/WEB-INF/classes/messages.properties +++ b/YACOSWeb/WebContent/WEB-INF/classes/messages.properties @@ -181,6 +181,9 @@ button.browse=Browse button.reset=Reset button.OK=OK +################### +# WARNING MESSAGE +warning.articleList.empty=Sorry, but there are no articles for this conference yet. listarticle.title=Article's list manageArticle.title=Manage your article @@ -191,7 +194,7 @@ preference.like=Like preference.indifferent=Indifferent preference.dislike=Dislike preference.ok=You have successfully chosen all your preferences about each article -evaluation.help=Choose the preference you have for each article. +preference.help=Choose the preference you have for each article. dispatch.title=Dispatch the articles to the members # Conference Form diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/choosePreference.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/choosePreference.jsp index 3ad584a..1da1266 100644 --- a/YACOSWeb/WebContent/WEB-INF/jsp/choosePreference.jsp +++ b/YACOSWeb/WebContent/WEB-INF/jsp/choosePreference.jsp @@ -7,33 +7,52 @@

+ + + +
+ + "> +
+
-

- - -

- - - - + +

+ +

+ +
+ + + + + + + - - + - - - - - - - + + + +
 dislike "/>indifferent "/>like "/>
${article.title} + ${article.title} +
+ + + + + +
- "/> +
+
"/>
+
- +

@@ -41,10 +60,6 @@ You can modify your choices immediately or later.

- -
-">Home - diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/denied.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/denied.jsp index dcfe4e4..0049c9d 100644 --- a/YACOSWeb/WebContent/WEB-INF/jsp/denied.jsp +++ b/YACOSWeb/WebContent/WEB-INF/jsp/denied.jsp @@ -1,16 +1,37 @@ -<%@ include file="/WEB-INF/decorators/include.jsp"%> - + + + + + +
+


+

+ 403
+ -

Access denied

- -
- ${message} -
- + + 403 Error - Access Denied + +

+ +
+ \ No newline at end of file diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/errors/404error.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/errors/404error.jsp index ff08ac5..6af924b 100644 --- a/YACOSWeb/WebContent/WEB-INF/jsp/errors/404error.jsp +++ b/YACOSWeb/WebContent/WEB-INF/jsp/errors/404error.jsp @@ -22,9 +22,12 @@



+

+ + 404
-

+ 404 Error - Page not found diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/submissionArticle.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/submissionArticle.jsp index 3edf0b3..cdd27e5 100644 --- a/YACOSWeb/WebContent/WEB-INF/jsp/submissionArticle.jsp +++ b/YACOSWeb/WebContent/WEB-INF/jsp/submissionArticle.jsp @@ -35,6 +35,7 @@

+
* diff --git a/YACOSWeb/WebContent/images/403error.jpg b/YACOSWeb/WebContent/images/403error.jpg new file mode 100644 index 0000000..3b93980 Binary files /dev/null and b/YACOSWeb/WebContent/images/403error.jpg differ diff --git a/YACOSWeb/WebContent/images/smiley_dislike.png b/YACOSWeb/WebContent/images/smiley_dislike.png new file mode 100644 index 0000000..d404616 Binary files /dev/null and b/YACOSWeb/WebContent/images/smiley_dislike.png differ diff --git a/YACOSWeb/WebContent/images/smiley_indifferent.png b/YACOSWeb/WebContent/images/smiley_indifferent.png new file mode 100644 index 0000000..87f2fb9 Binary files /dev/null and b/YACOSWeb/WebContent/images/smiley_indifferent.png differ diff --git a/YACOSWeb/WebContent/images/smiley_like.png b/YACOSWeb/WebContent/images/smiley_like.png new file mode 100644 index 0000000..f65b7d9 Binary files /dev/null and b/YACOSWeb/WebContent/images/smiley_like.png differ