taylor 2004/11/26 10:51:41
Modified: portal/src/webapp/WEB-INF/decorations/layout/html/ja/tigris
decorator-top.vm
portal/src/webapp/WEB-INF/decorations/layout/html/tigris/css
styles.css
portal/src/webapp/WEB-INF/decorations/layout/html/jetspeed
decorator-top.vm
portal/src/webapp/WEB-INF/templates/navigation/html/linksWithIcon1
TopToBottom.vm LeftToRight.vm
portal/src/webapp/WEB-INF/decorations/layout/html/tigris
decorator-top.vm
portal/src/webapp/WEB-INF/pages p002.psml
portal/src/webapp/WEB-INF/pages/_role/user/top-links
jakarta_velocity.link folder.metadata
portal/src/webapp/WEB-INF jetspeed_macros.vm
Log:
Nested Document Sets implementation in page manager, decorators, templates,
and demo site.
- Addition of getAll() method to jetspeed API Folder interface.
- Changes to CastorXmlPageManager/FolderImpl implementation and associated
unit tests for updating and removing PSML pages.
- Improved indenting in left menu pane for Tigris layout.
Note that an updated profiler/page manager design document is contained in
the "new" zip file.
To test nested document sets:
Login as user/user and validate nested document set named "More Pages"
appears within "Top Pages" and contains a new page and link to the Tigris
sample page.
patch from Randy Watler
Reviewed by: [EMAIL PROTECTED]
CVS: ----------------------------------------------------------------------
CVS: PR:
CVS: If this change addresses a PR in the problem report tracking
CVS: database, then enter the PR number(s) here.
CVS: Obtained from:
CVS: If this change has been taken from another system, such as NCSA,
CVS: then name the system in this line, otherwise delete it.
CVS: Submitted by:
CVS: If this code has been contributed to Apache by someone else; i.e.,
CVS: they sent us a patch or a new module, then include their name/email
CVS: address here. If this is your work then delete this line.
CVS: Reviewed by:
CVS: If we are doing pre-commit code reviews and someone else has
CVS: reviewed your changes, include their name(s) here.
CVS: If you have not had it reviewed then delete this line.
Revision Changes Path
1.3 +8 -6
jakarta-jetspeed-2/portal/src/webapp/WEB-INF/decorations/layout/html/ja/tigris/decorator-top.vm
Index: decorator-top.vm
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/decorations/layout/html/ja/tigris/decorator-top.vm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- decorator-top.vm 19 Nov 2004 03:07:43 -0000 1.2
+++ decorator-top.vm 26 Nov 2004 18:51:41 -0000 1.3
@@ -63,7 +63,7 @@
</div>
<div id="breadcrumbs">
#if($parentFolder)
- <a href="$jetspeed.getAbsoluteUrl($parentFolder.url)"
title="$parentFolder.getTitle($preferedLocale)">$parentFolder.getShortTitle($preferedLocale)へ戻る</a>
+ <a href="$jetspeed.getAbsoluteUrl($parentFolder.url)"
title="$parentFolder.getTitle($preferedLocale)">$parentFolder.getShortTitle($preferedLocale)?戻る</a>
#end
</div>
@@ -78,7 +78,7 @@
<td>
<div class="toolgroup">
<div class="label">
- フォルダとページ
+ フォルダ?ページ
</div>
<div class="body">
#includeNavigation("folders" $profiledPageContext.siblingFolders
$TOP_TO_BOTTOM)
@@ -86,10 +86,12 @@
#foreach($docSetName in $profiledPageContext.documentSetNames)
#set($docSet = $profiledPageContext.getDocumentSet($docSetName))
#set($docSetNodes = $profiledPageContext.getDocumentSetNodes($docSetName))
- <div class="pagetitle" title="$docSet.getTitle($preferedLocale)">
- ${docSet.getShortTitle($preferedLocale)}
+ <div>
+ <div class="pagetitle" title="$docSet.getTitle($preferedLocale)">
+ ${docSet.getShortTitle($preferedLocale)}
+ </div>
</div>
-#includeNavigation("linksWithIcon1" $docSetNodes $TOP_TO_BOTTOM)
+#includeDocumentSetNavigation("linksWithIcon1" $docSet $docSetNodes
$TOP_TO_BOTTOM)
#end
</div>
</div>
1.2 +2 -1
jakarta-jetspeed-2/portal/src/webapp/WEB-INF/decorations/layout/html/tigris/css/styles.css
Index: styles.css
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/decorations/layout/html/tigris/css/styles.css,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- styles.css 31 Oct 2004 22:06:10 -0000 1.1
+++ styles.css 26 Nov 2004 18:51:41 -0000 1.2
@@ -234,13 +234,14 @@
.layout-tigris .toolgroup .body div {
padding-bottom: .3em;
- padding-left: .5em;
+ padding-left: 0;
voice-family: "\"}\"";
voice-family: inherit;
font-size: x-small;
}
.layout-tigris .toolgroup .body div div {
+ padding-left: .5em;
}
.layout-tigris .toolgroup .pagetitle{
1.22 +1 -1
jakarta-jetspeed-2/portal/src/webapp/WEB-INF/decorations/layout/html/jetspeed/decorator-top.vm
Index: decorator-top.vm
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/decorations/layout/html/jetspeed/decorator-top.vm,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- decorator-top.vm 19 Nov 2004 03:07:43 -0000 1.21
+++ decorator-top.vm 26 Nov 2004 18:51:41 -0000 1.22
@@ -74,7 +74,7 @@
<tr>
<td nowrap>
<br><span
title="$docSet.getTitle($preferedLocale)">${docSet.getShortTitle($preferedLocale)}</span>:
- #includeNavigation("linksWithIcon1" $docSetNodes $TOP_TO_BOTTOM)
+ #includeDocumentSetNavigation("linksWithIcon1" $docSet
$docSetNodes $TOP_TO_BOTTOM)
</td>
</tr>
#end
1.5 +10 -7
jakarta-jetspeed-2/portal/src/webapp/WEB-INF/templates/navigation/html/linksWithIcon1/TopToBottom.vm
Index: TopToBottom.vm
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/templates/navigation/html/linksWithIcon1/TopToBottom.vm,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TopToBottom.vm 19 Nov 2004 03:07:42 -0000 1.4
+++ TopToBottom.vm 26 Nov 2004 18:51:41 -0000 1.5
@@ -1,15 +1,18 @@
-<div >
+<div>
#foreach($node in $_nodeSet.iterator())
- <div>
#if($node.type == ".psml")
- <a href="$jetspeed.getAbsoluteUrl($node.url)" class="LinkPage"
title="$node.getTitle($preferedLocale)">$node.getShortTitle($preferedLocale)</a>
+ <div><a href="$jetspeed.getAbsoluteUrl($node.url)" class="LinkPage"
title="$node.getTitle($preferedLocale)">$node.getShortTitle($preferedLocale)</a></div>
#elseif($node.type == ".link")
- <a href="$node.url" target="$node.target" class="Link"
title="$node.getTitle($preferedLocale)">$node.getShortTitle($preferedLocale)</a>
+ <div><a href="$node.url" target="$node.target" class="Link"
title="$node.getTitle($preferedLocale)">$node.getShortTitle($preferedLocale)</a></div>
#elseif($node.type == "folder")
- <a href="$jetspeed.getAbsoluteUrl($node.url)" class="LinkFolder"
title="$node.getTitle($preferedLocale)">$node.getShortTitle($preferedLocale)</a>
+ <div><a href="$jetspeed.getAbsoluteUrl($node.url)" class="LinkFolder"
title="$node.getTitle($preferedLocale)">$node.getShortTitle($preferedLocale)</a></div>
+ #elseif($node.type == ".ds")
+ <div class="pagetitle"
title="$node.getTitle($preferedLocale)">${node.getShortTitle($preferedLocale)}</div>
+ #set($__nodePrefix = "${_nodePrefix}${node.url}")
+ #set($__nodeSet =
$profiledPageContext.getDocumentSetNodes($__nodePrefix))
+ #includeNestedNavigation($_name $__nodeSet $_orientation $__nodePrefix)
#else
- <a href="$node.url" title="$node.getTitle()">$node.getShortTitle()</a>
+ <div><a href="$node.url"
title="$node.getTitle()">$node.getShortTitle()</a></div>
#end
- </div>
#end
</div>
1.4 +5 -1
jakarta-jetspeed-2/portal/src/webapp/WEB-INF/templates/navigation/html/linksWithIcon1/LeftToRight.vm
Index: LeftToRight.vm
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/templates/navigation/html/linksWithIcon1/LeftToRight.vm,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- LeftToRight.vm 19 Nov 2004 03:07:42 -0000 1.3
+++ LeftToRight.vm 26 Nov 2004 18:51:41 -0000 1.4
@@ -1,4 +1,4 @@
-<div >
+<div>
#foreach($node in $_nodeSet.iterator())
#if($node.type == ".psml")
<a href="$jetspeed.getAbsoluteUrl($node.url)" class="LinkPage"
title="$node.getTitle($preferedLocale)">$node.getShortTitle($preferedLocale)</a>
@@ -6,6 +6,10 @@
<a href="$node.url" target="$node.target" class="Link"
title="$node.getTitle($preferedLocale)">$node.getShortTitle($preferedLocale)</a>
#elseif($node.type == "folder")
<a href="$jetspeed.getAbsoluteUrl($node.url)" class="LinkFolder"
title="$node.getTitle($preferedLocale)">$node.getShortTitle($preferedLocale)</a>
+ #elseif($node.type == ".ds")
+ #set($__nodePrefix = "${_nodePrefix}${node.url}")
+ #set($__nodeSet =
$profiledPageContext.getDocumentSetNodes($__nodePrefix))
+ #includeNestedNavigation($_name $__nodeSet $_orientation $__nodePrefix)
#else
<a href="$node.url" title="$node.getTitle()">$node.getShortTitle()</a>
#end
1.3 +6 -4
jakarta-jetspeed-2/portal/src/webapp/WEB-INF/decorations/layout/html/tigris/decorator-top.vm
Index: decorator-top.vm
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/decorations/layout/html/tigris/decorator-top.vm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- decorator-top.vm 19 Nov 2004 03:07:42 -0000 1.2
+++ decorator-top.vm 26 Nov 2004 18:51:41 -0000 1.3
@@ -86,10 +86,12 @@
#foreach($docSetName in $profiledPageContext.documentSetNames)
#set($docSet = $profiledPageContext.getDocumentSet($docSetName))
#set($docSetNodes = $profiledPageContext.getDocumentSetNodes($docSetName))
- <div class="pagetitle" title="$docSet.getTitle($preferedLocale)">
- ${docSet.getShortTitle($preferedLocale)}
+ <div>
+ <div class="pagetitle" title="$docSet.getTitle($preferedLocale)">
+ ${docSet.getShortTitle($preferedLocale)}
+ </div>
</div>
-#includeNavigation("linksWithIcon1" $docSetNodes $TOP_TO_BOTTOM)
+#includeDocumentSetNavigation("linksWithIcon1" $docSet $docSetNodes
$TOP_TO_BOTTOM)
#end
</div>
</div>
1.14 +3 -3
jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/p002.psml
Index: p002.psml
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/p002.psml,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- p002.psml 15 Nov 2004 06:02:20 -0000 1.13
+++ p002.psml 26 Nov 2004 18:51:41 -0000 1.14
@@ -17,13 +17,13 @@
<page >
<defaults
skin="light-blue"
- layout-decorator="jetspeed"
- portlet-decorator="jetspeed"
+ layout-decorator="tigris"
+ portlet-decorator="tigris"
/>
<title>My Second PSML page</title>
<fragment id="xx2.0" type="layout" name="jetspeed::VelocityTwoColumns">
- <fragment id="xx2.1" type="portlet" name="demo::CustomerList"/>
+ <fragment id="xx2.1" type="portlet" name="demo::SSOIFramePortlet"/>
</fragment>
<metadata name="title" xml:lang="ja">
1.3 +1 -1
jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/_role/user/top-links/jakarta_velocity.link
Index: jakarta_velocity.link
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/_role/user/top-links/jakarta_velocity.link,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- jakarta_velocity.link 8 Nov 2004 21:08:46 -0000 1.2
+++ jakarta_velocity.link 26 Nov 2004 18:51:41 -0000 1.3
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<link target="top">
- <title>Apache Velocity</title>
+ <title>[USER] Jakarta Velocity</title>
<url>http://jakarta.apache.org/velocity</url>
</link>
1.4 +2 -1
jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/_role/user/top-links/folder.metadata
Index: folder.metadata
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/_role/user/top-links/folder.metadata,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- folder.metadata 19 Nov 2004 03:07:42 -0000 1.3
+++ folder.metadata 26 Nov 2004 18:51:41 -0000 1.4
@@ -1,8 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<folder>
- <document-order>apache_portals.link</document-order>
<document-order>apache_jakarta.link</document-order>
+ <document-order>apache_portals.link</document-order>
<document-order>apache_tomcat.link</document-order>
<document-order>apache_velocity.link</document-order>
+ <document-order>more-pages.ds</document-order>
<document-order>apache_commons.link</document-order>
</folder>
1.5 +16 -7
jakarta-jetspeed-2/portal/src/webapp/WEB-INF/jetspeed_macros.vm
Index: jetspeed_macros.vm
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/jetspeed_macros.vm,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- jetspeed_macros.vm 28 Sep 2004 04:01:35 -0000 1.4
+++ jetspeed_macros.vm 26 Nov 2004 18:51:41 -0000 1.5
@@ -22,14 +22,23 @@
#end
#end
-#macro (defineConfig $name $type)
- #set($_navConfig =$jetspeed.getTypeConfiguration("navigation", $name,
"templates"))
+#* Includes a nested navigation component *#
+#macro (includeNestedNavigation $_name $_nodeSet $_orientation $_nodePrefix)
+ #parse($jetspeed.getTemplate("${_name}/${_orientation}${_ext}",
"navigation").appRelativePath)
#end
#* Includes a navigation component *#
-#macro (includeNavigation $name $_nodeSet $orientation)
- #defineConfig($name "navigation")
- #set($_ext = $_navConfig.getString("template.extension"))
- #parse($jetspeed.getTemplate("${name}/${orientation}${_ext}",
"navigation").appRelativePath)
+#macro (defineConfig $name $type)
+ #set($_navConfig =$jetspeed.getTypeConfiguration("navigation", $name,
"templates"))
+#end
+#macro (includeNavigation $_name $_nodeSet $_orientation)
+ #defineConfig($_name "navigation")
+ #set($_ext = $_navConfig.getString("template.extension"))
+ #includeNestedNavigation($_name $_nodeSet $_orientation "")
+#end
+#macro (includeDocumentSetNavigation $_name $_node $_nodeSet $_orientation)
+ #defineConfig($_name "navigation")
+ #set($_ext = $_navConfig.getString("template.extension"))
+ #set($_nodePrefix = $_node.url)
+ #includeNestedNavigation($_name $_nodeSet $_orientation $_nodePrefix)
#end
-
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
