Author: weaver
Date: Tue Dec  6 13:47:05 2005
New Revision: 354578

URL: http://svn.apache.org/viewcvs?rev=354578&view=rev
Log:
Adding required macros

Modified:
    portals/jetspeed-2/trunk/src/webapp/decorations/layout/metal/header.vm
    portals/jetspeed-2/trunk/src/webapp/decorations/layout/minty-blue/header.vm

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=354578&r1=354577&r2=354578&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 13:47:05 2005
@@ -15,18 +15,16 @@
 *#
 
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-
+#defineLayoutObjects()
 <html>
-<head>
-    <meta http-equiv="Content-type" 
content="text/html#if($response.characterEncoding); 
charset=$response.characterEncoding#end" />
-    <title>$jetspeed.page.title</title> 
-#set($cssUrls = $renderRequest.getAttribute("cssUrls"))
-#foreach($cssUrl in $cssUrls)
-    <link rel="stylesheet" type="text/css" media="all" href="$cssUrl" />
-#end
+<head> 
+    <meta http-equiv="Content-type" content="#ContentType()" />        
+       <title>#PageTitle()</title> 
+       #includeJavaScriptForHead()
+       #IncludeStylesheets()    
 </head>
 
-<body class="layout-Metal">
+<body class="#PageBaseCSSClass()">
 
 
 

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=354578&r1=354577&r2=354578&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 13:47:05 2005
@@ -25,6 +25,7 @@
     <meta name="description" content="#PageDescription()" />   
     <title>#PageTitle()</title>
        #IncludeStylesheets()    
+       #includeJavaScriptForHead()
 </head>
 <body class="#PageBaseCSSClass()">
 



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to