Author: taylor
Date: Fri Dec 11 21:44:55 2009
New Revision: 889828
URL: http://svn.apache.org/viewvc?rev=889828&view=rev
Log:
https://issues.apache.org/jira/browse/JS2-1084
update /portal pipeline to use JETUI module
Modified:
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/header.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/header.vm
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=889828&r1=889827&r2=889828&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
Fri Dec 11 21:44:55 2009
@@ -30,9 +30,15 @@
#if ($jetspeed.isAjaxCustomizationEnabled())
<script type="text/javascript"
src="#BaseHref()/javascript/yui/build/yui/yui-min.js"></script>
<script language="javascript">
-var assetsDir = "assets/";
-var buildDir = "#BaseHref()/javascript/yui/build/" ;
-var yuiConfig = {base:"#BaseHref()/javascript/yui/build/", timeout: 10000,
debug: true, useBrowserConsole: true}; // ({classNamePrefix: 'jet'})
+var JETUI_YUI_config = {
+ base: "#BaseHref()/javascript/yui/build/",
+ timeout: 10000,
+ debug: true,
+ useBrowserConsole: true,
+ modules: {
+ '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"/>
#end
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=889828&r1=889827&r2=889828&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
Fri Dec 11 21:44:55 2009
@@ -30,9 +30,15 @@
#if ($jetspeed.isAjaxCustomizationEnabled())
<script type="text/javascript"
src="#BaseHref()/javascript/yui/build/yui/yui-min.js"></script>
<script language="javascript">
-var assetsDir = "assets/";
-var buildDir = "#BaseHref()/javascript/yui/build/" ;
-var yuiConfig = {base:"#BaseHref()/javascript/yui/build/", timeout: 10000,
debug: true, useBrowserConsole: true}; // ({classNamePrefix: 'jet'})
+var JETUI_YUI_config = {
+ base: "#BaseHref()/javascript/yui/build/",
+ timeout: 10000,
+ debug: true,
+ useBrowserConsole: true,
+ modules: {
+ '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"/>
#end
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=889828&r1=889827&r2=889828&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
Fri Dec 11 21:44:55 2009
@@ -30,9 +30,15 @@
#if ($jetspeed.isAjaxCustomizationEnabled())
<script type="text/javascript"
src="#BaseHref()/javascript/yui/build/yui/yui-min.js"></script>
<script language="javascript">
-var assetsDir = "assets/";
-var buildDir = "#BaseHref()/javascript/yui/build/" ;
-var yuiConfig = {base:"#BaseHref()/javascript/yui/build/", timeout: 10000,
debug: true, useBrowserConsole: true}; // ({classNamePrefix: 'jet'})
+var JETUI_YUI_config = {
+ base: "#BaseHref()/javascript/yui/build/",
+ timeout: 10000,
+ debug: true,
+ useBrowserConsole: true,
+ modules: {
+ '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"/>
#end
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=889828&r1=889827&r2=889828&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
Fri Dec 11 21:44:55 2009
@@ -30,9 +30,15 @@
#if ($jetspeed.isAjaxCustomizationEnabled())
<script type="text/javascript"
src="#BaseHref()/javascript/yui/build/yui/yui-min.js"></script>
<script language="javascript">
-var assetsDir = "assets/";
-var buildDir = "#BaseHref()/javascript/yui/build/" ;
-var yuiConfig = {base:"#BaseHref()/javascript/yui/build/", timeout: 10000,
debug: true, useBrowserConsole: true}; // ({classNamePrefix: 'jet'})
+var JETUI_YUI_config = {
+ base: "#BaseHref()/javascript/yui/build/",
+ timeout: 10000,
+ debug: true,
+ useBrowserConsole: true,
+ modules: {
+ '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"/>
#end
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscr...@portals.apache.org
For additional commands, e-mail: jetspeed-dev-h...@portals.apache.org
