Author: taylor
Date: Thu May 24 14:02:29 2007
New Revision: 541430
URL: http://svn.apache.org/viewvc?view=rev&rev=541430
Log:
https://issues.apache.org/jira/browse/JS2-675
Site Manager Admin portlet: cannot view pages located via profiling rules with
navigations or controls
patch from Vivek Kumar
Modified:
portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/site/PortalSiteManager.java
portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/view/site/site-view.vm
Modified:
portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/site/PortalSiteManager.java
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/site/PortalSiteManager.java?view=diff&rev=541430&r1=541429&r2=541430
==============================================================================
---
portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/site/PortalSiteManager.java
(original)
+++
portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/site/PortalSiteManager.java
Thu May 24 14:02:29 2007
@@ -97,6 +97,7 @@
this.getContext(request).put("page-decorations",
decorationFactory.getPageDecorations(requestContext));
this.getContext(request).put("portlet-decorations",
decorationFactory.getPortletDecorations(requestContext));
this.getContext(request).put("themes",
decorationFactory.getDesktopPageDecorations(requestContext));
+ this.getContext(request).put("treeName", "portal");
this.getContext(request).put("userTree",
determineuserTree(request));
this.getContext(request).put("defaultLayout",
request.getPreferences().getValue("defaultLayout",
"jetspeed-layouts::VelocityTwoColumns"));
this.getContext(request).put(FOLDERS, retrieveFolders(request,
jsroot));
Modified:
portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/view/site/site-view.vm
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/view/site/site-view.vm?view=diff&rev=541430&r1=541429&r2=541430
==============================================================================
---
portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/view/site/site-view.vm
(original)
+++
portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/view/site/site-view.vm
Thu May 24 14:02:29 2007
@@ -18,7 +18,8 @@
#set($req = $rc.Request)
#set($app = $renderRequest.getContextPath())
#set($rooturl =
"${req.scheme}://${req.serverName}:${req.serverPort}${req.contextPath}/")
-
+#set($treeName = $renderRequest.getParameter("treeName"))
+#set($renderURL = $renderResponse.createRenderURL())
<div dojoType="dialog" id="CopyResourceDialog" bgColor="grey"
bgOpacity="0.5" toggle="fade" toggleDuration="250" >
<form onsubmit="return false;">
<table>
@@ -404,9 +405,36 @@
var img = null;
var frmObj = null;
var a = null;
+ var folder =document.getElementById('path').value;
+ var rowNum;
+ if(folder =='/')
+ {
+ pgRoww = foldersTable.insertRow(0);
+ pgCol = pgRoww.insertCell(0);
+ frmObj = document.createElement("input");
+ frmObj.type = "radio";
+ frmObj.name = "fDestination";
+
frmObj.setAttribute("onChange","javascript:setDestination('/','/')");
+ pgCol.appendChild(frmObj);
+ pgCol = pgRoww.insertCell(1);
+ img = document.createElement("img");
+ img.src = '$app/images/folder.gif';
+ pgCol.appendChild(img);
+ pgCol = pgRoww.insertCell(2);
+ a = document.createElement("a");
+ a.innerHTML = '/';
+ a.href = "javascript:getFolders('/')";
+ pgCol.appendChild(a);
+
+ }
for ( var i = 0 ; i < folder_len ; i++ )
{
- pgRoww = foldersTable.insertRow(i);
+ if(folder =='/'){
+ rowNum = i+1;
+ }else{
+ rowNum = i;
+ }
+ pgRoww = foldersTable.insertRow(rowNum);
pgCol = pgRoww.insertCell(0);
frmObj = document.createElement("input");
frmObj.type = "radio";
@@ -1249,8 +1277,8 @@
#end
#macro (UserTreeView $f)
-<div dojoType="Tree" widgetId="userTree" DNDMode="between"
selector="treeSelector"
- actionsDisabled="customize,move,delete" toggler="fade"
DNDAcceptTypes="userTree" controller="treeController" menu='treeContextMenu'>
+<div dojoType="Tree" widgetId="siteTree" DNDMode="between"
selector="treeSelector"
+ actionsDisabled="customize,move,delete" toggler="fade"
DNDAcceptTypes="siteTree" controller="treeController" menu='treeContextMenu'>
#TraverseUserFolder($f)
</div>
#end
@@ -1264,16 +1292,33 @@
<!-- Start LHS -->
<div dojoType="LayoutContainer" widgetId="lhs" layoutAlign="left"
style="width: 32%; border: 1px solid gray; ">
-<div id="lmainTabContainer" dojoType="TabContainer" selectedChild="fullTree"
doLayout="false">
-<div dojoType="ContentPane" widgetId="fullTree" style="width: 100%; height:
100%; overflow:auto;" label="Portal Tree">
-#FolderTreeView($folders)
-</div>
- #if($userTree == 'false')
- <div dojoType="ContentPane" widgetId="userTree" label="User
Tree">
+#if (!$treeName || $treeName =='portal')
+ $!renderURL.setParameter("treeName","user")
+ #set($label = "User")
+ #set($treeName = "portal")
+
+ #if($userTree == 'false')
+ Click here for <a href="$renderURL">$label</a> Tree
+ #end
+ <div id="lmainTabContainer" dojoType="TabContainer" doLayout="false"
selectedChild="fullTree">
+ <div dojoType="ContentPane" widgetId="fullTree" style="width:
100%; height: 100%; overflow:auto;" label="Portal Tree">
+ #FolderTreeView($folders)
+ </div>
+ </div>
+#end
+#if ($treeName =='user')
+ $!renderURL.setParameter("treeName","portal")
+ #set($label = "Portal")
+ #set($treeName = "user")
+ #if($userTree == 'false')
+ Click here for <a href="$renderURL">$label</a> Tree
+ #end
+ <div id="lmainTabContainer" dojoType="TabContainer" doLayout="false"
selectedChild="userTree">
+ <div dojoType="ContentPane" widgetId="userTree" style="width:
100%; height: 100%; overflow:auto;" label="User Tree">
#UserTreeView($folders)
</div>
- #end
</div>
+#end
</div>
<!-- Start RHS -->
<div dojoType="LayoutContainer" id="rhs" widgetId="rhs" layoutAlign="client"
style="display:none; border: 1px solid gray; width: 68%">
@@ -1781,11 +1826,6 @@
var tree = dojo.widget.byId("siteTree");
if (tree.children[0])
tree.children[0].expand();
- #if($userTree == 'false')
- var uTree = dojo.widget.byId("userTree");
- if (uTree.children[0])
- uTree.children[0].expand();
- #end
});
// General Table Functions
function processTableRowEvent(e, tableName)
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
