cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rgo...@apache.org
Subject svn commit: r306570 - in /cocoon/branches/BRANCH_2_1_X: src/blocks/portal/java/org/apache/cocoon/portal/impl/PageLabelLinkService.java src/blocks/portal/samples/profiles/layout/portal.xml status.xml
Date Thu, 06 Oct 2005 10:01:16 GMT
Author: rgoers
Date: Thu Oct  6 03:00:53 2005
New Revision: 306570

URL: http://svn.apache.org/viewcvs?rev=306570&view=rev
Log:
<action dev="RG" type="fix" fixes-bug="34802" due-to="Roy Huang" due-to-email="roy_huang@nbmgroup.com">
  PageLabelLinkService generated the wrong url when using 3 layer tabs with showallnav.
</action>

Modified:
    cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/impl/PageLabelLinkService.java
    cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/profiles/layout/portal.xml
    cocoon/branches/BRANCH_2_1_X/status.xml

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/impl/PageLabelLinkService.java
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/impl/PageLabelLinkService.java?rev=306570&r1=306569&r2=306570&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/impl/PageLabelLinkService.java
(original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/impl/PageLabelLinkService.java
Thu Oct  6 03:00:53 2005
@@ -163,7 +163,15 @@
                     value.append('.');
                 }
                 if (item instanceof NamedItem) {
-                    value.append(((NamedItem)item).getName());
+                    if(value.length()>0) {
+                    	value.append(((NamedItem)item).getName());
+                    }
+                    else {
+                        StringBuffer key = new StringBuffer("");
+                        getKey(item, key);
+                	    value.append(key.toString());
+                    }
+
                 }
                 else {
                     value.append(Integer.toString(i));

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/profiles/layout/portal.xml
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/profiles/layout/portal.xml?rev=306570&r1=306569&r2=306570&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/profiles/layout/portal.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/profiles/layout/portal.xml Thu
Oct  6 03:00:53 2005
@@ -172,7 +172,43 @@
       </named-item>
     </composite-layout>
   </named-item>
-
+  <named-item name="TabDemo3">
+    <composite-layout name="linktab">
+      <named-item name="One">
+        <coplet-layout name="coplet">
+          <coplet-instance-data>CZ Weblog-1</coplet-instance-data>
+        </coplet-layout>
+      </named-item>
+      <named-item name="Two">
+        <coplet-layout name="coplet">
+          <coplet-instance-data>ML Weblog-1</coplet-instance-data>
+        </coplet-layout>
+      </named-item>
+      <named-item name="Three">
+        <composite-layout name="tab">
+          <named-item name="Weblog">
+             <coplet-layout name="coplet">
+          <coplet-instance-data>Weblog-1</coplet-instance-data>
+        </coplet-layout>
+          </named-item>
+          <named-item name="Gallery">
+            <composite-layout name="column">
+              <item>
+                <coplet-layout name="coplet">
+                  <coplet-instance-data>Gallery-Petstore</coplet-instance-data>
+               </coplet-layout>
+              </item>
+              <item>
+                <coplet-layout name="coplet">
+                  <coplet-instance-data>GalleryViewer-1</coplet-instance-data>
+                </coplet-layout>
+              </item>
+            </composite-layout>
+          </named-item>
+        </composite-layout>
+      </named-item>
+    </composite-layout>
+  </named-item>
   <named-item name="Gallery">
     <composite-layout name="column">
       <item>

Modified: cocoon/branches/BRANCH_2_1_X/status.xml
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/status.xml?rev=306570&r1=306569&r2=306570&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/status.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/status.xml Thu Oct  6 03:00:53 2005
@@ -197,6 +197,9 @@
 
   <changes>
   <release version="@version@" date="@date@">
+    <action dev="RG" type="fix" fixes-bug="34802" due-to="Roy Huang" due-to-email="roy_huang@nbmgroup.com">
+      PageLabelLinkService generated the wrong url when using 3 layer tabs with showallnav.
+    </action>
     <action dev="JHS" type="add" due-to="Thomas Lutz" due-to-email="mattom@gmx.at">
       CForms: The repeater widget now supports min and max-size attributes.
     </action>



Mime
View raw message