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 2005/01/20 16:24:46 UTC

svn commit: r125782 - in lenya/trunk/src/webapp: WEB-INF lenya/pubs/default/config/menus lenya/pubs/default/config/tasks lenya/usecases/site

Author: andreas
Date: Thu Jan 20 07:24:45 2005
New Revision: 125782

URL: http://svn.apache.org/viewcvs?view=rev&rev=125782
Log:
usecase framework used to change navigation title
Added:
   lenya/trunk/src/webapp/lenya/usecases/site/changeLabel.jx
Removed:
   lenya/trunk/src/webapp/lenya/usecases/site/renameLabel.jx
Modified:
   lenya/trunk/src/webapp/WEB-INF/cocoon-xconf.xsl
   lenya/trunk/src/webapp/lenya/pubs/default/config/menus/generic.xsp
   lenya/trunk/src/webapp/lenya/pubs/default/config/tasks/targets.xml

Modified: lenya/trunk/src/webapp/WEB-INF/cocoon-xconf.xsl
Url: http://svn.apache.org/viewcvs/lenya/trunk/src/webapp/WEB-INF/cocoon-xconf.xsl?view=diff&rev=125782&p1=lenya/trunk/src/webapp/WEB-INF/cocoon-xconf.xsl&r1=125781&p2=lenya/trunk/src/webapp/WEB-INF/cocoon-xconf.xsl&r2=125782
==============================================================================
--- lenya/trunk/src/webapp/WEB-INF/cocoon-xconf.xsl	(original)
+++ lenya/trunk/src/webapp/WEB-INF/cocoon-xconf.xsl	Thu Jan 20 07:24:45 2005
@@ -257,6 +257,7 @@
     <component-instance name="site.create" logger="lenya.site" class="org.apache.lenya.cms.site.usecases.CreateDocument"/>
     <component-instance name="site.createLanguage" logger="lenya.site" class="org.apache.lenya.cms.site.usecases.CreateLanguage"/>
     <component-instance name="site.deleteLanguage" logger="lenya.site" class="org.apache.lenya.cms.site.usecases.DeleteLanguage"/>
+    <component-instance name="site.changeLabel" logger="lenya.site" class="org.apache.lenya.cms.site.usecases.ChangeLabel"/>
     
     <component-instance name="tab.acArchive" logger="lenya.site" class="org.apache.lenya.cms.ac.usecases.AccessControl"/>
     <component-instance name="tab.acAuthoring" logger="lenya.site" class="org.apache.lenya.cms.ac.usecases.AccessControl"/>

Modified: lenya/trunk/src/webapp/lenya/pubs/default/config/menus/generic.xsp
Url: http://svn.apache.org/viewcvs/lenya/trunk/src/webapp/lenya/pubs/default/config/menus/generic.xsp?view=diff&rev=125782&p1=lenya/trunk/src/webapp/lenya/pubs/default/config/menus/generic.xsp&r1=125781&p2=lenya/trunk/src/webapp/lenya/pubs/default/config/menus/generic.xsp&r2=125782
==============================================================================
--- lenya/trunk/src/webapp/lenya/pubs/default/config/menus/generic.xsp	(original)
+++ lenya/trunk/src/webapp/lenya/pubs/default/config/menus/generic.xsp	Thu Jan 20 07:24:45 2005
@@ -147,7 +147,7 @@
         </block>
         <block info="false">
           <item wf:event="edit" uc:usecase="info-meta" uc:step="showscreen"><xsp:attribute name="href"><xsp-request:get-context-path/>/<input:get-attribute module="page-envelope" as="string" name="publication-id"/>/info-<input:get-attribute module="page-envelope" as="string" name="area"/><input:get-attribute module="page-envelope" as="string" name="document-url"/>?</xsp:attribute><i18n:text>Edit Metadata</i18n:text></item>
-          <item wf:event="edit" uc:usecase="rename-label" uc:step="showscreen"><xsp:attribute name="href"><xsp-request:get-uri/>?</xsp:attribute><i18n:text>Edit Navigation Title</i18n:text></item>
+          <item wf:event="edit" uc:usecase="site.changeLabel"><xsp:attribute name="href"><xsp-request:get-uri/>?</xsp:attribute><i18n:text>Edit Navigation Title</i18n:text></item>
         </block>
 
         <block authoring="false">

Modified: lenya/trunk/src/webapp/lenya/pubs/default/config/tasks/targets.xml
Url: http://svn.apache.org/viewcvs/lenya/trunk/src/webapp/lenya/pubs/default/config/tasks/targets.xml?view=diff&rev=125782&p1=lenya/trunk/src/webapp/lenya/pubs/default/config/tasks/targets.xml&r1=125781&p2=lenya/trunk/src/webapp/lenya/pubs/default/config/tasks/targets.xml&r2=125782
==============================================================================
--- lenya/trunk/src/webapp/lenya/pubs/default/config/tasks/targets.xml	(original)
+++ lenya/trunk/src/webapp/lenya/pubs/default/config/tasks/targets.xml	Thu Jan 20 07:24:45 2005
@@ -445,22 +445,6 @@
     
   </target>
   
-  <taskdef name="renameLabel" classname="org.apache.lenya.cms.ant.RenameLabelTask"/>
-  
-  <target name = "rename-label">
-    <property name="rename.label.document-id" value=""/>
-    <property name="rename.label.label-name" value=""/>
-    <property name="rename.label.language" value=""/>
-    <property name="rename.label.area" value=""/>
-    
-    <echo>Rename Label</echo>
-    <renameLabel
-      documentid="${rename.label.document-id}"
-      labelName="${rename.label.label-name}"
-      language="${rename.label.language}"
-      area="${rename.label.area}"
-      />
-  </target>
 
 <target name = "moveDocument" depends="firstareaproperties,
     secareaproperties, newcopydocumentid, firstdocumentpath,

Added: lenya/trunk/src/webapp/lenya/usecases/site/changeLabel.jx
Url: http://svn.apache.org/viewcvs/lenya/trunk/src/webapp/lenya/usecases/site/changeLabel.jx?view=auto&rev=125782
==============================================================================
--- (empty file)
+++ lenya/trunk/src/webapp/lenya/usecases/site/changeLabel.jx	Thu Jan 20 07:24:45 2005
@@ -0,0 +1,83 @@
+<?xml version="1.0"?>
+<!--
+  Copyright 1999-2004 The Apache Software Foundation
+
+  Licensed 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: renameLabel.jx 123364 2004-12-26 16:11:27Z gregor $ -->
+<page:page xmlns:c="http://apache.org/cocoon/templates/jx/1.0" 
+           xmlns="http://www.w3.org/1999/xhtml" 
+           xmlns:i18n="http://apache.org/cocoon/i18n/2.1" 
+           xmlns:page="http://apache.org/cocoon/lenya/cms-page/1.0"
+           xmlns:jx="http://apache.org/cocoon/templates/jx/1.0"
+           >
+           
+  <page:title>
+    <i18n:text>Edit Navigation Title</i18n:text>
+  </page:title>
+  <page:body>
+    <div class="lenya-box">
+      <div class="lenya-box-title">
+        <i18n:translate>
+          <i18n:text key="rename-label-doc"/>
+          <i18n:param>
+            <q>
+              <jx:out value="${usecase.getParameter('documentId')}"/>
+            </q>
+          </i18n:param>
+        </i18n:translate>
+      </div>
+      <div class="lenya-box-body">
+        <form method="get" action="">
+          <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 colspan="2">
+                <ul>
+                  <jx:forEach var="message" items="${usecase.getErrorMessages()}">
+                    <li>
+                      <i18n:text>
+                        <jx:out value="${message}"/>
+                      </i18n:text>
+                    </li>
+                  </jx:forEach>
+                  <jx:forEach var="message" items="${usecase.getInfoMessages()}">
+                    <li>
+                      <i18n:text>
+                        <jx:out value="${message}"/>
+                      </i18n:text>
+                    </li>
+                  </jx:forEach>
+                </ul>
+              </td>
+            </tr>
+            <tr>
+              <td class="lenya-entry-caption"><i18n:text>New Navigation Title</i18n:text>:</td>
+              <td><input type="text" class="lenya-form-element" name="label" value="${usecase.getParameter('label')}"/></td>
+            </tr>
+            <tr>
+              <td/>
+              <td>
+                <br/>
+                <input i18n:attr="value" type="submit" name="submit" value="Save"/>
+                &#160;
+                <input i18n:attr="value" type="submit" name="cancel" value="Cancel"/>
+              </td>
+            </tr>
+          </table>
+        </form>
+      </div>
+    </div>
+  </page:body>
+</page:page>
\ No newline at end of file

Deleted: /lenya/trunk/src/webapp/lenya/usecases/site/renameLabel.jx
Url: http://svn.apache.org/viewcvs/lenya/trunk/src/webapp/lenya/usecases/site/renameLabel.jx?view=auto&rev=125781
==============================================================================

---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org