Index: layout-portlets/src/java/org/apache/jetspeed/portlets/layout/MultiColumnPortlet.java =================================================================== --- layout-portlets/src/java/org/apache/jetspeed/portlets/layout/MultiColumnPortlet.java (revision 479794) +++ layout-portlets/src/java/org/apache/jetspeed/portlets/layout/MultiColumnPortlet.java (working copy) @@ -581,6 +581,36 @@ } return; } + // evlach + String decorators = request.getParameter("decorators"); + if ( decorators != null ) + { + Iterator fragmentsIter = requestPage.getRootFragment().getFragments().iterator(); + while(fragmentsIter.hasNext()) + { + Fragment fragment = (Fragment) fragmentsIter.next(); + if ( fragment == null ) + { + // ignore no longer consistent page definition + return; + } + + if (decorators.trim().length() == 0) + fragment.setDecorator(null); + else + fragment.setDecorator(decorators); + } + try + { + pageManager.updatePage(requestPage); + } + catch (Exception e) + { + throw new PortletException("Unable to update page for fragment decorator: "+e.getMessage(), e); + } + return; + } + //end evlach } String portlets = request.getParameter("portlets"); Index: layout-portlets/src/java/org/apache/jetspeed/portlets/layout/resources/LayoutResource.properties =================================================================== --- layout-portlets/src/java/org/apache/jetspeed/portlets/layout/resources/LayoutResource.properties (revision 479794) +++ layout-portlets/src/java/org/apache/jetspeed/portlets/layout/resources/LayoutResource.properties (working copy) @@ -15,15 +15,18 @@ # Messages used by velocity templates and the JetspeedPowerTool portal.help.title = Portal Online Help portal.page.help.title = Portal Pages +portal.page.help.descr = 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.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. [reload page] portal.page.help.select = Add more portlet applications to a page. portal.portlet.help.title = Portlet Applications +portal.portlet.help.descr = 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.descr = 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. @@ -31,37 +34,130 @@ 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.portlet.help.theme = 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.changelayout=Change Layout +portal.page.editing.changetheme=Change Theme +portal.page.editing.addlayout=Add portlet +portal.page.editing.page=New Page: +portal.page.editing.addpage=Create Page +portal.page.editing.portlet=Add Portlet [pop up window]: +portal.page.editing.addportlet=Add a Portlet [new window] +portal.page.editing.movePortletLeft=Move Portlet Left [reload page] +portal.page.editing.movePortletUp=Move Portlet Up [reload page] +portal.page.editing.removePortlet=Remove Portlet [reload page] +portal.page.editing.movePortletDown=Move Portlet Down [reload page] +portal.page.editing.movePortletRight=Move Portlet Right [reload page] +portal.page.editing.moveLayoutLeft=Move Layout Left [reload page] +portal.page.editing.moveLayoutUp=Move Layout Up [reload page] +portal.page.editing.removeLayout=Remove Layout [reload page] +portal.page.editing.moveLayoutDown=Move Layout Down [reload page] +portal.page.editing.moveLayoutRight=Move Layout Right [reload page] 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.editFieldset=Customize + +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 + +portal.page.navigation.skip=skip +portal.page.navigation.msg.pages=Select page or +portal.page.navigation.msg.page-navigations=Select subsite or +portal.page.navigation.msg.additional-links=Select additional link or + portal.page.editing.pagenavigation=Navigation: portal.page.editing.movePageLeft=Move Page Left portal.page.editing.movePageRight=Move Page Right +# 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.descr = +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. [reload page] +portal.page.help.select = Add more portlet applications to a page. +portal.portlet.help.title = Portlet Applications +portal.portlet.help.descr = +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.descr = +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.portlet.help.theme = + +portal.page.editing.theme=Theme: +portal.page.editing.layout=Layout: +portal.page.editing.changelayout=Change Layout +portal.page.editing.changetheme=Change Theme +portal.page.editing.addlayout=Add portlet +portal.page.editing.page=New Page: +portal.page.editing.addpage=Create Page +portal.page.editing.portlet=Add Portlet [pop up window]: +portal.page.editing.addportlet=Add a Portlet [new window] +portal.page.editing.movePortletLeft=Move Portlet Left [reload page] +portal.page.editing.movePortletUp=Move Portlet Up [reload page] +portal.page.editing.removePortlet=Remove Portlet [reload page] +portal.page.editing.movePortletDown=Move Portlet Down [reload page] +portal.page.editing.movePortletRight=Move Portlet Right [reload page] +portal.page.editing.moveLayoutLeft=Move Layout Left [reload page] +portal.page.editing.moveLayoutUp=Move Layout Up [reload page] +portal.page.editing.removeLayout=Remove Layout [reload page] +portal.page.editing.moveLayoutDown=Move Layout Down [reload page] +portal.page.editing.moveLayoutRight=Move Layout Right [reload page] +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.editFieldset=Customize + 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 + +portal.page.navigation.skip=skip +portal.page.navigation.msg.pages=Select page or +portal.page.navigation.msg.page-navigations=Select subsite or +portal.page.navigation.msg.additional-links=Select additional link or + +portal.page.actions.Edit=Customize +portal.page.actions.Help=Help +portal.page.actions.View=View + + Index: layout-portlets/src/java/org/apache/jetspeed/portlets/layout/resources/LayoutResource_el.properties =================================================================== --- layout-portlets/src/java/org/apache/jetspeed/portlets/layout/resources/LayoutResource_el.properties (revision 0) +++ layout-portlets/src/java/org/apache/jetspeed/portlets/layout/resources/LayoutResource_el.properties (revision 0) @@ -0,0 +1,86 @@ +# 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 = Online \u03b2\u03bf\u03ae\u03b8\u03b5\u03b9\u03b1 \u03b3\u03b9\u03b1 \u03c4\u03b7 \u03b4\u03b9\u03ba\u03c4\u03c5\u03b1\u03ba\u03ae \u03c0\u03cd\u03bb\u03b7 +portal.page.help.title = \u03a3\u03b5\u03bb\u03af\u03b4\u03b5\u03c2 +portal.page.help.descr = \u039f \u03b5\u03b3\u03b3\u03b5\u03b3\u03c1\u03b1\u03bc\u03ad\u03bd\u03bf\u03c2 \u03c7\u03c1\u03ae\u03c3\u03c4\u03b7\u03c2 \u03c4\u03b7\u03c2 \u03b4\u03b9\u03ba\u03c4\u03c5\u03b1\u03ba\u03ae\u03c2 \u03c0\u03cd\u03bb\u03b7\u03c2 \u03bc\u03c0\u03bf\u03c1\u03b5\u03af \u03bd\u03b1 \u03c0\u03b5\u03c1\u03b9\u03b7\u03b3\u03b7\u03b8\u03b5\u03af \u03c3\u03c4\u03b9\u03c2 \u03c3\u03b5\u03bb\u03af\u03b4\u03b5\u03c2 \u03c4\u03b7\u03c2 \u03c0\u03cd\u03bb\u03b7\u03c2 \u03c7\u03c1\u03b7\u03c3\u03b9\u03bc\u03bf\u03c0\u03bf\u03b9\u03ce\u03bd\u03c4\u03b1\u03c2 \u03c4\u03b9\u03c2 \u03ba\u03b1\u03c1\u03c4\u03ad\u03bb\u03b5\u03c2 \u03c3\u03c4\u03bf \u03c0\u03ac\u03bd\u03c9 \u03bc\u03ad\u03c1\u03bf\u03c2 \u03c4\u03b7\u03c2 \u03bf\u03b8\u03cc\u03bd\u03b7\u03c2. \u039c\u03c0\u03bf\u03c1\u03b5\u03af \u03b5\u03c0\u03af\u03c3\u03b7\u03c2 \u03bd\u03b1 \u03b5\u03c0\u03b5\u03be\u03b5\u03c1\u03b3\u03b1\u03c3\u03c4\u03b5\u03af \u03ae \u03bd\u03b1 \u03b4\u03b9\u03b1\u03b2\u03ac\u03c3\u03b5\u03b9 \u03c4\u03b7 \u03b2\u03bf\u03ae\u03b8\u03b5\u03b9\u03b1 \u03b3\u03b9\u03b1 \u03ba\u03ac\u03b8\u03b5 \u03c3\u03b5\u03bb\u03af\u03b4\u03b1 \u03b5\u03c0\u03b9\u03bb\u03ad\u03b3\u03bf\u03bd\u03c4\u03b1\u03c2 \u03c4\u03bf \u03ba\u03b1\u03c4\u03ac\u03bb\u03bb\u03b7\u03bb\u03bf \u03b5\u03b9\u03ba\u03bf\u03bd\u03af\u03b4\u03b9\u03bf \u03c3\u03c4\u03b1 \u03b4\u03b5\u03be\u03b9\u03ac \u03c4\u03b7\u03c2 \u03bf\u03b8\u03cc\u03bd\u03b7\u03c2. \u03a4\u03b1 \u03b5\u03b9\u03ba\u03bf\u03bd\u03af\u03b4\u03b9\u03b1 \u03c0\u03b5\u03c1\u03b9\u03b3\u03c1\u03ac\u03c6\u03bf\u03bd\u03c4\u03b1\u03b9 \u03c3\u03c4\u03b7 \u03c3\u03c5\u03bd\u03ad\u03c7\u03b5\u03b9\u03b1: +portal.page.help.view = \u0395\u03bc\u03c6\u03ac\u03bd\u03b9\u03c3\u03b7 \u03c4\u03b7\u03c2 \u03c3\u03b5\u03bb\u03af\u03b4\u03b1\u03c2 (view mode). +portal.page.help.help = \u0395\u03bc\u03c6\u03ac\u03bd\u03b9\u03c3\u03b7 \u03b2\u03bf\u03ae\u03b8\u03b5\u03b9\u03b1\u03c2 \u03b3\u03b9\u03b1 \u03bc\u03af\u03b1 \u03c3\u03b5\u03bb\u03af\u03b4\u03b1. +portal.page.help.edit = \u0395\u03c0\u03b5\u03be\u03b5\u03c1\u03b3\u03b1\u03c3\u03af\u03b1 \u03bc\u03af\u03b1\u03c2 \u03c3\u03b5\u03bb\u03af\u03b4\u03b1\u03c2. \u0395\u03b4\u03ce \u03c3\u03c5\u03bc\u03c0\u03b5\u03c1\u03b9\u03bb\u03b1\u03bc\u03b2\u03ac\u03bd\u03b5\u03c4\u03b1\u03b9 \u03b7 \u03b1\u03bb\u03bb\u03b1\u03b3\u03ae \u03b8\u03ad\u03bc\u03b1\u03c4\u03bf\u03c2 \u03ae \u03b4\u03b9\u03ac\u03c4\u03b1\u03be\u03b7\u03c2, \u03b7 \u03c0\u03c1\u03bf\u03c3\u03b8\u03ae\u03ba\u03b7 \u03c3\u03b5\u03bb\u03af\u03b4\u03c9\u03bd, \u03b7 \u03b1\u03bb\u03bb\u03b1\u03b3\u03ae \u03c4\u03b7\u03c2 \u03b5\u03bc\u03c6\u03ac\u03bd\u03b9\u03c3\u03b7\u03c2 portlets \u03ba\u03b1\u03b9 \u03b7 \u03c0\u03c1\u03bf\u03c3\u03b8\u03ae\u03ba\u03b7 \u03b7 \u03b1\u03c6\u03b1\u03af\u03c1\u03b5\u03c3\u03b7 portlets \u03b1\u03c0\u03cc \u03bc\u03af\u03b1 \u03c3\u03b5\u03bb\u03af\u03b4\u03b1. [\u03b5\u03c0\u03b1\u03bd\u03b1\u03c6\u03bf\u03c1\u03ac \u03c3\u03b5\u03bb\u03af\u03b4\u03b1\u03c2] +portal.page.help.select = \u03a0\u03c1\u03bf\u03c3\u03b8\u03ae\u03ba\u03b7 portlets \u03c3\u03b5 \u03bc\u03af\u03b1 \u03c3\u03b5\u03bb\u03af\u03b4\u03b1 (\u03b5\u03bc\u03c6\u03b1\u03bd\u03af\u03b6\u03b5\u03c4\u03b1\u03b9 \u03cc\u03c4\u03b1\u03bd \u03b7 \u03c3\u03b5\u03bb\u03af\u03b4\u03b1 \u03b5\u03af\u03bd\u03b1\u03b9 \u03c3\u03b5 \u03ba\u03b1\u03c4\u03ac\u03c3\u03c4\u03b1\u03c3\u03b7 \u03b5\u03c0\u03b5\u03be\u03b5\u03c1\u03b3\u03b1\u03c3\u03af\u03b1\u03c2). + +portal.portlet.help.title = Portlets +portal.portlet.help.descr = \u03a3\u03c4\u03b7\u03bd \u03b3\u03c1\u03b1\u03bc\u03bc\u03ae \u03c4\u03af\u03c4\u03bb\u03bf\u03c5 \u03c4\u03bf\u03c5 \u03ba\u03ac\u03b8\u03b5 portlet \u03c5\u03c0\u03ac\u03c1\u03c7\u03bf\u03c5\u03bd \u03bc\u03af\u03b1 \u03c3\u03b5\u03b9\u03c1\u03ac \u03b1\u03c0\u03cc \u03b5\u03b9\u03ba\u03bf\u03bd\u03af\u03b4\u03b9\u03b1 \u03c4\u03b1 \u03bf\u03c0\u03bf\u03af\u03b1 \u03b2\u03bf\u03b7\u03b8\u03bf\u03cd\u03bd \u03c3\u03c4\u03b7\u03bd \u03b4\u03b9\u03b1\u03c7\u03b5\u03af\u03c1\u03b9\u03c3\u03b7 \u03c4\u03bf\u03c5 \u03c3\u03c5\u03b3\u03ba\u03b5\u03ba\u03c1\u03b9\u03bc\u03ad\u03bd\u03bf\u03c5 portlet. \u03a4\u03b1 \u03b5\u03b9\u03ba\u03bf\u03bd\u03af\u03b4\u03b9\u03b1 \u03c0\u03b5\u03c1\u03b9\u03b3\u03c1\u03ac\u03c6\u03bf\u03bd\u03c4\u03b1\u03b9 \u03c3\u03c4\u03b7 \u03c3\u03c5\u03bd\u03ad\u03c7\u03b5\u03b9\u03b1: +portal.portlet.help.minimize = \u0395\u03bb\u03b1\u03c7\u03b9\u03c3\u03c4\u03bf\u03c0\u03bf\u03af\u03b7\u03c3\u03b7 portlet. +portal.portlet.help.maximize = \u039c\u03b5\u03b3\u03b9\u03c3\u03c4\u03bf\u03c0\u03bf\u03af\u03b7\u03c3\u03b7 portlet. +portal.portlet.help.restore = \u039a\u03b1\u03bd\u03bf\u03bd\u03b9\u03ba\u03ae \u03b5\u03bc\u03c6\u03ac\u03bd\u03b9\u03c3\u03b7 \u03c4\u03bf\u03c5 portlet (view mode). +portal.portlet.help.help = \u0395\u03bc\u03c6\u03ac\u03bd\u03b9\u03c3\u03b7 \u03b2\u03bf\u03ae\u03b8\u03b5\u03b9\u03b1\u03c2 \u03b3\u03b9\u03b1 \u03c4\u03bf portlet. +portal.portlet.help.print = \u0395\u03ba\u03c4\u03cd\u03c0\u03c9\u03c3\u03b7 \u03c4\u03c9\u03bd \u03c0\u03b5\u03c1\u03b9\u03b5\u03c7\u03bf\u03bc\u03ad\u03bd\u03c9\u03bd \u03b5\u03bd\u03cc\u03c2 portlet. +portal.portlet.help.edit = \u039f\u03b8\u03cc\u03bd\u03b7 \u03b5\u03c0\u03b5\u03be\u03b5\u03c1\u03b3\u03b1\u03c3\u03af\u03b1\u03c2 \u03c4\u03bf\u03c5 portlet. + +portal.portlet.help.edit.title = \u0395\u03c0\u03b5\u03be\u03b5\u03c1\u03b3\u03b1\u03c3\u03af\u03b1 \u03b5\u03bc\u03c6\u03ac\u03bd\u03b9\u03c3\u03b7\u03c2 \u03c4\u03c9\u03bd portlets +portal.portlet.help.edit.descr = \u03a0\u03b1\u03c4\u03ce\u03bd\u03c4\u03b1\u03c2 \u03c3\u03c4\u03bf \u03b5\u03b9\u03ba\u03bf\u03bd\u03af\u03b4\u03b9\u03bf \u03b5\u03c0\u03b5\u03be\u03b5\u03c1\u03b3\u03b1\u03c3\u03af\u03b1\u03c2 \u03bc\u03af\u03b1\u03c2 \u03c3\u03b5\u03bb\u03af\u03b4\u03b1\u03c2 \u03b5\u03bc\u03c6\u03b1\u03bd\u03af\u03b6\u03bf\u03bd\u03c4\u03b1\u03b9 \u03c3\u03c4\u03bf \u03c0\u03b1\u03bd\u03c9 \u03bc\u03ad\u03c1\u03bf\u03c2 \u03ba\u03ac\u03b8\u03b5 portlet \u03bc\u03af\u03b1 \u03c3\u03b5\u03b9\u03c1\u03ac \u03b1\u03c0\u03cc \u03b5\u03c0\u03b9\u03bb\u03bf\u03b3\u03ad\u03c2 \u03c3\u03c7\u03b5\u03c4\u03b9\u03ba\u03ad\u03c2 \u03bc\u03b5 \u03c4\u03b7\u03bd \u03b5\u03bc\u03c6\u03ac\u03bd\u03b9\u03c3\u03ae \u03c4\u03bf\u03c5 \u03bc\u03ad\u03c3\u03b1 \u03c3\u03c4\u03b7 \u03c3\u03b5\u03bb\u03af\u03b4\u03b1: +portal.portlet.help.close = \u0391\u03c6\u03b1\u03af\u03c1\u03b5\u03c3\u03b7 \u03c4\u03bf\u03c5 \u03c3\u03c5\u03b3\u03ba\u03b5\u03ba\u03c1\u03b9\u03bc\u03ad\u03bd\u03bf\u03c5 portlet \u03b1\u03c0\u03cc \u03c4\u03b7 \u03c3\u03b5\u03bb\u03af\u03b4\u03b1. +portal.portlet.help.movePortletUp = \u039c\u03b5\u03c4\u03b1\u03ba\u03af\u03bd\u03b7\u03c3\u03b7 \u03c4\u03bf\u03c5 portlet \u03c0\u03c1\u03bf\u03c2 \u03c4\u03b1 \u03c0\u03ac\u03bd\u03c9 \u03c3\u03c4\u03b7 \u03c3\u03b5\u03bb\u03af\u03b4\u03b1. +portal.portlet.help.movePortletDown = \u039c\u03b5\u03c4\u03b1\u03ba\u03af\u03bd\u03b7\u03c3\u03b7 \u03c4\u03bf\u03c5 portlet \u03c0\u03c1\u03bf\u03c2 \u03c4\u03b1 \u03ba\u03ac\u03c4\u03c9 \u03c3\u03c4\u03b7 \u03c3\u03b5\u03bb\u03af\u03b4\u03b1. +portal.portlet.help.movePortletLeft = \u039c\u03b5\u03c4\u03b1\u03ba\u03af\u03bd\u03b7\u03c3\u03b7 \u03c4\u03bf\u03c5 portlet \u03c0\u03c1\u03bf\u03c2 \u03c4\u03b1 \u03b1\u03c1\u03b9\u03c3\u03c4\u03b5\u03c1\u03ac \u03c3\u03c4\u03b7 \u03c3\u03b5\u03bb\u03af\u03b4\u03b1. +portal.portlet.help.movePortletRight = \u039c\u03b5\u03c4\u03b1\u03ba\u03af\u03bd\u03b7\u03c3\u03b7 \u03c4\u03bf\u03c5 portlet \u03c0\u03c1\u03bf\u03c2 \u03c4\u03b1 \u03b4\u03b5\u03be\u03b9\u03ac \u03c3\u03c4\u03b7 \u03c3\u03b5\u03bb\u03af\u03b4\u03b1. +portal.portlet.help.theme = \u03a4\u03ad\u03bb\u03bf\u03c2 \u03c5\u03c0\u03ac\u03c1\u03c7\u03b5\u03b9 \u03ba\u03b1\u03b9 \u03bc\u03b9\u03b1 \u03bb\u03af\u03c3\u03c4\u03b1 \u03bc\u03b5 \u03b4\u03b9\u03b1\u03b8\u03ad\u03c3\u03b9\u03bc\u03b1 \u03b8\u03ad\u03bc\u03b1\u03c4\u03b1 \u03b3\u03b9\u03b1 \u03c4\u03bf portlet, \u03b1\u03c0\u03cc \u03c4\u03b7\u03bd \u03bf\u03c0\u03bf\u03af\u03b1 \u03bf \u03c7\u03c1\u03ae\u03c3\u03c4\u03b7\u03c2 \u03bc\u03c0\u03bf\u03c1\u03b5\u03af \u03bd\u03b1 \u03b4\u03b9\u03b1\u03bb\u03ad\u03be\u03b5\u03b9 \u03cc\u03c0\u03bf\u03b9\u03bf \u03b5\u03c0\u03b9\u03b8\u03c5\u03bc\u03b5\u03af. + +portal.page.editing.theme=\u0398\u03ad\u03bc\u03b1: +portal.page.editing.layout=\u0394\u03b9\u03ac\u03c4\u03b1\u03be\u03b7 (layout): +portal.page.editing.changelayout=\u0391\u03bb\u03bb\u03b1\u03b3\u03ae \u03b4\u03b9\u03ac\u03c4\u03b1\u03be\u03b7\u03c2 +portal.page.editing.changetheme=\u0391\u03bb\u03bb\u03b1\u03b3\u03ae \u03b8\u03ad\u03bc\u03b1\u03c4\u03bf\u03c2 +portal.page.editing.changethemeall=\u0391\u03bb\u03bb\u03b1\u03b3\u03ae \u03b8\u03ad\u03bc\u03b1\u03c4\u03bf\u03c2 \u03c3\u03b5 \u03cc\u03bb\u03b1 \u03c4\u03b1 portlet \u03c4\u03b7\u03c2 \u03c3\u03b5\u03bb\u03af\u03b4\u03b1\u03c2 +portal.page.editing.addlayout=\u03a0\u03c1\u03bf\u03c3\u03b8\u03ae\u03ba\u03b7 portlet +portal.page.editing.page=\u039d\u03ad\u03b1 \u03c3\u03b5\u03bb\u03af\u03b4\u03b1: +portal.page.editing.addpage=\u0394\u03b7\u03bc\u03b9\u03bf\u03c5\u03c1\u03b3\u03af\u03b1 \u03c3\u03b5\u03bb\u03af\u03b4\u03b1\u03c2 +portal.page.editing.portlet=\u03a0\u03c1\u03bf\u03c3\u03b8\u03ae\u03ba\u03b7 Portlet [pop up \u03c0\u03b1\u03c1\u03ac\u03b8\u03c5\u03c1\u03bf]: +portal.page.editing.addportlet=\u03a0\u03c1\u03bf\u03c3\u03b8\u03ae\u03ba\u03b7 Portlet [\u03bd\u03ad\u03bf \u03c0\u03b1\u03c1\u03ac\u03b8\u03c5\u03c1\u03bf] +portal.page.editing.movePortletLeft=\u039c\u03b5\u03c4\u03b1\u03ba\u03af\u03bd\u03b7\u03c3\u03b7 Portlet \u03b1\u03c1\u03b9\u03c3\u03c4\u03b5\u03c1\u03ac [\u03b5\u03c0\u03b1\u03bd\u03b1\u03c6\u03cc\u03c1\u03c4\u03c9\u03c3\u03b7 \u03c3\u03b5\u03bb\u03af\u03b4\u03b1\u03c2] +portal.page.editing.movePortletUp=\u039c\u03b5\u03c4\u03b1\u03ba\u03af\u03bd\u03b7\u03c3\u03b7 Portlet \u03c0\u03ac\u03bd\u03c9 [\u03b5\u03c0\u03b1\u03bd\u03b1\u03c6\u03cc\u03c1\u03c4\u03c9\u03c3\u03b7 \u03c3\u03b5\u03bb\u03af\u03b4\u03b1\u03c2] +portal.page.editing.removePortlet=\u0391\u03c6\u03b1\u03af\u03c1\u03b5\u03c3\u03b7 Portlet [\u03b5\u03c0\u03b1\u03bd\u03b1\u03c6\u03cc\u03c1\u03c4\u03c9\u03c3\u03b7 \u03c3\u03b5\u03bb\u03af\u03b4\u03b1\u03c2] +portal.page.editing.movePortletDown=\u039c\u03b5\u03c4\u03b1\u03ba\u03af\u03bd\u03b7\u03c3\u03b7 Portlet \u03ba\u03ac\u03c4\u03c9 [\u03b5\u03c0\u03b1\u03bd\u03b1\u03c6\u03cc\u03c1\u03c4\u03c9\u03c3\u03b7 \u03c3\u03b5\u03bb\u03af\u03b4\u03b1\u03c2] +portal.page.editing.movePortletRight=\u039c\u03b5\u03c4\u03b1\u03ba\u03af\u03bd\u03b7\u03c3\u03b7 Portlet \u03b4\u03b5\u03be\u03b9\u03ac [\u03b5\u03c0\u03b1\u03bd\u03b1\u03c6\u03cc\u03c1\u03c4\u03c9\u03c3\u03b7 \u03c3\u03b5\u03bb\u03af\u03b4\u03b1\u03c2] +portal.page.editing.moveLayoutLeft=\u039c\u03b5\u03c4\u03b1\u03ba\u03af\u03bd\u03b7\u03c3\u03b7 \u03b4\u03b9\u03ac\u03c4\u03b1\u03be\u03b7\u03c2 \u03b1\u03c1\u03b9\u03c3\u03c4\u03b5\u03c1\u03ac [\u03b5\u03c0\u03b1\u03bd\u03b1\u03c6\u03cc\u03c1\u03c4\u03c9\u03c3\u03b7 \u03c3\u03b5\u03bb\u03af\u03b4\u03b1\u03c2] +portal.page.editing.moveLayoutUp=\u039c\u03b5\u03c4\u03b1\u03ba\u03af\u03bd\u03b7\u03c3\u03b7 \u03b4\u03b9\u03ac\u03c4\u03b1\u03be\u03b7\u03c2 \u03c0\u03ac\u03bd\u03c9 [\u03b5\u03c0\u03b1\u03bd\u03b1\u03c6\u03cc\u03c1\u03c4\u03c9\u03c3\u03b7 \u03c3\u03b5\u03bb\u03af\u03b4\u03b1\u03c2] +portal.page.editing.removeLayout=\u0394\u03b9\u03b1\u03b3\u03c1\u03b1\u03c6\u03ae \u03b4\u03b9\u03ac\u03c4\u03b1\u03be\u03b7\u03c2 [\u03b5\u03c0\u03b1\u03bd\u03b1\u03c6\u03cc\u03c1\u03c4\u03c9\u03c3\u03b7 \u03c3\u03b5\u03bb\u03af\u03b4\u03b1\u03c2] +portal.page.editing.moveLayoutDown=\u039c\u03b5\u03c4\u03b1\u03ba\u03af\u03bd\u03b7\u03c3\u03b7 \u03b4\u03b9\u03ac\u03c4\u03b1\u03be\u03b7\u03c2 \u03ba\u03ac\u03c4\u03c9 [\u03b5\u03c0\u03b1\u03bd\u03b1\u03c6\u03cc\u03c1\u03c4\u03c9\u03c3\u03b7 \u03c3\u03b5\u03bb\u03af\u03b4\u03b1\u03c2] +portal.page.editing.moveLayoutRight=\u039c\u03b5\u03c4\u03b1\u03ba\u03af\u03bd\u03b7\u03c3\u03b7 \u03b4\u03b9\u03ac\u03c4\u03b1\u03be\u03b7\u03c2 \u03b4\u03b5\u03be\u03b9\u03ac [\u03b5\u03c0\u03b1\u03bd\u03b1\u03c6\u03cc\u03c1\u03c4\u03c9\u03c3\u03b7 \u03c3\u03b5\u03bb\u03af\u03b4\u03b1\u03c2] +portal.page.editing.layoutConfiguration=\u0394\u03b9\u03b1\u03bc\u03cc\u03c1\u03c6\u03c9\u03c3\u03b7 \u03b4\u03b9\u03ac\u03c4\u03b1\u03be\u03b7\u03c2 +portal.page.editing.pageConfiguration=\u0394\u03b9\u03b1\u03bc\u03cc\u03c1\u03c6\u03c9\u03c3\u03b7 \u03c3\u03b5\u03bb\u03af\u03b4\u03b1\u03c2 +portal.page.editing.deleteThisPage=\u0394\u03b9\u03b1\u03b3\u03c1\u03b1\u03c6\u03ae \u03b1\u03c5\u03c4\u03ae\u03c2 \u03c4\u03b7\u03c2 \u03c3\u03b5\u03bb\u03af\u03b4\u03b1\u03c2: +portal.page.editing.deletePage=\u0394\u03b9\u03b1\u03b3\u03c1\u03b1\u03c6\u03ae +portal.page.editing.confirmDeleteThisPage=\u0398\u03ad\u03bb\u03b5\u03c4\u03b5 \u03bd\u03b1 \u03b4\u03b9\u03b1\u03b3\u03c1\u03ac\u03c8\u03b5\u03c4\u03b5 \u03b1\u03c5\u03c4\u03ae \u03c4\u03b7 \u03c3\u03b5\u03bb\u03af\u03b4\u03b1; + +portal.page.editing.editFieldset=\u03a0\u03c1\u03bf\u03c3\u03b1\u03c1\u03bc\u03bf\u03b3\u03ae + +portal.loginform.logout=\u0391\u03c0\u03bf\u03c3\u03cd\u03bd\u03b4\u03b5\u03c3\u03b7 +portal.loginform.login=\u03a3\u03cd\u03bd\u03b4\u03b5\u03c3\u03b7 +portal.loginform.username=\u038c\u03bd\u03bf\u03bc\u03b1 \u03c7\u03c1\u03ae\u03c3\u03c4\u03b7: +portal.loginform.password=\u039a\u03c9\u03b4\u03b9\u03ba\u03cc\u03c2 \u03a0\u03c1\u03cc\u03c3\u03b2\u03b1\u03c3\u03b7\u03c2: +portal.loginform.change_password=\u0391\u03bb\u03bb\u03b1\u03b3\u03ae \u03ba\u03c9\u03b4\u03b9\u03ba\u03bf\u03cd +portal.loginform.error.invalid_password=\u0386\u03ba\u03c5\u03c1\u03bf\u03c2 \u03ba\u03c9\u03b4\u03b9\u03ba\u03cc\u03c2 + +portal.page.navigation.skip=\u03c0\u03b1\u03c1\u03ac\u03bb\u03b5\u03b9\u03c8\u03b7 +portal.page.navigation.msg.pages=\u0394\u03b9\u03b1\u03bb\u03ad\u03be\u03c4\u03b5 \u03c3\u03b5\u03bb\u03af\u03b4\u03b1 \u03ae +portal.page.navigation.msg.page-navigations=\u0394\u03b9\u03b1\u03bb\u03ad\u03be\u03c4\u03b5 subsite \u03ae +portal.page.navigation.msg.additional-links=\u0394\u03b9\u03b1\u03bb\u03ad\u03be\u03c4\u03b5 \u03c0\u03c1\u03cc\u03c3\u03b8\u03b5\u03c4\u03bf \u03c5\u03c0\u03b5\u03c1\u03c3\u03cd\u03bd\u03b4\u03b5\u03c3\u03bc\u03bf \u03ae + +portal.page.actions.Edit=\u03a0\u03c1\u03bf\u03c3\u03c9\u03c0\u03bf\u03c0\u03bf\u03af\u03b7\u03c3\u03b7 +portal.page.actions.Help=\u0392\u03bf\u03ae\u03b8\u03b5\u03b9\u03b1 +portal.page.actions.View=\u0395\u03bc\u03c6\u03ac\u03bd\u03b9\u03c3\u03b7 + + Index: layout-portlets/src/java/org/apache/jetspeed/portlets/layout/resources/LayoutResource_en.properties =================================================================== --- layout-portlets/src/java/org/apache/jetspeed/portlets/layout/resources/LayoutResource_en.properties (revision 479794) +++ layout-portlets/src/java/org/apache/jetspeed/portlets/layout/resources/LayoutResource_en.properties (working copy) @@ -1,67 +1,81 @@ -# 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 +# 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.descr = +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. [reload page] +portal.page.help.select = Add more portlet applications to a page. +portal.portlet.help.title = Portlet Applications +portal.portlet.help.descr = +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.descr = +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.portlet.help.theme = + +portal.page.editing.theme=Theme: +portal.page.editing.layout=Layout: +portal.page.editing.changelayout=Change Layout +portal.page.editing.changetheme=Change Theme +portal.page.editing.changethemeall=Change Theme for page portlets +portal.page.editing.addlayout=Add portlet +portal.page.editing.page=New Page: +portal.page.editing.addpage=Create Page +portal.page.editing.portlet=Add Portlet [pop up window]: +portal.page.editing.addportlet=Add a Portlet [new window] +portal.page.editing.movePortletLeft=Move Portlet Left [reload page] +portal.page.editing.movePortletUp=Move Portlet Up [reload page] +portal.page.editing.removePortlet=Remove Portlet [reload page] +portal.page.editing.movePortletDown=Move Portlet Down [reload page] +portal.page.editing.movePortletRight=Move Portlet Right [reload page] +portal.page.editing.moveLayoutLeft=Move Layout Left [reload page] +portal.page.editing.moveLayoutUp=Move Layout Up [reload page] +portal.page.editing.removeLayout=Remove Layout [reload page] +portal.page.editing.moveLayoutDown=Move Layout Down [reload page] +portal.page.editing.moveLayoutRight=Move Layout Right [reload page] +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.editFieldset=Customize + +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 + +portal.page.navigation.skip=skip +portal.page.navigation.msg.pages=Select page or +portal.page.navigation.msg.page-navigations=Select subsite or +portal.page.navigation.msg.additional-links=Select additional link or + +portal.page.actions.Edit=Customize +portal.page.actions.Help=Help +portal.page.actions.View=View Index: src/webapp/WEB-INF/templates/layout/html/columns/layout.vm =================================================================== --- src/webapp/WEB-INF/templates/layout/html/columns/layout.vm (revision 479794) +++ src/webapp/WEB-INF/templates/layout/html/columns/layout.vm (working copy) @@ -169,6 +169,25 @@ #if($editing) #getBoolProperty($allowChangePortletDecorator $rootDecorator "allow.change.portlet.decorator" true) #end + ####### Take all fragments and apply style +
+ + + + + #if($allowChangePortletDecorator) +
+ +
+ + #end + +
#foreach($column in $columnLayout.columns)