Author: taylor
Date: Tue Dec 15 00:41:31 2009
New Revision: 890587
URL: http://svn.apache.org/viewvc?rev=890587&view=rev
Log:
https://issues.apache.org/jira/browse/JS2-1084
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/greenearth/footer.vm
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/greenearth/header.vm
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/jetspeed/footer.vm
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/jetspeed/header.vm
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/purpleplanet/footer.vm
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/purpleplanet/header.vm
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/turbo/footer.vm
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/turbo/header.vm
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/greenearth/footer.vm
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/greenearth/footer.vm?rev=890587&r1=890586&r2=890587&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/greenearth/footer.vm
(original)
+++
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/greenearth/footer.vm
Tue Dec 15 00:41:31 2009
@@ -21,8 +21,19 @@
<p>
<img src="#GetPageResource('images/Jetspeed_blue_sm.png')" alt="Jetspeed
2 Powered" border="0" />
</p>
- </body>
#if ($jetspeed.isAjaxCustomizationEnabled())
<script src="#BaseHref()/jetui/engine/portal.js"></script>
+<div id="jsPortletTemplate" class="portal-layout-cell yui-dd-draggable
yui-dd-drop" style="display: none">
+ <div class="portlet ${layoutDecoration.name}">
+ <div class="PTitle">
+ <div class="PTitleContent">Loading..L</div>
+ <div class="PActionBar"></div>
+ </div>
+ <div class="PContentBorder">
+ <div class="PContent"></div>
+ </div>
+ </div>
+</div>
#end
+</body>
</html>
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/greenearth/header.vm
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/greenearth/header.vm?rev=890587&r1=890586&r2=890587&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/greenearth/header.vm
(original)
+++
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/greenearth/header.vm
Tue Dec 15 00:41:31 2009
@@ -24,6 +24,13 @@
#* Add all template constants to the current context *#
#defineNavigationConstants()
#set($pc = $jetspeed.getPortalConfiguration())
+#set($rc = $request.getAttribute("org.apache.jetspeed.request.RequestContext"))
+#set($portalContextPath = $rc.request.getContextPath())
+#set($portalServletPath = $rc.request.getServletPath())
+#set($portalPagePath = $rc.getPortalURL().getPath())
+#if ($portalPagePath == "")
+ #set($portalPagePath = "/")
+#end
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
<html>
@@ -37,7 +44,10 @@
dragMode: '$pc.getString("jetui.drag.mode")',
portletStyle: '$pc.getString("jetui.style.portlet")',
layoutStyle: '$pc.getString("jetui.style.layout")',
- dragHandleStyle: '$pc.getString("jetui.style.drag.handle")'
+ dragHandleStyle: '$pc.getString("jetui.style.drag.handle")',
+ portalContextPath: "${portalContextPath}",
+ portalServletPath: "${portalServletPath}",
+ portalPagePath: "${portalPagePath}"
};
var JETUI_YUI = {
base: "#BaseHref()/javascript/yui/build/",
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/jetspeed/footer.vm
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/jetspeed/footer.vm?rev=890587&r1=890586&r2=890587&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/jetspeed/footer.vm
(original)
+++
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/jetspeed/footer.vm
Tue Dec 15 00:41:31 2009
@@ -22,8 +22,19 @@
<p>
<img src="#GetPageResource('images/Jetspeed_blue_sm.png')" alt="Jetspeed
2 Powered" border="0" />
</p>
- </body>
#if ($jetspeed.isAjaxCustomizationEnabled())
<script src="#BaseHref()/jetui/engine/portal.js"></script>
+<div id="jsPortletTemplate" class="portal-layout-cell yui-dd-draggable
yui-dd-drop" style="display: none">
+ <div class="portlet ${layoutDecoration.name}">
+ <div class="PTitle">
+ <div class="PTitleContent">Loading..L</div>
+ <div class="PActionBar"></div>
+ </div>
+ <div class="PContentBorder">
+ <div class="PContent"></div>
+ </div>
+ </div>
+</div>
#end
+</body>
</html>
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/jetspeed/header.vm
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/jetspeed/header.vm?rev=890587&r1=890586&r2=890587&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/jetspeed/header.vm
(original)
+++
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/jetspeed/header.vm
Tue Dec 15 00:41:31 2009
@@ -24,6 +24,13 @@
#* Add all template constants to the current context *#
#defineNavigationConstants()
#set($pc = $jetspeed.getPortalConfiguration())
+#set($rc = $request.getAttribute("org.apache.jetspeed.request.RequestContext"))
+#set($portalContextPath = $rc.request.getContextPath())
+#set($portalServletPath = $rc.request.getServletPath())
+#set($portalPagePath = $rc.getPortalURL().getPath())
+#if ($portalPagePath == "")
+ #set($portalPagePath = "/")
+#end
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
<html>
@@ -37,7 +44,10 @@
dragMode: '$pc.getString("jetui.drag.mode")',
portletStyle: '$pc.getString("jetui.style.portlet")',
layoutStyle: '$pc.getString("jetui.style.layout")',
- dragHandleStyle: '$pc.getString("jetui.style.drag.handle")'
+ dragHandleStyle: '$pc.getString("jetui.style.drag.handle")',
+ portalContextPath: "${portalContextPath}",
+ portalServletPath: "${portalServletPath}",
+ portalPagePath: "${portalPagePath}"
};
var JETUI_YUI = {
base: "#BaseHref()/javascript/yui/build/",
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/purpleplanet/footer.vm
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/purpleplanet/footer.vm?rev=890587&r1=890586&r2=890587&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/purpleplanet/footer.vm
(original)
+++
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/purpleplanet/footer.vm
Tue Dec 15 00:41:31 2009
@@ -21,8 +21,19 @@
<p>
<img src="#GetPageResource('images/Jetspeed_blue_sm.png')" alt="Jetspeed
2 Powered" border="0" />
</p>
- </body>
#if ($jetspeed.isAjaxCustomizationEnabled())
<script src="#BaseHref()/jetui/engine/portal.js"></script>
+<div id="jsPortletTemplate" class="portal-layout-cell yui-dd-draggable
yui-dd-drop" style="display: none">
+ <div class="portlet ${layoutDecoration.name}">
+ <div class="PTitle">
+ <div class="PTitleContent">Loading..L</div>
+ <div class="PActionBar"></div>
+ </div>
+ <div class="PContentBorder">
+ <div class="PContent"></div>
+ </div>
+ </div>
+</div>
#end
+</body>
</html>
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/purpleplanet/header.vm
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/purpleplanet/header.vm?rev=890587&r1=890586&r2=890587&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/purpleplanet/header.vm
(original)
+++
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/purpleplanet/header.vm
Tue Dec 15 00:41:31 2009
@@ -24,6 +24,13 @@
#* Add all template constants to the current context *#
#defineNavigationConstants()
#set($pc = $jetspeed.getPortalConfiguration())
+#set($rc = $request.getAttribute("org.apache.jetspeed.request.RequestContext"))
+#set($portalContextPath = $rc.request.getContextPath())
+#set($portalServletPath = $rc.request.getServletPath())
+#set($portalPagePath = $rc.getPortalURL().getPath())
+#if ($portalPagePath == "")
+ #set($portalPagePath = "/")
+#end
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
<html>
@@ -37,7 +44,10 @@
dragMode: '$pc.getString("jetui.drag.mode")',
portletStyle: '$pc.getString("jetui.style.portlet")',
layoutStyle: '$pc.getString("jetui.style.layout")',
- dragHandleStyle: '$pc.getString("jetui.style.drag.handle")'
+ dragHandleStyle: '$pc.getString("jetui.style.drag.handle")',
+ portalContextPath: "${portalContextPath}",
+ portalServletPath: "${portalServletPath}",
+ portalPagePath: "${portalPagePath}"
};
var JETUI_YUI = {
base: "#BaseHref()/javascript/yui/build/",
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/turbo/footer.vm
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/turbo/footer.vm?rev=890587&r1=890586&r2=890587&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/turbo/footer.vm
(original)
+++
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/turbo/footer.vm
Tue Dec 15 00:41:31 2009
@@ -21,8 +21,19 @@
<p>
<img src="#GetPageResource('images/Jetspeed_blue_sm.png')" alt="Jetspeed
2 Powered" border="0" />
</p>
- </body>
#if ($jetspeed.isAjaxCustomizationEnabled())
<script src="#BaseHref()/jetui/engine/portal.js"></script>
+<div id="jsPortletTemplate" class="portal-layout-cell yui-dd-draggable
yui-dd-drop" style="display: none">
+ <div class="portlet ${layoutDecoration.name}">
+ <div class="PTitle">
+ <div class="PTitleContent">Loading..L</div>
+ <div class="PActionBar"></div>
+ </div>
+ <div class="PContentBorder">
+ <div class="PContent"></div>
+ </div>
+ </div>
+</div>
#end
+</body>
</html>
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/turbo/header.vm
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/turbo/header.vm?rev=890587&r1=890586&r2=890587&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/turbo/header.vm
(original)
+++
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/turbo/header.vm
Tue Dec 15 00:41:31 2009
@@ -24,6 +24,13 @@
#* Add all template constants to the current context *#
#defineNavigationConstants()
#set($pc = $jetspeed.getPortalConfiguration())
+#set($rc = $request.getAttribute("org.apache.jetspeed.request.RequestContext"))
+#set($portalContextPath = $rc.request.getContextPath())
+#set($portalServletPath = $rc.request.getServletPath())
+#set($portalPagePath = $rc.getPortalURL().getPath())
+#if ($portalPagePath == "")
+ #set($portalPagePath = "/")
+#end
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
<html>
@@ -37,7 +44,10 @@
dragMode: '$pc.getString("jetui.drag.mode")',
portletStyle: '$pc.getString("jetui.style.portlet")',
layoutStyle: '$pc.getString("jetui.style.layout")',
- dragHandleStyle: '$pc.getString("jetui.style.drag.handle")'
+ dragHandleStyle: '$pc.getString("jetui.style.drag.handle")',
+ portalContextPath: "${portalContextPath}",
+ portalServletPath: "${portalServletPath}",
+ portalPagePath: "${portalPagePath}"
};
var JETUI_YUI = {
base: "#BaseHref()/javascript/yui/build/",
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
