r23 - in trunk/chorem-web/src/main: i18n java/org/chorem/gepeto/action resources resources/i18n webapp webapp/WEB-INF/jsp/gepeto webapp/WEB-INF/jsp/gepeto/admin - Chorem-commits

17 Mar 2011

Author: vbriand
Date: 2011-03-17 15:28:49 +0100 (Thu, 17 Mar 2011)
New Revision: 23

Url: http://chorem.org/repositories/revision/chorem/23

Log:
Added new i18n rule for textarea
Added (empty) home pages for chorem and gepeto
Added new gepeto jsp page for adding a new project


Added:
   trunk/chorem-web/src/main/java/org/chorem/gepeto/action/admin/
   trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/admin/
   trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/admin/addProject.jsp
   trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/home.jsp
Removed:
   trunk/chorem-web/src/main/webapp/index.jsp
Modified:
   trunk/chorem-web/src/main/i18n/jsp.rules
   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

Modified: trunk/chorem-web/src/main/i18n/jsp.rules
===================================================================

--- trunk/chorem-web/src/main/i18n/jsp.rules	2011-03-17 13:39:37 UTC (rev 22)
+++ trunk/chorem-web/src/main/i18n/jsp.rules	2011-03-17 14:28:49 UTC (rev 23)
@@ -5,5 +5,6 @@
 //s:textfield/@key
 //s:password/@key
 //s:file/@key
+//s:textarea/@key
 
 //sx:datetimepicker/@key

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 13:39:37 UTC (rev 22)
+++ trunk/chorem-web/src/main/resources/i18n/chorem-web_en_GB.properties	2011-03-17 14:28:49 UTC (rev 23)
@@ -1,5 +1,6 @@
 chorem.config.configFileName.description=chorem''s configuration filename
 chorem.error.internal=
+chorem.gepeto.home=
 chorem.gepeto.project=Project {0}
 chorem.gepeto.project.add=Add a new project
 chorem.gepeto.project.description=Description
@@ -7,4 +8,4 @@
 chorem.gepeto.projectDetails.title=Details of project {0}
 chorem.gepeto.projectsByYear.title=Projects of year {0}
 chorem.gepeto.results.title=Results by year
-chorem.home=
+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 13:39:37 UTC (rev 22)
+++ trunk/chorem-web/src/main/resources/i18n/chorem-web_fr_FR.properties	2011-03-17 14:28:49 UTC (rev 23)
@@ -1,5 +1,6 @@
 chorem.config.configFileName.description=Nom du fichier de configuration de chorem
 chorem.error.internal=
+chorem.gepeto.home=
 chorem.gepeto.project=Projet {0}
 chorem.gepeto.project.add=Ajouter un nouveau projet
 chorem.gepeto.project.description=Description
@@ -7,4 +8,4 @@
 chorem.gepeto.projectDetails.title=D\u00E9tails du projet {0}
 chorem.gepeto.projectsByYear.title=Projets de l''ann\u00E9e {0}
 chorem.gepeto.results.title=R\u00E9sultats par ann\u00E0e
-chorem.home=
+chorem.home=Accueil

Modified: trunk/chorem-web/src/main/resources/struts.xml
===================================================================
--- trunk/chorem-web/src/main/resources/struts.xml	2011-03-17 13:39:37 UTC (rev 22)
+++ trunk/chorem-web/src/main/resources/struts.xml	2011-03-17 14:28:49 UTC (rev 23)
@@ -6,36 +6,39 @@
     <constant name="struts.devMode" value="true" />
     <constant name="struts.ognl.allowStaticMethodAccess" value="true" />
   	
-    <package name="default" extends="struts-default">
-    
-    </package>
-
     <package name="chorem" namespace="/" extends="struts-default">
-        <action name="home" class="org.chorem.action.HomeAction">
+      	<default-action-ref name="home"  />
+        <action name="home">
             <result>/WEB-INF/jsp/home.jsp</result>
         </action>
     </package>
 <!--
     <package name="bonzoms" namespace="/bonzoms" extends="struts-default">
-        <action name="home" class="org.chorem.bonzoms.action.HomeAction">
+        <action name="home">
             <result>/WEB-INF/jsp/bonzoms/home.jsp</result>
         </action>
-    </package>
+    </package>-->
     
     <package name="gepeto" namespace="/gepeto" extends="struts-default">
-        <action name="home" class="org.chorem.gepeto.action.HomeAction">
+      	<default-action-ref name="home"  />
+        <action name="home">
             <result>/WEB-INF/jsp/gepeto/home.jsp</result>
         </action>
+        <action name="addProjectPage">
+            <result>/WEB-INF/jsp/gepeto/admin/addProject.jsp</result>
+        </action>
     </package>
     
-    <package name="billy" namespace="/billy" extends="struts-default">
-        <action name="home" class="org.chorem.billy.action.HomeAction">
+<!--<package name="billy" namespace="/billy" extends="struts-default">
+  	    <default-action-ref name="home"  />
+        <action name="home">
             <result>/WEB-INF/jsp/billy/home.jsp</result>
         </action>
     </package>
 
     <package name="cash" namespace="/cash" extends="struts-default">
-        <action name="home" class="org.chorem.cash.action.HomeAction">
+        <default-action-ref name="home"  />
+        <action name="home">
             <result>/WEB-INF/jsp/cash/home.jsp</result>
         </action>
     </package>

Added: trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/admin/addProject.jsp
===================================================================
--- trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/admin/addProject.jsp	                        (rev 0)
+++ trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/admin/addProject.jsp	2011-03-17 14:28:49 UTC (rev 23)
@@ -0,0 +1,28 @@
+<%@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.project.add" /></title>
+		<s:head />
+	</head>
+	<body>
+	    <h2><s:text name="chorem.gepeto.project.add" /></h2>
+	    <s:form action="addProject" method="post">
+	        <fieldset>
+	            <legend>
+	                <s:text name="chorem.gepeto.project">
+	                    <s:param></s:param>
+	                </s:text>
+	            </legend>
+	            <s:textfield key="chorem.gepeto.project.name" name="name" labelSeparator=": " />
+	            <br />
+	            <br />
+	            <s:textarea key="chorem.gepeto.project.description" name="description" cols="50" rows="10" labelposition="top" />
+	            <br />
+	            <s:submit key="chorem.gepeto.project.add" name="submit" />
+	        </fieldset>
+	    </s:form>
+	</body>
+</html>


Property changes on: trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/admin/addProject.jsp
___________________________________________________________________
Added: svn:mime-type
   + text/plain

Added: trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/home.jsp
===================================================================
--- trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/home.jsp	                        (rev 0)
+++ trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/home.jsp	2011-03-17 14:28:49 UTC (rev 23)
@@ -0,0 +1,12 @@
+<%@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>
+	</body>
+</html>


Property changes on: trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/home.jsp
___________________________________________________________________
Added: svn:mime-type
   + text/plain

Deleted: trunk/chorem-web/src/main/webapp/index.jsp
===================================================================
--- trunk/chorem-web/src/main/webapp/index.jsp	2011-03-17 13:39:37 UTC (rev 22)
+++ trunk/chorem-web/src/main/webapp/index.jsp	2011-03-17 14:28:49 UTC (rev 23)
@@ -1,7 +0,0 @@
-<html>
-    <head>
-        <title>Index</title>
-    </head>
-    <body>
-    </body>
-</html>
\ No newline at end of file

    

r23 - in trunk/chorem-web/src/main: i18n java/org/chorem/gepeto/action resources resources/i18n webapp webapp/WEB-INF/jsp/gepeto webapp/WEB-INF/jsp/gepeto/admin

vbriand＠users.chorem.org

tags

participants (1)