svn commit: r595127 - in /lenya/trunk/src/modules-core/acusecases: resources/ resources/i18n/ resources/i18n/cmsui.xml resources/i18n/cmsui_de.xml usecases/login.jx

Author: andreas
Date: Wed Nov 14 15:26:19 2007
New Revision: 595127

URL: http://svn.apache.org/viewvc?rev=595127&view=rev
Log:
Added i18n messages for login usecase error messages, removed dead code, don't lose username when an error occurs

Added:
    lenya/trunk/src/modules-core/acusecases/resources/
    lenya/trunk/src/modules-core/acusecases/resources/i18n/
    lenya/trunk/src/modules-core/acusecases/resources/i18n/cmsui.xml
    lenya/trunk/src/modules-core/acusecases/resources/i18n/cmsui_de.xml
Modified:
    lenya/trunk/src/modules-core/acusecases/usecases/login.jx

Added: lenya/trunk/src/modules-core/acusecases/resources/i18n/cmsui.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/acusecases/resources/i18n/cmsui.xml?rev=595127&view=auto
==============================================================================
--- lenya/trunk/src/modules-core/acusecases/resources/i18n/cmsui.xml (added)
+++ lenya/trunk/src/modules-core/acusecases/resources/i18n/cmsui.xml Wed Nov 14 15:26:19 2007
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<!-- $Id: cmsui.xml 446564 2006-09-15 10:13:16Z andreas $ -->
+
+<catalogue xml:lang="en" xmlns:xhtml="http://www.w3.org/1999/xhtml">
+
+  <message key="Please enter a user name.">Please enter a user name.</message>
+  <message key="Please enter a password.">Please enter a password.</message>
+  
+</catalogue>

Added: lenya/trunk/src/modules-core/acusecases/resources/i18n/cmsui_de.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/acusecases/resources/i18n/cmsui_de.xml?rev=595127&view=auto
==============================================================================
--- lenya/trunk/src/modules-core/acusecases/resources/i18n/cmsui_de.xml (added)
+++ lenya/trunk/src/modules-core/acusecases/resources/i18n/cmsui_de.xml Wed Nov 14 15:26:19 2007
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<!-- $Id: cmsui_de.xml 446564 2006-09-15 10:13:16Z andreas $ -->
+
+<catalogue xml:lang="de" xmlns:xhtml="http://www.w3.org/1999/xhtml">
+
+  <message key="Please enter a user name.">Bitte geben Sie einen Benutzernamen ein.</message>
+  <message key="Please enter a password.">Bitte geben Sie ein Passwort ein.</message>
+  
+</catalogue>
+

Modified: lenya/trunk/src/modules-core/acusecases/usecases/login.jx
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/acusecases/usecases/login.jx?rev=595127&r1=595126&r2=595127&view=diff
==============================================================================
--- lenya/trunk/src/modules-core/acusecases/usecases/login.jx (original)
+++ lenya/trunk/src/modules-core/acusecases/usecases/login.jx Wed Nov 14 15:26:19 2007
@@ -91,15 +91,11 @@
 
       <div class="lenya-box-body">
         <form name="login" id="login" method="post" action="?lenya.continuation=${continuation.id}&amp;lenya.usecase=${request.getParameter('lenya.usecase')}">
-<!--
-          <input type="hidden" name="lenya.continuation" value="${continuation.id}"/>
-          <input type="hidden" name="lenya.usecase" value="${request.getParameter('lenya.usecase')}"/>
--->
           <table class="lenya-table-noborder">
             <tr>
               <td><label for="name"><i18n:text>Username</i18n:text>: </label></td>
               <td>
-                <input class="lenya-form-element" name="username" type="text" />
+                <input class="lenya-form-element" name="username" type="text" value="${usecase.getParameter('username')}"/>
               </td>
             </tr>
             <tr>