diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/addConference5.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/addConference5.jsp index e908be0..8f60160 100644 --- a/YACOSWeb/WebContent/WEB-INF/jsp/addConference5.jsp +++ b/YACOSWeb/WebContent/WEB-INF/jsp/addConference5.jsp @@ -130,7 +130,7 @@ function filterUser(el, value) { -
+ <fmt:message key=" src="./images/search.png"/>

diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/listConference.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/listConference.jsp index 87aae1f..1f3b9b5 100644 --- a/YACOSWeb/WebContent/WEB-INF/jsp/listConference.jsp +++ b/YACOSWeb/WebContent/WEB-INF/jsp/listConference.jsp @@ -1,5 +1,4 @@ <%@ include file="/WEB-INF/decorators/include.jsp"%> -<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %> @@ -42,9 +41,7 @@ ${conference.title} - In this conference you are: - ${role.type} - - + ${role.type} @@ -54,9 +51,18 @@ Description: ${conference.description}
-
- ">Choose
-
+ + +
+ ">Select
+
+ + +
+ ">View details
+
+ + diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/main.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/main.jsp index d65aca1..57d36ba 100644 --- a/YACOSWeb/WebContent/WEB-INF/jsp/main.jsp +++ b/YACOSWeb/WebContent/WEB-INF/jsp/main.jsp @@ -11,8 +11,8 @@ - - Pour pouvoir accéder à vos fonctions veuillez choisir une conference : + + Choose a conference to access your features: "> diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/submissionArticle.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/submissionArticle.jsp index bcf6ecc..e9cf92e 100644 --- a/YACOSWeb/WebContent/WEB-INF/jsp/submissionArticle.jsp +++ b/YACOSWeb/WebContent/WEB-INF/jsp/submissionArticle.jsp @@ -44,7 +44,12 @@
-
+
+ + +
${secAuthor}
+ + "/> @@ -61,10 +66,8 @@ "/> "/>

- - - - + + ">Home diff --git a/YACOSWeb/WebContent/images/search.png b/YACOSWeb/WebContent/images/search.png new file mode 100644 index 0000000..5f264c3 Binary files /dev/null and b/YACOSWeb/WebContent/images/search.png differ diff --git a/YACOSWeb/WebContent/javascripts/yacos/submissionArticle.js b/YACOSWeb/WebContent/javascripts/yacos/submissionArticle.js index a16905a..2a885f5 100644 --- a/YACOSWeb/WebContent/javascripts/yacos/submissionArticle.js +++ b/YACOSWeb/WebContent/javascripts/yacos/submissionArticle.js @@ -8,6 +8,7 @@ var SecondaryAuthorManager = Class.create({ $(buttonAdd).observe("click",this.AddSecondaryAuthor.bind(this)); $(buttonRemove).observe("click",this.RemoveSecondaryAuthor.bind(this)); $(inputField).observe("keypress", this.KeyPressHandler.bindAsEventListener(this)); + this.lastRef = $('secondaryAuthorList').select(".dynamicListItem").size(); }, SelectSecondaryAuthor: function(event){ var item = event.element(); @@ -29,15 +30,19 @@ var SecondaryAuthorManager = Class.create({ KeyPressHandler: function(event){ switch(event.keyCode){ case Event.KEY_RETURN: - this.AddSecondaryAuthor(); + this.AddSecondaryAuthor(null); event.stop(); return false; } }, - AddSecondaryAuthor: function() { + AddSecondaryAuthor: function(name) { var ref = this.lastRef++; var elemName = "liste["+ref+"]"; - var value = $('newSecondaryAuthorInput').value; + var value; + if (name == null) + value = $('newSecondaryAuthorInput').value; + else + value = name; var hidden = new Element('input',{'id':elemName,'name':elemName,'type':'hidden','value':value}); var elem = new Element('div', { 'class':'dynamicListItem', @@ -47,6 +52,9 @@ var SecondaryAuthorManager = Class.create({ $('secondaryAuthorList').insert(elem); $(this.inputField).clear(); elem.appear(); + }, + FillSecondaryAuthor: function(liste) { + liste.each(this.AddSecondaryAuthor.bind(this)); } }); diff --git a/YACOSWeb/src/org/yacos/web/author/controller/SArticleController.java b/YACOSWeb/src/org/yacos/web/author/controller/SArticleController.java index 9844223..22ac994 100644 --- a/YACOSWeb/src/org/yacos/web/author/controller/SArticleController.java +++ b/YACOSWeb/src/org/yacos/web/author/controller/SArticleController.java @@ -140,8 +140,7 @@ public class SArticleController extends SimpleFormController { myArticle.setListe(a.getSecondaryAuthors()); myArticle.setTheme(a.getTopic()); - - + request.getSession().setAttribute("listSecondaryAuthors", a.getSecondaryAuthors()); return myArticle;