Author: weaver
Date: Tue Dec 6 13:51:05 2005
New Revision: 354579
URL: http://svn.apache.org/viewcvs?rev=354579&view=rev
Log:
- Adding required macros
- Adjustments for new Decorator API.
Modified:
portals/jetspeed-2/trunk/src/webapp/decorations/layout/jetspeed/footer.vm
portals/jetspeed-2/trunk/src/webapp/decorations/layout/jetspeed/header.vm
Modified:
portals/jetspeed-2/trunk/src/webapp/decorations/layout/jetspeed/footer.vm
URL:
http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/decorations/layout/jetspeed/footer.vm?rev=354579&r1=354578&r2=354579&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/decorations/layout/jetspeed/footer.vm
(original)
+++ portals/jetspeed-2/trunk/src/webapp/decorations/layout/jetspeed/footer.vm
Tue Dec 6 13:51:05 2005
@@ -20,7 +20,7 @@
</div>
<p>
-<img src="content/images/jetspeed-powered.gif" alt="Jetspeed 2 Powered"
border="0">
+<img src="#GetPageResource('images/jetspeed-powered.gif')" alt="Jetspeed 2
Powered" border="0">
</p>
</body>
</html>
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=354579&r1=354578&r2=354579&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 13:51:05 2005
@@ -26,16 +26,14 @@
<title>$jetspeed.page.getTitle($preferedLocale)</title>
#includeJavaScriptForHead()
#includeHeaderResource()
+#IncludeStylesheets()
</head>
-<body class="${_layoutBaseCssClass}">
-
-#set($myF = $jetspeed.currentFragment)
-
+<body class="#PageBaseCSSClass()">
<!-- BEGIN: layout/html/jetspeed/decorator.vm -->
-<div id="layout-${myF.id}" class="${_layoutBaseCssClass}" >
+<div id="layout-${layoutFragment.id}" class="#PageBaseCSSClass()" >
<p>
-<img src="content/images/jetspeed-logo.gif" alt="Jetspeed 2 Logo" border="0">
+<img src="#GetPageResource('images/jetspeed-logo.gif')" alt="Jetspeed 2 Logo"
border="0">
</p>
#set($site = $request.getAttribute("org.apache.jetspeed.profiledPageContext"))
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
