You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by ra...@apache.org on 2001/06/04 21:43:44 UTC
cvs commit: jakarta-jetspeed/webapp/WEB-INF/psml/anon/html/en default.psml
raphael 01/06/04 12:43:44
Modified: webapp/WEB-INF/psml/anon/html default.psml
webapp/WEB-INF/psml/anon/html/en default.psml
Log:
[fix] incorrect layout from GridController by changing controller in PSML
while waiting for the controllers to be replaced by a template based
implementation
Revision Changes Path
1.5 +35 -23 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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- default.psml 2001/05/29 23:17:32 1.4
+++ default.psml 2001/06/04 19:43:44 1.5
@@ -2,6 +2,7 @@
<portlets xmlns="http://xml.apache.org/jetspeed/2000/psml">
<control name="TabControl"/>
+
<controller name="CardPortletController">
<parameter name="parameter" value="pane"/>
</controller>
@@ -21,66 +22,77 @@
<portlets>
<controller name="RowColumnPortletController"/>
- <entry type="ref" parent="JetspeedContent"/>
+ <entry parent="JetspeedContent"/>
</portlets>
<portlets>
<controller name="RowColumnPortletController"/>
- <entry type="ref" parent="Jetspeed"/>
- <entry type="ref" parent="Welcome"/>
+ <entry parent="Jetspeed"/>
+ <entry parent="Welcome"/>
</portlets>
</portlets>
<portlets>
- <controller name="GridPortletController">
- <parameter name="columns" value="1"/>
- <parameter name="columnWidths" value="95%"/>
- </controller>
-
<metainfo>
- <title>RSS Sources</title>
+ <title>RSS</title>
</metainfo>
<portlets>
+ <control name="TabControl"/>
<controller name="CardPortletController">
<parameter name="defaultcard" value="0"/>
<parameter name="parameter" value="channel"/>
<parameter name="ruler-size" value="0"/>
- </controller>
-
- <control name="TabControl"/>
-
- <layout>
- <property name="row" value="0"/>
- <property name="column" value="0"/>
- </layout>
-
- <entry type="ref" parent="http://jakarta.apache.org/jetspeed/channels/jetspeed.rss">
+ </controller>
+
+ <entry parent="http://jakarta.apache.org/jetspeed/channels/jetspeed.rss">
<control name="ClearPortletControl"/>
</entry>
- <entry type="ref" parent="http://jakarta.apache.org/jetspeed/channels/turbine.rss">
+ <entry parent="http://jakarta.apache.org/jetspeed/channels/turbine.rss">
<control name="ClearPortletControl"/>
</entry>
- <entry type="ref" parent="http://www.mozilla.org/news.rdf">
+ <entry parent="http://www.mozilla.org/news.rdf">
<control name="ClearPortletControl"/>
<parameter name="itemdisplayed" value="5"/>
</entry>
- <entry type="ref" parent="http://www.apacheweek.com/issues/apacheweek-headlines.xml">
+ <entry parent="http://www.apacheweek.com/issues/apacheweek-headlines.xml">
<control name="ClearPortletControl"/>
<parameter name="showtitle" value="false"/>
<parameter name="showdescription" value="false"/>
</entry>
- <entry type="ref" parent="http://www.xmlhack.com/rsscat.php">
+ <entry parent="http://www.xmlhack.com/rsscat.php">
<control name="ClearPortletControl"/>
</entry>
</portlets>
</portlets>
+ <portlets>
+ <controller name="RowColumnPortletController">
+ <parameter name="mode" value="row"/>
+ </controller>
+
+ <metainfo>
+ <title>Dynamic</title>
+ </metainfo>
+
+ <portlets>
+ <controller name="RowColumnPortletController"/>
+
+ <entry parent="JetspeedContent"/>
+ </portlets>
+
+ <portlets>
+ <controller name="RowColumnPortletController"/>
+
+ <entry parent="HelloVelocity"/>
+ </portlets>
+
+ </portlets>
</portlets>
1.5 +3 -14 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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- default.psml 2001/05/29 23:17:33 1.4
+++ default.psml 2001/06/04 19:43:44 1.5
@@ -35,29 +35,18 @@
</portlets>
<portlets>
- <controller name="GridPortletController">
- <parameter name="columns" value="1"/>
- <parameter name="columnWidths" value="95%"/>
- </controller>
-
<metainfo>
<title>RSS</title>
</metainfo>
<portlets>
+ <control name="TabControl"/>
<controller name="CardPortletController">
<parameter name="defaultcard" value="0"/>
<parameter name="parameter" value="channel"/>
<parameter name="ruler-size" value="0"/>
- </controller>
-
- <control name="TabControl"/>
-
- <layout>
- <property name="row" value="0"/>
- <property name="column" value="0"/>
- </layout>
-
+ </controller>
+
<entry parent="http://jakarta.apache.org/jetspeed/channels/jetspeed.rss">
<control name="ClearPortletControl"/>
</entry>
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jetspeed-dev-help@jakarta.apache.org