Author: woonsan
Date: Tue Jan 5 17:01:37 2010
New Revision: 896127
URL: http://svn.apache.org/viewvc?rev=896127&view=rev
Log:
JS2-1084: Correcting the usage of #BaseHref() macro, which already contains '/'
after context path.
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=896127&r1=896126&r2=896127&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 Jan 5 17:01:37 2010
@@ -24,7 +24,7 @@
<img src="#GetPageResource('images/Jetspeed_blue_sm.png')" alt="Jetspeed
2 Powered" border="0" />
</p>
#if ($jetspeed.isAjaxCustomizationEnabled())
-<script src="#BaseHref()/jetui/engine/portal.js"></script>
+<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">
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=896127&r1=896126&r2=896127&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 Jan 5 17:01:37 2010
@@ -36,7 +36,7 @@
<html>
<head>
#if ($jetspeed.isAjaxCustomizationEnabled())
-<script type="text/javascript"
src="#BaseHref()/javascript/yui/build/yui/yui-min.js"></script>
+<script type="text/javascript"
src="#BaseHref()javascript/yui/build/yui/yui-min.js"></script>
<script language="javascript">
var JetuiConfiguration = {
engine: '$pc.getString("jetui.render.engine")',
@@ -50,17 +50,17 @@
portalPagePath: "${portalPagePath}"
};
var JETUI_YUI = {
- base: "#BaseHref()/javascript/yui/build/",
+ base: "#BaseHref()javascript/yui/build/",
timeout: 10000,
debug: true,
useBrowserConsole: true,
config: JetuiConfiguration,
modules: {
- 'jetui-portal': { fullpath:
"#BaseHref()/javascript/jetspeed/jetui/jetui-portal.js" }
+ 'jetui-portal': { fullpath:
"#BaseHref()javascript/jetspeed/jetui/jetui-portal.js" }
}
}; // ({classNamePrefix: 'jet'})
</script>
-<link rel="stylesheet" type="text/css"
href="#BaseHref()/jetui/css/portal.css"/>
+<link rel="stylesheet" type="text/css" href="#BaseHref()jetui/css/portal.css"/>
#end
#includeHeaderResource()
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=896127&r1=896126&r2=896127&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 Jan 5 17:01:37 2010
@@ -26,7 +26,7 @@
<img src="#GetPageResource('images/Jetspeed_blue_sm.png')" alt="Jetspeed
2 Powered" border="0" />
</p>
#if ($jetspeed.isAjaxCustomizationEnabled())
-<script src="#BaseHref()/jetui/engine/portal.js"></script>
+<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">
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=896127&r1=896126&r2=896127&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 Jan 5 17:01:37 2010
@@ -36,7 +36,7 @@
<html>
<head>
#if ($jetspeed.isAjaxCustomizationEnabled())
-<script type="text/javascript"
src="#BaseHref()/javascript/yui/build/yui/yui-min.js"></script>
+<script type="text/javascript"
src="#BaseHref()javascript/yui/build/yui/yui-min.js"></script>
<script language="javascript">
var JetuiConfiguration = {
engine: '$pc.getString("jetui.render.engine")',
@@ -50,17 +50,17 @@
portalPagePath: "${portalPagePath}"
};
var JETUI_YUI = {
- base: "#BaseHref()/javascript/yui/build/",
+ base: "#BaseHref()javascript/yui/build/",
timeout: 10000,
debug: true,
useBrowserConsole: true,
config: JetuiConfiguration,
modules: {
- 'jetui-portal': { fullpath:
"#BaseHref()/javascript/jetspeed/jetui/jetui-portal.js" }
+ 'jetui-portal': { fullpath:
"#BaseHref()javascript/jetspeed/jetui/jetui-portal.js" }
}
}; // ({classNamePrefix: 'jet'})
</script>
-<link rel="stylesheet" type="text/css"
href="#BaseHref()/jetui/css/portal.css"/>
+<link rel="stylesheet" type="text/css" href="#BaseHref()jetui/css/portal.css"/>
#end
#includeHeaderResource()
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=896127&r1=896126&r2=896127&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 Jan 5 17:01:37 2010
@@ -24,7 +24,7 @@
<img src="#GetPageResource('images/Jetspeed_blue_sm.png')" alt="Jetspeed
2 Powered" border="0" />
</p>
#if ($jetspeed.isAjaxCustomizationEnabled())
-<script src="#BaseHref()/jetui/engine/portal.js"></script>
+<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">
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=896127&r1=896126&r2=896127&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 Jan 5 17:01:37 2010
@@ -36,7 +36,7 @@
<html>
<head>
#if ($jetspeed.isAjaxCustomizationEnabled())
-<script type="text/javascript"
src="#BaseHref()/javascript/yui/build/yui/yui-min.js"></script>
+<script type="text/javascript"
src="#BaseHref()javascript/yui/build/yui/yui-min.js"></script>
<script language="javascript">
var JetuiConfiguration = {
engine: '$pc.getString("jetui.render.engine")',
@@ -50,17 +50,17 @@
portalPagePath: "${portalPagePath}"
};
var JETUI_YUI = {
- base: "#BaseHref()/javascript/yui/build/",
+ base: "#BaseHref()javascript/yui/build/",
timeout: 10000,
debug: true,
useBrowserConsole: true,
config: JetuiConfiguration,
modules: {
- 'jetui-portal': { fullpath:
"#BaseHref()/javascript/jetspeed/jetui/jetui-portal.js" }
+ 'jetui-portal': { fullpath:
"#BaseHref()javascript/jetspeed/jetui/jetui-portal.js" }
}
}; // ({classNamePrefix: 'jet'})
</script>
-<link rel="stylesheet" type="text/css"
href="#BaseHref()/jetui/css/portal.css"/>
+<link rel="stylesheet" type="text/css" href="#BaseHref()jetui/css/portal.css"/>
#end
#includeHeaderResource()
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=896127&r1=896126&r2=896127&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 Jan 5 17:01:37 2010
@@ -24,7 +24,7 @@
<img src="#GetPageResource('images/Jetspeed_blue_sm.png')" alt="Jetspeed
2 Powered" border="0" />
</p>
#if ($jetspeed.isAjaxCustomizationEnabled())
-<script src="#BaseHref()/jetui/engine/portal.js"></script>
+<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">
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=896127&r1=896126&r2=896127&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 Jan 5 17:01:37 2010
@@ -36,7 +36,7 @@
<html>
<head>
#if ($jetspeed.isAjaxCustomizationEnabled())
-<script type="text/javascript"
src="#BaseHref()/javascript/yui/build/yui/yui-min.js"></script>
+<script type="text/javascript"
src="#BaseHref()javascript/yui/build/yui/yui-min.js"></script>
<script language="javascript">
var JetuiConfiguration = {
engine: '$pc.getString("jetui.render.engine")',
@@ -50,17 +50,17 @@
portalPagePath: "${portalPagePath}"
};
var JETUI_YUI = {
- base: "#BaseHref()/javascript/yui/build/",
+ base: "#BaseHref()javascript/yui/build/",
timeout: 10000,
debug: true,
useBrowserConsole: true,
config: JetuiConfiguration,
modules: {
- 'jetui-portal': { fullpath:
"#BaseHref()/javascript/jetspeed/jetui/jetui-portal.js" }
+ 'jetui-portal': { fullpath:
"#BaseHref()javascript/jetspeed/jetui/jetui-portal.js" }
}
}; // ({classNamePrefix: 'jet'})
</script>
-<link rel="stylesheet" type="text/css"
href="#BaseHref()/jetui/css/portal.css"/>
+<link rel="stylesheet" type="text/css" href="#BaseHref()jetui/css/portal.css"/>
#end
#includeHeaderResource()
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
