Author: woonsan
Date: Wed Mar 24 18:31:14 2010
New Revision: 927143

URL: http://svn.apache.org/viewvc?rev=927143&view=rev
Log:
JS2-1120: Allow override portlet icons path by portlet application context 
relative path.

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=927143&r1=927142&r2=927143&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
 Wed Mar 24 18:31:14 2010
@@ -396,7 +396,8 @@ YUI().use('jetui-portal', 'io', 'json', 
             clone.setStyle('display', '');
             var imgNode = clone.one('img');
             if (def.portletIcon) {
-                imgNode.set("src", "${portalContextPath}/images/portlets/" + 
def.portletIcon);
+                var iconContextPath = ("portlet" == def.portletIconHolder && 
def.applicationContextPath ? def.applicationContextPath : 
"${portalContextPath}"); 
+                imgNode.set("src", iconContextPath + (def.portletIconBasePath 
? def.portletIconBasePath : "/images/portlets") + "/" + def.portletIcon);
             } else {
                 imgNode.set("src", 
"${portalContextPath}/images/portlets/applications-other.png");
             }



---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to