You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by an...@apache.org on 2007/02/20 15:02:09 UTC
svn commit: r509567 - in /lenya/trunk/src/modules-core/sitemanagement:
resources/i18n/cmsui.xml resources/i18n/cmsui_de.xml usecases/tab/ac/ac.jx
usecases/tab/meta.jx
Author: andreas
Date: Tue Feb 20 06:02:08 2007
New Revision: 509567
URL: http://svn.apache.org/viewvc?view=rev&rev=509567
Log:
Fixed some layout and i18n problems
Modified:
lenya/trunk/src/modules-core/sitemanagement/resources/i18n/cmsui.xml
lenya/trunk/src/modules-core/sitemanagement/resources/i18n/cmsui_de.xml
lenya/trunk/src/modules-core/sitemanagement/usecases/tab/ac/ac.jx
lenya/trunk/src/modules-core/sitemanagement/usecases/tab/meta.jx
Modified: lenya/trunk/src/modules-core/sitemanagement/resources/i18n/cmsui.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/sitemanagement/resources/i18n/cmsui.xml?view=diff&rev=509567&r1=509566&r2=509567
==============================================================================
--- lenya/trunk/src/modules-core/sitemanagement/resources/i18n/cmsui.xml (original)
+++ lenya/trunk/src/modules-core/sitemanagement/resources/i18n/cmsui.xml Tue Feb 20 06:02:08 2007
@@ -34,5 +34,11 @@
<message key="no-assets">No assets uploaded yet.</message>
<message key="Editor">Editor</message>
<message key="missing-languages">Missing Languages<br/> (click to create)</message>
+ <message key="Namespace">Namespace</message>
+ <message key="http://purl.org/dc/terms/">Dublin Core Terms</message>
+ <message key="http://purl.org/dc/elements/1.1/">Dublin Core Elements</message>
+ <message key="Inherited credentials">Inherited credentials</message>
+ <message key="Subtree credentials">Subtree credentials</message>
+ <message key="New subtree credential">New subtree credential</message>
</catalogue>
Modified: lenya/trunk/src/modules-core/sitemanagement/resources/i18n/cmsui_de.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/sitemanagement/resources/i18n/cmsui_de.xml?view=diff&rev=509567&r1=509566&r2=509567
==============================================================================
--- lenya/trunk/src/modules-core/sitemanagement/resources/i18n/cmsui_de.xml (original)
+++ lenya/trunk/src/modules-core/sitemanagement/resources/i18n/cmsui_de.xml Tue Feb 20 06:02:08 2007
@@ -34,6 +34,12 @@
<message key="no-assets">Es wurden noch keine Anlagen hochgeladen.</message>
<message key="Editor">Bearbeiter</message>
<message key="missing-languages">Fehlende Sprachen<br/> (Klicken zum Erstellen)</message>
+ <message key="Namespace">Namensraum</message>
+ <message key="http://purl.org/dc/terms/">Dublin-Core-Terme</message>
+ <message key="http://purl.org/dc/elements/1.1/">Dublin-Core-Elemente</message>
+ <message key="Inherited credentials">Vererbte Berechtigungen</message>
+ <message key="Subtree credentials">Berechtigungen für diesen Teilbaum</message>
+ <message key="New subtree credential">Neue Berechtigung für diesen Teilbaum</message>
</catalogue>
Modified: lenya/trunk/src/modules-core/sitemanagement/usecases/tab/ac/ac.jx
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/sitemanagement/usecases/tab/ac/ac.jx?view=diff&rev=509567&r1=509566&r2=509567
==============================================================================
--- lenya/trunk/src/modules-core/sitemanagement/usecases/tab/ac/ac.jx (original)
+++ lenya/trunk/src/modules-core/sitemanagement/usecases/tab/ac/ac.jx Tue Feb 20 06:02:08 2007
@@ -52,16 +52,16 @@
</td>
</tr>
<tr>
- <th colspan="5">
+ <td colspan="5">
<jx:import
uri="fallback://lenya/modules/sitemanagement/usecases/tab/ac/ssl-form.jx"/>
- </th>
+ </td>
</tr>
<tr>
<td colspan="5" style="border-left: 0; border-right: 0;">
- <p style="margin: 30px 0 0 0;">
+ <h4 style="margin: 30px 0 0 0;">
<i18n:text>Inherited credentials</i18n:text>
- </p>
+ </h4>
</td>
</tr>
<tr>
@@ -93,9 +93,9 @@
<tr>
<td colspan="5" style="border-left: 0; border-right: 0;">
- <p style="margin: 30px 0 0 0;">
+ <h4 style="margin: 30px 0 0 0;">
<i18n:text>Subtree credentials</i18n:text>
- </p>
+ </h4>
</td>
</tr>
<tr>
@@ -155,9 +155,9 @@
<tr>
<td colspan="5" style="border-left: 0; border-right: 0; border-top: 0px;">
- <p style="margin: 30px 0 0 0;">
+ <h4 style="margin: 30px 0 0 0;">
<i18n:text>New subtree credential</i18n:text>
- </p>
+ </h4>
</td>
</tr>
<tr>
Modified: lenya/trunk/src/modules-core/sitemanagement/usecases/tab/meta.jx
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/sitemanagement/usecases/tab/meta.jx?view=diff&rev=509567&r1=509566&r2=509567
==============================================================================
--- lenya/trunk/src/modules-core/sitemanagement/usecases/tab/meta.jx (original)
+++ lenya/trunk/src/modules-core/sitemanagement/usecases/tab/meta.jx Tue Feb 20 06:02:08 2007
@@ -27,8 +27,37 @@
<jx:import uri="fallback://lenya/modules/sitemanagement/usecases/tab/sitetree.jx"/>
<jx:import uri="fallback://lenya/modules/usecase/templates/tabs.jx"/>
<div id="contentblock1" class="lenya-tab-sitetree">
- <h1><i18n:text>Meta Data</i18n:text></h1>
- <form id="form-meta">
+ <h1 id="form-meta" style="width: 600px"><i18n:text>Meta Data</i18n:text></h1>
+ <form>
+
+ <jx:set var="num2namespace" value="${usecase.getParameter('namespaces')}"/>
+
+ <jx:import uri="fallback://lenya/modules/usecase/templates/messages.jx"/>
+
+ <jx:forEach var="num" items="${usecase.getParameter('numbers')}">
+ <div class="lenya-box-toggled">
+ <div class="lenya-box-title">
+ <!--<i18n:text>Namespace</i18n:text>:-->
+ <i18n:text><jx:out value="${num2namespace.get(num)}"/></i18n:text>
+ </div>
+ <div class="lenya-box-body">
+ <table class="lenya-table-list-noborder">
+ <jx:forEach var="key" items="${usecase.getParameter('keys')}">
+ <jx:if test="${key.startsWith('ns' + num + '.')}">
+ <tr>
+ <td class="lenya-entry-caption"><label for="${key}"><i18n:text><jx:out value="${key.substring(key.indexOf('.')).substring(1)}"/></i18n:text>:</label></td>
+ <td>
+ <input type="text" id="${key}" name="${key}" class="lenya-form-element" value="${usecase.getParameter(key)}"/>
+ </td>
+ </tr>
+ </jx:if>
+ </jx:forEach>
+ </table>
+ </div>
+ </div>
+ </jx:forEach>
+
+ <!--
<table class="lenya-table-noborder">
<tr>
<td colspan="2">
@@ -36,8 +65,6 @@
</td>
</tr>
- <jx:set var="num2namespace" value="${usecase.getParameter('namespaces')}"/>
-
<jx:forEach var="num" items="${usecase.getParameter('numbers')}">
<tr>
@@ -78,6 +105,18 @@
</td>
</tr>
</table>
+ -->
+
+ <jx:choose>
+ <jx:when
+ test="${usecase.getParameter('document').getArea().equals('authoring') && ! usecase.hasErrors()}">
+ <input i18n:attr="value" name="submit" type="submit" value="Save"/>
+ </jx:when>
+ <jx:otherwise>
+ <input i18n:attr="value" name="submit" type="submit" disabled="disabled" value="Save"/>
+ </jx:otherwise>
+ </jx:choose>
+
<input type="hidden" name="lenya.usecase" value="${request.getParameter('lenya.usecase')}"/>
<input type="hidden" name="lenya.continuation" value="${continuation.id}"/>
</form>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org