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 ta...@apache.org on 2006/11/28 23:34:25 UTC
svn commit: r480257 - 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/
Author: taylor
Date: Tue Nov 28 14:34:24 2006
New Revision: 480257
URL: http://svn.apache.org/viewvc?view=rev&rev=480257
Log:
http://issues.apache.org/jira/browse/JS2-615
In customizer, let user apply theme to all portlets per page with 1 submit
contribution from Evangelos Vlachogiannis
I really liked the fieldset design effect, and applied it to all the customizer widgets to give a little more of a 'toolbar' look
Added:
portals/jetspeed-2/trunk/layout-portlets/src/java/org/apache/jetspeed/portlets/layout/resources/LayoutResource_el.properties
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=480257&r1=480256&r2=480257
==============================================================================
--- 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 Tue Nov 28 14:34:24 2006
@@ -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");
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=480257&r1=480256&r2=480257
==============================================================================
--- 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 Tue Nov 28 14:34:24 2006
@@ -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.
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,132 @@
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.changelayout=Change Layout
+portal.page.editing.changetheme=Change Theme
+portal.page.editing.changethemeall=Change Portlets Theme
+portal.page.customizer.name=Jetspeed Customizer
+portal.page.editing.addlayout=Add portlet
+portal.page.editing.page=New Page:
+portal.page.editing.addpage=Create Page
+portal.page.editing.portlet=Add 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.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.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.
+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:
+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.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
+
+
Added: portals/jetspeed-2/trunk/layout-portlets/src/java/org/apache/jetspeed/portlets/layout/resources/LayoutResource_el.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/layout-portlets/src/java/org/apache/jetspeed/portlets/layout/resources/LayoutResource_el.properties?view=auto&rev=480257
==============================================================================
--- portals/jetspeed-2/trunk/layout-portlets/src/java/org/apache/jetspeed/portlets/layout/resources/LayoutResource_el.properties (added)
+++ portals/jetspeed-2/trunk/layout-portlets/src/java/org/apache/jetspeed/portlets/layout/resources/LayoutResource_el.properties Tue Nov 28 14:34:24 2006
@@ -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 <b>\u03c3\u03b5\u03bb\u03af\u03b4\u03b1\u03c2</b> \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
+
+
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=480257&r1=480256&r2=480257
==============================================================================
--- 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 Tue Nov 28 14:34:24 2006
@@ -1,67 +1,82 @@
-# 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.
+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 Portlets Theme
+portal.page.customizer.name=Jetspeed Customizer
+portal.page.editing.addlayout=Add portlet
+portal.page.editing.page=New Page:
+portal.page.editing.addpage=Create Page
+portal.page.editing.portlet=Add 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.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
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=480257&r1=480256&r2=480257
==============================================================================
--- 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 Tue Nov 28 14:34:24 2006
@@ -54,7 +54,6 @@
#if($editing)
<div class="layout-edit-bar">
-
#if($isRoot)
#getBoolProperty($allowChangePageTheme $rootDecorator "allow.change.page.theme" true)
#getBoolProperty($allowAddPage $rootDecorator "allow.add.page" true)
@@ -76,37 +75,50 @@
#getBoolProperty($allowChangeLayout $rootDecorator "allow.change.layout" true)
#getBoolProperty($allowAddPortlet $rootDecorator "allow.add.portlet" true)
-
+ <fieldset>
+ <div class="layout-edit-bar-left">
+ <div class="layout-title"><b>$messages.getString("portal.page.customizer.name")</b></div>
+ </div>
+ <div class="layout-edit-bar-right">
+ #if($allowAddPortlet)
+ <label>$messages.getString("portal.page.editing.portlet")</label>
+################## OLD portlet selector ####
+## #set ($chooser = "${jetspeed.basePath}/system/customizer/portlet-selector.psml")
+## <a href="#" onClick="portletform.action='$formAction';openWindow('$response.encodeURL($chooser)');return false">
+############################################
+ #set ($chooser = "${jetspeed.basePath}/system/customizer/selector.psml?jspage=${rc.Path}")
+ <a href="$response.encodeURL($chooser)">
+ <img src="#GetPageResource('images/select.gif')" border="0" title="$messages.getString("portal.page.editing.addportlet")"/>
+ </a>
+ #end
+ </div>
+ </fieldset>
+ <fieldset>
<div class="layout-edit-bar-left">
-
#set($form="f${renderResponse.namespace}")
#set($formAction = "$renderResponse.createActionURL()")
#set($submit = ".submit()")
<form name="$form" action="$formAction" method='post'>
#if($allowAddLayout||$allowChangeLayout)
- <div class="layout-title">$messages.getString("portal.page.editing.layoutConfiguration")</div>
+ <div class="layout-title"><b>$messages.getString("portal.page.editing.layoutConfiguration")</b></div>
<div class="layout-content">
#end
#if ($allowChangePageTheme)
- <div>
<label for="theme">$messages.getString("portal.page.editing.theme")</label>
<select id='theme' name='theme' onChange="$form$submit">
#foreach($td in $decorationFactory.getPageDecorations($rc))
<option value='$td' #if($rootDecorator.Name == $td) SELECTED #end>$td
#end
</select>
- </div>
#end
#if($allowAddLayout||$allowChangeLayout)
- <div>
<label for="layout">$messages.getString("portal.page.editing.layout")</label>
<select id='layout' name='layout'>
#foreach($ld in $decorationFactory.getLayouts($rc))
<option value='$ld.Name' #if($myFragment.Name == $ld.Name) SELECTED #end>$ld.DisplayName
#end
</select>
- </div>
#end
#if ($allowChangeLayout)
<input type="submit" name="jsChangeLayout" value="$messages.getString("portal.page.editing.changelayout")" />
@@ -114,61 +126,60 @@
#if($allowAddLayout)
<input type="submit" name="jsAddLayout" value="$messages.getString("portal.page.editing.addlayout")" />
#end
+ #getBoolProperty($allowChangePortletDecorator $rootDecorator "allow.change.portlet.decorator" true)
+ ####### Take all fragments and apply style
+ #if($allowChangePortletDecorator)
+ <form name="$form$dcnt" action="$formAction" method='post'>
+
+ <input type="hidden" name="fragment" value="$f.id">
+ <input type="hidden" name="move" value="">
+ <input type="hidden" name="remove" value="">
+ <select id="decorators" name="decorators">
+ <option value=''>
+ #foreach($pd in $decorationFactory.getPortletDecorations($rc))
+ <option value='$pd' #if ($f.Decorator == $pd) SELECTED #end>$pd
+ #end
+ </select>
+ <input type="submit" name="jsSubmitTheme" value="$messages.getString("portal.page.editing.changethemeall")"/>
+ </form>
+ #end
#if($allowAddLayout||$allowChangeLayout)
</div>
#end
-
+ </div>
+ </fieldset>
+ <fieldset>
+ <div class="layout-edit-bar-left">
#if($allowAddPage||$allowDeletePage)
- <div class="page-title">$messages.getString("portal.page.editing.pageConfiguration")</div>
+ <div class="page-title"><b>$messages.getString("portal.page.editing.pageConfiguration")</b></div>
<div class="page-content">
#end
#if($allowAddPage)
- <div>
<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)
- <div>
<label for="deletepage">$messages.getString("portal.page.editing.deleteThisPage")</label>
<input id="deletepage" type="submit" name="jsDeletePage" value="$messages.getString("portal.page.editing.deletePage")" onclick="if(window.confirm('$messages.getString("portal.page.editing.confirmDeleteThisPage")')){return true;}return false;"/>
- </div>
#end
#if($allowAddPage||$allowDeletePage)
</div>
#end
</form>
- </div>
- <div class="layout-edit-bar-right">
- #if($allowAddPortlet)
- <label>$messages.getString("portal.page.editing.portlet")</label>
-################## OLD portlet selector ####
-## #set ($chooser = "${jetspeed.basePath}/system/customizer/portlet-selector.psml")
-## <a href="#" onClick="portletform.action='$formAction';openWindow('$response.encodeURL($chooser)');return false">
-############################################
- #set ($chooser = "${jetspeed.basePath}/system/customizer/selector.psml?jspage=${rc.Path}")
- <a href="$response.encodeURL($chooser)">
- <img src="#GetPageResource('images/select.gif')" border="0" title="$messages.getString("portal.page.editing.addportlet")"/>
- </a>
- #end
- </div>
+ </div>
+ </fieldset>
</div>
+## end edit mode
#end
#set ($dcnt = 0)
#set ($columnIndex = 0)
-
-#if($editing)
- #getBoolProperty($allowChangePortletDecorator $rootDecorator "allow.change.portlet.decorator" true)
-#end
#foreach($column in $columnLayout.columns)
@@ -266,4 +277,4 @@
</form>
#parse($myFragment.decoration.footer)
#end
-
+
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org