dflorey 2004/08/09 09:44:32
Modified: projector/src/content/applications/admin/templates
createUserForm.tmpl createRoleForm.tmpl
projector/src/content/applications/admin/security login.xml
createRole.xml createUser.xml
projector/src/content/applications/admin/site listUsers.xml
projector/src/content/applications/admin/i18n text.xml
Log:
Some last bugfixes...
Revision Changes Path
1.2 +1 -1
jakarta-slide/projector/src/content/applications/admin/templates/createUserForm.tmpl
Index: createUserForm.tmpl
===================================================================
RCS file:
/home/cvs/jakarta-slide/projector/src/content/applications/admin/templates/createUserForm.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- createUserForm.tmpl 22 Jul 2004 12:18:37 -0000 1.1
+++ createUserForm.tmpl 9 Aug 2004 16:44:32 -0000 1.2
@@ -9,6 +9,6 @@
<%control:retypePassword%>
<?renderedErrors <tr><td><%renderedErrors%></td></tr>?>
<tr><td></td><td><%trigger:create%></td></tr>
-<table>
+</table>
</form>
<!--*** End of 'default form' ***-->
1.2 +1 -1
jakarta-slide/projector/src/content/applications/admin/templates/createRoleForm.tmpl
Index: createRoleForm.tmpl
===================================================================
RCS file:
/home/cvs/jakarta-slide/projector/src/content/applications/admin/templates/createRoleForm.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- createRoleForm.tmpl 22 Jul 2004 12:18:37 -0000 1.1
+++ createRoleForm.tmpl 9 Aug 2004 16:44:32 -0000 1.2
@@ -7,6 +7,6 @@
<%control:rolename%>
<?renderedErrors <tr><td><%renderedErrors%></td></tr>?>
<tr><td></td><td><%trigger:create%></td></tr>
-<table>
+</table>
</form>
<!--*** End of 'default form' ***-->
1.3 +2 -2
jakarta-slide/projector/src/content/applications/admin/security/login.xml
Index: login.xml
===================================================================
RCS file:
/home/cvs/jakarta-slide/projector/src/content/applications/admin/security/login.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- login.xml 4 Aug 2004 15:27:22 -0000 1.2
+++ login.xml 9 Aug 2004 16:44:32 -0000 1.3
@@ -36,7 +36,7 @@
<entry key="validate"><string>false</string></entry>
<entry key="step"><string>clearForm</string></entry>
<entry
key="trigger"><string>imageTrigger</string></entry>
- <entry key="image"><value processor="image"
result="url"><string>/contelligent/images/right.gif</string></value></entry>
+ <entry key="image"><value processor="image"
result="url"><string>/projector/applications/admin/images/button_cancel.png</string></value></entry>
</map>
</load>
<load parameter="trigger:login">
@@ -45,7 +45,7 @@
<entry key="validate"><string>true</string></entry>
<entry key="step"><string>login</string></entry>
<entry
key="trigger"><string>imageTrigger</string></entry>
- <entry key="image"><value processor="image"
result="url"><string>/contelligent/images/right.gif</string></value></entry>
+ <entry key="image"><value processor="image"
result="url"><string>/projector/applications/admin/images/button_ok.png</string></value></entry>
</map>
</load>
<save result="output" store="output" key="output" />
1.3 +2 -2
jakarta-slide/projector/src/content/applications/admin/security/createRole.xml
Index: createRole.xml
===================================================================
RCS file:
/home/cvs/jakarta-slide/projector/src/content/applications/admin/security/createRole.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- createRole.xml 4 Aug 2004 15:27:22 -0000 1.2
+++ createRole.xml 9 Aug 2004 16:44:32 -0000 1.3
@@ -10,7 +10,7 @@
<step id="form" processor="createRoleForm">
<load parameter="action"><string>createRole</string></load>
<load parameter="errorsProcessor"><string>errors</string></load>
- <load parameter="title"><string>Create role:</string></load>
+ <load parameter="title"><value
processor="message"><string>createRole</string></value></load>
<load parameter="locale"><value processor="localeResolver"
key="accept-language" store="request-header" /></load>
<load parameter="control:rolename">
<map>
@@ -24,7 +24,7 @@
<entry key="validate"><string>true</string></entry>
<entry key="step"><string>create</string></entry>
<entry
key="trigger"><string>imageTrigger</string></entry>
- <entry key="image"><value processor="image"
result="url"><string>/contelligent/images/right.gif</string></value></entry>
+ <entry key="image"><value processor="image"
result="url"><string>/projector/applications/admin/images/button_ok.png</string></value></entry>
</map>
</load>
<save result="output" store="output" key="output" />
1.3 +2 -2
jakarta-slide/projector/src/content/applications/admin/security/createUser.xml
Index: createUser.xml
===================================================================
RCS file:
/home/cvs/jakarta-slide/projector/src/content/applications/admin/security/createUser.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- createUser.xml 4 Aug 2004 15:27:22 -0000 1.2
+++ createUser.xml 9 Aug 2004 16:44:32 -0000 1.3
@@ -10,7 +10,7 @@
<step id="form" processor="createUserForm">
<load parameter="action"><string>createUser</string></load>
<load parameter="errorsProcessor"><string>errors</string></load>
- <load parameter="title"><string>Create account:</string></load>
+ <load parameter="title"><value
processor="message"><string>createUser</string></value></load>
<load parameter="locale"><value processor="localeResolver"
key="accept-language" store="request-header" /></load>
<load parameter="control:username">
<map>
@@ -38,7 +38,7 @@
<entry key="validate"><string>true</string></entry>
<entry key="step"><string>create</string></entry>
<entry
key="trigger"><string>imageTrigger</string></entry>
- <entry key="image"><value processor="image"
result="url"><string>/contelligent/images/right.gif</string></value></entry>
+ <entry key="image"><value processor="image"
result="url"><string>/projector/applications/admin/images/button_ok.png</string></value></entry>
</map>
</load>
<save result="output" store="output" key="output" />
1.3 +0 -6
jakarta-slide/projector/src/content/applications/admin/site/listUsers.xml
Index: listUsers.xml
===================================================================
RCS file:
/home/cvs/jakarta-slide/projector/src/content/applications/admin/site/listUsers.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- listUsers.xml 4 Aug 2004 15:27:22 -0000 1.2
+++ listUsers.xml 9 Aug 2004 16:44:32 -0000 1.3
@@ -18,12 +18,6 @@
<route state="noUsersAvailable" step="renderNoUser" />
</step>
- <step id="saveRenderUser" processor="echo">
- <load parameter="input"><value key="users" /></load>
- <save result="output" store="repository"
key="/files/Locale:{session:locale}locale:{session:locale}:users.xml" />
- <route state="ok" step="renderUser"/>
- </step>
-
<step id="renderUser" processor="table/default">
<load parameter="columns">
<array>
1.2 +65 -0
jakarta-slide/projector/src/content/applications/admin/i18n/text.xml
Index: text.xml
===================================================================
RCS file:
/home/cvs/jakarta-slide/projector/src/content/applications/admin/i18n/text.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- text.xml 22 Jul 2004 12:18:39 -0000 1.1
+++ text.xml 9 Aug 2004 16:44:32 -0000 1.2
@@ -48,4 +48,69 @@
<entry key="text">Roles available:</entry>
</locale>
</message>
+ <message id="createRole">
+ <locale language="de">
+ <entry key="text">Rolle anlegen</entry>
+ </locale>
+ <locale language="en">
+ <entry key="text">Create role</entry>
+ </locale>
+ </message>
+ <message id="createUser">
+ <locale language="de">
+ <entry key="text">Benutzer anlegen</entry>
+ </locale>
+ <locale language="en">
+ <entry key="text">Create user</entry>
+ </locale>
+ </message>
+ <message id="createRole/parameter/rolename">
+ <locale language="de">
+ <entry key="title">Rolle</entry>
+ <entry key="text">Bitte den Namen der Rolle angeben</entry>
+ <entry key="prompt">Name der Rolle:</entry>
+ </locale>
+ <locale language="en">
+ <entry key="title">Role</entry>
+ <entry key="text">Please enter the name of the role</entry>
+ <entry key="prompt">Enter role:</entry>
+ </locale>
+ </message>
+ <message id="create-user/username">
+ <locale language="de">
+ <entry key="title">Benutzer</entry>
+ <entry key="text">Bitte den Namen des Benutzers angeben</entry>
+ <entry key="prompt">Name des Benutzers;</entry>
+ </locale>
+ <locale language="en">
+ <entry key="title">Username</entry>
+ <entry key="text">Please enter the name of the user</entry>
+ <entry key="prompt">Enter username:</entry>
+ </locale>
+ </message>
+ <message id="create-user/password">
+ <locale language="de">
+ <entry key="title">Passwort</entry>
+ <entry key="text">Bitte geben Sie das Passwort dieses
Benutzers ein</entry>
+ <entry key="prompt">Password:</entry>
+ </locale>
+ <locale language="en">
+ <entry key="title">Password</entry>
+ <entry key="text">Please enter the password of the user</entry>
+ <entry key="prompt">Enter password:</entry>
+ </locale>
+ </message>
+ <message id="create-user/retyped-password">
+ <locale language="de">
+ <entry key="title">Passwort wiederholen</entry>
+ <entry key="text">Bitte wiederholen Sie das Passwort dieses
Benutzers</entry>
+ <entry key="prompt">Passwort wiederholen:</entry>
+ </locale>
+ <locale language="en">
+ <entry key="title">Password</entry>
+ <entry key="text">Please enter the password of the user</entry>
+ <entry key="prompt">Retype password:</entry>
+ </locale>
+ </message>
+
</messages>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
