Return-Path: 
 <jetspeed-dev-return-35299-apmail-portals-jetspeed-dev-archive=portals.apache.org@portals.apache.org>
Delivered-To: apmail-portals-jetspeed-dev-archive@www.apache.org
Received: (qmail 49686 invoked from network); 12 Dec 2009 19:18:46 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3)
  by minotaur.apache.org with SMTP; 12 Dec 2009 19:18:46 -0000
Received: (qmail 47886 invoked by uid 500); 12 Dec 2009 19:18:46 -0000
Delivered-To: apmail-portals-jetspeed-dev-archive@portals.apache.org
Received: (qmail 47828 invoked by uid 500); 12 Dec 2009 19:18:46 -0000
Mailing-List: contact jetspeed-dev-help@portals.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:jetspeed-dev-help@portals.apache.org>
List-Unsubscribe: <mailto:jetspeed-dev-unsubscribe@portals.apache.org>
List-Post: <mailto:jetspeed-dev@portals.apache.org>
List-Id: <jetspeed-dev.portals.apache.org>
Reply-To: "Jetspeed Developers List" <jetspeed-dev@portals.apache.org>
Delivered-To: mailing list jetspeed-dev@portals.apache.org
Received: (qmail 47818 invoked by uid 99); 12 Dec 2009 19:18:45 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 12 Dec 2009 19:18:45 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 12 Dec 2009 19:18:44 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id BDB46238898A; Sat, 12 Dec 2009 19:18:22 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r889962 -
 /portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/toolbox/toolbox.jsp
Date: Sat, 12 Dec 2009 19:18:21 -0000
To: jetspeed-dev@portals.apache.org
From: ate@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20091212191822.BDB46238898A@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: ate
Date: Sat Dec 12 19:18:21 2009
New Revision: 889962

URL: http://svn.apache.org/viewvc?rev=889962&view=rev
Log:
JS2-5057: minor adjustments to get toolbox working when the portal is deployed under / (ROOT)

Modified:
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/toolbox/toolbox.jsp

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/toolbox/toolbox.jsp
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/toolbox/toolbox.jsp?rev=889962&r1=889961&r2=889962&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/toolbox/toolbox.jsp (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/toolbox/toolbox.jsp Sat Dec 12 19:18:21 2009
@@ -31,10 +31,15 @@
 
 <portlet:defineObjects/>
 <c_rt:set var="requestContext" value="<%=request.getAttribute(RequestContext.REQUEST_PORTALENV)%>"/>
+<c:set var="portalContextPrefix" value="${requestContext.request.contextPath}"/>
 <c:set var="portalContextPath" value="${requestContext.request.contextPath}"/>
+<c:set var="portalPath" value="${requestContext.portalURL.path}"/>
 <c:if test="${empty portalContextPath}">
   <c:set var="portalContextPath" value="/"/>
 </c:if>
+<c:if test="${empty portalPath}">
+  <c:set var="portalPath" value="/"/>
+</c:if>
 
 <table style="border-collapse: collapse;  width: 100%; margin-top: 0px; margin-bottom: 0px; float: left;">
     <tr>
@@ -234,9 +239,9 @@
             clone.setStyle('display', '');
             var imgNode = clone.one('img');
             if (def.portletIcon) {
-                imgNode.set("src", "${portalContextPath}/images/portlets/" + def.portletIcon);
+                imgNode.set("src", "${portalContextPrefix}/images/portlets/" + def.portletIcon);
             } else {
-                imgNode.set("src", "${portalContextPath}/images/portlets/applications-other.png");
+                imgNode.set("src", "${portalContextPefix}/images/portlets/applications-other.png");
             }
             
             var nameNode = clone.one('div');
@@ -270,7 +275,7 @@
             return;
         }
         Y.Cookie.set("toolboxcat", category);
-        var uri = "${portalContextPath}/services/portletregistry/definition/?_type=json";
+        var uri = "${portalContextPrefix}/services/portletregistry/definition/?_type=json";
         uri += "&query=" + category;
         var request = Y.io(uri, { on: { complete: onLoadPortletComplete } });
         Y.Node.getDOMNode(Y.Node.one("#<portlet:namespace/>form")).query.value = "";
@@ -279,7 +284,7 @@
     var loadPortletsByQuery = function(e) {
         var form = Y.Node.getDOMNode(e.target);
         var query = form.query.value;
-        var uri = "${portalContextPath}/services/portletregistry/definition/?_type=json";
+        var uri = "${portalContextPrefix}/services/portletregistry/definition/?_type=json";
         if (query) {
             uri += "&query=" + query;
         }
@@ -315,11 +320,11 @@
         var portletUniqueName = a.getAttribute("portletUniqueName");
 
         if (portletUniqueName) {
-            var uri = "${portalContextPath}/services/pagelayout/fragment/portlet/" + portletUniqueName + "/?_type=json";
+            var uri = "${portalContextPrefix}/services/pagelayout/fragment/portlet/" + portletUniqueName + "/?_type=json";
             var config = {
                     on: { complete: onAddPortletComplete },
                     method: "POST",
-                    headers: { "X-Portal-Path" : "${requestContext.portalURL.path}" } 
+                    headers: { "X-Portal-Path" : "${portalPath}" } 
                 };
             var request = Y.io(uri, config);
         }
@@ -341,4 +346,4 @@
     
     switchTab(tabId);
 });
-</script>
+</script>
\ No newline at end of file



---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org