Author: ate
Date: Tue Feb 20 08:33:42 2007
New Revision: 509631
URL: http://svn.apache.org/viewvc?view=rev&rev=509631
Log:
JS2-275: standard/demo decorations no longer need the base tag set.
Removing the dependency on the base tag is needed to be able to use a Proxy
frontend for the portal which required all portal generated urls to be relative.
Note: the jetspeed-macros.vm BaseHref macro is still available so existing
decorators will continue to work properly.
Modified:
portals/jetspeed-2/trunk/src/webapp/decorations/layout/blueocean/header.vm
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/simple/header.vm
portals/jetspeed-2/trunk/src/webapp/decorations/layout/simple/xhtml-basic/header.vm
portals/jetspeed-2/trunk/src/webapp/decorations/layout/sunflower/header.vm
portals/jetspeed-2/trunk/src/webapp/decorations/layout/thesolution/header.vm
portals/jetspeed-2/trunk/src/webapp/decorations/layout/tigris/header.vm
Modified:
portals/jetspeed-2/trunk/src/webapp/decorations/layout/blueocean/header.vm
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/decorations/layout/blueocean/header.vm?view=diff&rev=509631&r1=509630&r2=509631
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/decorations/layout/blueocean/header.vm
(original)
+++ portals/jetspeed-2/trunk/src/webapp/decorations/layout/blueocean/header.vm
Tue Feb 20 08:33:42 2007
@@ -35,12 +35,8 @@
<html xmlns="http://www.w3.org/1999/xhtml";>
<head>
- ## include header resources immdiately after head and before base is reset
to the portal
- ## web application context path root; this implies that header resources
can not reliably
- ## employ relative urls to locate content
#includeHeaderResource()
- <base href="#BaseHref()" />
<meta http-equiv="Content-type" content="#ContentType()" />
<meta http-equiv="Content-style-type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
Modified:
portals/jetspeed-2/trunk/src/webapp/decorations/layout/jetspeed/header.vm
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/decorations/layout/jetspeed/header.vm?view=diff&rev=509631&r1=509630&r2=509631
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/decorations/layout/jetspeed/header.vm
(original)
+++ portals/jetspeed-2/trunk/src/webapp/decorations/layout/jetspeed/header.vm
Tue Feb 20 08:33:42 2007
@@ -24,13 +24,9 @@
<html>
<head>
-## include header resources immdiately after head and before base is reset to
the portal
-## web application context path root; this implies that header resources can
not reliably
-## employ relative urls to locate content
#includeHeaderResource()
<meta http-equiv="Content-type" content="#ContentType()" />
- <base href="#BaseHref()">
<title>#PageTitle()</title>
#includeJavaScriptForHead()
Modified:
portals/jetspeed-2/trunk/src/webapp/decorations/layout/jscookmenu/header.vm
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/decorations/layout/jscookmenu/header.vm?view=diff&rev=509631&r1=509630&r2=509631
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/decorations/layout/jscookmenu/header.vm
(original)
+++ portals/jetspeed-2/trunk/src/webapp/decorations/layout/jscookmenu/header.vm
Tue Feb 20 08:33:42 2007
@@ -60,12 +60,8 @@
<html>
<head>
-## include header resources immdiately after head and before base is reset to
the portal
-## web application context path root; this implies that header resources can
not reliably
-## employ relative urls to locate content
#includeHeaderResource()
- <base href="#BaseHref()">
<meta http-equiv="Content-type" content="#ContentType()" />
<meta http-equiv="Content-style-type" content="text/css" />
Modified:
portals/jetspeed-2/trunk/src/webapp/decorations/layout/simple/header.vm
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/decorations/layout/simple/header.vm?view=diff&rev=509631&r1=509630&r2=509631
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/decorations/layout/simple/header.vm
(original)
+++ portals/jetspeed-2/trunk/src/webapp/decorations/layout/simple/header.vm Tue
Feb 20 08:33:42 2007
@@ -26,12 +26,8 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
<head>
-## include header resources immdiately after head and before base is reset to
the portal
-## web application context path root; this implies that header resources can
not reliably
-## employ relative urls to locate content
#includeHeaderResource()
- <base href="#BaseHref()">
<meta http-equiv="Content-type" content="#ContentType()" />
<meta http-equiv="Content-style-type" content="text/css" />
Modified:
portals/jetspeed-2/trunk/src/webapp/decorations/layout/simple/xhtml-basic/header.vm
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/decorations/layout/simple/xhtml-basic/header.vm?view=diff&rev=509631&r1=509630&r2=509631
==============================================================================
---
portals/jetspeed-2/trunk/src/webapp/decorations/layout/simple/xhtml-basic/header.vm
(original)
+++
portals/jetspeed-2/trunk/src/webapp/decorations/layout/simple/xhtml-basic/header.vm
Tue Feb 20 08:33:42 2007
@@ -17,12 +17,8 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML Basic 1.0//EN"
"http://www.w3.org/TR/xhtml-basic/xhtml-basic10.dtd";>
<html>
<head>
-## include header resources immdiately after head and before base is reset to
the portal
-## web application context path root; this implies that header resources can
not reliably
-## employ relative urls to locate content
#includeHeaderResource()
<meta http-equiv="Content-Type" content="$response.contentType"/>
-<base href="#BaseHref()">
#IncludeStylesheets()
<title>#PageTitle()</title>
</head>
Modified:
portals/jetspeed-2/trunk/src/webapp/decorations/layout/sunflower/header.vm
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/decorations/layout/sunflower/header.vm?view=diff&rev=509631&r1=509630&r2=509631
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/decorations/layout/sunflower/header.vm
(original)
+++ portals/jetspeed-2/trunk/src/webapp/decorations/layout/sunflower/header.vm
Tue Feb 20 08:33:42 2007
@@ -31,12 +31,8 @@
<html>
<head>
- ## include header resources immdiately after head and before base is reset
to the portal
- ## web application context path root; this implies that header resources
can not reliably
- ## employ relative urls to locate content
#includeHeaderResource()
- <base href="#BaseHref()">
<meta http-equiv="Content-type" content="#ContentType()" />
<meta http-equiv="Content-style-type" content="text/css" />
Modified:
portals/jetspeed-2/trunk/src/webapp/decorations/layout/thesolution/header.vm
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/decorations/layout/thesolution/header.vm?view=diff&rev=509631&r1=509630&r2=509631
==============================================================================
---
portals/jetspeed-2/trunk/src/webapp/decorations/layout/thesolution/header.vm
(original)
+++
portals/jetspeed-2/trunk/src/webapp/decorations/layout/thesolution/header.vm
Tue Feb 20 08:33:42 2007
@@ -31,12 +31,8 @@
<html>
<head>
- ## include header resources immdiately after head and before base is reset
to the portal
- ## web application context path root; this implies that header resources
can not reliably
- ## employ relative urls to locate content
#includeHeaderResource()
- <base href="#BaseHref()">
<meta http-equiv="Content-type" content="#ContentType()" />
<meta http-equiv="Content-style-type" content="text/css" />
Modified:
portals/jetspeed-2/trunk/src/webapp/decorations/layout/tigris/header.vm
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/decorations/layout/tigris/header.vm?view=diff&rev=509631&r1=509630&r2=509631
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/decorations/layout/tigris/header.vm
(original)
+++ portals/jetspeed-2/trunk/src/webapp/decorations/layout/tigris/header.vm Tue
Feb 20 08:33:42 2007
@@ -25,12 +25,8 @@
<html>
<head>
- ## include header resources immdiately after head and before base is reset
to the portal
- ## web application context path root; this implies that header resources
can not reliably
- ## employ relative urls to locate content
#includeHeaderResource()
- <base href="#BaseHref()">
<meta http-equiv="Content-type" content="#ContentType()" />
<meta http-equiv="Content-style-type" content="text/css" />
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
