Return-Path: Delivered-To: apmail-portals-jetspeed-dev-archive@www.apache.org Received: (qmail 4839 invoked from network); 18 Apr 2007 23:44:23 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 18 Apr 2007 23:44:22 -0000 Received: (qmail 15909 invoked by uid 500); 18 Apr 2007 23:44:28 -0000 Delivered-To: apmail-portals-jetspeed-dev-archive@portals.apache.org Received: (qmail 15876 invoked by uid 500); 18 Apr 2007 23:44:28 -0000 Mailing-List: contact jetspeed-dev-help@portals.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "Jetspeed Developers List" Delivered-To: mailing list jetspeed-dev@portals.apache.org Received: (qmail 15865 invoked by uid 99); 18 Apr 2007 23:44:28 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 18 Apr 2007 16:44:28 -0700 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 18 Apr 2007 16:44:20 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 845AC1A9838; Wed, 18 Apr 2007 16:44:00 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r530204 - 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/ Date: Wed, 18 Apr 2007 23:44:00 -0000 To: jetspeed-dev@portals.apache.org From: shinsuke@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070418234400.845AC1A9838@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: shinsuke Date: Wed Apr 18 16:43:59 2007 New Revision: 530204 URL: http://svn.apache.org/viewvc?view=rev&rev=530204 Log: fixed https://issues.apache.org/jira/browse/JS2-683 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/src/webapp/WEB-INF/templates/layout/html/columns/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=530204&r1=530203&r2=530204 ============================================================================== --- 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 Apr 18 16:43:59 2007 @@ -271,6 +271,8 @@ if ( request.getParameter("jsSubmitPage" ) != null ) { String jsPageName = request.getParameter("jsPageName"); + String jsPageTitle = request.getParameter("jsPageTitle"); + String jsPageShortTitle = request.getParameter("jsPageShortTitle"); if ( jsPageName != null && jsPageName.length() > 0 && jsPageName.indexOf(Folder.PATH_SEPARATOR) == -1 ) { try @@ -296,7 +298,10 @@ page.getRootFragment().setName(layout); page.setDefaultDecorator(requestPage.getDefaultDecorator(Fragment.LAYOUT), Fragment.LAYOUT); page.setDefaultDecorator(requestPage.getDefaultDecorator(Fragment.PORTLET), Fragment.PORTLET); - page.setTitle(jsPageName); + page.setTitle(jsPageTitle != null && !jsPageTitle.equals("") ? jsPageTitle : jsPageName); + page.setShortTitle(jsPageShortTitle != null + && !jsPageShortTitle.equals("") ? jsPageShortTitle + : jsPageName); pageManager.updatePage(page); List orderList = parent.getDocumentOrder(); @@ -320,6 +325,33 @@ return; } + if (request.getParameter("jsChangePageName") != null) + { + String jsPageTitle = request.getParameter("jsPageTitle"); + String jsPageShortTitle = request + .getParameter("jsPageShortTitle"); + try + { + if (jsPageTitle != null && !jsPageTitle.equals("")) + { + requestPage.setTitle(jsPageTitle); + } + if (jsPageShortTitle != null + && !jsPageShortTitle.equals("")) + { + requestPage.setShortTitle(jsPageShortTitle); + } + pageManager.updatePage(requestPage); + } + catch (Exception e) + { + throw new PortletException( + "Unable to access page for editing: " + + e.getMessage(), e); + } + return; + } + if ( request.getParameter("jsDeletePage" ) != null ) { try @@ -462,6 +494,8 @@ if (request.getParameter("jsSubmitFolder") != null) { String jsFolderName = request.getParameter("jsFolderName"); + String jsFolderTitle = request.getParameter("jsFolderTitle"); + String jsFolderShortTitle = request.getParameter("jsFolderShortTitle"); if (jsFolderName != null && jsFolderName.length() > 0 && jsFolderName.indexOf(Folder.PATH_SEPARATOR) == -1) { @@ -492,7 +526,14 @@ folder.setDefaultDecorator(requestPage .getDefaultDecorator(Fragment.PORTLET), Fragment.PORTLET); - folder.setTitle(jsFolderName); + folder + .setTitle(jsFolderTitle != null + && !jsFolderTitle.equals("") ? jsFolderTitle + : jsFolderName); + folder + .setShortTitle(jsFolderShortTitle != null + && !jsFolderShortTitle.equals("") ? jsFolderShortTitle + : jsFolderName); pageManager.updateFolder(folder); List orderList = parent.getDocumentOrder(); @@ -557,6 +598,38 @@ return; } + if (request.getParameter("jsChangeFolderName") != null) + { + String jsFolderTitle = request.getParameter("jsFolderTitle"); + String jsFolderShortTitle = request + .getParameter("jsFolderShortTitle"); + try + { + Folder parent = (Folder) requestPage.getParent(); + if (parent != null) + { + if (jsFolderTitle != null && !jsFolderTitle.equals("")) + { + parent.setTitle(jsFolderTitle); + } + if (jsFolderShortTitle != null + && !jsFolderShortTitle.equals("")) + { + parent.setShortTitle(jsFolderShortTitle); + } + pageManager.updateFolder(parent); + } + + } + catch (Exception e) + { + throw new PortletException( + "Unable to access folder for editing: " + + e.getMessage(), e); + } + return; + } + if (request.getParameter("jsDeleteFolder") != null) { try 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=530204&r1=530203&r2=530204 ============================================================================== --- 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 Apr 18 16:43:59 2007 @@ -39,13 +39,17 @@ portal.page.editing.theme=Theme: portal.page.editing.layout=Layout: +portal.page.editing.portlet.decorator=Portlet Theme: portal.page.editing.changelayout=Change Layout portal.page.editing.changetheme=Change Theme portal.page.editing.changethemeall=Change Portlets Theme -portal.page.customizer.name=Jetspeed Customizer +portal.page.customizer.name=Page/Folder Customizer portal.page.editing.addlayout=Add portlet -portal.page.editing.page=New Page: +portal.page.editing.page=Page Name: +portal.page.editing.page.title=Title: +portal.page.editing.page.shorttitle=Short Title: portal.page.editing.addpage=Create Page +portal.page.editing.changepagename=Change Page Name portal.page.editing.portlet=Add Portlet: portal.page.editing.addportlet=Add a Portlet portal.page.editing.movePortletLeft=Move Portlet Left @@ -87,8 +91,11 @@ portal.page.actions.View=View portal.folder.editing.folderConfiguration=Folder Configuration -portal.folder.editing.folder=Folder -portal.folder.editing.addfolder=Add Folder +portal.folder.editing.folder=Folder Name: +portal.folder.editing.folder.title=Title: +portal.folder.editing.folder.shorttitle=Short Title: +portal.folder.editing.addfolder=Create Folder +portal.folder.editing.changefoldername=Change Folder Name portal.folder.editing.foldernavigation=Navigation: portal.folder.editing.moveFolderLeft=Move Folder Left portal.folder.editing.moveFolderRight=Move Folder Right 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=530204&r1=530203&r2=530204 ============================================================================== --- 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 Apr 18 16:43:59 2007 @@ -39,13 +39,17 @@ portal.page.editing.theme=Theme: portal.page.editing.layout=Layout: +portal.page.editing.portlet.decorator=Portlet Theme: portal.page.editing.changelayout=Change Layout portal.page.editing.changetheme=Change Theme portal.page.editing.changethemeall=Change Portlets Theme -portal.page.customizer.name=Jetspeed Customizer +portal.page.customizer.name=Page/Folder Customizer portal.page.editing.addlayout=Add portlet -portal.page.editing.page=New Page: +portal.page.editing.page=Page Name: +portal.page.editing.page.title=Title: +portal.page.editing.page.shorttitle=Short Title: portal.page.editing.addpage=Create Page +portal.page.editing.changepagename=Change Page Name portal.page.editing.portlet=Add Portlet: portal.page.editing.addportlet=Add a Portlet portal.page.editing.movePortletLeft=Move Portlet Left @@ -87,12 +91,16 @@ portal.page.actions.View=View portal.folder.editing.folderConfiguration=Folder Configuration -portal.folder.editing.folder=Folder -portal.folder.editing.addfolder=Add Folder +portal.folder.editing.folder=Folder Name: +portal.folder.editing.folder.title=Title: +portal.folder.editing.folder.shorttitle=Short Title: +portal.folder.editing.addfolder=Create Folder +portal.folder.editing.changefoldername=Change Folder Name portal.folder.editing.foldernavigation=Navigation: portal.folder.editing.moveFolderLeft=Move Folder Left portal.folder.editing.moveFolderRight=Move Folder Right portal.folder.editing.deleteThisFolder=Delete this folder: portal.folder.editing.deleteFolder=Delete portal.folder.editing.confirmDeleteThisFolder=Do you want to delete this folder? + 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=530204&r1=530203&r2=530204 ============================================================================== --- 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 Apr 18 16:43:59 2007 @@ -60,19 +60,23 @@ #if($isRoot) #getBoolProperty($allowChangePageTheme $rootDecorator "allow.change.page.theme" true) #getBoolProperty($allowAddPage $rootDecorator "allow.add.page" true) + #getBoolProperty($allowChangePageName $rootDecorator "allow.change.page.name" true) #getBoolProperty($allowNavigatePage $rootDecorator "allow.navigate.page" true) #getBoolProperty($allowDeletePage $rootDecorator "allow.delete.page" true) #getBoolProperty($allowChangeFolderTheme $rootDecorator "allow.change.folder.theme" true) #getBoolProperty($allowAddFolder $rootDecorator "allow.add.folder" true) + #getBoolProperty($allowChangeFolderName $rootDecorator "allow.change.folder.name" true) #getBoolProperty($allowNavigateFolder $rootDecorator "allow.navigate.folder" true) #getBoolProperty($allowDeleteFolder $rootDecorator "allow.delete.folder" true) #else #set($allowChangePageTheme=false) #set($allowAddPage=false) + #set($allowChangePageName=false) #set($allowNavigatePage=false) #set($allowDeletePage=false) #set($allowChangeFolderTheme=false) #set($allowAddFolder=false) + #set($allowChangeFolderName=false) #set($allowNavigateFolder=false) #set($allowDeleteFolder=false) #end @@ -108,22 +112,25 @@
#if($allowAddLayout||$allowChangeLayout) -
$messages.getString("portal.page.editing.layoutConfiguration")
-
+
$messages.getString("portal.page.editing.layoutConfiguration")
+
#end #if ($allowChangePageTheme) +
+
#end #if($allowAddLayout||$allowChangeLayout) +
#end @@ -133,75 +140,128 @@ #if($allowAddLayout) #end + #if($allowAddLayout||$allowChangeLayout) +
+ #end #getBoolProperty($allowChangePortletDecorator $rootDecorator "allow.change.portlet.decorator" true) ####### Take all fragments and apply style #if($allowChangePortletDecorator) - - - - + + + + - + + +
#end #if($allowAddLayout||$allowChangeLayout) -
+
#end
-
+
- #if($allowAddPage||$allowDeletePage) -
$messages.getString("portal.page.editing.pageConfiguration")
-
+ #if($allowAddPage||$allowChangePageName||$allowDeletePage) +
$messages.getString("portal.page.editing.pageConfiguration")
+
+ #end + #if($allowAddPage||$allowChangePageName) +
+ + +
+
+ + +
+
+ + +
+
#end #if($allowAddPage) - - #end + #if($allowChangePageName) + + #end + #if($allowAddPage||$allowChangePageName) +
+ #end #if($allowNavigatePage) +
+
#end #if($allowDeletePage) +
+
#end - #if($allowAddPage||$allowDeletePage) -
+ #if($allowAddPage||$allowChangePageName||$allowDeletePage) +
#end
-
+
- #if($allowAddFolder||$allowDeleteFolder) -
$messages.getString("portal.folder.editing.folderConfiguration")
-
+ #if($allowAddFolder||$allowChangeFolderName||$allowDeleteFolder) +
$messages.getString("portal.folder.editing.folderConfiguration")
+
+ #end + #if($allowAddFolder||$allowChangeFolderName) +
+ + +
+
+ + +
+
+ + +
+
#end #if($allowAddFolder) - - #end + #if($allowChangeFolderName) + + #end + #if($allowAddFolder||$allowChangeFolderName) +
+ #end #if($allowNavigateFolder) +
+
#end #if($allowDeleteFolder) +
+
#end - #if($allowAddFolder||$allowDeleteFolder) -
+ #if($allowAddFolder||$allowChangeFolderName||$allowDeleteFolder) +
#end
+
## end edit mode --------------------------------------------------------------------- To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org For additional commands, e-mail: jetspeed-dev-help@portals.apache.org