diff --git a/YACOSWeb/WebContent/WEB-INF/classes/messages.properties b/YACOSWeb/WebContent/WEB-INF/classes/messages.properties index fcb2c58..895dc86 100644 --- a/YACOSWeb/WebContent/WEB-INF/classes/messages.properties +++ b/YACOSWeb/WebContent/WEB-INF/classes/messages.properties @@ -31,4 +31,7 @@ dispatch.title=Dispatch the articles to the members conference.titleMenu=Add a conference conference.title=Title conference.description=Description -conference.otherInformations=Complementary information \ No newline at end of file +conference.otherInformations=Complementary information +conference.linkMenu.title=Adding Conference +conference.linkMenu.choose=Choosing current conference +conference.linkMenu.change=Change current conference diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/listArticle.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/listArticle.jsp index 383ba64..460cdbd 100644 --- a/YACOSWeb/WebContent/WEB-INF/jsp/listArticle.jsp +++ b/YACOSWeb/WebContent/WEB-INF/jsp/listArticle.jsp @@ -1,5 +1,4 @@ <%@ include file="/WEB-INF/jsp/include.jsp"%> -<%@ page session="false"%> diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/listConference.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/listConference.jsp new file mode 100644 index 0000000..538fd32 --- /dev/null +++ b/YACOSWeb/WebContent/WEB-INF/jsp/listConference.jsp @@ -0,0 +1,62 @@ +<%@ include file="/WEB-INF/jsp/include.jsp"%> + + + + + +<fmt:message key="title" /> + + + + + + + + +
+
 
+
+
+ + +

Choose a conference

+ + Choix de la conference

+ + + La conférence courante est : ${idCurrentConference}.

+ + + Il n'y a pas de conférence sélectionné.

+ + + + + Il n'y a pas de conférence présente.
+ + + +
+ ID : ${conference.id}
+ Title : ${conference.title}
+ Description : ${conference.description}
+ Other Informations : ${conference.otherInformations}
+
+ ">Choisir
+
+
+ + + + + +
+ + +">Home
+
+
 
+
+ + + diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/menu.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/menu.jsp index fdf2d18..75b5a10 100644 --- a/YACOSWeb/WebContent/WEB-INF/jsp/menu.jsp +++ b/YACOSWeb/WebContent/WEB-INF/jsp/menu.jsp @@ -16,7 +16,16 @@
Status
- Affichage status de connexion + + + La conférence courante est : ${idCurrentConference}.
+ "> + + + Il n'y a pas de conférence courante.
+ "> + +
 
diff --git a/YACOSWeb/WebContent/WEB-INF/yacos-servlet.xml b/YACOSWeb/WebContent/WEB-INF/yacos-servlet.xml index 5d1bdb7..cf260fc 100644 --- a/YACOSWeb/WebContent/WEB-INF/yacos-servlet.xml +++ b/YACOSWeb/WebContent/WEB-INF/yacos-servlet.xml @@ -73,6 +73,15 @@ + + + + + + + + + diff --git a/YACOSWeb/WebContent/stylesheets/base.css b/YACOSWeb/WebContent/stylesheets/base.css index 5a0eeab..7263653 100644 --- a/YACOSWeb/WebContent/stylesheets/base.css +++ b/YACOSWeb/WebContent/stylesheets/base.css @@ -148,4 +148,9 @@ ul.article .topic { ul.article .article_url { font-size: small; +} + +.conferenceBloc { + background-color: #FFE591; + padding: 5px; } \ No newline at end of file diff --git a/YACOSWeb/src/org/yacos/web/system/controller/ChooseConferenceController.java b/YACOSWeb/src/org/yacos/web/system/controller/ChooseConferenceController.java new file mode 100644 index 0000000..0b26427 --- /dev/null +++ b/YACOSWeb/src/org/yacos/web/system/controller/ChooseConferenceController.java @@ -0,0 +1,24 @@ +package org.yacos.web.system.controller; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.springframework.web.servlet.ModelAndView; +import org.springframework.web.servlet.mvc.Controller; + +public class ChooseConferenceController implements Controller { + + + public ModelAndView handleRequest(HttpServletRequest request, + HttpServletResponse response) throws Exception { + + // get IDConf + int idConf = Integer.parseInt(request.getParameter("idConf")); + + // Set idConf in session context + request.getSession().setAttribute("idCurrentConference", idConf); + + + return new ModelAndView("main"); + } +} diff --git a/YACOSWeb/src/org/yacos/web/system/controller/ListConferenceController.java b/YACOSWeb/src/org/yacos/web/system/controller/ListConferenceController.java new file mode 100644 index 0000000..433059f --- /dev/null +++ b/YACOSWeb/src/org/yacos/web/system/controller/ListConferenceController.java @@ -0,0 +1,46 @@ +package org.yacos.web.system.controller; + + +import java.util.HashMap; +import java.util.Map; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.springframework.web.servlet.ModelAndView; +import org.springframework.web.servlet.mvc.Controller; +import org.yacos.core.conferences.IConferenceManager; + +public class ListConferenceController implements Controller{ + + protected final Log logger = LogFactory.getLog(getClass()); + + private IConferenceManager conferenceManager; + + public IConferenceManager getConferenceManager() { + return conferenceManager; + } + public void setConferenceManager(IConferenceManager conferenceManager) { + this.conferenceManager = conferenceManager; + } + + + /** + * Generate list of conference fo can choose + */ + public ModelAndView handleRequest(HttpServletRequest request, + HttpServletResponse response) throws Exception + { + + logger.info("Returning listConference view"); + + // List all conference + Map model = new HashMap(); + model.put("listConference", conferenceManager.getConferences()); + + return new ModelAndView("listConference", model); + } + +}