sgala 02/01/31 04:24:29
Modified: webapp/WEB-INF/templates/vm/layouts/html default.vm
webapp/WEB-INF/psml/user/turbine/html default.psml
webapp/WEB-INF/psml/anon/html default.psml
webapp/WEB-INF/psml/user/admin/html default.psml
webapp/WEB-INF/psml/anon/html/es default.psml news.psml
webapp/WEB-INF/psml/anon/html/en default.psml news.psml
webapp/WEB-INF/psml/group/apache default.psml news.psml
webapp/WEB-INF/psml/group/Jetspeed default.psml news.psml
Log:
Added title to the HTML getting the document Title of the root portlets in the
document. It could be made simpler in Velocity by adding a getTitle() method to
PSMLDocument which would do getPortlets().getMetainfo().getTitle() with null checks.
Updated psml files to show a title.
Revision Changes Path
1.7 +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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- default.vm 28 Jan 2002 19:13:21 -0000 1.6
+++ default.vm 31 Jan 2002 12:24:28 -0000 1.7
@@ -2,7 +2,7 @@
<head>
<base href="$clink.External">
<link href="$clink.setURI("css/default.css").Absolute" type="text/css"
rel="stylesheet">
- <title>Jetspeed Portal Page</title>
+ <title>Jakarta Jetspeed Portal:
$!{data.profile.document.portlets.getMetainfo().title} </title>
</head>
<body bgcolor="#ffffff">
#if ($config.getBoolean("topnav.enable") == true)
1.12 +3 -0
jakarta-jetspeed/webapp/WEB-INF/psml/user/turbine/html/default.psml
Index: default.psml
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/webapp/WEB-INF/psml/user/turbine/html/default.psml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- default.psml 18 Jan 2002 12:39:43 -0000 1.11
+++ default.psml 31 Jan 2002 12:24:28 -0000 1.12
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<portlets xmlns="http://www.apache.org/2000/02/CVS";>
+ <metainfo>
+ <title>Default Jetspeed page</title>
+ </metainfo>
<controller name="TabController"/>
<control name="TabControl"/>
<skin name="orange-red"/>
1.7 +3 -0 jakarta-jetspeed/webapp/WEB-INF/psml/anon/html/default.psml
Index: default.psml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/psml/anon/html/default.psml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- default.psml 2 Jul 2001 08:07:14 -0000 1.6
+++ default.psml 31 Jan 2002 12:24:28 -0000 1.7
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<portlets xmlns="http://xml.apache.org/jetspeed/2000/psml";>
+ <metainfo>
+ <title>Default Jetspeed page (for default locale)</title>
+ </metainfo>
<control name="TabControl"/>
1.9 +3 -0
jakarta-jetspeed/webapp/WEB-INF/psml/user/admin/html/default.psml
Index: default.psml
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/webapp/WEB-INF/psml/user/admin/html/default.psml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- default.psml 30 Jul 2001 06:26:54 -0000 1.8
+++ default.psml 31 Jan 2002 12:24:28 -0000 1.9
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<portlets xmlns="http://www.apache.org/2000/02/CVS";>
+ <metainfo>
+ <title>Default Jetspeed Admin page</title>
+ </metainfo>
<controller name="CardPortletController"/>
<control name="TabControl"/>
<skin name="orange-grey"/>
1.2 +3 -0 jakarta-jetspeed/webapp/WEB-INF/psml/anon/html/es/default.psml
Index: default.psml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/psml/anon/html/es/default.psml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- default.psml 25 Nov 2001 20:51:18 -0000 1.1
+++ default.psml 31 Jan 2002 12:24:28 -0000 1.2
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<portlets xmlns="http://xml.apache.org/jetspeed/2000/psml";>
+ <metainfo>
+ <title>Pagina en espa�ol por defecto</title>
+ </metainfo>
<control name="TabControl"/>
1.2 +7 -0 jakarta-jetspeed/webapp/WEB-INF/psml/anon/html/es/news.psml
Index: news.psml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/psml/anon/html/es/news.psml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- news.psml 25 Nov 2001 20:51:18 -0000 1.1
+++ news.psml 31 Jan 2002 12:24:28 -0000 1.2
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<portlets user="default" xmlns="http://xml.apache.org/jetspeed/2000/psml";>
+ <metainfo>
+ <title>P�gina de Noticias</title>
+ </metainfo>
<controller
name="org.apache.jetspeed.portal.controllers.RowColumnPortletController">
<parameter name="sizes" value="100%"/>
@@ -18,6 +21,10 @@
</skin>
<controller
name="org.apache.jetspeed.portal.controllers.RowColumnPortletController"/>
+
+ <entry parent="http://barrapunto.com/barrapunto.rdf";>
+ <parameter name="itemdisplayed" value="5"/>
+ </entry>
<entry type="ref" parent="Apacheweek"/>
1.9 +3 -0 jakarta-jetspeed/webapp/WEB-INF/psml/anon/html/en/default.psml
Index: default.psml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/psml/anon/html/en/default.psml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- default.psml 21 Aug 2001 07:45:14 -0000 1.8
+++ default.psml 31 Jan 2002 12:24:28 -0000 1.9
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<portlets xmlns="http://xml.apache.org/jetspeed/2000/psml";>
+ <metainfo>
+ <title>Default Jetspeed Page</title>
+ </metainfo>
<control name="TabControl"/>
1.2 +3 -0 jakarta-jetspeed/webapp/WEB-INF/psml/anon/html/en/news.psml
Index: news.psml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/psml/anon/html/en/news.psml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- news.psml 25 Apr 2001 00:20:28 -0000 1.1
+++ news.psml 31 Jan 2002 12:24:28 -0000 1.2
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<portlets user="default" xmlns="http://xml.apache.org/jetspeed/2000/psml";>
+ <metainfo>
+ <title>News Page</title>
+ </metainfo>
<controller
name="org.apache.jetspeed.portal.controllers.RowColumnPortletController">
<parameter name="sizes" value="100%"/>
1.2 +3 -0 jakarta-jetspeed/webapp/WEB-INF/psml/group/apache/default.psml
Index: default.psml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/psml/group/apache/default.psml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- default.psml 13 Dec 2000 04:42:29 -0000 1.1
+++ default.psml 31 Jan 2002 12:24:29 -0000 1.2
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<portlets user="default" xmlns="http://xml.apache.org/jetspeed/2000/psml";>
+ <metainfo>
+ <title>Default Apache Group page</title>
+ </metainfo>
<controller
name="org.apache.jetspeed.portal.controllers.RowColumnPortletController">
<parameter name="sizes" value="50%,50%"/>
1.2 +3 -0 jakarta-jetspeed/webapp/WEB-INF/psml/group/apache/news.psml
Index: news.psml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/psml/group/apache/news.psml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- news.psml 13 Dec 2000 04:42:47 -0000 1.1
+++ news.psml 31 Jan 2002 12:24:29 -0000 1.2
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<portlets user="default" xmlns="http://xml.apache.org/jetspeed/2000/psml";>
+ <metainfo>
+ <title>Default Apache News page</title>
+ </metainfo>
<controller
name="org.apache.jetspeed.portal.controllers.RowColumnPortletController">
<parameter name="sizes" value="100%"/>
1.2 +3 -0 jakarta-jetspeed/webapp/WEB-INF/psml/group/Jetspeed/default.psml
Index: default.psml
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/webapp/WEB-INF/psml/group/Jetspeed/default.psml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- default.psml 30 Jul 2001 04:24:46 -0000 1.1
+++ default.psml 31 Jan 2002 12:24:29 -0000 1.2
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<portlets user="default" xmlns="http://xml.apache.org/jetspeed/2000/psml";>
+ <metainfo>
+ <title>Default Jetspeed Group page</title>
+ </metainfo>
<controller
name="org.apache.jetspeed.portal.controllers.RowColumnPortletController">
<parameter name="sizes" value="50%,50%"/>
1.2 +3 -0 jakarta-jetspeed/webapp/WEB-INF/psml/group/Jetspeed/news.psml
Index: news.psml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/psml/group/Jetspeed/news.psml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- news.psml 30 Jul 2001 04:24:46 -0000 1.1
+++ news.psml 31 Jan 2002 12:24:29 -0000 1.2
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<portlets user="default" xmlns="http://xml.apache.org/jetspeed/2000/psml";>
+ <metainfo>
+ <title>Default Jetspeed News page</title>
+ </metainfo>
<controller
name="org.apache.jetspeed.portal.controllers.RowColumnPortletController">
<parameter name="sizes" value="100%"/>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
