=================================================================== --- components/portal/src/java/org/apache/jetspeed/container/url/impl/JetspeedPortletURL.java (revision 449944) +++ components/portal/src/java/org/apache/jetspeed/container/url/impl/JetspeedPortletURL.java (working copy) @@ -30,13 +30,17 @@ */ public class JetspeedPortletURL extends PortletURLImpl { + private String portletAnchor = null; public JetspeedPortletURL(PortletWindow portletWindow, HttpServletRequest servletRequest, HttpServletResponse servletResponse, boolean isAction) - { + { super(portletWindow, servletRequest, servletResponse, isAction); + // for better accessibility when an action is submitted the portal points to portlet id that submitted the action + if(isAction) + this.portletAnchor = "#" + portletWindow.getPortletEntity().getId(); } public String toString() - { - return servletResponse.encodeURL(super.toString()); + { + return servletResponse.encodeURL(super.toString()) + this.portletAnchor; } } Index: applications/j2-admin/src/webapp/WEB-INF/security/login/login.jsp =================================================================== --- applications/j2-admin/src/webapp/WEB-INF/security/login/login.jsp (revision 449944) +++ applications/j2-admin/src/webapp/WEB-INF/security/login/login.jsp (working copy) @@ -41,9 +41,9 @@ -
+
-
+
@@ -51,34 +51,27 @@ -
+
-
+
-
+
-
+
-
- - - + + - - - - - - - - - -
">
">
+ "/> +
+ + + "/>
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 449944) +++ layout-portlets/src/java/org/apache/jetspeed/portlets/layout/resources/LayoutResource.properties (working copy) @@ -17,7 +17,7 @@ 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.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.minimize = Minimize a portlet. @@ -34,22 +34,24 @@ 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.editFieldset=Customize portal.loginform.logout=Logout portal.loginform.login=Login @@ -57,3 +59,8 @@ 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 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 449944) +++ layout-portlets/src/java/org/apache/jetspeed/portlets/layout/resources/LayoutResource_en.properties (working copy) @@ -17,7 +17,7 @@ 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.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.minimize = Minimize a portlet. @@ -34,22 +34,24 @@ 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.editFieldset=Customize portal.loginform.logout=Logout portal.loginform.login=Login @@ -57,3 +59,8 @@ 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 Index: src/webapp/WEB-INF/templates/layout/html/columns/layout.vm =================================================================== --- src/webapp/WEB-INF/templates/layout/html/columns/layout.vm (revision 451218) +++ src/webapp/WEB-INF/templates/layout/html/columns/layout.vm (working copy) @@ -1,4 +1,4 @@ - +## #* Copyright 2004 The Apache Software Foundation @@ -80,47 +80,54 @@ #set($submit = ".submit()")
- #if ($allowChangePageTheme) - - - #end - #if($allowAddLayout||$allowChangeLayout) - - - #end - #if ($allowChangeLayout) - - #end - #if($allowAddLayout) - - #end - #if($allowAddPage) - - - - #end +
+ $messages.getString("portal.page.editing.editFieldset") + #if ($allowChangePageTheme) + + + +
+ #end + #if($allowAddLayout||$allowChangeLayout) + + + #end + #if ($allowChangeLayout) + +
+ #end + #if($allowAddLayout) + +
+ #end + #if($allowAddPage) + + + +
+ #end +
#if($allowAddPortlet) - #set ($chooser = "${jetspeed.basePath}/system/customizer/portlet-selector.psml") - - - + + $messages.getString("portal.page.editing.addportlet") + #end
#end - +
#set ($dcnt = 0) #set ($columnIndex = 0) @@ -158,11 +165,12 @@ #if($f.type == "portlet") #set($fragmentType="Portlet") #if($allowChangePortletDecorator) -