Author: vbriand Date: 2011-03-18 10:39:33 +0100 (Fri, 18 Mar 2011) New Revision: 30 Url: http://chorem.org/repositories/revision/chorem/30 Log: Added new pages in bonzoms for adding a new company or person Completed page for adding a task Added: trunk/chorem-web/src/main/webapp/WEB-INF/jsp/bonzoms/ trunk/chorem-web/src/main/webapp/WEB-INF/jsp/bonzoms/admin/ trunk/chorem-web/src/main/webapp/WEB-INF/jsp/bonzoms/admin/addCompany.jsp trunk/chorem-web/src/main/webapp/WEB-INF/jsp/bonzoms/admin/addPerson.jsp Modified: trunk/chorem-web/src/main/resources/i18n/chorem-web_en_GB.properties trunk/chorem-web/src/main/resources/i18n/chorem-web_fr_FR.properties trunk/chorem-web/src/main/resources/struts.xml trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/admin/addTask.jsp Modified: trunk/chorem-web/src/main/resources/i18n/chorem-web_en_GB.properties =================================================================== --- trunk/chorem-web/src/main/resources/i18n/chorem-web_en_GB.properties 2011-03-17 16:40:52 UTC (rev 29) +++ trunk/chorem-web/src/main/resources/i18n/chorem-web_en_GB.properties 2011-03-18 09:39:33 UTC (rev 30) @@ -1,3 +1,13 @@ +chorem.bonzoms.company=Company {0} +chorem.bonzoms.company.add=Add a new company +chorem.bonzoms.company.name=Company''s name +chorem.bonzoms.company.type=Company''s type +chorem.bonzoms.person=Person +chorem.bonzoms.person.add=Add a new person +chorem.bonzoms.person.birthDate=Birth date +chorem.bonzoms.person.email=Email +chorem.bonzoms.person.firstName=First name +chorem.bonzoms.person.lastName=Last name chorem.config.configFileName.description=chorem''s configuration filename chorem.error.internal=An internal error occurred chorem.gepeto.home=Home @@ -4,12 +14,16 @@ chorem.gepeto.project=Project {0} chorem.gepeto.project.add=Add a new project chorem.gepeto.project.description=Description -chorem.gepeto.project.name=Project name +chorem.gepeto.project.name=Project''s name chorem.gepeto.projectDetails.title=Details of project {0} chorem.gepeto.projectsByYear.title=Projects of year {0} chorem.gepeto.results.title=Results by year chorem.gepeto.task=Task {0} chorem.gepeto.task.add=Add a new task chorem.gepeto.task.description=Description +chorem.gepeto.task.estimatedBeginDate=Estimated begin date +chorem.gepeto.task.estimatedDays=Estimated days +chorem.gepeto.task.estimatedEndDate=Estimated end date chorem.gepeto.task.name=Task name +chorem.gepeto.task.price=Price chorem.home=Home Modified: trunk/chorem-web/src/main/resources/i18n/chorem-web_fr_FR.properties =================================================================== --- trunk/chorem-web/src/main/resources/i18n/chorem-web_fr_FR.properties 2011-03-17 16:40:52 UTC (rev 29) +++ trunk/chorem-web/src/main/resources/i18n/chorem-web_fr_FR.properties 2011-03-18 09:39:33 UTC (rev 30) @@ -1,3 +1,13 @@ +chorem.bonzoms.company=Soci\u00E9t\u00E9 +chorem.bonzoms.company.add=Ajouter une nouvelle soci\u00E9t\u00E9 +chorem.bonzoms.company.name=Nom de la soci\u00E9t\u00E9 +chorem.bonzoms.company.type=Type de la soci\u00E9t\u00E9 +chorem.bonzoms.person=Personne +chorem.bonzoms.person.add=Ajouter une nouvelle personne +chorem.bonzoms.person.birthDate=Date de naissance +chorem.bonzoms.person.email=Email +chorem.bonzoms.person.firstName=Pr\u00E9nom +chorem.bonzoms.person.lastName=Nom chorem.config.configFileName.description=Nom du fichier de configuration de chorem chorem.error.internal=Une erreur interne s''est produite chorem.gepeto.home=Accueil @@ -11,5 +21,9 @@ chorem.gepeto.task=T\u00E2che {0} chorem.gepeto.task.add=Ajouter une nouvelle t\u00E2che chorem.gepeto.task.description=Description +chorem.gepeto.task.estimatedBeginDate=Date de d\u00E9but estim\u00E9e +chorem.gepeto.task.estimatedDays=Nombre de jours estim\u00E9s +chorem.gepeto.task.estimatedEndDate=Date de fin estim\u00E9e chorem.gepeto.task.name=Nom de la t\u00E2che +chorem.gepeto.task.price=Prix chorem.home=Accueil Modified: trunk/chorem-web/src/main/resources/struts.xml =================================================================== --- trunk/chorem-web/src/main/resources/struts.xml 2011-03-17 16:40:52 UTC (rev 29) +++ trunk/chorem-web/src/main/resources/struts.xml 2011-03-18 09:39:33 UTC (rev 30) @@ -12,12 +12,18 @@ <result>/WEB-INF/jsp/home.jsp</result> </action> </package> -<!-- + <package name="bonzoms" namespace="/bonzoms" extends="struts-default"> <action name="home"> <result>/WEB-INF/jsp/bonzoms/home.jsp</result> </action> - </package>--> + <action name="addCompanyPage"> + <result>/WEB-INF/jsp/bonzoms/admin/addCompany.jsp</result> + </action> + <action name="addPersonPage"> + <result>/WEB-INF/jsp/bonzoms/admin/addPerson.jsp</result> + </action> + </package> <package name="gepeto" namespace="/gepeto" extends="struts-default"> <default-action-ref name="home" /> Added: trunk/chorem-web/src/main/webapp/WEB-INF/jsp/bonzoms/admin/addCompany.jsp =================================================================== --- trunk/chorem-web/src/main/webapp/WEB-INF/jsp/bonzoms/admin/addCompany.jsp (rev 0) +++ trunk/chorem-web/src/main/webapp/WEB-INF/jsp/bonzoms/admin/addCompany.jsp 2011-03-18 09:39:33 UTC (rev 30) @@ -0,0 +1,27 @@ +<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> +<%@taglib prefix="s" uri="/struts-tags" %> + +<html xmlns:s="http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd" + xmlns:jsp="http://java.sun.com/JSP/Page"> + <head> + <title><s:text name="chorem.bonzoms.company.add" /></title> + <s:head /> + </head> + <body> + <h2><s:text name="chorem.bonzoms.company.add" /></h2> + <s:form action="addCompany" method="post"> + <fieldset> + <legend> + <s:text name="chorem.bonzoms.company"> + <s:param></s:param> + </s:text> + </legend> + <s:textfield key="chorem.bonzoms.company.name" name="name" labelSeparator=": " /> + <br /> + <s:textfield key="chorem.bonzoms.company.type" name="type" labelSeparator=": " /> + <br /> + <s:submit key="chorem.bonzoms.company.add" name="submit" /> + </fieldset> + </s:form> + </body> +</html> Property changes on: trunk/chorem-web/src/main/webapp/WEB-INF/jsp/bonzoms/admin/addCompany.jsp ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/chorem-web/src/main/webapp/WEB-INF/jsp/bonzoms/admin/addPerson.jsp =================================================================== --- trunk/chorem-web/src/main/webapp/WEB-INF/jsp/bonzoms/admin/addPerson.jsp (rev 0) +++ trunk/chorem-web/src/main/webapp/WEB-INF/jsp/bonzoms/admin/addPerson.jsp 2011-03-18 09:39:33 UTC (rev 30) @@ -0,0 +1,27 @@ +<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> +<%@taglib prefix="s" uri="/struts-tags" %> + +<html xmlns:s="http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd" + xmlns:jsp="http://java.sun.com/JSP/Page"> + <head> + <title><s:text name="chorem.bonzoms.person.add" /></title> + <s:head /> + </head> + <body> + <h2><s:text name="chorem.bonzoms.person.add" /></h2> + <s:form action="addPerson" method="post"> + <fieldset> + <legend><s:text name="chorem.bonzoms.person" /></legend> + <s:textfield key="chorem.bonzoms.person.firstName" name="firstName" labelSeparator=": " /> + <br /> + <s:textfield key="chorem.bonzoms.person.lastName" name="lastName" labelSeparator=": " /> + <br /> + <s:textfield key="chorem.bonzoms.person.email" name="email" labelSeparator=": " /> + <br /> + <s:textfield key="chorem.bonzoms.person.birthDate" name="birthDate" labelSeparator=": " /> + <br /> + <s:submit key="chorem.bonzoms.company.add" name="submit" /> + </fieldset> + </s:form> + </body> +</html> Property changes on: trunk/chorem-web/src/main/webapp/WEB-INF/jsp/bonzoms/admin/addPerson.jsp ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/admin/addTask.jsp =================================================================== --- trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/admin/addTask.jsp 2011-03-17 16:40:52 UTC (rev 29) +++ trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/admin/addTask.jsp 2011-03-18 09:39:33 UTC (rev 30) @@ -21,6 +21,16 @@ <br /> <s:textarea key="chorem.gepeto.task.description" name="description" cols="50" rows="10" labelposition="top" /> <br /> + <br /> + <s:textfield key="chorem.gepeto.task.price" name="price" labelSeparator=": " /> + <br /> + <s:textfield key="chorem.gepeto.task.estimatedDays" name="estimatedDays" labelSeparator=": " /> + <br /> + <s:textfield key="chorem.gepeto.task.estimatedBeginDate" name="estimatedBeginDate" labelSeparator=": " /> + <br /> + <s:textfield key="chorem.gepeto.task.estimatedEndDate" name="estimatedEndDate" labelSeparator=": " /> + <br /> + <br /> <s:submit key="chorem.gepeto.task.add" name="submit" /> </fieldset> </s:form>