Author: vbriand Date: 2011-03-18 11:22:55 +0100 (Fri, 18 Mar 2011) New Revision: 31 Url: http://chorem.org/repositories/revision/chorem/31 Log: Added pages for adding contact details and project order Modified wrong textfield keys Added: trunk/chorem-web/src/main/webapp/WEB-INF/jsp/bonzoms/admin/addContactDetails.jsp trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/admin/addProjectOrder.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/bonzoms/admin/addPerson.jsp 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-18 09:39:33 UTC (rev 30) +++ trunk/chorem-web/src/main/resources/i18n/chorem-web_en_GB.properties 2011-03-18 10:22:55 UTC (rev 31) @@ -2,6 +2,11 @@ chorem.bonzoms.company.add=Add a new company chorem.bonzoms.company.name=Company''s name chorem.bonzoms.company.type=Company''s type +chorem.bonzoms.contactDetails=Contact details +chorem.bonzoms.contactDetails.add=Add a new contact details +chorem.bonzoms.contactDetails.name=Contact details'' name +chorem.bonzoms.contactDetails.type=Contact details'' type +chorem.bonzoms.contactDetails.value=Contact details'' value chorem.bonzoms.person=Person chorem.bonzoms.person.add=Add a new person chorem.bonzoms.person.birthDate=Birth date @@ -16,14 +21,20 @@ chorem.gepeto.project.description=Description chorem.gepeto.project.name=Project''s name chorem.gepeto.projectDetails.title=Details of project {0} +chorem.gepeto.projectOrder=Project order +chorem.gepeto.projectOrder.add=Add a new project order +chorem.gepeto.projectOrder.beginDate=Begin date +chorem.gepeto.projectOrder.description=Description +chorem.gepeto.projectOrder.estimatedEndDate=Estimated end date +chorem.gepeto.projectOrder.type=Type 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.beginDate=Begin date 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.name=Task''s 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-18 09:39:33 UTC (rev 30) +++ trunk/chorem-web/src/main/resources/i18n/chorem-web_fr_FR.properties 2011-03-18 10:22:55 UTC (rev 31) @@ -2,6 +2,11 @@ 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.contactDetails=M\u00E9thode de contact +chorem.bonzoms.contactDetails.add=Ajouter une nouvelle m\u00E9thode de contact +chorem.bonzoms.contactDetails.name=Nom de la m\u00E9thode de contact +chorem.bonzoms.contactDetails.type=Type de la m\u00E9thode de contact +chorem.bonzoms.contactDetails.value=Valeur de la m\u00E9thode de contact chorem.bonzoms.person=Personne chorem.bonzoms.person.add=Ajouter une nouvelle personne chorem.bonzoms.person.birthDate=Date de naissance @@ -16,12 +21,18 @@ chorem.gepeto.project.description=Description chorem.gepeto.project.name=Nom du projet chorem.gepeto.projectDetails.title=D\u00E9tails du projet {0} +chorem.gepeto.projectOrder=Contrat de commande d''un projet +chorem.gepeto.projectOrder.add=Ajouter le contrat d''un projet +chorem.gepeto.projectOrder.beginDate=Date de d\u00E9but +chorem.gepeto.projectOrder.description=Description +chorem.gepeto.projectOrder.estimatedEndDate=Date de fin estim\u00E9e +chorem.gepeto.projectOrder.type=Type chorem.gepeto.projectsByYear.title=Projets de l''ann\u00E9e {0} chorem.gepeto.results.title=R\u00E9sultats par ann\u00E0e chorem.gepeto.task=T\u00E2che {0} chorem.gepeto.task.add=Ajouter une nouvelle t\u00E2che +chorem.gepeto.task.beginDate=Date de d\u00E9but 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 Modified: trunk/chorem-web/src/main/resources/struts.xml =================================================================== --- trunk/chorem-web/src/main/resources/struts.xml 2011-03-18 09:39:33 UTC (rev 30) +++ trunk/chorem-web/src/main/resources/struts.xml 2011-03-18 10:22:55 UTC (rev 31) @@ -23,6 +23,9 @@ <action name="addPersonPage"> <result>/WEB-INF/jsp/bonzoms/admin/addPerson.jsp</result> </action> + <action name="addContactDetails"> + <result>/WEB-INF/jsp/bonzoms/admin/addContactDetails.jsp</result> + </action> </package> <package name="gepeto" namespace="/gepeto" extends="struts-default"> @@ -36,6 +39,9 @@ <action name="addTaskPage"> <result>/WEB-INF/jsp/gepeto/admin/addTask.jsp</result> </action> + <action name="addProjectOrder"> + <result>/WEB-INF/jsp/gepeto/admin/addProjectOrder.jsp</result> + </action> </package> <!--<package name="billy" namespace="/billy" extends="struts-default"> Added: trunk/chorem-web/src/main/webapp/WEB-INF/jsp/bonzoms/admin/addContactDetails.jsp =================================================================== --- trunk/chorem-web/src/main/webapp/WEB-INF/jsp/bonzoms/admin/addContactDetails.jsp (rev 0) +++ trunk/chorem-web/src/main/webapp/WEB-INF/jsp/bonzoms/admin/addContactDetails.jsp 2011-03-18 10:22:55 UTC (rev 31) @@ -0,0 +1,25 @@ +<%@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.contactDetails.add" /></title> + <s:head /> + </head> + <body> + <h2><s:text name="chorem.bonzoms.contactDetails.add" /></h2> + <s:form action="addContactDetails" method="post"> + <fieldset> + <legend><s:text name="chorem.bonzoms.contactDetails" /></legend> + <s:textfield key="chorem.bonzoms.contactDetails.name" name="name" labelSeparator=": " /> + <br /> + <s:textfield key="chorem.bonzoms.contactDetails.type" name="type" labelSeparator=": " /> + <br /> + <s:textfield key="chorem.bonzoms.contactDetails.value" name="value" labelSeparator=": " /> + <br /> + <s:submit key="chorem.bonzoms.contactDetails.add" name="submit" /> + </fieldset> + </s:form> + </body> +</html> Property changes on: trunk/chorem-web/src/main/webapp/WEB-INF/jsp/bonzoms/admin/addContactDetails.jsp ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: 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 2011-03-18 09:39:33 UTC (rev 30) +++ trunk/chorem-web/src/main/webapp/WEB-INF/jsp/bonzoms/admin/addPerson.jsp 2011-03-18 10:22:55 UTC (rev 31) @@ -20,7 +20,7 @@ <br /> <s:textfield key="chorem.bonzoms.person.birthDate" name="birthDate" labelSeparator=": " /> <br /> - <s:submit key="chorem.bonzoms.company.add" name="submit" /> + <s:submit key="chorem.bonzoms.person.add" name="submit" /> </fieldset> </s:form> </body> Added: trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/admin/addProjectOrder.jsp =================================================================== --- trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/admin/addProjectOrder.jsp (rev 0) +++ trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/admin/addProjectOrder.jsp 2011-03-18 10:22:55 UTC (rev 31) @@ -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.gepeto.projectOrder.add" /></title> + <s:head /> + </head> + <body> + <h2><s:text name="chorem.gepeto.projectOrder.add" /></h2> + <s:form action="addProjectOrder" method="post"> + <fieldset> + <legend><s:text name="chorem.gepeto.projectOrder" /></legend> + <s:textfield key="chorem.gepeto.projectOrder.type" name="type" labelSeparator=": " /> + <br /> + <s:textfield key="chorem.gepeto.projectOrder.description" name="description" labelSeparator=": " /> + <br /> + <s:textfield key="chorem.gepeto.projectOrder.beginDate" name="beginDate" labelSeparator=": " /> + <br /> + <s:textfield key="chorem.gepeto.projectOrder.estimatedEndDate" name="estimatedEndDate" labelSeparator=": " /> + <br /> + <s:submit key="chorem.gepeto.projectOrder.add" name="submit" /> + </fieldset> + </s:form> + </body> +</html> Property changes on: trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/admin/addProjectOrder.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-18 09:39:33 UTC (rev 30) +++ trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/admin/addTask.jsp 2011-03-18 10:22:55 UTC (rev 31) @@ -26,7 +26,7 @@ <br /> <s:textfield key="chorem.gepeto.task.estimatedDays" name="estimatedDays" labelSeparator=": " /> <br /> - <s:textfield key="chorem.gepeto.task.estimatedBeginDate" name="estimatedBeginDate" labelSeparator=": " /> + <s:textfield key="chorem.gepeto.task.beginDate" name="beginDate" labelSeparator=": " /> <br /> <s:textfield key="chorem.gepeto.task.estimatedEndDate" name="estimatedEndDate" labelSeparator=": " /> <br />