You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by we...@apache.org on 2005/12/07 00:18:23 UTC
svn commit: r354609 - in
/portals/jetspeed-2/trunk/src/webapp/decorations/layout: jetspeed/
jscookmenu/ jscookmenu/scripts/ThemeIE/ jscookmenu/scripts/ThemeOffice/
jscookmenu/scripts/ThemePanel/ metal/ minty-blue/ simple/
Author: weaver
Date: Tue Dec 6 15:18:17 2005
New Revision: 354609
URL: http://svn.apache.org/viewcvs?rev=354609&view=rev
Log:
- Adding required macros
- Adjustments for new Decorator API.
- Fixed JSCookmenu
Added:
portals/jetspeed-2/trunk/src/webapp/decorations/layout/metal/decorator.properties (with props)
Modified:
portals/jetspeed-2/trunk/src/webapp/decorations/layout/jetspeed/header.vm
portals/jetspeed-2/trunk/src/webapp/decorations/layout/jscookmenu/header.vm
portals/jetspeed-2/trunk/src/webapp/decorations/layout/jscookmenu/scripts/ThemeIE/theme.js
portals/jetspeed-2/trunk/src/webapp/decorations/layout/jscookmenu/scripts/ThemeOffice/theme.js
portals/jetspeed-2/trunk/src/webapp/decorations/layout/jscookmenu/scripts/ThemePanel/theme.js
portals/jetspeed-2/trunk/src/webapp/decorations/layout/metal/header.vm
portals/jetspeed-2/trunk/src/webapp/decorations/layout/minty-blue/header.vm
portals/jetspeed-2/trunk/src/webapp/decorations/layout/simple/header.vm
Modified: portals/jetspeed-2/trunk/src/webapp/decorations/layout/jetspeed/header.vm
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/decorations/layout/jetspeed/header.vm?rev=354609&r1=354608&r2=354609&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/decorations/layout/jetspeed/header.vm (original)
+++ portals/jetspeed-2/trunk/src/webapp/decorations/layout/jetspeed/header.vm Tue Dec 6 15:18:17 2005
@@ -22,8 +22,9 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
<head>
- <meta http-equiv="Content-type" content="text/html#if($response.characterEncoding); charset=$response.characterEncoding#end" />
- <title>$jetspeed.page.getTitle($preferedLocale)</title>
+ <meta http-equiv="Content-type" content="#ContentType()" />
+ <base href="#BaseHref()">
+ <title>#PageTitle()</title>
#includeJavaScriptForHead()
#includeHeaderResource()
#IncludeStylesheets()
Modified: portals/jetspeed-2/trunk/src/webapp/decorations/layout/jscookmenu/header.vm
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/decorations/layout/jscookmenu/header.vm?rev=354609&r1=354608&r2=354609&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/decorations/layout/jscookmenu/header.vm (original)
+++ portals/jetspeed-2/trunk/src/webapp/decorations/layout/jscookmenu/header.vm Tue Dec 6 15:18:17 2005
@@ -36,12 +36,15 @@
DEALINGS IN THE SOFTWARE.
*#
-#* Add all template constants to the current context *#
-#defineNavigationConstants()
-
#* Add the current layouts configuration values to the context *#
#defineLayoutObjects()
+#* Loads our custom macros *#
+#parse($layoutDecoration.getResource("decorator-macros.vm"))
+
+#* Add all template constants to the current context *#
+#defineNavigationConstants()
+
#* Access page context *#
#set($site = $request.getAttribute("org.apache.jetspeed.portalsite.PortalSiteRequestContext"))
@@ -56,11 +59,12 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
<head>
+ <base href="#BaseHref()">
<meta http-equiv="Content-type" content="#ContentType()" />
<meta http-equiv="Content-style-type" content="text/css" />
#includeJavaScriptForHead()
-#includeHeaderResource()
+## #includeHeaderResource()
#IncludeStylesheets()
<title>#PageTitle()</title>
Modified: portals/jetspeed-2/trunk/src/webapp/decorations/layout/jscookmenu/scripts/ThemeIE/theme.js
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/decorations/layout/jscookmenu/scripts/ThemeIE/theme.js?rev=354609&r1=354608&r2=354609&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/decorations/layout/jscookmenu/scripts/ThemeIE/theme.js (original)
+++ portals/jetspeed-2/trunk/src/webapp/decorations/layout/jscookmenu/scripts/ThemeIE/theme.js Tue Dec 6 15:18:17 2005
@@ -1,5 +1,5 @@
-var cmThemeIEBase = 'content/images/ThemeIE/';
+var cmThemeIEBase = 'images/ThemeIE/';
var cmThemeIE =
{
Modified: portals/jetspeed-2/trunk/src/webapp/decorations/layout/jscookmenu/scripts/ThemeOffice/theme.js
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/decorations/layout/jscookmenu/scripts/ThemeOffice/theme.js?rev=354609&r1=354608&r2=354609&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/decorations/layout/jscookmenu/scripts/ThemeOffice/theme.js (original)
+++ portals/jetspeed-2/trunk/src/webapp/decorations/layout/jscookmenu/scripts/ThemeOffice/theme.js Tue Dec 6 15:18:17 2005
@@ -1,6 +1,6 @@
// directory of where all the images are
-var cmThemeOfficeBase = 'content/images/ThemeOffice/';
+var cmThemeOfficeBase = 'images/ThemeOffice/';
var cmThemeOffice =
{
Modified: portals/jetspeed-2/trunk/src/webapp/decorations/layout/jscookmenu/scripts/ThemePanel/theme.js
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/decorations/layout/jscookmenu/scripts/ThemePanel/theme.js?rev=354609&r1=354608&r2=354609&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/decorations/layout/jscookmenu/scripts/ThemePanel/theme.js (original)
+++ portals/jetspeed-2/trunk/src/webapp/decorations/layout/jscookmenu/scripts/ThemePanel/theme.js Tue Dec 6 15:18:17 2005
@@ -1,6 +1,6 @@
// directory of where all the images are
-var cmThemePanelBase = 'content/images/ThemePanel/';
+var cmThemePanelBase = 'images/ThemePanel/';
var cmThemePanel =
{
Added: portals/jetspeed-2/trunk/src/webapp/decorations/layout/metal/decorator.properties
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/decorations/layout/metal/decorator.properties?rev=354609&view=auto
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/decorations/layout/metal/decorator.properties (added)
+++ portals/jetspeed-2/trunk/src/webapp/decorations/layout/metal/decorator.properties Tue Dec 6 15:18:17 2005
@@ -0,0 +1,19 @@
+# Copyright 2004 The Apache Software Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+id=metal
+template.type=velocity
+template.extension=.vm
+decorates=layout
+base.css.class=layout-metal
Propchange: portals/jetspeed-2/trunk/src/webapp/decorations/layout/metal/decorator.properties
------------------------------------------------------------------------------
svn:eol-style = native
Modified: portals/jetspeed-2/trunk/src/webapp/decorations/layout/metal/header.vm
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/decorations/layout/metal/header.vm?rev=354609&r1=354608&r2=354609&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/decorations/layout/metal/header.vm (original)
+++ portals/jetspeed-2/trunk/src/webapp/decorations/layout/metal/header.vm Tue Dec 6 15:18:17 2005
@@ -18,6 +18,7 @@
#defineLayoutObjects()
<html>
<head>
+ <base href="#BaseHref()">
<meta http-equiv="Content-type" content="#ContentType()" />
<title>#PageTitle()</title>
#includeJavaScriptForHead()
@@ -35,7 +36,4 @@
<p>
<img src="#PageBaseCSSClass('images/jetspeed-logo.gif')" alt="Jetspeed 2 Logo" border="0">
</p>
-
-## $jetspeed.include($jetspeed.currentFragment)
-
<!-- END: layout/html/metal/decorator.vm -->
Modified: portals/jetspeed-2/trunk/src/webapp/decorations/layout/minty-blue/header.vm
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/decorations/layout/minty-blue/header.vm?rev=354609&r1=354608&r2=354609&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/decorations/layout/minty-blue/header.vm (original)
+++ portals/jetspeed-2/trunk/src/webapp/decorations/layout/minty-blue/header.vm Tue Dec 6 15:18:17 2005
@@ -19,6 +19,7 @@
<html>
<head>
+ <base href="#BaseHref()">
<meta http-equiv="Content-type" content="#ContentType()" />
<meta name="version" content="#SiteVersionTag()">
<meta name="keywords" content="" />
Modified: portals/jetspeed-2/trunk/src/webapp/decorations/layout/simple/header.vm
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/decorations/layout/simple/header.vm?rev=354609&r1=354608&r2=354609&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/decorations/layout/simple/header.vm (original)
+++ portals/jetspeed-2/trunk/src/webapp/decorations/layout/simple/header.vm Tue Dec 6 15:18:17 2005
@@ -24,6 +24,7 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
<head>
+ <base href="#BaseHref()">
<meta http-equiv="Content-type" content="#ContentType()" />
<meta http-equiv="Content-style-type" content="text/css" />
#includeJavaScriptForHead()
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org