svn commit: r598694 - in /lenya/trunk/src/modules/editors: resources/i18n/cmsui.xml resources/i18n/cmsui_de.xml usecases/forms/form-layout.xsl usecases/forms/forms.jx

[email protected]
Newsgroups gmane.comp.cms.lenya.cvs
Message-ID <[email protected]> 
Author: andreas
Date: Tue Nov 27 09:03:41 2007
New Revision: 598694

URL: http://svn.apache.org/viewvc?rev=598694&view=rev
Log:
Fixed i18n for forms editor, removed outdated information box

Modified:
    lenya/trunk/src/modules/editors/resources/i18n/cmsui.xml
    lenya/trunk/src/modules/editors/resources/i18n/cmsui_de.xml
    lenya/trunk/src/modules/editors/usecases/forms/form-layout.xsl
    lenya/trunk/src/modules/editors/usecases/forms/forms.jx

Modified: lenya/trunk/src/modules/editors/resources/i18n/cmsui.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/editors/resources/i18n/cmsui.xml?rev=598694&r1=598693&r2=598694&view=diff
==============================================================================
--- lenya/trunk/src/modules/editors/resources/i18n/cmsui.xml (original)
+++ lenya/trunk/src/modules/editors/resources/i18n/cmsui.xml Tue Nov 27 09:03:41 2007
@@ -47,5 +47,7 @@
   <message key="insertAsset.height">height</message>
   <message key="insertAsset.insertAsset">Insert asset</message>
   <message key="insertAsset.insertImage">Insert image</message>
-  <message key="insertAsset.createResource">Upload new resource</message>
+  <message key="insertAsset.createResource">Upload new resource</message>
+  
+  <message key="Choose element ...">Choose element ...</message>
 </catalogue>

Modified: lenya/trunk/src/modules/editors/resources/i18n/cmsui_de.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/editors/resources/i18n/cmsui_de.xml?rev=598694&r1=598693&r2=598694&view=diff
==============================================================================
--- lenya/trunk/src/modules/editors/resources/i18n/cmsui_de.xml (original)
+++ lenya/trunk/src/modules/editors/resources/i18n/cmsui_de.xml Tue Nov 27 09:03:41 2007
@@ -48,4 +48,6 @@
   <message key="insertAsset.insertAsset">Anlage einfügen</message>
   <message key="insertAsset.insertImage">Bild einfügen</message>
   <message key="insertAsset.createResource">Neue Datei hochladen...</message>
+
+  <message key="Choose element ...">Element wählen ...</message>
 </catalogue>

Modified: lenya/trunk/src/modules/editors/usecases/forms/form-layout.xsl
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/editors/usecases/forms/form-layout.xsl?rev=598694&r1=598693&r2=598694&view=diff
==============================================================================
--- lenya/trunk/src/modules/editors/usecases/forms/form-layout.xsl (original)
+++ lenya/trunk/src/modules/editors/usecases/forms/form-layout.xsl Tue Nov 27 09:03:41 2007
@@ -20,6 +20,7 @@
 
 <xsl:stylesheet version="1.0"
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
   xmlns="http://www.w3.org/1999/xhtml"
 >
 
@@ -32,6 +33,14 @@
 <xsl:variable name="imagesPath"><xsl:value-of select="$contextPrefix"/>/lenya/images/editor</xsl:variable>
 
 <xsl:include href="copy-mixed-content.xsl"/>
+  
+  
+  <xsl:template name="buttons">
+    <input type="submit" value="Save" name="submit" i18n:attr="value"/>
+    <xsl:text> </xsl:text>
+    <input type="submit" value="Cancel" name="cancel" i18n:attr="value"/>
+  </xsl:template>
+
 
 <xsl:template match="form">
 <div>
@@ -47,7 +56,7 @@
         <xsl:apply-templates select="//*" mode="namespaces" />
       </xsl:attribute>
     </input>
-    <input type="submit" value="SAVE" name="submit"/>&#160;<input type="submit" value="CANCEL" name="cancel"/>
+    <xsl:call-template name="buttons"/>
   </div>
   <div class="lenya-box-body">
   
@@ -57,7 +66,7 @@
 
   </div>
   <div class="lenya-box-title" style="text-align: right">
-    <input type="submit" value="SAVE" name="submit"/>&#160;<input type="submit" value="CANCEL" name="cancel"/>
+    <xsl:call-template name="buttons"/>
   </div>
 </div>
 
@@ -125,7 +134,7 @@
 
 <xsl:template match="insert-before" mode="nodes">
     <tr>
-      <td style="background-color: #BFBFA2"><input type="submit" value="INSERT BEFORE" name="insert-before"/></td>
+      <td style="background-color: #BFBFA2"><input type="submit" value="Insert before" name="insert-before" i18n:attr="value"/></td>
       <td colspan="2" style="background-color: #DCDBBF">
         <select name="&lt;xupdate:insert-before select=&quot;{@select}&quot;/&gt;" size="1">
             <option value="null">Choose element ...</option>
@@ -139,10 +148,10 @@
 
 <xsl:template match="insert-after" mode="nodes">
     <tr>
-      <td style="background-color: #BFBFA2"><input type="submit" value="INSERT" name="insert-after"/></td>
+      <td style="background-color: #BFBFA2"><input type="submit" value="Insert" name="insert-after" i18n:attr="value"/></td>
       <td colspan="2" style="background-color: #DCDBBF">
         <select name="&lt;xupdate:insert-after select=&quot;{@select}&quot;/&gt;" size="1">
-            <option value="null">Choose element ...</option>
+          <option value="null"><i18n:text>Choose element ...</i18n:text></option>
           <xsl:for-each select="element">
             <option value="{@xupdate}"><xsl:value-of select="@name"/></option>
           </xsl:for-each>

Modified: lenya/trunk/src/modules/editors/usecases/forms/forms.jx
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/editors/usecases/forms/forms.jx?rev=598694&r1=598693&r2=598694&view=diff
==============================================================================
--- lenya/trunk/src/modules/editors/usecases/forms/forms.jx (original)
+++ lenya/trunk/src/modules/editors/usecases/forms/forms.jx Tue Nov 27 09:03:41 2007
@@ -38,37 +38,13 @@
       <jx:choose>
         <jx:when test="${! usecase.hasErrors()}">
           
-          <div class="lenya-box">
-            <div class="lenya-box-title">Information</div>
-            <div class="lenya-box-body">
-              <table class="lenya-table-noborder">
-                <tr>
-                  <td class="lenya-entry-caption">Document:</td>
-                  <td><jx:out value="${usecase.getParameter('document').getId()}"/></td>
-                </tr>
-                <tr>
-                  <td class="lenya-entry-caption">Form:</td>
-                  <td><jx:out value="${usecase.getParameter('form')}"/></td>
-                </tr>
-                <tr>
-                  <td class="lenya-entry-caption">Node:</td>
-                  <td><jx:out value="${usecase.getParameter('editSelect')}"/></td>
-                </tr>
-                <tr>
-                  <td class="lenya-entry-caption">Workflow Event:</td>
-                  <jx:set var="event" value="${request.getParameter('lenya.event')}"/>
-                  <jx:choose>
-                    <jx:when test="${event.equals('') || event.equals('null')}">
-                      <td>No workflow event specified</td>
-                    </jx:when>
-                    <jx:otherwise>
-                      <td><jx:out value="${event}"/></td>
-                    </jx:otherwise>
-                  </jx:choose>
-                </tr>
-              </table>
-            </div>
-          </div>
+          <p>
+            <jx:set var="title"
+              value="${usecase.getParameter('document')
+              .getMetaData('http://purl.org/dc/elements/1.1/')
+              .getFirstValue('title')}"/>
+            <i18n:text>Document</i18n:text>: <q><jx:out value="${title}"/></q>
+          </p>
           
           <cinclude:includexml>
             <cinclude:src>cocoon://modules/editors/form/<jx:out value="${usecase.getParameter('form')}"/>/<jx:out value="${usecase.getParameter('editSelect')}"/></cinclude:src>
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.