Author: jford
Date: Sat Aug 6 15:18:07 2005
New Revision: 230606
URL: http://svn.apache.org/viewcvs?rev=230606&view=rev
Log:
Removed openWindow javascript function from layout.vm and placed in
jetspeed_macros.vm.
The layout vm was placing the script before the html root element
Modified:
portals/jetspeed-2/trunk/portal-webapp/src/webapp/WEB-INF/jetspeed_macros.vm
portals/jetspeed-2/trunk/portal-webapp/src/webapp/WEB-INF/templates/layout/html/columns/layout.vm
Modified:
portals/jetspeed-2/trunk/portal-webapp/src/webapp/WEB-INF/jetspeed_macros.vm
URL:
http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/portal-webapp/src/webapp/WEB-INF/jetspeed_macros.vm?rev=230606&r1=230605&r2=230606&view=diff
==============================================================================
---
portals/jetspeed-2/trunk/portal-webapp/src/webapp/WEB-INF/jetspeed_macros.vm
(original)
+++
portals/jetspeed-2/trunk/portal-webapp/src/webapp/WEB-INF/jetspeed_macros.vm
Sat Aug 6 15:18:07 2005
@@ -7,6 +7,14 @@
#* Adds link for all style sheets required by the layout and portlet
decorations *#
#macro (includeHeaderResource)
+ <script>
+ function openWindow(pipeline)
+ {
+ var vWinUsers = window.open(pipeline, 'PortletSelector',
'status=no,resizable=yes,width=500,height=600,scrollbars=yes');
+ vWinUsers.opener = self;
+ vWinUsers.focus();
+ }
+ </script>
#set($resourceHeaderFactory =
$jetspeed.getComponent("org.apache.jetspeed.headerresource.HeaderResourceFactory"))
#set($resourceHeader =
$resourceHeaderFactory.getHeaderResouce($JS2RequestContext))
$resourceHeader
Modified:
portals/jetspeed-2/trunk/portal-webapp/src/webapp/WEB-INF/templates/layout/html/columns/layout.vm
URL:
http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/portal-webapp/src/webapp/WEB-INF/templates/layout/html/columns/layout.vm?rev=230606&r1=230605&r2=230606&view=diff
==============================================================================
---
portals/jetspeed-2/trunk/portal-webapp/src/webapp/WEB-INF/templates/layout/html/columns/layout.vm
(original)
+++
portals/jetspeed-2/trunk/portal-webapp/src/webapp/WEB-INF/templates/layout/html/columns/layout.vm
Sat Aug 6 15:18:07 2005
@@ -27,15 +27,7 @@
#if($jetspeed.portletMode.toString() == "edit")
#set($editing = true)
- #set($lastColumn = $renderRequest.getAttribute("numberOfColumns") - 1)
-<script>
-function openWindow(pipeline)
-{
- var vWinUsers = window.open(pipeline, 'PortletSelector',
'status=no,resizable=yes,width=500,height=600,scrollbars=yes');
- vWinUsers.opener = self;
- vWinUsers.focus();
-}
-</script>
+ #set($lastColumn = $renderRequest.getAttribute("numberOfColumns") - 1)
#end
#if($myFragment.getDecorator())
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
