diff --git a/YACOSWeb/.classpath b/YACOSWeb/.classpath index b61dfba..7a33423 100644 --- a/YACOSWeb/.classpath +++ b/YACOSWeb/.classpath @@ -1,10 +1,10 @@ - - - - - - - - - - + + + + + + + + + + diff --git a/YACOSWeb/.settings/org.eclipse.jdt.core.prefs b/YACOSWeb/.settings/org.eclipse.jdt.core.prefs index e2b54a3..34abcd5 100644 --- a/YACOSWeb/.settings/org.eclipse.jdt.core.prefs +++ b/YACOSWeb/.settings/org.eclipse.jdt.core.prefs @@ -1,7 +1,7 @@ -#Wed Feb 20 12:50:07 CET 2008 -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.compliance=1.6 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.6 +#Sun Feb 24 14:14:49 CET 2008 +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 +org.eclipse.jdt.core.compiler.compliance=1.5 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.5 diff --git a/YACOSWeb/.settings/org.eclipse.jst.common.project.facet.core.prefs b/YACOSWeb/.settings/org.eclipse.jst.common.project.facet.core.prefs index 6aab761..2488c94 100644 --- a/YACOSWeb/.settings/org.eclipse.jst.common.project.facet.core.prefs +++ b/YACOSWeb/.settings/org.eclipse.jst.common.project.facet.core.prefs @@ -1,4 +1,4 @@ -#Wed Feb 20 12:50:07 CET 2008 -classpath.helper/org.eclipse.jdt.launching.JRE_CONTAINER/owners=jst.java\:6.0 -classpath.helper/org.eclipse.jst.server.core.container\:\:org.eclipse.jst.server.generic.runtimeTarget\:\:JBoss\ v4.2/owners=jst.web\:2.5 -eclipse.preferences.version=1 +#Sun Feb 24 14:14:49 CET 2008 +classpath.helper/org.eclipse.jdt.launching.JRE_CONTAINER/owners=jst.java\:5.0 +classpath.helper/org.eclipse.jst.server.core.container\:\:org.eclipse.jst.server.generic.runtimeTarget\:\:JBoss\ v4.2/owners=jst.web\:2.5 +eclipse.preferences.version=1 diff --git a/YACOSWeb/.settings/org.eclipse.wst.common.project.facet.core.xml b/YACOSWeb/.settings/org.eclipse.wst.common.project.facet.core.xml index d3676ea..7e00757 100644 --- a/YACOSWeb/.settings/org.eclipse.wst.common.project.facet.core.xml +++ b/YACOSWeb/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -1,8 +1,8 @@ - - - - - - - - + + + + + + + + diff --git a/YACOSWeb/WebContent/WEB-INF/classes/messages.properties b/YACOSWeb/WebContent/WEB-INF/classes/messages.properties index cfd1e1a..7947951 100644 --- a/YACOSWeb/WebContent/WEB-INF/classes/messages.properties +++ b/YACOSWeb/WebContent/WEB-INF/classes/messages.properties @@ -216,6 +216,7 @@ step=Step ({0}/{1}) conference.remainingTokens=You have {0} tokens left to create new conferences.
\n You can ask to the admin if you need more. conference.help.step1= conference.help.step2=This step is used to define some dates like the starting date for the conference.
\nYou just have to click on a field and the calendar will appear. +conference.help.step2datelimit=Warning : in fact, the articles could not be subjected one day before the limiting date. conference.help.step3=Here you can add some constraints at your conference like the number of pages by articles (just for indication) or the type of file you want the authors to use.
If you don't select any file types, any file types will be authorized. conference.help.step4=This step allows you to add criterion which will be used when someone will evaluate an article.
\nYou can add a new criterion using the form, or simply add an existing criterion using the list. conference.help.step5=This step allows you to add PC Member to the conference.
\nYou can add a Program Committee Member using the list below, or invite someone using his email address. diff --git a/YACOSWeb/WebContent/WEB-INF/decorators/headerchoose.jsp b/YACOSWeb/WebContent/WEB-INF/decorators/headerchoose.jsp index 1089b8f..f4ea48b 100644 --- a/YACOSWeb/WebContent/WEB-INF/decorators/headerchoose.jsp +++ b/YACOSWeb/WebContent/WEB-INF/decorators/headerchoose.jsp @@ -19,7 +19,12 @@
">
-

${currentConference.title}

+

+ ${fn:substring(currentConference.title, 0, 135)} + + ... + +

diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/addConference2.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/addConference2.jsp index 4f04b42..28e0871 100644 --- a/YACOSWeb/WebContent/WEB-INF/jsp/addConference2.jsp +++ b/YACOSWeb/WebContent/WEB-INF/jsp/addConference2.jsp @@ -23,6 +23,7 @@

+

diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/main.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/main.jsp index 0d36bdc..957a5c7 100644 --- a/YACOSWeb/WebContent/WEB-INF/jsp/main.jsp +++ b/YACOSWeb/WebContent/WEB-INF/jsp/main.jsp @@ -8,7 +8,13 @@ -

${currentConference.title}

+

+ + ${fn:substring(currentConference.title, 0, 90)} + + ... + +

@@ -16,7 +22,14 @@
-

${currentConference.title}

+

+ ${fn:substring(currentConference.title, 0, 40)} + + ... + +

+ +

${currentConference.description } diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/submissionArticle.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/submissionArticle.jsp index fb46b9d..1fa9c1c 100644 --- a/YACOSWeb/WebContent/WEB-INF/jsp/submissionArticle.jsp +++ b/YACOSWeb/WebContent/WEB-INF/jsp/submissionArticle.jsp @@ -33,6 +33,7 @@

+

diff --git a/YACOSWeb/WebContent/stylesheets/base.css b/YACOSWeb/WebContent/stylesheets/base.css index 5b013d3..81a3255 100644 --- a/YACOSWeb/WebContent/stylesheets/base.css +++ b/YACOSWeb/WebContent/stylesheets/base.css @@ -148,6 +148,14 @@ form > table > thead th { margin-bottom: 20px; color: #ff5600; } + +.maintitleconf{ + font-weight: bold; + font-size: 30px; + margin-top: 30px; + margin-bottom: 20px; + color: #ff5600; +} .subtitle{ font-weight: bold; diff --git a/YACOSWeb/src/org/yacos/auth/UserDetailsService.java b/YACOSWeb/src/org/yacos/auth/UserDetailsService.java index 1281f17..968fee7 100644 --- a/YACOSWeb/src/org/yacos/auth/UserDetailsService.java +++ b/YACOSWeb/src/org/yacos/auth/UserDetailsService.java @@ -35,5 +35,6 @@ public class UserDetailsService implements return new UserDetails(user); } + }