Author: vbriand Date: 2011-04-21 11:31:10 +0200 (Thu, 21 Apr 2011) New Revision: 96 Url: http://chorem.org/repositories/revision/chorem/96 Log: Removed home page of both bonzoms and gepeto. Added a menu for easier access to actions. Added: trunk/chorem-web/src/main/webapp/WEB-INF/decorators/billy.jsp trunk/chorem-web/src/main/webapp/WEB-INF/decorators/bonzoms.jsp trunk/chorem-web/src/main/webapp/WEB-INF/decorators/cash.jsp trunk/chorem-web/src/main/webapp/WEB-INF/decorators/gepeto.jsp trunk/chorem-web/src/main/webapp/WEB-INF/jsp/bonzoms/menu.jsp trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/menu.jsp Removed: trunk/chorem-web/src/main/webapp/WEB-INF/jsp/bonzoms/home.jsp trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/home.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/decorators.xml trunk/chorem-web/src/main/webapp/WEB-INF/jsp/bonzoms/companies.jsp trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/projectsWithoutQuotation.jsp trunk/chorem-web/src/main/webapp/css/style.css 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-15 15:53:43 UTC (rev 95) +++ trunk/chorem-web/src/main/resources/i18n/chorem-web_en_GB.properties 2011-04-21 09:31:10 UTC (rev 96) @@ -104,7 +104,7 @@ chorem.error.internal=An internal error occurred chorem.gepeto.home=Home chorem.gepeto.project=Project {0} -chorem.gepeto.project.add=Add a new project +chorem.gepeto.project.add=New project chorem.gepeto.project.create.error=An error occurred while creating your new project, please try again. If the problem persists, please contact an administrator chorem.gepeto.project.description=Description chorem.gepeto.project.description.required=You must describe the project @@ -147,13 +147,13 @@ chorem.gepeto.projectOrderDetails.tasks= chorem.gepeto.projectOrderDetails.title= chorem.gepeto.projectOrderDetails.type= -chorem.gepeto.projects=Get the projects list +chorem.gepeto.projects=Projects list chorem.gepeto.projectsByYear.thead.company=Company chorem.gepeto.projectsByYear.thead.end=End chorem.gepeto.projectsByYear.thead.name=Name chorem.gepeto.projectsByYear.thead.start=Start chorem.gepeto.projectsByYear.title=Projects of year {0} -chorem.gepeto.projectsWithoutQuotation= +chorem.gepeto.projectsWithoutQuotation=Projects list without quotation chorem.gepeto.projectsWithoutQuotation.title= chorem.gepeto.results.title=Results by year chorem.gepeto.task=Task {0} 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-15 15:53:43 UTC (rev 95) +++ trunk/chorem-web/src/main/resources/i18n/chorem-web_fr_FR.properties 2011-04-21 09:31:10 UTC (rev 96) @@ -17,10 +17,10 @@ chorem.billy.quotation.reference=R\u00E9f\u00E9rence chorem.billy.quotation.vta=TVA chorem.billy.quotationDetails.title= -chorem.bonzoms.companies= +chorem.bonzoms.companies=Liste des entreprises chorem.bonzoms.company=Soci\u00E9t\u00E9 chorem.bonzoms.company.add=Ajouter une nouvelle soci\u00E9t\u00E9 -chorem.bonzoms.company.address= +chorem.bonzoms.company.address=Adresse chorem.bonzoms.company.addressLine1=Adresse chorem.bonzoms.company.addressLine1.required=Vous devez donner l'adresse de l''entreprise chorem.bonzoms.company.addressLine2=Adresse ligne 2 (opt.) @@ -29,6 +29,7 @@ chorem.bonzoms.company.country=Pays chorem.bonzoms.company.country.required=Vous devez indiquer le pays chorem.bonzoms.company.create.error=Une erreur s''est produite lors de la cr\u00E9ation de votre nouvelle soci\u00E9t\u00E9, merci d''essayer \u00E0 nouveau. Si le probl\u00E8me se reproduit, merci de contacter un administrateur +chorem.bonzoms.company.employees=Liste des employ\u00E9s chorem.bonzoms.company.list=Obtenir la liste des soci\u00E9t\u00E9s chorem.bonzoms.company.name=Nom de la soci\u00E9t\u00E9 chorem.bonzoms.company.name.required=Vous devez entrer le nom de la soci\u00E9t\u00E9 @@ -99,7 +100,7 @@ chorem.error.internal=Une erreur interne s''est produite chorem.gepeto.home=Accueil chorem.gepeto.project=Projet {0} -chorem.gepeto.project.add=Ajouter un nouveau projet +chorem.gepeto.project.add=Nouveau projet chorem.gepeto.project.create.error=Une erreur s''est produite lors de la cr\u00E9ation de votre nouveau projet, merci d''essayer \u00E0 nouveau. Si le probl\u00E8me se reproduit, merci de contacter un administrateur chorem.gepeto.project.description=Description chorem.gepeto.project.description.required=Vous devez d\u00E9crire le projet @@ -143,14 +144,16 @@ chorem.gepeto.projectOrderDetails.tasks=T\u00E2ches li\u00E9es au contrat chorem.gepeto.projectOrderDetails.title=D\u00E9tails du contrat chorem.gepeto.projectOrderDetails.type=Type de contrat \: {0} -chorem.gepeto.projects=Obtenir la liste des projets +chorem.gepeto.projects=Liste des projets chorem.gepeto.projectsByYear.thead.company=Demandeur chorem.gepeto.projectsByYear.thead.end=Fin chorem.gepeto.projectsByYear.thead.name=Nom chorem.gepeto.projectsByYear.thead.start=D\u00E9but chorem.gepeto.projectsByYear.title=Projets de l''ann\u00E9e {0} -chorem.gepeto.projectsWithoutQuotation=Obtenir la liste des projets sans devis -chorem.gepeto.projectsWithoutQuotation.title= +chorem.gepeto.projectsByYear.withProjectOrder=Avec contrat +chorem.gepeto.projectsByYear.withoutProjectOrder=Sans contrat +chorem.gepeto.projectsWithoutQuotation=Liste des projets sans devis +chorem.gepeto.projectsWithoutQuotation.title=Liste des projets sans devis chorem.gepeto.results.title=R\u00E9sultats par ann\u00E0e chorem.gepeto.task=T\u00E2che {0} chorem.gepeto.task.add=Ajouter une nouvelle t\u00E2che Modified: trunk/chorem-web/src/main/resources/struts.xml =================================================================== --- trunk/chorem-web/src/main/resources/struts.xml 2011-04-15 15:53:43 UTC (rev 95) +++ trunk/chorem-web/src/main/resources/struts.xml 2011-04-21 09:31:10 UTC (rev 96) @@ -14,10 +14,7 @@ </package> <package name="bonzoms" namespace="/bonzoms" extends="struts-default"> - <default-action-ref name="home" /> - <action name="home"> - <result>/WEB-INF/jsp/bonzoms/home.jsp</result> - </action> + <default-action-ref name="companies" /> <action name="addCompanyInput"> <result>/WEB-INF/jsp/bonzoms/addCompany.jsp</result> </action> @@ -60,10 +57,7 @@ </package> <package name="gepeto" namespace="/gepeto" extends="struts-default"> - <default-action-ref name="home" /> - <action name="home"> - <result>/WEB-INF/jsp/gepeto/home.jsp</result> - </action> + <default-action-ref name="projectsWithoutQuotation" /> <action name="addProjectInput"> <result>/WEB-INF/jsp/gepeto/addProject.jsp</result> </action> Added: trunk/chorem-web/src/main/webapp/WEB-INF/decorators/billy.jsp =================================================================== --- trunk/chorem-web/src/main/webapp/WEB-INF/decorators/billy.jsp (rev 0) +++ trunk/chorem-web/src/main/webapp/WEB-INF/decorators/billy.jsp 2011-04-21 09:31:10 UTC (rev 96) @@ -0,0 +1,26 @@ +<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %> +<%@taglib prefix="decorator" uri="http://www.opensymphony.com/sitemesh/decorator" %> +<%@taglib prefix="page" uri="http://www.opensymphony.com/sitemesh/page" %> +<%@taglib prefix="s" uri="/struts-tags" %> + +<html xmlns="http://www.w3.org/1999/xhtml" + xmlns:s="http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd" + xmlns:jsp="http://java.sun.com/JSP/Page" + xmlns:decorator="http://www.opensymphony.com/sitemesh/decorator"> + <head> + <title>Chorem : <decorator:title default="no title" /></title> + <decorator:head /> + <meta http-equiv="content-type" content="text/html; charset=UTF-8" /> + <meta name="description" content="" /> + <s:url var="CSS" value="/css/style.css" /> + <link href="${CSS}" rel="stylesheet" type="text/css" media="all" /> + </head> + <body> + <s:include value="/WEB-INF/jsp/common/inc/header.jsp" /> + <s:include value="/WEB-INF/jsp/billy/menu.jsp" /> + <div id="content"> + <decorator:body /> + </div> + <s:include value="/WEB-INF/jsp/common/inc/footer.jsp" /> + </body> +</html> Property changes on: trunk/chorem-web/src/main/webapp/WEB-INF/decorators/billy.jsp ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/chorem-web/src/main/webapp/WEB-INF/decorators/bonzoms.jsp =================================================================== --- trunk/chorem-web/src/main/webapp/WEB-INF/decorators/bonzoms.jsp (rev 0) +++ trunk/chorem-web/src/main/webapp/WEB-INF/decorators/bonzoms.jsp 2011-04-21 09:31:10 UTC (rev 96) @@ -0,0 +1,26 @@ +<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %> +<%@taglib prefix="decorator" uri="http://www.opensymphony.com/sitemesh/decorator" %> +<%@taglib prefix="page" uri="http://www.opensymphony.com/sitemesh/page" %> +<%@taglib prefix="s" uri="/struts-tags" %> + +<html xmlns="http://www.w3.org/1999/xhtml" + xmlns:s="http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd" + xmlns:jsp="http://java.sun.com/JSP/Page" + xmlns:decorator="http://www.opensymphony.com/sitemesh/decorator"> + <head> + <title>Chorem : <decorator:title default="no title" /></title> + <decorator:head /> + <meta http-equiv="content-type" content="text/html; charset=UTF-8" /> + <meta name="description" content="" /> + <s:url var="CSS" value="/css/style.css" /> + <link href="${CSS}" rel="stylesheet" type="text/css" media="all" /> + </head> + <body> + <s:include value="/WEB-INF/jsp/common/inc/header.jsp" /> + <s:include value="/WEB-INF/jsp/bonzoms/menu.jsp" /> + <div id="content"> + <decorator:body /> + </div> + <s:include value="/WEB-INF/jsp/common/inc/footer.jsp" /> + </body> +</html> Property changes on: trunk/chorem-web/src/main/webapp/WEB-INF/decorators/bonzoms.jsp ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/chorem-web/src/main/webapp/WEB-INF/decorators/cash.jsp =================================================================== --- trunk/chorem-web/src/main/webapp/WEB-INF/decorators/cash.jsp (rev 0) +++ trunk/chorem-web/src/main/webapp/WEB-INF/decorators/cash.jsp 2011-04-21 09:31:10 UTC (rev 96) @@ -0,0 +1,26 @@ +<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %> +<%@taglib prefix="decorator" uri="http://www.opensymphony.com/sitemesh/decorator" %> +<%@taglib prefix="page" uri="http://www.opensymphony.com/sitemesh/page" %> +<%@taglib prefix="s" uri="/struts-tags" %> + +<html xmlns="http://www.w3.org/1999/xhtml" + xmlns:s="http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd" + xmlns:jsp="http://java.sun.com/JSP/Page" + xmlns:decorator="http://www.opensymphony.com/sitemesh/decorator"> + <head> + <title>Chorem : <decorator:title default="no title" /></title> + <decorator:head /> + <meta http-equiv="content-type" content="text/html; charset=UTF-8" /> + <meta name="description" content="" /> + <s:url var="CSS" value="/css/style.css" /> + <link href="${CSS}" rel="stylesheet" type="text/css" media="all" /> + </head> + <body> + <s:include value="/WEB-INF/jsp/common/inc/header.jsp" /> + <s:include value="/WEB-INF/jsp/cash/menu.jsp" /> + <div id="content"> + <decorator:body /> + </div> + <s:include value="/WEB-INF/jsp/common/inc/footer.jsp" /> + </body> +</html> Property changes on: trunk/chorem-web/src/main/webapp/WEB-INF/decorators/cash.jsp ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/chorem-web/src/main/webapp/WEB-INF/decorators/gepeto.jsp =================================================================== --- trunk/chorem-web/src/main/webapp/WEB-INF/decorators/gepeto.jsp (rev 0) +++ trunk/chorem-web/src/main/webapp/WEB-INF/decorators/gepeto.jsp 2011-04-21 09:31:10 UTC (rev 96) @@ -0,0 +1,26 @@ +<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %> +<%@taglib prefix="decorator" uri="http://www.opensymphony.com/sitemesh/decorator" %> +<%@taglib prefix="page" uri="http://www.opensymphony.com/sitemesh/page" %> +<%@taglib prefix="s" uri="/struts-tags" %> + +<html xmlns="http://www.w3.org/1999/xhtml" + xmlns:s="http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd" + xmlns:jsp="http://java.sun.com/JSP/Page" + xmlns:decorator="http://www.opensymphony.com/sitemesh/decorator"> + <head> + <title>Chorem : <decorator:title default="no title" /></title> + <decorator:head /> + <meta http-equiv="content-type" content="text/html; charset=UTF-8" /> + <meta name="description" content="" /> + <s:url var="CSS" value="/css/style.css" /> + <link href="${CSS}" rel="stylesheet" type="text/css" media="all" /> + </head> + <body> + <s:include value="/WEB-INF/jsp/common/inc/header.jsp" /> + <s:include value="/WEB-INF/jsp/gepeto/menu.jsp" /> + <div id="content"> + <decorator:body /> + </div> + <s:include value="/WEB-INF/jsp/common/inc/footer.jsp" /> + </body> +</html> Property changes on: trunk/chorem-web/src/main/webapp/WEB-INF/decorators/gepeto.jsp ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: trunk/chorem-web/src/main/webapp/WEB-INF/decorators.xml =================================================================== --- trunk/chorem-web/src/main/webapp/WEB-INF/decorators.xml 2011-04-15 15:53:43 UTC (rev 95) +++ trunk/chorem-web/src/main/webapp/WEB-INF/decorators.xml 2011-04-21 09:31:10 UTC (rev 96) @@ -3,7 +3,23 @@ <excludes> <pattern>/css/*</pattern> </excludes> - + + <decorator name="billy" page="billy.jsp"> + <pattern>/billy/*</pattern> + </decorator> + + <decorator name="bonzoms" page="bonzoms.jsp"> + <pattern>/bonzoms/*</pattern> + </decorator> + + <decorator name="cash" page="cash.jsp"> + <pattern>/cash/*</pattern> + </decorator> + + <decorator name="gepeto" page="gepeto.jsp"> + <pattern>/gepeto/*</pattern> + </decorator> + <decorator name="main" page="main.jsp"> <pattern>/*</pattern> </decorator> Modified: trunk/chorem-web/src/main/webapp/WEB-INF/jsp/bonzoms/companies.jsp =================================================================== --- trunk/chorem-web/src/main/webapp/WEB-INF/jsp/bonzoms/companies.jsp 2011-04-15 15:53:43 UTC (rev 95) +++ trunk/chorem-web/src/main/webapp/WEB-INF/jsp/bonzoms/companies.jsp 2011-04-21 09:31:10 UTC (rev 96) @@ -7,12 +7,11 @@ <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.companies" /> - </title> + <title><s:text name="chorem.bonzoms.companies" /></title> <s:head /> </head> <body> + <h2><s:text name="chorem.bonzoms.companies" /></h2> <% List<Company> companies = CompanyAction.getAction().getAllCompanies(); Deleted: 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-15 15:53:43 UTC (rev 95) +++ trunk/chorem-web/src/main/webapp/WEB-INF/jsp/bonzoms/home.jsp 2011-04-21 09:31:10 UTC (rev 96) @@ -1,17 +0,0 @@ -<%@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.home" /></title> - <s:head /> - </head> - <body> - <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><br /> - <s:a action="companies"><s:text name="chorem.bonzoms.company.list" /></s:a> - </p> - </body> -</html> Added: trunk/chorem-web/src/main/webapp/WEB-INF/jsp/bonzoms/menu.jsp =================================================================== --- trunk/chorem-web/src/main/webapp/WEB-INF/jsp/bonzoms/menu.jsp (rev 0) +++ trunk/chorem-web/src/main/webapp/WEB-INF/jsp/bonzoms/menu.jsp 2011-04-21 09:31:10 UTC (rev 96) @@ -0,0 +1,9 @@ +<%@taglib prefix="s" uri="/struts-tags" %> + +<div id="menu"> + <ul> + <li><s:a action="addCompanyInput"><s:text name="chorem.bonzoms.company.add" /></s:a></li> + <li><s:a action="addPersonInput"><s:text name="chorem.bonzoms.person.add" /></s:a></li> + <li><s:a action="companies"><s:text name="chorem.bonzoms.company.list" /></s:a></li> + </ul> +</div> Property changes on: trunk/chorem-web/src/main/webapp/WEB-INF/jsp/bonzoms/menu.jsp ___________________________________________________________________ Added: svn:mime-type + text/plain Deleted: 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-15 15:53:43 UTC (rev 95) +++ trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/home.jsp 2011-04-21 09:31:10 UTC (rev 96) @@ -1,20 +0,0 @@ -<%@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.home" /></title> - <s:head /> - </head> - <body> - <p> - <s:a action="addProjectInput"><s:text name="chorem.gepeto.project.add" /></s:a><br /> - <s:url action="projectsByYear" var="projectsByYear"> - <s:param name="year">2011</s:param> - </s:url> - <a href="${projectsByYear}"><s:text name="chorem.gepeto.projects" /></a><br /> - <s:a action="projectsWithoutQuotation"><s:text name="chorem.gepeto.projectsWithoutQuotation" /></s:a><br /> - </p> - </body> -</html> Added: trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/menu.jsp =================================================================== --- trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/menu.jsp (rev 0) +++ trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/menu.jsp 2011-04-21 09:31:10 UTC (rev 96) @@ -0,0 +1,12 @@ +<%@taglib prefix="s" uri="/struts-tags" %> + +<div id="menu"> + <ul> + <li><s:a action="addProjectInput"><s:text name="chorem.gepeto.project.add" /></s:a></li> + <s:url action="projectsByYear" var="projectsByYear"> + <s:param name="year">2011</s:param> + </s:url> + <li><a href="${projectsByYear}"><s:text name="chorem.gepeto.projects" /></a></li> + <li><s:a action="projectsWithoutQuotation"><s:text name="chorem.gepeto.projectsWithoutQuotation" /></s:a></li> + </ul> +</div> \ No newline at end of file Property changes on: trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/menu.jsp ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/projectsWithoutQuotation.jsp =================================================================== --- trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/projectsWithoutQuotation.jsp 2011-04-15 15:53:43 UTC (rev 95) +++ trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/projectsWithoutQuotation.jsp 2011-04-21 09:31:10 UTC (rev 96) @@ -11,6 +11,7 @@ <s:head /> </head> <body> + <h2><s:text name="chorem.gepeto.projectsWithoutQuotation.title" /></h2> <p> <% List<Project> projects = ProjectAction.getAction().getProjectsWithoutQuotation(); Modified: trunk/chorem-web/src/main/webapp/css/style.css =================================================================== --- trunk/chorem-web/src/main/webapp/css/style.css 2011-04-15 15:53:43 UTC (rev 95) +++ trunk/chorem-web/src/main/webapp/css/style.css 2011-04-21 09:31:10 UTC (rev 96) @@ -4,4 +4,25 @@ border-color: blue; margin: 3px; padding: 3px; +} + +#header { + margin-bottom:10px; +} + +#content { + margin-left:220px; + margin-top:20px; +} + +#menu { + float:left; + width:200px; + border:1px solid black; + margin-top:15px; + margin-bottom:10px; +} + +#footer { + clear:left; } \ No newline at end of file