kimptoc 02/05/22 12:39:44
Modified: webapp/WEB-INF/templates/jsp/layouts/html default.jsp
webapp/WEB-INF/templates/jsp/layouts/html/de default.jsp
webapp/WEB-INF/templates/jsp/layouts/html/en default.jsp
webapp/WEB-INF/templates/vm/layouts/html content.vm
default.vm
Log:
ensure the JR.p site stylesheet setting is used- thanks for Hammad Sophie
Revision Changes Path
1.9 +3 -1
jakarta-jetspeed/webapp/WEB-INF/templates/jsp/layouts/html/default.jsp
Index: default.jsp
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/webapp/WEB-INF/templates/jsp/layouts/html/default.jsp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- default.jsp 24 Nov 2001 00:45:24 -0000 1.8
+++ default.jsp 22 May 2002 19:39:44 -0000 1.9
@@ -1,12 +1,14 @@
<%@ taglib uri='/WEB-INF/templates/jsp/tld/template.tld' prefix='jetspeed' %>
+<%@ page import = "org.apache.turbine.services.resources.TurbineResources" %>
+
<% String screenJsp = (String)request.getAttribute("screenJsp"); %>
<html>
<head>
<base href="<jetspeed:uriLookup type="BaseURL" />">
- <link href="css/default.css" type="text/css" rel="stylesheet">
+ <link href="<%= TurbineResources.getString( "site.stylesheet" ) %>"
type="text/css" rel="stylesheet">
</head>
1.2 +3 -1
jakarta-jetspeed/webapp/WEB-INF/templates/jsp/layouts/html/de/default.jsp
Index: default.jsp
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/webapp/WEB-INF/templates/jsp/layouts/html/de/default.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- default.jsp 8 Mar 2001 16:11:37 -0000 1.1
+++ default.jsp 22 May 2002 19:39:44 -0000 1.2
@@ -1,12 +1,14 @@
<%@ taglib uri='/WEB-INF/templates/jsp/tld/template.tld' prefix='jetspeed' %>
+<%@ page import = "org.apache.turbine.services.resources.TurbineResources" %>
+
<% String screenJsp = (String)request.getAttribute("screenJsp"); %>
<html>
<head>
<base href="<jetspeed:uriLookup type="BaseURL" />">
- <link href="css/default.css" type="text/css" rel="stylesheet">
+ <link href="<%= TurbineResources.getString( "site.stylesheet" ) %>"
type="text/css" rel="stylesheet">
</head>
1.2 +3 -1
jakarta-jetspeed/webapp/WEB-INF/templates/jsp/layouts/html/en/default.jsp
Index: default.jsp
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/webapp/WEB-INF/templates/jsp/layouts/html/en/default.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- default.jsp 8 Mar 2001 16:12:21 -0000 1.1
+++ default.jsp 22 May 2002 19:39:44 -0000 1.2
@@ -1,12 +1,14 @@
<%@ taglib uri='/WEB-INF/templates/jsp/tld/template.tld' prefix='jetspeed' %>
+<%@ page import = "org.apache.turbine.services.resources.TurbineResources" %>
+
<% String screenJsp = (String)request.getAttribute("screenJsp"); %>
<html>
<head>
<base href="<jetspeed:uriLookup type="BaseURL" />">
- <link href="css/default.css" type="text/css" rel="stylesheet">
+ <link href="<%= TurbineResources.getString( "site.stylesheet" ) %>"
type="text/css" rel="stylesheet">
</head>
1.2 +2 -2
jakarta-jetspeed/webapp/WEB-INF/templates/vm/layouts/html/content.vm
Index: content.vm
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/webapp/WEB-INF/templates/vm/layouts/html/content.vm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- content.vm 30 Apr 2002 14:44:28 -0000 1.1
+++ content.vm 22 May 2002 19:39:44 -0000 1.2
@@ -1,12 +1,12 @@
## content.vm
## Turbine Velocity Screen Layout to show just the screen contents
## (the normal navigation is not included)
-## $Header:
/home/cvs/jakarta-jetspeed/webapp/WEB-INF/templates/vm/layouts/html/content.vm,v 1.1
2002/04/30 14:44:28 ggolden Exp $
+## $Header:
/home/cvs/jakarta-jetspeed/webapp/WEB-INF/templates/vm/layouts/html/content.vm,v 1.2
2002/05/22 19:39:44 kimptoc Exp $
<html>
<head>
<base href="$clink.External" />
- <link href="$clink.setURI("css/default.css").Absolute" type="text/css"
rel="stylesheet" />
+ <link href="$clink.setURI($config.getString("site.stylesheet")).Absolute"
type="text/css" rel="stylesheet" />
</head>
<body bgcolor="#ffffff">
$screen_placeholder
1.9 +1 -1
jakarta-jetspeed/webapp/WEB-INF/templates/vm/layouts/html/default.vm
Index: default.vm
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/webapp/WEB-INF/templates/vm/layouts/html/default.vm,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- default.vm 1 Apr 2002 18:07:22 -0000 1.8
+++ default.vm 22 May 2002 19:39:44 -0000 1.9
@@ -1,7 +1,7 @@
<html>
<head>
<base href="$clink.External">
- <link href="$clink.setURI("css/default.css").Absolute" type="text/css"
rel="stylesheet">
+ <link href="$clink.setURI($config.getString("site.stylesheet")).Absolute"
type="text/css" rel="stylesheet">
<title>Jakarta Jetspeed Portal:
$!{data.profile.document.portlets.getMetaInfo().title} </title>
</head>
<body bgcolor="#ffffff">
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
