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 sh...@apache.org on 2006/10/25 16:05:27 UTC
svn commit: r467659 - in /portals/jetspeed-2/trunk:
layout-portlets/src/java/org/apache/jetspeed/portlets/layout/
layout-portlets/src/java/org/apache/jetspeed/portlets/layout/resources/
src/webapp/WEB-INF/templates/layout/html/columns/ src/webapp/WEB-I...
Author: shinsuke
Date: Wed Oct 25 07:05:26 2006
New Revision: 467659
URL: http://svn.apache.org/viewvc?view=rev&rev=467659
Log:
enabled user to change the document order on the page
Modified:
portals/jetspeed-2/trunk/layout-portlets/src/java/org/apache/jetspeed/portlets/layout/MultiColumnPortlet.java
portals/jetspeed-2/trunk/layout-portlets/src/java/org/apache/jetspeed/portlets/layout/resources/LayoutResource.properties
portals/jetspeed-2/trunk/layout-portlets/src/java/org/apache/jetspeed/portlets/layout/resources/LayoutResource_en.properties
portals/jetspeed-2/trunk/layout-portlets/src/java/org/apache/jetspeed/portlets/layout/resources/LayoutResource_ja.properties
portals/jetspeed-2/trunk/src/webapp/WEB-INF/templates/layout/html/columns/layout.vm
portals/jetspeed-2/trunk/src/webapp/WEB-INF/templates/layout/html/tcolumns/layout.vm
Modified: portals/jetspeed-2/trunk/layout-portlets/src/java/org/apache/jetspeed/portlets/layout/MultiColumnPortlet.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/layout-portlets/src/java/org/apache/jetspeed/portlets/layout/MultiColumnPortlet.java?view=diff&rev=467659&r1=467658&r2=467659
==============================================================================
--- portals/jetspeed-2/trunk/layout-portlets/src/java/org/apache/jetspeed/portlets/layout/MultiColumnPortlet.java (original)
+++ portals/jetspeed-2/trunk/layout-portlets/src/java/org/apache/jetspeed/portlets/layout/MultiColumnPortlet.java Wed Oct 25 07:05:26 2006
@@ -333,6 +333,115 @@
return;
}
+ if (request.getParameter("jsMovePageLeft") != null)
+ {
+ try
+ {
+ Folder parent = (Folder) requestPage.getParent();
+ if (parent != null)
+ {
+ List orderList = parent.getDocumentOrder();
+ String name = requestPage.getName();
+ if (orderList != null)
+ {
+ int index = orderList.indexOf(name);
+ if (index > -1)
+ {
+ String type = requestPage.getType();
+ int i = index - 1;
+ while (i >= 0)
+ {
+ String value = (String) orderList.get(i);
+ if (value.endsWith(type))
+ {
+ orderList.remove(index);
+ orderList.add(i, name);
+ parent.setDocumentOrder(orderList);
+ pageManager.updateFolder(parent);
+ break;
+ }
+ i--;
+ }
+ }
+ else
+ {
+ orderList.add(name);
+ parent.setDocumentOrder(orderList);
+ pageManager.updateFolder(parent);
+ }
+ }
+ else
+ {
+ orderList = new ArrayList(4);
+ orderList.add(name);
+ parent.setDocumentOrder(orderList);
+ pageManager.updateFolder(parent);
+ }
+ }
+ }
+ catch (Exception e)
+ {
+ throw new PortletException(
+ "Unable to access page for changing the document order: "
+ + e.getMessage(), e);
+ }
+ return;
+ }
+
+ if (request.getParameter("jsMovePageRight") != null)
+ {
+ try
+ {
+ Folder parent = (Folder) requestPage.getParent();
+ if (parent != null)
+ {
+ List orderList = parent.getDocumentOrder();
+ String name = requestPage.getName();
+ if (orderList != null)
+ {
+ int index = orderList.indexOf(name);
+ if (index > -1)
+ {
+ String type = requestPage.getType();
+ int i = index + 1;
+ while (i < orderList.size())
+ {
+ String value = (String) orderList.get(i);
+ if (value.endsWith(type))
+ {
+ orderList.remove(index);
+ orderList.add(i, name);
+ parent.setDocumentOrder(orderList);
+ pageManager.updateFolder(parent);
+ break;
+ }
+ i++;
+ }
+ }
+ else
+ {
+ orderList.add(name);
+ parent.setDocumentOrder(orderList);
+ pageManager.updateFolder(parent);
+ }
+ }
+ else
+ {
+ orderList = new ArrayList(4);
+ orderList.add(name);
+ parent.setDocumentOrder(orderList);
+ pageManager.updateFolder(parent);
+ }
+ }
+ }
+ catch (Exception e)
+ {
+ throw new PortletException(
+ "Unable to access page for changing the document order: "
+ + e.getMessage(), e);
+ }
+ return;
+ }
String theme = request.getParameter("theme");
if ( theme != null && theme.length() > 0 && !theme.equals(requestPage.getDefaultDecorator(Fragment.LAYOUT)) )
Modified: portals/jetspeed-2/trunk/layout-portlets/src/java/org/apache/jetspeed/portlets/layout/resources/LayoutResource.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/layout-portlets/src/java/org/apache/jetspeed/portlets/layout/resources/LayoutResource.properties?view=diff&rev=467659&r1=467658&r2=467659
==============================================================================
--- portals/jetspeed-2/trunk/layout-portlets/src/java/org/apache/jetspeed/portlets/layout/resources/LayoutResource.properties (original)
+++ portals/jetspeed-2/trunk/layout-portlets/src/java/org/apache/jetspeed/portlets/layout/resources/LayoutResource.properties Wed Oct 25 07:05:26 2006
@@ -55,6 +55,9 @@
portal.page.editing.deleteThisPage=Delete this page:
portal.page.editing.deletePage=Delete
portal.page.editing.confirmDeleteThisPage=Do you want to delete this page?
+portal.page.editing.pagenavigation=Navigation:
+portal.page.editing.movePageLeft=Move Page Left
+portal.page.editing.movePageRight=Move Page Right
portal.loginform.logout=Logout
portal.loginform.login=Login
Modified: portals/jetspeed-2/trunk/layout-portlets/src/java/org/apache/jetspeed/portlets/layout/resources/LayoutResource_en.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/layout-portlets/src/java/org/apache/jetspeed/portlets/layout/resources/LayoutResource_en.properties?view=diff&rev=467659&r1=467658&r2=467659
==============================================================================
--- portals/jetspeed-2/trunk/layout-portlets/src/java/org/apache/jetspeed/portlets/layout/resources/LayoutResource_en.properties (original)
+++ portals/jetspeed-2/trunk/layout-portlets/src/java/org/apache/jetspeed/portlets/layout/resources/LayoutResource_en.properties Wed Oct 25 07:05:26 2006
@@ -1,59 +1,67 @@
-# Copyright 2005 The Apache Software Foundation.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# Messages used by velocity templates and the JetspeedPowerTool
-portal.help.title = Portal Online Help
-portal.page.help.title = Portal Pages
-portal.page.help.view = Render the page in view mode.
-portal.page.help.help = Get help on a page or portlet.
-portal.page.help.edit = Edit a portal page. Which includes changing the theme or layout, adding pages, changing the portlet application decorators, and moving or removing portlet applications from a page.
-portal.page.help.select = Add more portlet applications to a page.
-portal.portlet.help.title = Portlet Applications
-portal.portlet.help.minimize = Minimize a portlet.
-portal.portlet.help.maximize = Maximize a portlet.
-portal.portlet.help.restore = Render the portlet in view mode.
-portal.portlet.help.edit.title = Arranging Portlets
-portal.portlet.help.edit = Edit a portlet application.
-portal.portlet.help.print = Print the contents of a portlet application.
-portal.portlet.help.close = Remove a given portlet application from a page.
-portal.portlet.help.movePortletUp = Move the given portlet up on a page.
-portal.portlet.help.movePortletDown = Move the given portlet down on a page.
-portal.portlet.help.movePortletLeft = Move the given portlet to the left column.
-portal.portlet.help.movePortletRight = Move the given portlet to the right column.
-
-portal.page.editing.theme=Theme:
-portal.page.editing.layout=Layout:
-portal.page.editing.changelayout=Change
-portal.page.editing.addlayout=Add
-portal.page.editing.page=Page:
-portal.page.editing.addpage=Add
-portal.page.editing.portlet=Portlet:
-portal.page.editing.addportlet=Add a Portlet
-portal.page.editing.movePortletLeft=Move Portlet Left
-portal.page.editing.movePortletUp=Move Portlet Up
-portal.page.editing.removePortlet=Remove Portlet
-portal.page.editing.movePortletDown=Move Portlet Down
-portal.page.editing.movePortletRight=Move Portlet Right
-portal.page.editing.moveLayoutLeft=Move Layout Left
-portal.page.editing.moveLayoutUp=Move Layout Up
-portal.page.editing.removeLayout=Remove Layout
-portal.page.editing.moveLayoutDown=Move Layout Down
-portal.page.editing.moveLayoutRight=Move Layout Right
-
-portal.loginform.logout=Logout
-portal.loginform.login=Login
-portal.loginform.username=Username:
-portal.loginform.password=Password:
-portal.loginform.change_password=Change Password
-portal.loginform.error.invalid_password=Invalid password
+# Copyright 2005 The Apache Software Foundation.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Messages used by velocity templates and the JetspeedPowerTool
+portal.help.title = Portal Online Help
+portal.page.help.title = Portal Pages
+portal.page.help.view = Render the page in view mode.
+portal.page.help.help = Get help on a page or portlet.
+portal.page.help.edit = Edit a portal page. Which includes changing the theme or layout, adding pages, changing the portlet application decorators, and moving or removing portlet applications from a page.
+portal.page.help.select = Add more portlet applications to a page.
+portal.portlet.help.title = Portlet Applications
+portal.portlet.help.minimize = Minimize a portlet.
+portal.portlet.help.maximize = Maximize a portlet.
+portal.portlet.help.restore = Render the portlet in view mode.
+portal.portlet.help.edit.title = Arranging Portlets
+portal.portlet.help.edit = Edit a portlet application.
+portal.portlet.help.print = Print the contents of a portlet application.
+portal.portlet.help.close = Remove a given portlet application from a page.
+portal.portlet.help.movePortletUp = Move the given portlet up on a page.
+portal.portlet.help.movePortletDown = Move the given portlet down on a page.
+portal.portlet.help.movePortletLeft = Move the given portlet to the left column.
+portal.portlet.help.movePortletRight = Move the given portlet to the right column.
+
+portal.page.editing.theme=Theme:
+portal.page.editing.layout=Layout:
+portal.page.editing.changelayout=Change
+portal.page.editing.addlayout=Add
+portal.page.editing.page=Page:
+portal.page.editing.addpage=Add
+portal.page.editing.portlet=Portlet:
+portal.page.editing.addportlet=Add a Portlet
+portal.page.editing.movePortletLeft=Move Portlet Left
+portal.page.editing.movePortletUp=Move Portlet Up
+portal.page.editing.removePortlet=Remove Portlet
+portal.page.editing.movePortletDown=Move Portlet Down
+portal.page.editing.movePortletRight=Move Portlet Right
+portal.page.editing.moveLayoutLeft=Move Layout Left
+portal.page.editing.moveLayoutUp=Move Layout Up
+portal.page.editing.removeLayout=Remove Layout
+portal.page.editing.moveLayoutDown=Move Layout Down
+portal.page.editing.moveLayoutRight=Move Layout Right
+portal.page.editing.layoutConfiguration=Layout Configuration
+portal.page.editing.pageConfiguration=Page Configuration
+portal.page.editing.deleteThisPage=Delete this page:
+portal.page.editing.deletePage=Delete
+portal.page.editing.confirmDeleteThisPage=Do you want to delete this page?
+portal.page.editing.pagenavigation=Navigation:
+portal.page.editing.movePageLeft=Move Page Left
+portal.page.editing.movePageRight=Move Page Right
+
+portal.loginform.logout=Logout
+portal.loginform.login=Login
+portal.loginform.username=Username:
+portal.loginform.password=Password:
+portal.loginform.change_password=Change Password
+portal.loginform.error.invalid_password=Invalid password
Modified: portals/jetspeed-2/trunk/layout-portlets/src/java/org/apache/jetspeed/portlets/layout/resources/LayoutResource_ja.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/layout-portlets/src/java/org/apache/jetspeed/portlets/layout/resources/LayoutResource_ja.properties?view=diff&rev=467659&r1=467658&r2=467659
==============================================================================
--- portals/jetspeed-2/trunk/layout-portlets/src/java/org/apache/jetspeed/portlets/layout/resources/LayoutResource_ja.properties (original)
+++ portals/jetspeed-2/trunk/layout-portlets/src/java/org/apache/jetspeed/portlets/layout/resources/LayoutResource_ja.properties Wed Oct 25 07:05:26 2006
@@ -55,7 +55,9 @@
portal.page.editing.deleteThisPage=\u3053\u306e\u30da\u30fc\u30b8\u306e\u524a\u9664:
portal.page.editing.deletePage=\u524a\u9664
portal.page.editing.confirmDeleteThisPage=\u3053\u306e\u30da\u30fc\u30b8\u3092\u524a\u9664\u3057\u3066\u3082\u3088\u308d\u3057\u3044\u3067\u3059\u304b?
-
+portal.page.editing.pagenavigation=\u79fb\u52d5:
+portal.page.editing.movePageLeft=\u5de6\u306b\u30da\u30fc\u30b8\u3092\u79fb\u52d5
+portal.page.editing.movePageRight=\u53f3\u306b\u30da\u30fc\u30b8\u3092\u79fb\u52d5
portal.loginform.logout=\u30ed\u30b0\u30a2\u30a6\u30c8
portal.loginform.login=\u30ed\u30b0\u30a4\u30f3
Modified: portals/jetspeed-2/trunk/src/webapp/WEB-INF/templates/layout/html/columns/layout.vm
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/WEB-INF/templates/layout/html/columns/layout.vm?view=diff&rev=467659&r1=467658&r2=467659
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/WEB-INF/templates/layout/html/columns/layout.vm (original)
+++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/templates/layout/html/columns/layout.vm Wed Oct 25 07:05:26 2006
@@ -58,10 +58,12 @@
#if($isRoot)
#getBoolProperty($allowChangePageTheme $rootDecorator "allow.change.page.theme" true)
#getBoolProperty($allowAddPage $rootDecorator "allow.add.page" true)
+ #getBoolProperty($allowNavigatePage $rootDecorator "allow.navigate.page" true)
#getBoolProperty($allowDeletePage $rootDecorator "allow.delete.page" true)
#else
#set($allowChangePageTheme=false)
#set($allowAddPage=false)
+ #set($allowNavigatePage=false)
#set($allowDeletePage=false)
#end
@@ -125,6 +127,13 @@
<label for="newpage">$messages.getString("portal.page.editing.page")</label>
<input id='newpage' name='jsPageName'/>
<input type="submit" name="jsSubmitPage" value="$messages.getString("portal.page.editing.addpage")"/>
+ </div>
+ #end
+ #if($allowNavigatePage)
+ <div>
+ <label>$messages.getString("portal.page.editing.pagenavigation")</label>
+ <input id="move-page-left" type="submit" name="jsMovePageLeft" value="$messages.getString("portal.page.editing.movePageLeft")" />
+ <input id="move-page-right" type="submit" name="jsMovePageRight" value="$messages.getString("portal.page.editing.movePageRight")" />
</div>
#end
#if($allowDeletePage)
Modified: portals/jetspeed-2/trunk/src/webapp/WEB-INF/templates/layout/html/tcolumns/layout.vm
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/WEB-INF/templates/layout/html/tcolumns/layout.vm?view=diff&rev=467659&r1=467658&r2=467659
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/WEB-INF/templates/layout/html/tcolumns/layout.vm (original)
+++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/templates/layout/html/tcolumns/layout.vm Wed Oct 25 07:05:26 2006
@@ -61,10 +61,12 @@
#if($isRoot)
#getBoolProperty($allowChangePageTheme $rootDecorator "allow.change.page.theme" true)
#getBoolProperty($allowAddPage $rootDecorator "allow.add.page" true)
+ #getBoolProperty($allowNavigatePage $rootDecorator "allow.navigate.page" true)
#getBoolProperty($allowDeletePage $rootDecorator "allow.delete.page" true)
#else
#set($allowChangePageTheme=false)
#set($allowAddPage=false)
+ #set($allowNavigatePage=false)
#set($allowDeletePage=false)
#end
@@ -128,6 +130,13 @@
<label for="newpage">$messages.getString("portal.page.editing.page")</label>
<input id='newpage' name='jsPageName'/>
<input type="submit" name="jsSubmitPage" value="$messages.getString("portal.page.editing.addpage")"/>
+ </div>
+ #end
+ #if($allowNavigatePage)
+ <div>
+ <label>$messages.getString("portal.page.editing.pagenavigation")</label>
+ <input id="move-page-left" type="submit" name="jsMovePageLeft" value="$messages.getString("portal.page.editing.movePageLeft")" />
+ <input id="move-page-right" type="submit" name="jsMovePageRight" value="$messages.getString("portal.page.editing.movePageRight")" />
</div>
#end
#if($allowDeletePage)
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org