taylor 2004/12/03 01:10:19
Modified: portal/src/webapp/WEB-INF/decorations/layout/html/jetspeed
decorator-top.vm decorator-macros.vm
portal/src/webapp/WEB-INF/decorations/layout/html/tigris
decorator-top.vm decorator-macros.vm
portal/src/webapp/WEB-INF jetspeed_macros.vm
portal/src/webapp/WEB-INF/decorations/layout/html/ja/tigris
decorator-top.vm
Removed: portal/src/webapp/WEB-INF/templates/jsp portletstd-top.jsp
clear-top.jsp columns.jsp portletstd-bottom.jsp
clear-bottom.jsp
portal/src/webapp/WEB-INF/templates/layout/html/columns_jsp
layout.jsp layout.properties
portal/src/webapp/WEB-INF/decorations/portlet/html/portletstd_jsp
decorator.jsp decorator.properties
portal/src/webapp/WEB-INF/templates/vm clear-top.vm
clear-bottom.vm
portal/src/webapp/WEB-INF/decorations/portlet/html/portletstd
decorator.vm decorator.properties
Log:
cleanup, moving out some old unused impls
Revision Changes Path
1.24 +11 -11
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.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- decorator-top.vm 2 Dec 2004 05:18:09 -0000 1.23
+++ decorator-top.vm 3 Dec 2004 09:10:18 -0000 1.24
@@ -25,21 +25,21 @@
<title>$jetspeed.page.getTitle($preferedLocale)</title>
#includeStyleSheets()
</head>
-<body class="${_layouyBaseCssClass}">
+<body class="${_layoutBaseCssClass}">
#set($myF = $jetspeed.currentFragment)
<!-- BEGIN: layout/html/jetspeed/decorator.vm -->
-<div id="layout-${myF.id}" class="${_layouyBaseCssClass}" >
+<div id="layout-${myF.id}" class="${_layoutBaseCssClass}" >
<p>
<img src="content/images/jetspeed-logo.gif" alt="Jetspeed 2 Logo" border="0">
</p>
-#set($profiledPageContext =
$request.getAttribute("org.apache.jetspeed.profiledPageContext"))
+#set($site =
$request.getAttribute("org.apache.jetspeed.profiledPageContext"))
<p>
- #set($parentFolder = $profiledPageContext.parentFolder)
+ #set($parentFolder = $site.parentFolder)
#if($parentFolder)
<p style="font-style:italic">
@@ -47,10 +47,10 @@
</p>
#end
- #includeFoldersNavigation($profiledPageContext.siblingFolders)
+ #includeFoldersNavigation($site.siblingFolders)
</p>
<p>
- #includeTabsNavigation($profiledPageContext.siblingPages)
+ #includeTabsNavigation($site.siblingPages)
</p>
</p>
@@ -58,17 +58,17 @@
<tr>
<td valign="top">
<table cellpadding="0" cellspacing="0" border="0" width="100%">
- #if($profiledPageContext.rootLinks)
+ #if($site.rootLinks)
<tr>
<td nowrap>
<br>Additional Links:
- #includeLinksWithIconNavigation($profiledPageContext.rootLinks)
+ #includeLinksWithIconNavigation($site.rootLinks)
</td>
</tr>
#end
- #foreach($docSetName in $profiledPageContext.documentSetNames)
- #set($docSet = $profiledPageContext.getDocumentSet($docSetName))
- #set($docSetNodes =
$profiledPageContext.getDocumentSetNodes($docSetName))
+ #foreach($docSetName in $site.documentSetNames)
+ #set($docSet = $site.getDocumentSet($docSetName))
+ #set($docSetNodes = $site.getDocumentSetNodes($docSetName))
<tr>
<td nowrap>
<br><span
title="$docSet.getTitle($preferedLocale)">${docSet.getShortTitle($preferedLocale)}</span>:
1.3 +1 -1
jakarta-jetspeed-2/portal/src/webapp/WEB-INF/decorations/layout/html/jetspeed/decorator-macros.vm
Index: decorator-macros.vm
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/decorations/layout/html/jetspeed/decorator-macros.vm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- decorator-macros.vm 2 Dec 2004 06:17:55 -0000 1.2
+++ decorator-macros.vm 3 Dec 2004 09:10:18 -0000 1.3
@@ -11,7 +11,7 @@
#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))
+ #set($__nodeSet = $site.getDocumentSetNodes($__nodePrefix))
#includeNestedLinksWithIconNavigation($__nodeSet $__nodePrefix)
#else
<div><a href="$node.url"
title="$node.getTitle()">$node.getShortTitle()</a></div>
1.5 +10 -10
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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- decorator-top.vm 2 Dec 2004 05:18:09 -0000 1.4
+++ decorator-top.vm 3 Dec 2004 09:10:18 -0000 1.5
@@ -36,8 +36,8 @@
<body marginwidth="0" marginheight="0" class="layout-tigris">
#set($myF = $jetspeed.currentFragment)
-#set($profiledPageContext =
$request.getAttribute("org.apache.jetspeed.profiledPageContext"))
-#set($parentFolder = $profiledPageContext.parentFolder)
+#set($site =
$request.getAttribute("org.apache.jetspeed.profiledPageContext"))
+#set($parentFolder = $site.parentFolder)
<!-- BEGIN: layout/html/tigris/decorator.vm -->
@@ -59,7 +59,7 @@
</div>
<!-- Top Tabs -->
<div class="tabs">
-#includeTabsNavigation($profiledPageContext.siblingPages $LEFT_TO_RIGHT)
+#includeTabsNavigation($site.siblingPages $LEFT_TO_RIGHT)
</div>
<div id="breadcrumbs">
#if($parentFolder)
@@ -81,11 +81,11 @@
Folders and Pages
</div>
<div class="body">
-#includeFoldersNavigation($profiledPageContext.siblingFolders $TOP_TO_BOTTOM)
+#includeFoldersNavigation($site.siblingFolders $TOP_TO_BOTTOM)
-#foreach($docSetName in $profiledPageContext.documentSetNames)
- #set($docSet = $profiledPageContext.getDocumentSet($docSetName))
- #set($docSetNodes = $profiledPageContext.getDocumentSetNodes($docSetName))
+#foreach($docSetName in $site.documentSetNames)
+ #set($docSet = $site.getDocumentSet($docSetName))
+ #set($docSetNodes = $site.getDocumentSetNodes($docSetName))
<div>
<div class="pagetitle" title="$docSet.getTitle($preferedLocale)">
${docSet.getShortTitle($preferedLocale)}
@@ -97,7 +97,7 @@
</div>
</td>
</tr>
-#if($profiledPageContext.rootLinks)
+#if($site.rootLinks)
<tr>
<td>
<div class="toolgroup">
@@ -105,7 +105,7 @@
Additional Links
</div>
<div class="body">
-#includeLinksWithIconNavigation($profiledPageContext.rootLinks
$TOP_TO_BOTTOM)
+#includeLinksWithIconNavigation($site.rootLinks $TOP_TO_BOTTOM)
</div>
</div>
</td>
1.3 +1 -1
jakarta-jetspeed-2/portal/src/webapp/WEB-INF/decorations/layout/html/tigris/decorator-macros.vm
Index: decorator-macros.vm
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/decorations/layout/html/tigris/decorator-macros.vm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- decorator-macros.vm 2 Dec 2004 06:17:55 -0000 1.2
+++ decorator-macros.vm 3 Dec 2004 09:10:18 -0000 1.3
@@ -27,7 +27,7 @@
<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))
+ #set($__nodeSet = $site.getDocumentSetNodes($__nodePrefix))
#includeNestedLinksWithIconNavigation($__nodeSet $__nodePrefix
$_orientation)
#else
<a href="$node.url" title="$node.getTitle()">$node.getShortTitle()</a>
1.7 +1 -1
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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- jetspeed_macros.vm 2 Dec 2004 05:18:09 -0000 1.6
+++ jetspeed_macros.vm 3 Dec 2004 09:10:19 -0000 1.7
@@ -1,7 +1,7 @@
#macro (defineLayoutObjects)
#set($_layoutDecorator = $myPage.getDefaultDecorator("layout"))
#set($_layoutDecoratorConfig = $jetspeed.getTypeConfiguration("layout",
"${_layoutDecorator}", "decorations"))
- #set($_layouyBaseCssClass =
$_layoutDecoratorConfig.getString("base.css.class"))
+ #set($_layoutBaseCssClass =
$_layoutDecoratorConfig.getString("base.css.class"))
#set($preferedLocale = $JS2RequestContext.locale)
#end
1.6 +10 -10
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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- decorator-top.vm 2 Dec 2004 05:18:09 -0000 1.5
+++ decorator-top.vm 3 Dec 2004 09:10:19 -0000 1.6
@@ -36,8 +36,8 @@
<body marginwidth="0" marginheight="0" class="layout-tigris">
#set($myF = $jetspeed.currentFragment)
-#set($profiledPageContext =
$request.getAttribute("org.apache.jetspeed.profiledPageContext"))
-#set($parentFolder = $profiledPageContext.parentFolder)
+#set($site =
$request.getAttribute("org.apache.jetspeed.profiledPageContext"))
+#set($parentFolder = $site.parentFolder)
<!-- BEGIN: layout/html/tigris/decorator.vm -->
@@ -59,7 +59,7 @@
</div>
<!-- Top Tabs -->
<div class="tabs">
-#includeTabsNavigation($profiledPageContext.siblingPages $LEFT_TO_RIGHT)
+#includeTabsNavigation($site.siblingPages $LEFT_TO_RIGHT)
</div>
<div id="breadcrumbs">
#if($parentFolder)
@@ -81,11 +81,11 @@
フォルダ＆ページ
</div>
<div class="body">
-#includeFoldersNavigation($profiledPageContext.siblingFolders $TOP_TO_BOTTOM)
+#includeFoldersNavigation($site.siblingFolders $TOP_TO_BOTTOM)
-#foreach($docSetName in $profiledPageContext.documentSetNames)
- #set($docSet = $profiledPageContext.getDocumentSet($docSetName))
- #set($docSetNodes = $profiledPageContext.getDocumentSetNodes($docSetName))
+#foreach($docSetName in $site.documentSetNames)
+ #set($docSet = $site.getDocumentSet($docSetName))
+ #set($docSetNodes = $site.getDocumentSetNodes($docSetName))
<div>
<div class="pagetitle" title="$docSet.getTitle($preferedLocale)">
${docSet.getShortTitle($preferedLocale)}
@@ -97,7 +97,7 @@
</div>
</td>
</tr>
-#if($profiledPageContext.rootLinks)
+#if($site.rootLinks)
<tr>
<td>
<div class="toolgroup">
@@ -105,7 +105,7 @@
追加リンク
</div>
<div class="body">
-#includeLinksWithIconNavigation($profiledPageContext.rootLinks
$TOP_TO_BOTTOM)
+#includeLinksWithIconNavigation($site.rootLinks $TOP_TO_BOTTOM)
</div>
</div>
</td>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
