raphael 01/05/27 08:36:19
Modified: webapp/WEB-INF/psml info.psml
webapp/WEB-INF/psml/anon/html default.psml
webapp/WEB-INF/psml/anon/html/en default.psml
webapp/WEB-INF/psml/user/turbine/html default.psml
Log:
add a Skin registry and use named Skin configuration within PortletConfig
Revision Changes Path
1.3 +3 -1 jakarta-jetspeed/webapp/WEB-INF/psml/info.psml
Index: info.psml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/psml/info.psml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- info.psml 2000/12/14 18:15:30 1.2
+++ info.psml 2001/05/27 15:36:17 1.3
@@ -1,7 +1,9 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<portlets user="default" xmlns="http://xml.apache.org/jetspeed/2000/psml";>
- <controller
name="org.apache.jetspeed.portal.controllers.RowColumnPortletController"/>
+ <controller name="RowColumnPortletController"/>
+ <skin name="orange-grey"/>
+
<entry type="ref" parent="PortletInfoPortlet">
<control name="org.apache.jetspeed.portal.controls.FullScreenControl"/>
</entry>
1.3 +14 -19 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- default.psml 2001/05/08 19:55:11 1.2
+++ default.psml 2001/05/27 15:36:17 1.3
@@ -1,20 +1,15 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<portlets user="default" xmlns="http://xml.apache.org/jetspeed/2000/psml";>
- <controller name="org.apache.jetspeed.portal.controllers.CardPortletController">
+ <controller name="CardPortletController">
<parameter name="parameter" value="pane"/>
</controller>
- <control name="org.apache.jetspeed.portal.controls.PanedPortletControl"/>
-
- <skin>
- <property name="selected-color" value="#ffcc00"/>
- <property name="background-color" value="#FFFFFF"/>
- <property name="title-color" value="#dddddd"/>
- </skin>
+ <control name="PanedPortletControl"/>
+ <skin name="orange-grey"/>
<portlets>
- <controller
name="org.apache.jetspeed.portal.controllers.RowColumnPortletController">
+ <controller name="RowColumnPortletController">
<parameter name="sizes" value="66%,34%"/>
<parameter name="mode" value="row"/>
</controller>
@@ -24,13 +19,13 @@
</metainfo>
<portlets>
- <controller
name="org.apache.jetspeed.portal.controllers.RowColumnPortletController"/>
+ <controller name="RowColumnPortletController"/>
<entry type="ref" parent="JetspeedContent"/>
</portlets>
<portlets>
- <controller
name="org.apache.jetspeed.portal.controllers.RowColumnPortletController"/>
+ <controller name="RowColumnPortletController"/>
<entry type="ref" parent="Jetspeed"/>
<entry type="ref" parent="Welcome"/>
@@ -39,7 +34,7 @@
</portlets>
<portlets>
- <controller name="org.apache.jetspeed.portal.controllers.GridPortletController">
+ <controller name="GridPortletController">
<parameter name="columns" value="1"/>
<parameter name="columnWidths" value="95%"/>
</controller>
@@ -49,13 +44,13 @@
</metainfo>
<portlets>
- <controller
name="org.apache.jetspeed.portal.controllers.CardPortletController">
+ <controller name="CardPortletController">
<parameter name="defaultcard" value="0"/>
<parameter name="parameter" value="channel"/>
<parameter name="ruler-size" value="0"/>
</controller>
- <control name="org.apache.jetspeed.portal.controls.PanedPortletControl"/>
+ <control name="PanedPortletControl"/>
<layout>
<property name="row" value="0"/>
@@ -63,26 +58,26 @@
</layout>
<entry type="ref"
parent="http://jakarta.apache.org/jetspeed/channels/jetspeed.rss";>
- <control name="org.apache.jetspeed.portal.controls.ClearPortletControl"/>
+ <control name="ClearPortletControl"/>
</entry>
<entry type="ref"
parent="http://jakarta.apache.org/jetspeed/channels/turbine.rss";>
- <control name="org.apache.jetspeed.portal.controls.ClearPortletControl"/>
+ <control name="ClearPortletControl"/>
</entry>
<entry type="ref" parent="http://www.mozilla.org/news.rdf";>
- <control name="org.apache.jetspeed.portal.controls.ClearPortletControl"/>
+ <control name="ClearPortletControl"/>
<parameter name="itemdisplayed" value="5"/>
</entry>
<entry type="ref"
parent="http://www.apacheweek.com/issues/apacheweek-headlines.xml";>
- <control name="org.apache.jetspeed.portal.controls.ClearPortletControl"/>
+ <control name="ClearPortletControl"/>
<parameter name="showtitle" value="false"/>
<parameter name="showdescription" value="false"/>
</entry>
<entry type="ref" parent="http://www.xmlhack.com/rsscat.php";>
- <control name="org.apache.jetspeed.portal.controls.ClearPortletControl"/>
+ <control name="ClearPortletControl"/>
</entry>
</portlets>
1.3 +15 -20 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- default.psml 2001/05/09 06:25:30 1.2
+++ default.psml 2001/05/27 15:36:18 1.3
@@ -1,20 +1,15 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<portlets user="default" xmlns="http://xml.apache.org/jetspeed/2000/psml";>
- <controller name="org.apache.jetspeed.portal.controllers.CardPortletController">
+ <controller name="CardPortletController">
<parameter name="parameter" value="pane"/>
</controller>
- <control name="org.apache.jetspeed.portal.controls.PanedPortletControl"/>
-
- <skin>
- <property name="selected-color" value="#ffcc00"/>
- <property name="background-color" value="#FFFFFF"/>
- <property name="title-color" value="#dddddd"/>
- </skin>
+ <control name="PanedPortletControl"/>
+ <skin name="orange-grey"/>
<portlets>
- <controller
name="org.apache.jetspeed.portal.controllers.RowColumnPortletController">
+ <controller name="RowColumnPortletController">
<parameter name="sizes" value="66%,34%"/>
<parameter name="mode" value="row"/>
</controller>
@@ -24,13 +19,13 @@
</metainfo>
<portlets>
- <controller
name="org.apache.jetspeed.portal.controllers.RowColumnPortletController"/>
+ <controller name="RowColumnPortletController"/>
<entry type="ref" parent="JetspeedContent"/>
</portlets>
<portlets>
- <controller
name="org.apache.jetspeed.portal.controllers.RowColumnPortletController"/>
+ <controller name="RowColumnPortletController"/>
<entry type="ref" parent="Jetspeed"/>
<entry type="ref" parent="Welcome"/>
@@ -39,7 +34,7 @@
</portlets>
<portlets>
- <controller name="org.apache.jetspeed.portal.controllers.GridPortletController">
+ <controller name="GridPortletController">
<parameter name="columns" value="1"/>
<parameter name="columnWidths" value="95%"/>
</controller>
@@ -49,13 +44,13 @@
</metainfo>
<portlets>
- <controller
name="org.apache.jetspeed.portal.controllers.CardPortletController">
+ <controller name="CardPortletController">
<parameter name="defaultcard" value="0"/>
<parameter name="parameter" value="channel"/>
<parameter name="ruler-size" value="0"/>
</controller>
- <control name="org.apache.jetspeed.portal.controls.PanedPortletControl"/>
+ <control name="PanedPortletControl"/>
<layout>
<property name="row" value="0"/>
@@ -63,29 +58,29 @@
</layout>
<entry type="ref"
parent="http://jakarta.apache.org/jetspeed/channels/jetspeed.rss";>
- <control name="org.apache.jetspeed.portal.controls.ClearPortletControl"/>
+ <control name="ClearPortletControl"/>
</entry>
<entry type="ref"
parent="http://jakarta.apache.org/jetspeed/channels/turbine.rss";>
- <control name="org.apache.jetspeed.portal.controls.ClearPortletControl"/>
+ <control name="ClearPortletControl"/>
</entry>
<entry type="ref" parent="http://www.mozilla.org/news.rdf";>
- <control name="org.apache.jetspeed.portal.controls.ClearPortletControl"/>
+ <control name="ClearPortletControl"/>
<parameter name="itemdisplayed" value="5"/>
</entry>
<entry type="ref"
parent="http://www.apacheweek.com/issues/apacheweek-headlines.xml";>
- <control name="org.apache.jetspeed.portal.controls.ClearPortletControl"/>
+ <control name="ClearPortletControl"/>
<parameter name="showtitle" value="false"/>
<parameter name="showdescription" value="false"/>
</entry>
<entry type="ref" parent="http://www.xmlhack.com/rsscat.php";>
- <control name="org.apache.jetspeed.portal.controls.ClearPortletControl"/>
+ <control name="ClearPortletControl"/>
</entry>
</portlets>
</portlets>
-</portlets>
+</portlets>
\ No newline at end of file
1.5 +7 -22
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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- default.psml 2001/05/08 19:57:58 1.4
+++ default.psml 2001/05/27 15:36:19 1.5
@@ -1,37 +1,22 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<portlets user="default" xmlns="http://xml.apache.org/jetspeed/2000/psml";>
- <controller
name="org.apache.jetspeed.portal.controllers.RowColumnPortletController">
+ <controller name="RowColumnPortletController">
<parameter name="sizes" value="70%,30%"/>
<parameter name="mode" value="row"/>
</controller>
- <skin>
- <property name="selected-color" value="#FFCC00"/>
- <property name="title-color" value="#dddddd"/>
- </skin>
+ <skin name="orange-grey"/>
<portlets>
- <controller
name="org.apache.jetspeed.portal.controllers.RowColumnPortletController"/>
- <entry type="ref"
parent="http://jakarta.apache.org/jetspeed/channels/turbine.rss";>
- <control name="TitlePortletControl"/>
- </entry>
- <entry type="ref"
parent="http://jakarta.apache.org/jetspeed/channels/jetspeed.rss";>
- <control name="TitlePortletControl"/>
- </entry>
- <entry type="ref" parent="http://www.xmlhack.com/rsscat.php";>
- <control name="TitlePortletControl"/>
- </entry>
+ <entry type="ref"
parent="http://jakarta.apache.org/jetspeed/channels/turbine.rss"/>
+ <entry type="ref"
parent="http://jakarta.apache.org/jetspeed/channels/jetspeed.rss"/>
+ <entry type="ref" parent="http://www.xmlhack.com/rsscat.php"/>
</portlets>
<portlets>
- <controller
name="org.apache.jetspeed.portal.controllers.RowColumnPortletController"/>
- <entry type="ref" parent="http://www.mozilla.org/news.rdf";>
- <control name="TitlePortletControl"/>
- </entry>
- <entry type="ref"
parent="http://www.apacheweek.com/issues/apacheweek-headlines.xml";>
- <control name="TitlePortletControl"/>
- </entry>
+ <entry type="ref" parent="http://www.mozilla.org/news.rdf"/>
+ <entry type="ref"
parent="http://www.apacheweek.com/issues/apacheweek-headlines.xml"/>
</portlets>
</portlets>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
