taylor 2005/03/09 09:31:03
Modified: layout-portlets/src/java/org/apache/jetspeed/portlets/layout
LayoutPortlet.java
Log:
allow override of view/help/edit page via both init param and pref
Revision Changes Path
1.8 +23 -3
jakarta-jetspeed-2/layout-portlets/src/java/org/apache/jetspeed/portlets/layout/LayoutPortlet.java
Index: LayoutPortlet.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/layout-portlets/src/java/org/apache/jetspeed/portlets/layout/LayoutPortlet.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- LayoutPortlet.java 4 Jan 2005 16:01:58 -0000 1.7
+++ LayoutPortlet.java 9 Mar 2005 17:31:03 -0000 1.8
@@ -59,7 +59,14 @@
try
{
- String helpPage = prefs.getValue(PARAM_VIEW_PAGE, "columns");
+ String helpPage = prefs.getValue(PARAM_HELP_PAGE, null);
+ if (helpPage == null)
+ {
+ helpPage = this.getInitParameter(PARAM_HELP_PAGE);
+ if (helpPage == null)
+ helpPage = "columns";
+ }
+
// TODO: Need to retreive layout.properties instead of
// hard-coding ".vm"
@@ -106,7 +113,13 @@
JetspeedPowerTool jpt = getJetspeedPowerTool(request);
if (maximized)
{
- String viewPage = prefs.getValue(PARAM_MAX_PAGE,
"maximized");
+ String viewPage = prefs.getValue(PARAM_MAX_PAGE, null);
+ if (viewPage == null)
+ {
+ viewPage = this.getInitParameter(PARAM_MAX_PAGE);
+ if (viewPage == null)
+ viewPage = "maximized";
+ }
// TODO: Need to retreive layout.properties instead of
// hard-coding ".vm"
@@ -115,7 +128,14 @@
}
else
{
- String viewPage = prefs.getValue(PARAM_VIEW_PAGE,
"columns");
+ String viewPage = prefs.getValue(PARAM_VIEW_PAGE, null);
+ if (viewPage == null)
+ {
+ viewPage = this.getInitParameter(PARAM_VIEW_PAGE);
+ if (viewPage == null)
+ viewPage = "columns";
+ }
+
// TODO: Need to retreive layout.properties instead of
// hard-coding ".vm"
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
