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 12:59:49 UTC
svn commit: r509523 - in /lenya/trunk/src:
modules-core/administration/resources/
modules-core/administration/resources/i18n/
modules-core/administration/usecases/
modules-core/sitemanagement/resources/i18n/
modules-core/sitemanagement/usecases/tab/ mo...
Author: andreas
Date: Tue Feb 20 03:59:48 2007
New Revision: 509523
URL: http://svn.apache.org/viewvc?view=rev&rev=509523
Log:
Various little layout and i18n improvements for usecases
Added:
lenya/trunk/src/modules-core/administration/resources/
lenya/trunk/src/modules-core/administration/resources/i18n/
lenya/trunk/src/modules-core/administration/resources/i18n/cmsui.xml
lenya/trunk/src/modules-core/administration/resources/i18n/cmsui_de.xml
Modified:
lenya/trunk/src/modules-core/administration/usecases/emptyTrash.jx
lenya/trunk/src/modules-core/administration/usecases/groups.jx
lenya/trunk/src/modules-core/administration/usecases/ipRanges.jx
lenya/trunk/src/modules-core/administration/usecases/sessions.jx
lenya/trunk/src/modules-core/administration/usecases/siteOverview.jx
lenya/trunk/src/modules-core/administration/usecases/usecases.jx
lenya/trunk/src/modules-core/administration/usecases/users.jx
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/assets.jx
lenya/trunk/src/modules-core/sitemanagement/usecases/tab/meta.jx
lenya/trunk/src/modules-core/sitemanagement/usecases/tab/overview.jx
lenya/trunk/src/modules-core/sitemanagement/usecases/tab/revisions.jx
lenya/trunk/src/modules-core/sitemanagement/usecases/tab/scheduler.jx
lenya/trunk/src/modules-core/sitemanagement/usecases/tab/workflow.jx
lenya/trunk/src/modules/notification/usecases/inbox.jx
lenya/trunk/src/pubs/default/config/publication.xconf
lenya/trunk/src/webapp/lenya/resources/css/tables.css
lenya/trunk/src/webapp/lenya/resources/css/tabs.css
Added: lenya/trunk/src/modules-core/administration/resources/i18n/cmsui.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/administration/resources/i18n/cmsui.xml?view=auto&rev=509523
==============================================================================
--- lenya/trunk/src/modules-core/administration/resources/i18n/cmsui.xml (added)
+++ lenya/trunk/src/modules-core/administration/resources/i18n/cmsui.xml Tue Feb 20 03:59:48 2007
@@ -0,0 +1,29 @@
+<?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="Documents in trash">Documents in trash</message>
+ <message key="The trash is empty.">The trash is empty.</message>
+ <message key="Sessions">Sessions</message>
+ <message key="Path">Path</message>
+ <message key="Inbox">Inbox</message>
+
+</catalogue>
Added: lenya/trunk/src/modules-core/administration/resources/i18n/cmsui_de.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/administration/resources/i18n/cmsui_de.xml?view=auto&rev=509523
==============================================================================
--- lenya/trunk/src/modules-core/administration/resources/i18n/cmsui_de.xml (added)
+++ lenya/trunk/src/modules-core/administration/resources/i18n/cmsui_de.xml Tue Feb 20 03:59:48 2007
@@ -0,0 +1,30 @@
+<?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="Documents in trash">Dokumente im Papierkorb</message>
+ <message key="The trash is empty.">Der Papierkorb ist leer.</message>
+ <message key="Sessions">Sitzungen</message>
+ <message key="Path">Pfad</message>
+ <message key="Inbox">Posteingang</message>
+
+</catalogue>
+
Modified: lenya/trunk/src/modules-core/administration/usecases/emptyTrash.jx
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/administration/usecases/emptyTrash.jx?view=diff&rev=509523&r1=509522&r2=509523
==============================================================================
--- lenya/trunk/src/modules-core/administration/usecases/emptyTrash.jx (original)
+++ lenya/trunk/src/modules-core/administration/usecases/emptyTrash.jx Tue Feb 20 03:59:48 2007
@@ -36,16 +36,27 @@
<i18n:text>The trash is empty.</i18n:text>
</jx:when>
<jx:otherwise>
- <strong><i18n:text>Documents in trash</i18n:text>:</strong>
- <ul style="list-style-type: none">
+ <table class="lenya-table-list-noborder">
+ <tr>
+ <th colspan="2"><i18n:text>Documents in trash</i18n:text></th>
+ </tr>
<jx:forEach var="document" items="${usecase.getParameter('documents')}">
- <li><jx:out value="${document.getId()}"/></li>
+ <tr>
+ <td>
+ <jx:if test="${document.hasLink()}">
+ <jx:out value="${document.getPath()}"/>
+ </jx:if>
+ </td>
+ <td>
+ <jx:out value="${document.getMetaData('http://purl.org/dc/elements/1.1/').getFirstValue('title')}"/>
+ </td>
+ </tr>
</jx:forEach>
- </ul>
+ </table>
</jx:otherwise>
</jx:choose>
</p>
- <form id="form-delete_trash">
+ <form id="form-delete_trash" style="margin-top: 20px">
<input type="hidden" name="lenya.continuation" value="${continuation.id}"/>
<input type="hidden" name="lenya.usecase" value="${request.getParameter('lenya.usecase')}"/>
<jx:choose>
Modified: lenya/trunk/src/modules-core/administration/usecases/groups.jx
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/administration/usecases/groups.jx?view=diff&rev=509523&r1=509522&r2=509523
==============================================================================
--- lenya/trunk/src/modules-core/administration/usecases/groups.jx (original)
+++ lenya/trunk/src/modules-core/administration/usecases/groups.jx Tue Feb 20 03:59:48 2007
@@ -38,7 +38,7 @@
</tr>
</table>
- <div style="margin: 10px 0px">
+ <div style="margin-bottom: 10px">
<table class="lenya-table-noborder">
<tr>
<td style="padding: 0px">
@@ -51,11 +51,11 @@
</table>
</div>
- <table cellspacing="0" class="lenya-table-list">
+ <table cellspacing="0" class="lenya-table-list-noborder">
<tr>
<th><i18n:text>Group ID</i18n:text></th>
<th><i18n:text>Name</i18n:text></th>
- <th></th>
+ <th><i18n:text>Actions</i18n:text></th>
</tr>
<jx:forEach var="group" items="${usecase.getParameter('groups')}">
<tr>
@@ -63,6 +63,7 @@
<a href="${request.contextPath}${request.requestURI}?lenya.usecase=admin.group&groupId=${group.getId()}"><jx:out value="${group.getId()}"/></a>
</td>
<td style="vertical-align: middle">
+ <jx:if test="${group.getName().equals('')}"><span style="color: #999999">--</span></jx:if>
<jx:out value="${group.getName()}"/>
</td>
<td style="vertical-align: middle">
Modified: lenya/trunk/src/modules-core/administration/usecases/ipRanges.jx
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/administration/usecases/ipRanges.jx?view=diff&rev=509523&r1=509522&r2=509523
==============================================================================
--- lenya/trunk/src/modules-core/administration/usecases/ipRanges.jx (original)
+++ lenya/trunk/src/modules-core/administration/usecases/ipRanges.jx Tue Feb 20 03:59:48 2007
@@ -38,25 +38,19 @@
</tr>
</table>
- <div style="margin: 10px 0px">
- <table class="lenya-table-noborder">
- <tr>
- <td>
- <form method="GET" id="form-add_iprange">
- <input type="hidden" name="lenya.usecase" value="admin.addIPRange"/>
- <input i18n:attr="value" type="submit" value="Add IP Range" name="input-add_iprange"/>
- </form>
- </td>
- </tr>
- </table>
+ <div style="margin-bottom: 10px">
+ <form method="GET" id="form-add_iprange">
+ <input type="hidden" name="lenya.usecase" value="admin.addIPRange"/>
+ <input i18n:attr="value" type="submit" value="Add IP Range" name="input-add_iprange"/>
+ </form>
</div>
- <table cellspacing="0" class="lenya-table">
+ <table cellspacing="0" class="lenya-table-list-noborder">
<tr>
<th><i18n:text>IP Range ID</i18n:text></th>
<th><i18n:text>Name</i18n:text></th>
<th><i18n:text>Groups</i18n:text></th>
- <th></th>
+ <th><i18n:text>Actions</i18n:text></th>
</tr>
<jx:forEach var="ipRange" items="${usecase.getParameter('ipRanges')}">
<tr>
@@ -67,6 +61,7 @@
<jx:out value="${ipRange.getName()}"/>
</td>
<td>
+ <jx:if test="${ipRange.getGroups().size() == 0}"><span style="color: #999999">--</span></jx:if>
<jx:forEach var="group" items="${ipRange.getGroups()}">
<a href="${request.contextPath}${request.requestURI}?lenya.usecase=admin.groupProfile&groupId=${group.getId()}"><jx:out value="${group.getId()}"/></a>
</jx:forEach>
Modified: lenya/trunk/src/modules-core/administration/usecases/sessions.jx
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/administration/usecases/sessions.jx?view=diff&rev=509523&r1=509522&r2=509523
==============================================================================
--- lenya/trunk/src/modules-core/administration/usecases/sessions.jx (original)
+++ lenya/trunk/src/modules-core/administration/usecases/sessions.jx Tue Feb 20 03:59:48 2007
@@ -27,6 +27,8 @@
<page:body>
<jx:import uri="fallback://lenya/modules/usecase/templates/tabs.jx"/>
<div id="contentblock1" class="lenya-tab">
+
+ <h1><i18n:text>Sessions</i18n:text></h1>
<table class="lenya-table-noborder">
<tr>
@@ -36,7 +38,7 @@
</tr>
</table>
- <table cellspacing="0" class="lenya-table">
+ <table cellspacing="0" class="lenya-table-list-noborder">
<tr>
<th><i18n:text>User ID</i18n:text></th>
<th><i18n:text>Full Name</i18n:text></th>
Modified: lenya/trunk/src/modules-core/administration/usecases/siteOverview.jx
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/administration/usecases/siteOverview.jx?view=diff&rev=509523&r1=509522&r2=509523
==============================================================================
--- lenya/trunk/src/modules-core/administration/usecases/siteOverview.jx (original)
+++ lenya/trunk/src/modules-core/administration/usecases/siteOverview.jx Tue Feb 20 03:59:48 2007
@@ -66,7 +66,7 @@
</div>
</div>
- <table class="lenya-table">
+ <table class="lenya-table-list-noborder">
<tr>
<jx:forEach var="key" items="${usecase.getParameter('keys')}">
Modified: lenya/trunk/src/modules-core/administration/usecases/usecases.jx
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/administration/usecases/usecases.jx?view=diff&rev=509523&r1=509522&r2=509523
==============================================================================
--- lenya/trunk/src/modules-core/administration/usecases/usecases.jx (original)
+++ lenya/trunk/src/modules-core/administration/usecases/usecases.jx Tue Feb 20 03:59:48 2007
@@ -48,7 +48,7 @@
</p>
</jx:if>
<jx:import uri="fallback://lenya/modules/usecase/templates/messages.jx"/>
- <table class="lenya-table">
+ <table class="lenya-table-list-noborder">
<jx:set var="i" value="0"/>
<jx:forEach var="usecaseName" items="${usecase.getParameter('usecases')}">
<jx:if test="${i % 10 == 0}">
Modified: lenya/trunk/src/modules-core/administration/usecases/users.jx
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/administration/usecases/users.jx?view=diff&rev=509523&r1=509522&r2=509523
==============================================================================
--- lenya/trunk/src/modules-core/administration/usecases/users.jx (original)
+++ lenya/trunk/src/modules-core/administration/usecases/users.jx Tue Feb 20 03:59:48 2007
@@ -36,7 +36,7 @@
</tr>
</table>
- <div style="margin: 10px 0;">
+ <div style="margin-bottom: 10px;">
<table class="lenya-table-noborder">
<tr>
<td style="padding: 0; margin: 0 10px 0 0;">
@@ -56,12 +56,12 @@
</table>
</div>
- <table cellspacing="0" class="lenya-table-list">
+ <table cellspacing="0" class="lenya-table-list-noborder">
<tr>
<th><i18n:text>User ID</i18n:text></th>
<th><i18n:text>Full Name</i18n:text></th>
<th><i18n:text>Groups</i18n:text></th>
- <th></th>
+ <th><i18n:text>Actions</i18n:text></th>
</tr>
<jx:forEach var="user" items="${usecase.getParameter('users')}">
<tr>
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=509523&r1=509522&r2=509523
==============================================================================
--- lenya/trunk/src/modules-core/sitemanagement/resources/i18n/cmsui.xml (original)
+++ lenya/trunk/src/modules-core/sitemanagement/resources/i18n/cmsui.xml Tue Feb 20 03:59:48 2007
@@ -30,5 +30,8 @@
<message key="Relation">Relation</message>
<message key="Page Layout">Page Layout</message>
<message key="Document Path">Path</message>
+ <message key="Meta Data">Meta Data</message>
+ <message key="no-assets">No assets uploaded yet.</message>
+ <message key="Editor">Editor</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=509523&r1=509522&r2=509523
==============================================================================
--- 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 03:59:48 2007
@@ -30,6 +30,9 @@
<message key="Relation">Relation</message>
<message key="Page Layout">Seitenlayout</message>
<message key="Document Path">Pfad</message>
+ <message key="Meta Data">Meta-Daten</message>
+ <message key="no-assets">Es wurden noch keine Anlagen hochgeladen.</message>
+ <message key="Editor">Bearbeiter</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=509523&r1=509522&r2=509523
==============================================================================
--- 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 03:59:48 2007
@@ -31,6 +31,8 @@
<jx:set var="area" value="${usecase.getParameter('acArea')}"/>
<div id="contentblock1" class="lenya-tab-sitetree">
+
+ <h1><i18n:text><jx:out value="${usecase.getView().getTab().getLabel()}"/></i18n:text></h1>
<!--
<div class="lenya-box-toggled">
Modified: lenya/trunk/src/modules-core/sitemanagement/usecases/tab/assets.jx
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/sitemanagement/usecases/tab/assets.jx?view=diff&rev=509523&r1=509522&r2=509523
==============================================================================
--- lenya/trunk/src/modules-core/sitemanagement/usecases/tab/assets.jx (original)
+++ lenya/trunk/src/modules-core/sitemanagement/usecases/tab/assets.jx Tue Feb 20 03:59:48 2007
@@ -28,42 +28,51 @@
<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>Assets</i18n:text></h1>
- <table class="lenya-table">
- <tr>
- <th><i18n:text>Title</i18n:text></th>
- <th><i18n:text>Preview</i18n:text></th>
- <th><i18n:text>File Size</i18n:text></th>
- <th><i18n:text>Dimension (w x h)</i18n:text></th>
- <th><i18n:text>Creation Date</i18n:text></th>
- </tr>
- <jx:forEach var="doc" items="${usecase.getParameter('resourceDocuments')}">
- <tr>
- <jx:set var="title" value="${doc.getMetaData('http://purl.org/dc/elements/1.1/').getFirstValue('title')}"/>
- <td>
- <a href="${request.getContextPath()}${doc.getCanonicalWebappURL()}"><jx:out value="${title}"/></a>
- </td>
- <td>
- <jx:set var="mimeType" value="${doc.getMimeType()}"/>
- <jx:if test="${mimeType.startsWith('image/')}">
- <jx:set var="extension" value="${doc.getSourceExtension()}"/>
- <jx:set var="url" value="${doc.getCanonicalWebappURL()}"/>
- <jx:set var="imageUrl" value="${url.replaceFirst('\.html', '\.' + extension)}"/>
- <img src="${request.getContextPath()}${imageUrl}"
- style="height: 32px; vertical-align: middle;"/> 
- </jx:if>
- </td>
- <td align="right"><jx:out value="${doc.getContentLength() / 1000}"/> kB</td>
- <td align="right">
- <jx:if test="${mimeType.startsWith('image/')}">
- <jx:set var="mediaMeta" value="${doc.getMetaData('http://apache.org/lenya/metadata/media/1.0')}"/>
- <jx:out value="${mediaMeta.getFirstValue('width')}"/> x <jx:out value="${mediaMeta.getFirstValue('height')}"/>
- </jx:if>
- </td>
- <td align="right"><jx:out value="${java.text.DateFormat.getDateInstance().format(doc.getLastModified())}"/></td>
- </tr>
- </jx:forEach>
- </table>
+ <jx:choose>
+ <jx:when test="${usecase.getParameter('resourceDocuments').size() == 0}">
+ <i18n:text>no-assets</i18n:text>
+ </jx:when>
+ <jx:otherwise>
+ <table class="lenya-table-list-noborder">
+ <tr>
+ <th><i18n:text>Title</i18n:text></th>
+ <th><i18n:text>Preview</i18n:text></th>
+ <th><i18n:text>File Size</i18n:text></th>
+ <th><i18n:text>Dimension (w x h)</i18n:text></th>
+ <th><i18n:text>Creation Date</i18n:text></th>
+ </tr>
+ <jx:forEach var="doc" items="${usecase.getParameter('resourceDocuments')}">
+ <tr>
+ <jx:set var="title" value="${doc.getMetaData('http://purl.org/dc/elements/1.1/').getFirstValue('title')}"/>
+ <td>
+ <a href="${request.getContextPath()}${doc.getCanonicalWebappURL()}"><jx:out value="${title}"/></a>
+ </td>
+ <td>
+ <jx:set var="mimeType" value="${doc.getMimeType()}"/>
+ <jx:if test="${mimeType.startsWith('image/')}">
+ <jx:set var="extension" value="${doc.getSourceExtension()}"/>
+ <jx:set var="url" value="${doc.getCanonicalWebappURL()}"/>
+ <jx:set var="imageUrl" value="${url.replaceFirst('\.html', '\.' + extension)}"/>
+ <img src="${request.getContextPath()}${imageUrl}"
+ style="height: 32px; vertical-align: middle;"/> 
+ </jx:if>
+ </td>
+ <td align="right"><jx:out value="${doc.getContentLength() / 1000}"/> kB</td>
+ <td align="right">
+ <jx:if test="${mimeType.startsWith('image/')}">
+ <jx:set var="mediaMeta" value="${doc.getMetaData('http://apache.org/lenya/metadata/media/1.0')}"/>
+ <jx:out value="${mediaMeta.getFirstValue('width')}"/> x <jx:out value="${mediaMeta.getFirstValue('height')}"/>
+ </jx:if>
+ </td>
+ <td align="right"><jx:out value="${java.text.DateFormat.getDateInstance().format(doc.getLastModified())}"/></td>
+ </tr>
+ </jx:forEach>
+ </table>
+ </jx:otherwise>
+ </jx:choose>
<jx:if test="${usecase.getParameter('document').getArea().equals('authoring')}">
<form method="GET" id="form-add_asset" style="margin-top: 20px">
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=509523&r1=509522&r2=509523
==============================================================================
--- lenya/trunk/src/modules-core/sitemanagement/usecases/tab/meta.jx (original)
+++ lenya/trunk/src/modules-core/sitemanagement/usecases/tab/meta.jx Tue Feb 20 03:59:48 2007
@@ -27,6 +27,7 @@
<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">
<table class="lenya-table-noborder">
<tr>
Modified: lenya/trunk/src/modules-core/sitemanagement/usecases/tab/overview.jx
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/sitemanagement/usecases/tab/overview.jx?view=diff&rev=509523&r1=509522&r2=509523
==============================================================================
--- lenya/trunk/src/modules-core/sitemanagement/usecases/tab/overview.jx (original)
+++ lenya/trunk/src/modules-core/sitemanagement/usecases/tab/overview.jx Tue Feb 20 03:59:48 2007
@@ -27,6 +27,7 @@
<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>Overview</i18n:text></h1>
<jx:choose>
<jx:when test="${not(empty(usecase.getParameter('title')))}">
<table class="lenya-table-noborder">
Modified: lenya/trunk/src/modules-core/sitemanagement/usecases/tab/revisions.jx
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/sitemanagement/usecases/tab/revisions.jx?view=diff&rev=509523&r1=509522&r2=509523
==============================================================================
--- lenya/trunk/src/modules-core/sitemanagement/usecases/tab/revisions.jx (original)
+++ lenya/trunk/src/modules-core/sitemanagement/usecases/tab/revisions.jx Tue Feb 20 03:59:48 2007
@@ -28,29 +28,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">
- <table class="lenya-table-noborder">
+ <h1><i18n:text>Revisions</i18n:text></h1>
+ <table class="lenya-table-list-noborder">
+ <tr>
+ <th><i18n:text>No.</i18n:text></th>
+ <th><i18n:text>Time</i18n:text></th>
+ <th><i18n:text>Editor</i18n:text></th>
+ <th><i18n:text>Actions</i18n:text></th>
+ </tr>
+ <jx:set var="count" value="${usecase.getParameter('entries').size()}"/>
<jx:forEach var="item" items="${usecase.getParameter('entries')}" end="0">
<tr>
- <td><i18n:text>Current Version</i18n:text></td>
- <td> </td>
+ <td><jx:out value="${count}"/></td>
<td align="right"><jx:formatDate value="${item.time}" pattern="yyyy-MM-dd HH:mm:ss"/></td>
<td><jx:out value="${item.identity}"/></td>
+ <td><i18n:text>Current Version</i18n:text></td>
</tr>
</jx:forEach>
<jx:forEach var="item" items="${usecase.getParameter('entries')}" begin="1">
- <tr>
- <td>
- <a href="?lenya.usecase=sitemanagement.rollback&rollbackTime=${item.time}">
- <i18n:text>Rollback to this version</i18n:text>
- </a>
- </td>
- <td>
- <a href="?lenya.revision=${item.version}" target="_blank">
- <i18n:text>View</i18n:text></a>
- </td>
- <td align="right"><jx:formatDate value="${item.time}" pattern="yyyy-MM-dd HH:mm:ss"/></td>
- <td><jx:out value="${item.identity}"/></td>
- </tr>
+ <tr>
+ <jx:set var="count" value="${count - 1}"/>
+ <td align="right">
+ <a href="?lenya.revision=${item.version}" target="_blank"><jx:out value="${count}"/></a>
+ </td>
+ <td align="right"><jx:formatDate value="${item.time}" pattern="yyyy-MM-dd HH:mm:ss"/></td>
+ <td><jx:out value="${item.identity}"/></td>
+ <td>
+ <a href="?lenya.usecase=sitemanagement.rollback&rollbackTime=${item.time}">
+ <i18n:text>Rollback to this version</i18n:text>
+ </a>
+ </td>
+ </tr>
</jx:forEach>
</table>
</div>
Modified: lenya/trunk/src/modules-core/sitemanagement/usecases/tab/scheduler.jx
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/sitemanagement/usecases/tab/scheduler.jx?view=diff&rev=509523&r1=509522&r2=509523
==============================================================================
--- lenya/trunk/src/modules-core/sitemanagement/usecases/tab/scheduler.jx (original)
+++ lenya/trunk/src/modules-core/sitemanagement/usecases/tab/scheduler.jx Tue Feb 20 03:59:48 2007
@@ -28,7 +28,9 @@
<jx:import uri="fallback://lenya/modules/usecase/templates/tabs.jx"/>
<div id="contentblock1" class="lenya-tab-sitetree">
- <table class="lenya-table">
+ <h1><i18n:text>Scheduler</i18n:text></h1>
+
+ <table class="lenya-table-list">
<tr>
<th><i18n:text>Job</i18n:text></th>
<th><i18n:text>Time</i18n:text></th>
Modified: lenya/trunk/src/modules-core/sitemanagement/usecases/tab/workflow.jx
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/sitemanagement/usecases/tab/workflow.jx?view=diff&rev=509523&r1=509522&r2=509523
==============================================================================
--- lenya/trunk/src/modules-core/sitemanagement/usecases/tab/workflow.jx (original)
+++ lenya/trunk/src/modules-core/sitemanagement/usecases/tab/workflow.jx Tue Feb 20 03:59:48 2007
@@ -27,11 +27,11 @@
<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">
- <h2><i18n:text>Variables</i18n:text></h2>
- <table class="lenya-table">
+ <h1><i18n:text>Workflow</i18n:text></h1>
+ <!--
+ <table class="lenya-table-list-noborder">
<tr><th><i18n:text>Name</i18n:text></th><th><i18n:text>Value</i18n:text></th></tr>
<jx:forEach var="item" items="${usecase.getParameter('variables')}">
- <!--wf:variable -->
<tr>
<td>
<jx:out value="${item.name}"/>
@@ -42,8 +42,8 @@
</tr>
</jx:forEach>
</table>
- <h2><i18n:text>History</i18n:text></h2>
- <table class="lenya-table">
+ -->
+ <table class="lenya-table-list-noborder">
<tr>
<th><i18n:text>Date</i18n:text></th>
<th><i18n:text>Event</i18n:text></th>
Modified: lenya/trunk/src/modules/notification/usecases/inbox.jx
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/notification/usecases/inbox.jx?view=diff&rev=509523&r1=509522&r2=509523
==============================================================================
--- lenya/trunk/src/modules/notification/usecases/inbox.jx (original)
+++ lenya/trunk/src/modules/notification/usecases/inbox.jx Tue Feb 20 03:59:48 2007
@@ -42,19 +42,19 @@
</tr>
</table>
- <p>
+ <div style="margin-bottom: 10px;">
<a href="?lenya.usecase=notification.sendMessage"><i18n:text>new-message</i18n:text></a>
- </p>
+ </div>
<jx:set var="inbox" value="${usecase.getParameter('inbox')}"/>
<jx:set var="messageId" value="${request.getParameter('messageId')}"/>
<table>
<tr>
- <td valign="top" style="padding-right: 20px;">
+ <td valign="top" style="padding: 0px; padding-right: 20px;">
<jx:import uri="fallback://lenya/modules/notification/usecases/messageList.jx"/>
</td>
- <td valign="top" style="padding-left: 20px;">
+ <td valign="top" style="padding: 0px; padding-left: 20px;">
<jx:import uri="fallback://lenya/modules/notification/usecases/currentMessage.jx"/>
</td>
</tr>
Modified: lenya/trunk/src/pubs/default/config/publication.xconf
URL: http://svn.apache.org/viewvc/lenya/trunk/src/pubs/default/config/publication.xconf?view=diff&rev=509523&r1=509522&r2=509523
==============================================================================
--- lenya/trunk/src/pubs/default/config/publication.xconf (original)
+++ lenya/trunk/src/pubs/default/config/publication.xconf Tue Feb 20 03:59:48 2007
@@ -60,6 +60,7 @@
<module name="lucene"/>
<module name="development"/>
<module name="languageselector"/>
+ <module name="administration"/>
<!-- TODO: The goal is to have a blog module ;-) -->
<!--
<module name="blog"/>
Modified: lenya/trunk/src/webapp/lenya/resources/css/tables.css
URL: http://svn.apache.org/viewvc/lenya/trunk/src/webapp/lenya/resources/css/tables.css?view=diff&rev=509523&r1=509522&r2=509523
==============================================================================
--- lenya/trunk/src/webapp/lenya/resources/css/tables.css (original)
+++ lenya/trunk/src/webapp/lenya/resources/css/tables.css Tue Feb 20 03:59:48 2007
@@ -68,7 +68,9 @@
}
table.lenya-table-list th,
-table.lenya-table-list td {
+table.lenya-table-list td,
+table.lenya-table-list-noborder th,
+table.lenya-table-list-noborder td {
text-align: left;
padding: 2px 2em 2px 5px;
border-bottom: solid 1px #CCCCCC;
@@ -85,6 +87,26 @@
color: Black;
}
-table.lenya-table-list a {
+table.lenya-table-list a,
+table.lenya-table-list-noborder a {
text-decoration: none;
+}
+
+table.lenya-table-list-noborder {
+ border-spacing: 0px;
+ border-collapse: collapse;
+}
+
+table.lenya-table-list-noborder th {
+ font-weight: normal;
+ color: #999999;
+}
+
+table.lenya-table-list-noborder td {
+ border-bottom: none;
+}
+
+table.lenya-table-list-noborder th,
+table.lenya-table-list-noborder td {
+ padding-left: 0px;
}
Modified: lenya/trunk/src/webapp/lenya/resources/css/tabs.css
URL: http://svn.apache.org/viewvc/lenya/trunk/src/webapp/lenya/resources/css/tabs.css?view=diff&rev=509523&r1=509522&r2=509523
==============================================================================
--- lenya/trunk/src/webapp/lenya/resources/css/tabs.css (original)
+++ lenya/trunk/src/webapp/lenya/resources/css/tabs.css Tue Feb 20 03:59:48 2007
@@ -23,12 +23,24 @@
color: black;
border: solid 1px #CCCCCC;
float: left;
- padding: 10px;
+ padding: 0 20px 20px 20px;
min-height: 400px;
}
+.lenya-tab h1, .lenya-tab-sitetree h1 {
+ font-size: medium;
+ margin-bottom: 10px;
+ border-bottom: solid 1px #CCCCCC;
+ padding: 10px 0px 5px 0px;
+}
+
+.lenya-tab h2, .lenya-tab-sitetree h2 {
+ font-size: medium;
+}
+
.lenya-tabs {
float: left;
+ /* margin-top: 40px; */
}
#lenya-info-treecanvas .lenya-tablink,
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org