Author: vbriand Date: 2011-04-08 11:34:00 +0200 (Fri, 08 Apr 2011) New Revision: 69 Url: http://chorem.org/repositories/revision/chorem/69 Log: Deleted non usable links on home pages. Added direct redirection to the project's page after its creation Modified: trunk/chorem-web/src/main/java/org/chorem/gepeto/action/ProjectAction.java 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/billy/home.jsp trunk/chorem-web/src/main/webapp/WEB-INF/jsp/billy/quotationDetails.jsp trunk/chorem-web/src/main/webapp/WEB-INF/jsp/bonzoms/home.jsp trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/addProjectOrder.jsp trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/home.jsp Modified: trunk/chorem-web/src/main/java/org/chorem/gepeto/action/ProjectAction.java =================================================================== --- trunk/chorem-web/src/main/java/org/chorem/gepeto/action/ProjectAction.java 2011-04-08 09:11:46 UTC (rev 68) +++ trunk/chorem-web/src/main/java/org/chorem/gepeto/action/ProjectAction.java 2011-04-08 09:34:00 UTC (rev 69) @@ -115,6 +115,7 @@ newProject.setDescription(description); newProject.setName(name); + projectId = newProject.getWikittyId(); proxy.store(newProject); } catch (Exception e) { result = false; 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-04-08 09:11:46 UTC (rev 68) +++ trunk/chorem-web/src/main/resources/i18n/chorem-web_en_GB.properties 2011-04-08 09:34:00 UTC (rev 69) @@ -104,6 +104,7 @@ chorem.gepeto.projectOrder=Project order chorem.gepeto.projectOrder.add=Add a new project order chorem.gepeto.projectOrder.addToQuotation=Add a new project order to the quotation \#{0} +chorem.gepeto.projectOrder.backToQuotationDetails=Get back to the quotation chorem.gepeto.projectOrder.beginDate=Begin date (dd/mm/yyyy) chorem.gepeto.projectOrder.beginDate.required=You must provide a begin date for this project order chorem.gepeto.projectOrder.create.error=An error occurred while creating your new project order, please try again. If the problem persists, please contact an administrator 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-04-08 09:11:46 UTC (rev 68) +++ trunk/chorem-web/src/main/resources/i18n/chorem-web_fr_FR.properties 2011-04-08 09:34:00 UTC (rev 69) @@ -99,6 +99,7 @@ chorem.gepeto.projectOrder=Contrat de commande d''un projet chorem.gepeto.projectOrder.add=Ajouter le contrat d''un projet chorem.gepeto.projectOrder.addToQuotation=Lier un nouveau contrat au devis \#{0} +chorem.gepeto.projectOrder.backToQuotationDetails=Retourner sur le devis chorem.gepeto.projectOrder.beginDate=Date de d\u00E9but chorem.gepeto.projectOrder.beginDate.required=Vous devez renseigner une date de d\u00E9but pour le contrat chorem.gepeto.projectOrder.create.error=Une erreur s''est produite lors de la cr\u00E9ation de votre nouveau contrat de projet, merci d''essayer \u00E0 nouveau. Si le probl\u00E8me se reproduit, merci de contacter un administrateur Modified: trunk/chorem-web/src/main/resources/struts.xml =================================================================== --- trunk/chorem-web/src/main/resources/struts.xml 2011-04-08 09:11:46 UTC (rev 68) +++ trunk/chorem-web/src/main/resources/struts.xml 2011-04-08 09:34:00 UTC (rev 69) @@ -63,7 +63,11 @@ <action name="addProject" class="org.chorem.gepeto.action.ProjectAction" method="add"> <result name="input">/WEB-INF/jsp/gepeto/addProject.jsp</result> <result name="error">/WEB-INF/jsp/gepeto/addProject.jsp</result> - <result type="redirectAction">home</result> + <result type="redirectAction"> + <param name="actionName">projectDetails</param> + <param name="namespace">gepeto</param> + <param name="projectId">${projectId}</param> + </result> </action> <action name="removeProject" class="org.chorem.gepeto.action.ProjectAction" method="delete"> <result type="redirectAction">home</result> Modified: trunk/chorem-web/src/main/webapp/WEB-INF/jsp/billy/home.jsp =================================================================== --- trunk/chorem-web/src/main/webapp/WEB-INF/jsp/billy/home.jsp 2011-04-08 09:11:46 UTC (rev 68) +++ trunk/chorem-web/src/main/webapp/WEB-INF/jsp/billy/home.jsp 2011-04-08 09:34:00 UTC (rev 69) @@ -7,7 +7,6 @@ <title><s:text name="chorem.billy.home" /></title> <s:head /> </head> - <body> - <s:a action="addQuotationInput"><s:text name="chorem.billy.quotation.add" /></s:a><br /> + <body> </body> </html> Modified: trunk/chorem-web/src/main/webapp/WEB-INF/jsp/billy/quotationDetails.jsp =================================================================== --- trunk/chorem-web/src/main/webapp/WEB-INF/jsp/billy/quotationDetails.jsp 2011-04-08 09:11:46 UTC (rev 68) +++ trunk/chorem-web/src/main/webapp/WEB-INF/jsp/billy/quotationDetails.jsp 2011-04-08 09:34:00 UTC (rev 69) @@ -30,12 +30,6 @@ <s:textfield readonly="true" name="postedDate" key="chorem.billy.quotation.postedDate" labelSeparator=": " /> <br /> <br /> - <s:url namespace="/gepeto" action="addProjectOrderInput" var="addProjectOrder"> - <s:param name="quotationId"><%= QuotationAction.getAction().getQuotationId() %></s:param> - </s:url> - <s:url namespace="/gepeto" action="projectDetails" var="projectDetails"> - <s:param name="projectId"><%= QuotationAction.getAction().getProjectId() %></s:param> - </s:url> <% ProjectOrder projectOrder = QuotationAction.getAction().getProjectOrder(); @@ -60,10 +54,16 @@ </s:text> <br /> <% } else { %> + <s:url namespace="/gepeto" action="addProjectOrderInput" var="addProjectOrder"> + <s:param name="quotationId"><%= QuotationAction.getAction().getQuotationId() %></s:param> + </s:url> <a href="${addProjectOrder}"><s:text name="chorem.billy.quotation.addProjectOrder" /></a> <br /> <% } %> <br /> + <s:url namespace="/gepeto" action="projectDetails" var="projectDetails"> + <s:param name="projectId"><%= QuotationAction.getAction().getProjectId() %></s:param> + </s:url> <a href="${projectDetails}"><s:text name="chorem.billy.quotation.backToProjectDetails" /></a> </p> </body> Modified: trunk/chorem-web/src/main/webapp/WEB-INF/jsp/bonzoms/home.jsp =================================================================== --- trunk/chorem-web/src/main/webapp/WEB-INF/jsp/bonzoms/home.jsp 2011-04-08 09:11:46 UTC (rev 68) +++ trunk/chorem-web/src/main/webapp/WEB-INF/jsp/bonzoms/home.jsp 2011-04-08 09:34:00 UTC (rev 69) @@ -8,8 +8,9 @@ <s:head /> </head> <body> - <s:a action="addCompanyInput"><s:text name="chorem.bonzoms.company.add" /></s:a><br /> - <s:a action="addEmploymentContractInput"><s:text name="chorem.bonzoms.employmentContract.add" /></s:a><br /> - <s:a action="addPersonInput"><s:text name="chorem.bonzoms.person.add" /></s:a> + <p> + <s:a action="addCompanyInput"><s:text name="chorem.bonzoms.company.add" /></s:a><br /> + <s:a action="addPersonInput"><s:text name="chorem.bonzoms.person.add" /></s:a> + </p> </body> </html> Modified: trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/addProjectOrder.jsp =================================================================== --- trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/addProjectOrder.jsp 2011-04-08 09:11:46 UTC (rev 68) +++ trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/addProjectOrder.jsp 2011-04-08 09:34:00 UTC (rev 69) @@ -34,5 +34,9 @@ <s:submit key="chorem.gepeto.projectOrder.add" name="submit" /> </fieldset> </form> + <s:url namespace="/billy" action="quotationDetails" var="quotationDetails"> + <s:param name="quotationId"><%= ProjectOrderAction.getAction().getQuotationId() %></s:param> + </s:url> + <a href="${quotationDetails}"><s:text name="chorem.gepeto.projectOrder.backToQuotationDetails" /></a> </body> </html> Modified: trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/home.jsp =================================================================== --- trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/home.jsp 2011-04-08 09:11:46 UTC (rev 68) +++ trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/home.jsp 2011-04-08 09:34:00 UTC (rev 69) @@ -8,9 +8,9 @@ <s:head /> </head> <body> - <s:a action="addProjectInput"><s:text name="chorem.gepeto.project.add" /></s:a><br /> - <s:a action="addProjectOrderInput"><s:text name="chorem.gepeto.projectOrder.add" /></s:a><br /> - <s:a action="addTaskInput"><s:text name="chorem.gepeto.task.add" /></s:a><br /> - <s:a action="getProjectsByYear"><s:text name="chorem.gepeto.projects" /></s:a><br /> + <p> + <s:a action="addProjectInput"><s:text name="chorem.gepeto.project.add" /></s:a><br /> + <s:a action="getProjectsByYear"><s:text name="chorem.gepeto.projects" /></s:a><br /> + </p> </body> </html>