March 2010 - gatein-commits - Jboss List Archives

gatein SVN: r2146 - portal/trunk/component/web/src/main/java/org/exoplatform/web/login.

by do-not-reply＠jboss.org

Author: julien_viet Date: 2010-03-11 03:57:03 -0500 (Thu, 11 Mar 2010) New Revision: 2146 Modified: portal/trunk/component/web/src/main/java/org/exoplatform/web/login/InitiateLoginServlet.java Log: GTNPORTAL-854 GTNPORTAL-864 Modified: portal/trunk/component/web/src/main/java/org/exoplatform/web/login/InitiateLoginServlet.java =================================================================== --- portal/trunk/component/web/src/main/java/org/exoplatform/web/login/InitiateLoginServlet.java 2010-03-11 06:31:20 UTC (rev 2145) +++ portal/trunk/component/web/src/main/java/org/exoplatform/web/login/InitiateLoginServlet.java 2010-03-11 08:57:03 UTC (rev 2146) @@ -122,9 +122,14 @@ private void showLoginForm(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { + String initialURI = (String)req.getAttribute("javax.servlet.forward.request_uri"); + if (initialURI == null) + { + throw new IllegalStateException("request attribute javax.servlet.forward.request_uri should not be null here"); + } try { - req.setAttribute("org.gatein.portal.login.initial_uri", "javax.servlet.forward.request_uri"); + req.setAttribute("org.gatein.portal.login.initial_uri", initialURI); getServletContext().getRequestDispatcher("/login/jsp/login.jsp").include(req, resp); } finally

14 years, 9 months

1
0
0 / 0

gatein SVN: r2145 - portal/trunk/docs/user-guide/en/images.

by do-not-reply＠jboss.org

Author: smumford Date: 2010-03-11 01:31:20 -0500 (Thu, 11 Mar 2010) New Revision: 2145 Added: portal/trunk/docs/user-guide/en/images/ActivePortals.png portal/trunk/docs/user-guide/en/images/DeleteGroup.png portal/trunk/docs/user-guide/en/images/EditActivePortals.png portal/trunk/docs/user-guide/en/images/EditLayout.png portal/trunk/docs/user-guide/en/images/EditLayout2.png portal/trunk/docs/user-guide/en/images/EditLayout3.png portal/trunk/docs/user-guide/en/images/EditNavigation1.png portal/trunk/docs/user-guide/en/images/NewStaff.png portal/trunk/docs/user-guide/en/images/PortalProperties.png Modified: portal/trunk/docs/user-guide/en/images/AAANavi.png portal/trunk/docs/user-guide/en/images/Account.png portal/trunk/docs/user-guide/en/images/AccountProfiles.png portal/trunk/docs/user-guide/en/images/AccountProfiles3.png portal/trunk/docs/user-guide/en/images/AccountSetting.png portal/trunk/docs/user-guide/en/images/ActionGadget.png portal/trunk/docs/user-guide/en/images/Add.png portal/trunk/docs/user-guide/en/images/Add3.png portal/trunk/docs/user-guide/en/images/AddApplication.png portal/trunk/docs/user-guide/en/images/AddCategory1.png portal/trunk/docs/user-guide/en/images/AddGadgetnew.png portal/trunk/docs/user-guide/en/images/AddGadgetnewUrl.png portal/trunk/docs/user-guide/en/images/AddGroup.png portal/trunk/docs/user-guide/en/images/AddMember1.png portal/trunk/docs/user-guide/en/images/AddNode4.png portal/trunk/docs/user-guide/en/images/AddPermission.png portal/trunk/docs/user-guide/en/images/AddPortal.png portal/trunk/docs/user-guide/en/images/AddPortlet2.png portal/trunk/docs/user-guide/en/images/Admin1.png portal/trunk/docs/user-guide/en/images/Administration.png portal/trunk/docs/user-guide/en/images/AfterEdit1.png portal/trunk/docs/user-guide/en/images/Application1.png portal/trunk/docs/user-guide/en/images/ApplicationRegistry.png portal/trunk/docs/user-guide/en/images/ApplicationRegistry2.png portal/trunk/docs/user-guide/en/images/BannerPortlet.png portal/trunk/docs/user-guide/en/images/Breadcrumbs.png portal/trunk/docs/user-guide/en/images/Calculator.png portal/trunk/docs/user-guide/en/images/Calendar.png portal/trunk/docs/user-guide/en/images/ChangeAccount.png portal/trunk/docs/user-guide/en/images/ChangePassword.png portal/trunk/docs/user-guide/en/images/ChangePortal2.6.png portal/trunk/docs/user-guide/en/images/CloneNode2.png portal/trunk/docs/user-guide/en/images/CodePaste.png portal/trunk/docs/user-guide/en/images/Column.png portal/trunk/docs/user-guide/en/images/ContextMenu1.png portal/trunk/docs/user-guide/en/images/CopyNode3.png portal/trunk/docs/user-guide/en/images/CreateEditNode.png portal/trunk/docs/user-guide/en/images/CreateGadget1.png portal/trunk/docs/user-guide/en/images/CutNode4.png portal/trunk/docs/user-guide/en/images/Dash2.png portal/trunk/docs/user-guide/en/images/Dashboard.png portal/trunk/docs/user-guide/en/images/Dashboard1.png portal/trunk/docs/user-guide/en/images/DashboardLink.png portal/trunk/docs/user-guide/en/images/DashboardPortlet.png portal/trunk/docs/user-guide/en/images/Dashname.png portal/trunk/docs/user-guide/en/images/Dashname1.png portal/trunk/docs/user-guide/en/images/Delete.png portal/trunk/docs/user-guide/en/images/DeleteNode2.png portal/trunk/docs/user-guide/en/images/Demo1.png portal/trunk/docs/user-guide/en/images/Demo3.png portal/trunk/docs/user-guide/en/images/Downloads.png portal/trunk/docs/user-guide/en/images/DragPage1.png portal/trunk/docs/user-guide/en/images/DragPage3.png portal/trunk/docs/user-guide/en/images/Edit.png portal/trunk/docs/user-guide/en/images/Edit2.6.png portal/trunk/docs/user-guide/en/images/EditApplication.png portal/trunk/docs/user-guide/en/images/EditApplicationInformation.png portal/trunk/docs/user-guide/en/images/EditCategoryPermissions.png portal/trunk/docs/user-guide/en/images/EditCurrentPortal.png portal/trunk/docs/user-guide/en/images/EditGroupNavigation.png portal/trunk/docs/user-guide/en/images/EditGroupNavigation2.png portal/trunk/docs/user-guide/en/images/EditInline.png portal/trunk/docs/user-guide/en/images/EditMember1.png portal/trunk/docs/user-guide/en/images/EditNavigation.png portal/trunk/docs/user-guide/en/images/EditNode1.png portal/trunk/docs/user-guide/en/images/EditPermission1.png portal/trunk/docs/user-guide/en/images/EditPermission2.png portal/trunk/docs/user-guide/en/images/EditPortal.png portal/trunk/docs/user-guide/en/images/EditPortal2.6New.png portal/trunk/docs/user-guide/en/images/EditPortalNavigation.png portal/trunk/docs/user-guide/en/images/EditPortalNavigation2.png portal/trunk/docs/user-guide/en/images/EditingArea1.png portal/trunk/docs/user-guide/en/images/EditorPortlet.png portal/trunk/docs/user-guide/en/images/EnterLink.png portal/trunk/docs/user-guide/en/images/FCK1.png portal/trunk/docs/user-guide/en/images/Footer.png portal/trunk/docs/user-guide/en/images/Forgot1.png portal/trunk/docs/user-guide/en/images/ForgotEmail1.png portal/trunk/docs/user-guide/en/images/ForgotUserName1.png portal/trunk/docs/user-guide/en/images/Frontpage.png portal/trunk/docs/user-guide/en/images/GadgetContainer.png portal/trunk/docs/user-guide/en/images/GadgetManagement.png portal/trunk/docs/user-guide/en/images/GadgetManagement1.png portal/trunk/docs/user-guide/en/images/GadgetWrapper.png portal/trunk/docs/user-guide/en/images/Gadgetnew.png portal/trunk/docs/user-guide/en/images/GateIn.png portal/trunk/docs/user-guide/en/images/GoogleGadgets.png portal/trunk/docs/user-guide/en/images/GroupManage.png portal/trunk/docs/user-guide/en/images/GroupPortlet.png portal/trunk/docs/user-guide/en/images/HomePage2.png portal/trunk/docs/user-guide/en/images/In3.png portal/trunk/docs/user-guide/en/images/Inter2.png portal/trunk/docs/user-guide/en/images/InterfaceLanguage.png portal/trunk/docs/user-guide/en/images/InterfaceLanguage2.6.png portal/trunk/docs/user-guide/en/images/Internal2.png portal/trunk/docs/user-guide/en/images/InternationalizationPortlet1.png portal/trunk/docs/user-guide/en/images/Link.png portal/trunk/docs/user-guide/en/images/ManagePage.png portal/trunk/docs/user-guide/en/images/ManagePage2.png portal/trunk/docs/user-guide/en/images/MembershipManage1.png portal/trunk/docs/user-guide/en/images/MoveUpDown.png portal/trunk/docs/user-guide/en/images/NavigationManagement.png portal/trunk/docs/user-guide/en/images/NavigationPortlet.png portal/trunk/docs/user-guide/en/images/NewAccount3.png portal/trunk/docs/user-guide/en/images/NewGadget.png portal/trunk/docs/user-guide/en/images/NewSearch1.png portal/trunk/docs/user-guide/en/images/NewSearch2.png portal/trunk/docs/user-guide/en/images/Nouvel.png portal/trunk/docs/user-guide/en/images/Org1.png portal/trunk/docs/user-guide/en/images/Organization5.png portal/trunk/docs/user-guide/en/images/OrganizationPortlet1.png portal/trunk/docs/user-guide/en/images/PageList.png portal/trunk/docs/user-guide/en/images/PageNodeSetting.png portal/trunk/docs/user-guide/en/images/PageSelector.png portal/trunk/docs/user-guide/en/images/PageSelector6.png portal/trunk/docs/user-guide/en/images/PageSetting.png portal/trunk/docs/user-guide/en/images/PageSetting1.png portal/trunk/docs/user-guide/en/images/PageWizard.png portal/trunk/docs/user-guide/en/images/PageWizard2.png portal/trunk/docs/user-guide/en/images/PageWizard3.png portal/trunk/docs/user-guide/en/images/Pagewizard1.png portal/trunk/docs/user-guide/en/images/PasteCloneNode2.png portal/trunk/docs/user-guide/en/images/PasteCutNode4.png portal/trunk/docs/user-guide/en/images/PasteNode3.png portal/trunk/docs/user-guide/en/images/Permission2.png portal/trunk/docs/user-guide/en/images/PermissionSetting1.png portal/trunk/docs/user-guide/en/images/PermissionSetting2.png portal/trunk/docs/user-guide/en/images/PortalAccessPermissions.png portal/trunk/docs/user-guide/en/images/PortalHome.png portal/trunk/docs/user-guide/en/images/PortalPermission.png portal/trunk/docs/user-guide/en/images/PortalSet.png portal/trunk/docs/user-guide/en/images/PortalSetting2.5.png portal/trunk/docs/user-guide/en/images/PortalTemplate.png portal/trunk/docs/user-guide/en/images/Portlet.png portal/trunk/docs/user-guide/en/images/PortletPermission.png portal/trunk/docs/user-guide/en/images/RSSReader.png portal/trunk/docs/user-guide/en/images/Register.png portal/trunk/docs/user-guide/en/images/RememberMe.png portal/trunk/docs/user-guide/en/images/RememberMe2.6.png portal/trunk/docs/user-guide/en/images/Resource2.png portal/trunk/docs/user-guide/en/images/Resource3.png portal/trunk/docs/user-guide/en/images/ResourceData1.png portal/trunk/docs/user-guide/en/images/Root1.png portal/trunk/docs/user-guide/en/images/Search.png portal/trunk/docs/user-guide/en/images/SearchUser.png portal/trunk/docs/user-guide/en/images/SelectPage1.png portal/trunk/docs/user-guide/en/images/SelectUser.png portal/trunk/docs/user-guide/en/images/SignIn1.png portal/trunk/docs/user-guide/en/images/SignIn2.6.png portal/trunk/docs/user-guide/en/images/SignOut.png portal/trunk/docs/user-guide/en/images/Signin.png portal/trunk/docs/user-guide/en/images/SiteMap.png portal/trunk/docs/user-guide/en/images/SitePortlet.png portal/trunk/docs/user-guide/en/images/Skin1.png portal/trunk/docs/user-guide/en/images/SkinSet1.png portal/trunk/docs/user-guide/en/images/Source.png portal/trunk/docs/user-guide/en/images/StarPortlet.png portal/trunk/docs/user-guide/en/images/Step32.6.png portal/trunk/docs/user-guide/en/images/SureDelete.png portal/trunk/docs/user-guide/en/images/Todo.png portal/trunk/docs/user-guide/en/images/ToolBar1.png portal/trunk/docs/user-guide/en/images/Toolbar.png portal/trunk/docs/user-guide/en/images/UserManage.png portal/trunk/docs/user-guide/en/images/UserProfile.png portal/trunk/docs/user-guide/en/images/UserWorkspace.png portal/trunk/docs/user-guide/en/images/UserWorkspace1.png portal/trunk/docs/user-guide/en/images/UserWorkspace2.png portal/trunk/docs/user-guide/en/images/Videos.png portal/trunk/docs/user-guide/en/images/WebExplorer1.png portal/trunk/docs/user-guide/en/images/Welcome.png portal/trunk/docs/user-guide/en/images/Wizard1.png portal/trunk/docs/user-guide/en/images/XMLURL.png portal/trunk/docs/user-guide/en/images/http.png portal/trunk/docs/user-guide/en/images/local.png Log: Incorporate ltexier changes to ch5 and other edits Modified: portal/trunk/docs/user-guide/en/images/AAANavi.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/Account.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/AccountProfiles.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/AccountProfiles3.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/AccountSetting.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/ActionGadget.png =================================================================== (Binary files differ) Added: portal/trunk/docs/user-guide/en/images/ActivePortals.png =================================================================== (Binary files differ) Property changes on: portal/trunk/docs/user-guide/en/images/ActivePortals.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: portal/trunk/docs/user-guide/en/images/Add.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/Add3.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/AddApplication.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/AddCategory1.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/AddGadgetnew.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/AddGadgetnewUrl.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/AddGroup.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/AddMember1.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/AddNode4.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/AddPermission.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/AddPortal.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/AddPortlet2.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/Admin1.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/Administration.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/AfterEdit1.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/Application1.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/ApplicationRegistry.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/ApplicationRegistry2.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/BannerPortlet.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/Breadcrumbs.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/Calculator.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/Calendar.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/ChangeAccount.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/ChangePassword.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/ChangePortal2.6.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/CloneNode2.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/CodePaste.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/Column.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/ContextMenu1.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/CopyNode3.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/CreateEditNode.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/CreateGadget1.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/CutNode4.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/Dash2.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/Dashboard.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/Dashboard1.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/DashboardLink.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/DashboardPortlet.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/Dashname.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/Dashname1.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/Delete.png =================================================================== (Binary files differ) Added: portal/trunk/docs/user-guide/en/images/DeleteGroup.png =================================================================== (Binary files differ) Property changes on: portal/trunk/docs/user-guide/en/images/DeleteGroup.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: portal/trunk/docs/user-guide/en/images/DeleteNode2.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/Demo1.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/Demo3.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/Downloads.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/DragPage1.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/DragPage3.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/Edit.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/Edit2.6.png =================================================================== (Binary files differ) Added: portal/trunk/docs/user-guide/en/images/EditActivePortals.png =================================================================== (Binary files differ) Property changes on: portal/trunk/docs/user-guide/en/images/EditActivePortals.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: portal/trunk/docs/user-guide/en/images/EditApplication.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/EditApplicationInformation.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/EditCategoryPermissions.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/EditCurrentPortal.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/EditGroupNavigation.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/EditGroupNavigation2.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/EditInline.png =================================================================== (Binary files differ) Added: portal/trunk/docs/user-guide/en/images/EditLayout.png =================================================================== (Binary files differ) Property changes on: portal/trunk/docs/user-guide/en/images/EditLayout.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: portal/trunk/docs/user-guide/en/images/EditLayout2.png =================================================================== (Binary files differ) Property changes on: portal/trunk/docs/user-guide/en/images/EditLayout2.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: portal/trunk/docs/user-guide/en/images/EditLayout3.png =================================================================== (Binary files differ) Property changes on: portal/trunk/docs/user-guide/en/images/EditLayout3.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: portal/trunk/docs/user-guide/en/images/EditMember1.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/EditNavigation.png =================================================================== (Binary files differ) Added: portal/trunk/docs/user-guide/en/images/EditNavigation1.png =================================================================== (Binary files differ) Property changes on: portal/trunk/docs/user-guide/en/images/EditNavigation1.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: portal/trunk/docs/user-guide/en/images/EditNode1.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/EditPermission1.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/EditPermission2.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/EditPortal.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/EditPortal2.6New.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/EditPortalNavigation.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/EditPortalNavigation2.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/EditingArea1.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/EditorPortlet.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/EnterLink.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/FCK1.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/Footer.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/Forgot1.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/ForgotEmail1.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/ForgotUserName1.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/Frontpage.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/GadgetContainer.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/GadgetManagement.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/GadgetManagement1.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/GadgetWrapper.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/Gadgetnew.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/GateIn.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/GoogleGadgets.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/GroupManage.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/GroupPortlet.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/HomePage2.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/In3.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/Inter2.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/InterfaceLanguage.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/InterfaceLanguage2.6.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/Internal2.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/InternationalizationPortlet1.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/Link.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/ManagePage.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/ManagePage2.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/MembershipManage1.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/MoveUpDown.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/NavigationManagement.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/NavigationPortlet.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/NewAccount3.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/NewGadget.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/NewSearch1.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/NewSearch2.png =================================================================== (Binary files differ) Added: portal/trunk/docs/user-guide/en/images/NewStaff.png =================================================================== (Binary files differ) Property changes on: portal/trunk/docs/user-guide/en/images/NewStaff.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: portal/trunk/docs/user-guide/en/images/Nouvel.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/Org1.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/Organization5.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/OrganizationPortlet1.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/PageList.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/PageNodeSetting.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/PageSelector.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/PageSelector6.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/PageSetting.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/PageSetting1.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/PageWizard.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/PageWizard2.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/PageWizard3.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/Pagewizard1.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/PasteCloneNode2.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/PasteCutNode4.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/PasteNode3.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/Permission2.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/PermissionSetting1.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/PermissionSetting2.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/PortalAccessPermissions.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/PortalHome.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/PortalPermission.png =================================================================== (Binary files differ) Added: portal/trunk/docs/user-guide/en/images/PortalProperties.png =================================================================== (Binary files differ) Property changes on: portal/trunk/docs/user-guide/en/images/PortalProperties.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: portal/trunk/docs/user-guide/en/images/PortalSet.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/PortalSetting2.5.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/PortalTemplate.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/Portlet.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/PortletPermission.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/RSSReader.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/Register.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/RememberMe.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/RememberMe2.6.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/Resource2.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/Resource3.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/ResourceData1.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/Root1.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/Search.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/SearchUser.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/SelectPage1.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/SelectUser.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/SignIn1.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/SignIn2.6.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/SignOut.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/Signin.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/SiteMap.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/SitePortlet.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/Skin1.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/SkinSet1.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/Source.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/StarPortlet.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/Step32.6.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/SureDelete.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/Todo.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/ToolBar1.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/Toolbar.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/UserManage.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/UserProfile.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/UserWorkspace.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/UserWorkspace1.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/UserWorkspace2.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/Videos.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/WebExplorer1.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/Welcome.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/Wizard1.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/XMLURL.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/http.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/local.png =================================================================== (Binary files differ)

14 years, 9 months

1
0
0 / 0

gatein SVN: r2144 - in portal/trunk/docs/user-guide/en/modules: account and 5 other directories.

by do-not-reply＠jboss.org

Author: smumford Date: 2010-03-11 01:26:25 -0500 (Thu, 11 Mar 2010) New Revision: 2144 Modified: portal/trunk/docs/user-guide/en/modules/Portal.xml portal/trunk/docs/user-guide/en/modules/account/Account_and_Password_Retrieval.xml portal/trunk/docs/user-guide/en/modules/account/Change_Account_Settings.xml portal/trunk/docs/user-guide/en/modules/account/Register_New_Accounts.xml portal/trunk/docs/user-guide/en/modules/account/Remember_User_Account.xml portal/trunk/docs/user-guide/en/modules/account/Sign_in_and_Sign_out.xml portal/trunk/docs/user-guide/en/modules/gadgetsAdmin/Import_Portlets_and_Gadgets.xml portal/trunk/docs/user-guide/en/modules/gadgetsAdmin/Manage_Portlets_and_Gadgets.xml portal/trunk/docs/user-guide/en/modules/language/Change_Interface_Language.xml portal/trunk/docs/user-guide/en/modules/language/Multi-Language_Navigation_Nodes.xml portal/trunk/docs/user-guide/en/modules/language/Right_To_Left_Support_(RTL).xml portal/trunk/docs/user-guide/en/modules/portal/Manage_Navigation_Nodes.xml portal/trunk/docs/user-guide/en/modules/portal/Manage_Pages.xml portal/trunk/docs/user-guide/en/modules/portal/Manage_Permission.xml portal/trunk/docs/user-guide/en/modules/portal/Manage_Portals.xml portal/trunk/docs/user-guide/en/modules/portal/Toolbar.xml portal/trunk/docs/user-guide/en/modules/portal/User_Management.xml portal/trunk/docs/user-guide/en/modules/portletsUser/Dashboard_Portlet.xml portal/trunk/docs/user-guide/en/modules/portletsUser/Functional_Portlets.xml portal/trunk/docs/user-guide/en/modules/portletsUser/Interface_Portlets.xml portal/trunk/docs/user-guide/en/modules/terms/Toolbar_concept.xml Log: Incorporate ltexier changes to ch5 and other edits Modified: portal/trunk/docs/user-guide/en/modules/Portal.xml =================================================================== --- portal/trunk/docs/user-guide/en/modules/Portal.xml 2010-03-11 03:31:57 UTC (rev 2143) +++ portal/trunk/docs/user-guide/en/modules/Portal.xml 2010-03-11 06:26:25 UTC (rev 2144) @@ -5,27 +5,11 @@ ]> <chapter id="chap-User_Guide-Portal_Administration"> <title>Portal Administration</title> -  <xi:include href="portal/Toolbar.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> - - <xi:include href="portal/Manage_Portals.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> - - - <xi:include href="portal/Manage_Navigation_Nodes.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> - - - <xi:include href="portal/Manage_Pages.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> - - <xi:include href="portal/User_Management.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> <xi:include href="portal/Manage_Permission.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> - - - </chapter> Modified: portal/trunk/docs/user-guide/en/modules/account/Account_and_Password_Retrieval.xml =================================================================== --- portal/trunk/docs/user-guide/en/modules/account/Account_and_Password_Retrieval.xml 2010-03-11 03:31:57 UTC (rev 2143) +++ portal/trunk/docs/user-guide/en/modules/account/Account_and_Password_Retrieval.xml 2010-03-11 06:26:25 UTC (rev 2144) @@ -15,10 +15,10 @@ </para> <mediaobject> <imageobject role="html"> - <imagedata fileref="images/SignIn1.png" format="PNG" align="center" width="444" /> + <imagedata fileref="images/SignIn1.png" format="PNG" align="center" scale="110"/> </imageobject> <imageobject role="fo"> - <imagedata fileref="images/SignIn1.png" format="PNG" align="center" contentwidth="110mm" /> + <imagedata fileref="images/SignIn1.png" format="PNG" align="center" scalefit="1" contentwidth="100mm" /> </imageobject> </mediaobject> </step> @@ -41,10 +41,10 @@ </itemizedlist> <mediaobject> <imageobject role="html"> - <imagedata fileref="images/Forgot1.png" format="PNG" align="center" /> + <imagedata fileref="images/Forgot1.png" format="PNG" align="center" scale="110"/> </imageobject> <imageobject role="fo"> - <imagedata fileref="images/Forgot1.png" format="PNG" align="center" contentwidth="110mm" /> + <imagedata fileref="images/Forgot1.png" format="PNG" align="center" scalefit="1" contentwidth="100mm" /> </imageobject> </mediaobject> <para> @@ -62,10 +62,10 @@ </para> <mediaobject> <imageobject role="html"> - <imagedata fileref="images/ForgotUserName1.png" format="PNG" align="center" width="444" /> + <imagedata fileref="images/ForgotUserName1.png" format="PNG" align="center" scale="110"/> </imageobject> <imageobject role="fo"> - <imagedata fileref="images/ForgotUserName1.png" format="PNG" align="center" contentwidth="110mm"/> + <imagedata fileref="images/ForgotUserName1.png" format="PNG" align="center" scalefit="1" contentwidth="100mm"/> </imageobject> </mediaobject> </listitem> @@ -75,10 +75,10 @@ </para> <mediaobject> <imageobject role="html"> - <imagedata fileref="images/ForgotEmail1.png" format="PNG" align="center" width="444" /> + <imagedata fileref="images/ForgotEmail1.png" format="PNG" align="center" scale="110"/> </imageobject> <imageobject role="fo"> - <imagedata fileref="images/ForgotEmail1.png" format="PNG" align="center" contentwidth="110mm" /> + <imagedata fileref="images/ForgotEmail1.png" format="PNG" align="center" scalefit="1" contentwidth="100mm" /> </imageobject> </mediaobject> </listitem> Modified: portal/trunk/docs/user-guide/en/modules/account/Change_Account_Settings.xml =================================================================== --- portal/trunk/docs/user-guide/en/modules/account/Change_Account_Settings.xml 2010-03-11 03:31:57 UTC (rev 2143) +++ portal/trunk/docs/user-guide/en/modules/account/Change_Account_Settings.xml 2010-03-11 06:26:25 UTC (rev 2144) @@ -11,10 +11,10 @@ </para> <mediaobject> <imageobject role="html"> - <imagedata fileref="images/ChangeAccount.png" format="PNG" align="center" /> + <imagedata fileref="images/ChangeAccount.png" format="PNG" align="center" scale="110"/> </imageobject> <imageobject role="fo"> - <imagedata fileref="images/ChangeAccount.png" format="PNG" align="center" contentwidth="150mm"/> + <imagedata fileref="images/ChangeAccount.png" format="PNG" align="center" scalefit="1" contentwidth="120mm"/> </imageobject> </mediaobject> <para> @@ -22,10 +22,10 @@ </para> <mediaobject> <imageobject role="html"> - <imagedata fileref="images/AccountProfiles3.png" format="PNG" align="center" width="444" /> + <imagedata fileref="images/AccountProfiles3.png" format="PNG" align="center" scale="110" /> </imageobject> <imageobject role="fo"> - <imagedata fileref="images/AccountProfiles3.png" format="PNG" align="center" contentwidth="150mm" /> + <imagedata fileref="images/AccountProfiles3.png" format="PNG" align="center" scalefit="1" contentwidth="100mm" /> </imageobject> </mediaobject> <para> @@ -59,10 +59,10 @@ <mediaobject> <imageobject role="html"> - <imagedata fileref="images/ChangePassword.png" format="PNG" align="center" width="444" /> + <imagedata fileref="images/ChangePassword.png" format="PNG" align="center" scale="110" /> </imageobject> <imageobject role="fo"> - <imagedata fileref="images/ChangePassword.png" format="PNG" align="center" contentwidth="110mm" /> + <imagedata fileref="images/ChangePassword.png" format="PNG" align="center" scalefit="1" contentwidth="100mm" /> </imageobject> </mediaobject> </step> Modified: portal/trunk/docs/user-guide/en/modules/account/Register_New_Accounts.xml =================================================================== --- portal/trunk/docs/user-guide/en/modules/account/Register_New_Accounts.xml 2010-03-11 03:31:57 UTC (rev 2143) +++ portal/trunk/docs/user-guide/en/modules/account/Register_New_Accounts.xml 2010-03-11 06:26:25 UTC (rev 2144) @@ -22,10 +22,10 @@ <mediaobject> <imageobject role="html"> - <imagedata fileref="images/Register.png" format="PNG" align="center" /> + <imagedata fileref="images/Register.png" format="PNG" align="center" scale="110"/> </imageobject> <imageobject role="fo"> - <imagedata fileref="images/Register.png" format="PNG" align="center" contentwidth="150mm" /> + <imagedata fileref="images/Register.png" format="PNG" align="center" scalefit="1" contentwidth="150mm" /> </imageobject> </mediaobject> <para> @@ -33,10 +33,10 @@ </para> <mediaobject> <imageobject role="html"> - <imagedata fileref="images/AccountSetting.png" format="PNG" align="center" /> + <imagedata fileref="images/AccountSetting.png" format="PNG" align="center" scale="110"/> </imageobject> <imageobject role="fo"> - <imagedata fileref="images/AccountSetting.png" format="PNG" align="center" contentwidth="110mm"/> + <imagedata fileref="images/AccountSetting.png" format="PNG" align="center" scalefit="1" contentwidth="150mm"/> </imageobject> </mediaobject> Modified: portal/trunk/docs/user-guide/en/modules/account/Remember_User_Account.xml =================================================================== --- portal/trunk/docs/user-guide/en/modules/account/Remember_User_Account.xml 2010-03-11 03:31:57 UTC (rev 2143) +++ portal/trunk/docs/user-guide/en/modules/account/Remember_User_Account.xml 2010-03-11 06:26:25 UTC (rev 2144) @@ -10,10 +10,10 @@ </para> <mediaobject> <imageobject role="html"> - <imagedata fileref="images/RememberMe.png" format="PNG" align="center" /> + <imagedata fileref="images/RememberMe.png" format="PNG" align="center" scale="110"/> </imageobject> <imageobject role="fo"> - <imagedata fileref="images/RememberMe.png" format="PNG" align="center" contentwidth="150mm" /> + <imagedata fileref="images/RememberMe.png" format="PNG" align="center" scalefit="1" contentwidth="150mm" /> </imageobject> </mediaobject> <procedure> Modified: portal/trunk/docs/user-guide/en/modules/account/Sign_in_and_Sign_out.xml =================================================================== --- portal/trunk/docs/user-guide/en/modules/account/Sign_in_and_Sign_out.xml 2010-03-11 03:31:57 UTC (rev 2143) +++ portal/trunk/docs/user-guide/en/modules/account/Sign_in_and_Sign_out.xml 2010-03-11 06:26:25 UTC (rev 2144) @@ -89,10 +89,10 @@ </para> <mediaobject> <imageobject role="html"> - <imagedata fileref="images/Signin.png" format="PNG" align="center" /> + <imagedata fileref="images/Signin.png" format="PNG" align="center" scale="110"/> </imageobject> <imageobject role="fo"> - <imagedata fileref="images/Signin.png" format="PNG" align="center" contentwidth="150mm"/> + <imagedata fileref="images/Signin.png" format="PNG" align="center" scalefit="1" contentwidth="150mm"/> </imageobject> </mediaobject> </step> @@ -120,10 +120,10 @@ </para> <mediaobject> <imageobject role="html"> - <imagedata fileref="images/Toolbar.png" format="PNG" align="center" width="444" /> + <imagedata fileref="images/Toolbar.png" format="PNG" align="center" scale="110"/> </imageobject> <imageobject role="fo"> - <imagedata fileref="images/Toolbar.png" format="PNG" align="center" contentwidth="150mm" /> + <imagedata fileref="images/Toolbar.png" format="PNG" align="center" scalefit="1" contentwidth="150mm" /> </imageobject> </mediaobject> @@ -148,10 +148,10 @@ </procedure> <mediaobject> <imageobject role="html"> - <imagedata fileref="images/StarPortlet.png" format="PNG" align="center" /> + <imagedata fileref="images/StarPortlet.png" format="PNG" align="center" scale="110" /> </imageobject> <imageobject role="fo"> - <imagedata fileref="images/StarPortlet.png" format="PNG" align="center" contentwidth="150mm"/> + <imagedata fileref="images/StarPortlet.png" format="PNG" align="center" scalefit="1" contentwidth="150mm"/> </imageobject> </mediaobject> Modified: portal/trunk/docs/user-guide/en/modules/gadgetsAdmin/Import_Portlets_and_Gadgets.xml =================================================================== --- portal/trunk/docs/user-guide/en/modules/gadgetsAdmin/Import_Portlets_and_Gadgets.xml 2010-03-11 03:31:57 UTC (rev 2143) +++ portal/trunk/docs/user-guide/en/modules/gadgetsAdmin/Import_Portlets_and_Gadgets.xml 2010-03-11 06:26:25 UTC (rev 2144) @@ -21,10 +21,10 @@ </para> <mediaobject> <imageobject role="html"> - <imagedata fileref="images/Org1.png" format="PNG" align="center" scale="100" /> + <imagedata fileref="images/Org1.png" format="PNG" align="center" scale="90" /> </imageobject> <imageobject role="fo"> - <imagedata fileref="images/Org1.png" format="PNG" align="center" contentwidth="150mm" /> + <imagedata fileref="images/Org1.png" format="PNG" align="center" scalefit="1" contentwidth="150mm" /> </imageobject> </mediaobject> </step> @@ -37,7 +37,7 @@ <imagedata fileref="images/local.png" format="PNG" align="center" scale="110" /> </imageobject> <imageobject role="fo"> - <imagedata fileref="images/local.png" format="PNG" align="center" contentwidth="150mm" /> + <imagedata fileref="images/local.png" format="PNG" align="center" scalefit="1" contentwidth="110mm" /> </imageobject> </mediaobject> </step> Modified: portal/trunk/docs/user-guide/en/modules/gadgetsAdmin/Manage_Portlets_and_Gadgets.xml =================================================================== --- portal/trunk/docs/user-guide/en/modules/gadgetsAdmin/Manage_Portlets_and_Gadgets.xml 2010-03-11 03:31:57 UTC (rev 2143) +++ portal/trunk/docs/user-guide/en/modules/gadgetsAdmin/Manage_Portlets_and_Gadgets.xml 2010-03-11 06:26:25 UTC (rev 2144) @@ -29,7 +29,7 @@ <imagedata fileref="images/Column.png" format="PNG" align="center" scale="110"/> </imageobject> <imageobject role="fo"> - <imagedata fileref="images/Column.png" format="PNG" align="center" contentwidth="150mm" /> + <imagedata fileref="images/Column.png" format="PNG" align="center" scalefit="1" contentwidth="120mm" /> </imageobject> </mediaobject> </step> @@ -59,10 +59,10 @@ </para> <mediaobject> <imageobject role="html"> - <imagedata fileref="images/AddCategory1.png" format="PNG" align="center" scale="100" /> + <imagedata fileref="images/AddCategory1.png" format="PNG" align="center" scale="110" /> </imageobject> <imageobject role="fo"> - <imagedata fileref="images/AddCategory1.png" format="PNG" align="center" contentwidth="150mm" /> + <imagedata fileref="images/AddCategory1.png" format="PNG" align="center" scalefit="1" contentwidth="150mm" /> </imageobject> </mediaobject> <para> @@ -105,7 +105,7 @@ <imagedata fileref="images/Permission2.png" format="PNG" align="center" scale="110" /> </imageobject> <imageobject role="fo"> - <imagedata fileref="images/Permission2.png" format="PNG" align="center" contentwidth="150mm" /> + <imagedata fileref="images/Permission2.png" format="PNG" align="center" scalefit="1" contentwidth="130mm" /> </imageobject> </mediaobject> </step> @@ -170,10 +170,10 @@ </para> <mediaobject> <imageobject role="html"> - <imagedata fileref="images/AddPortlet2.png" format="PNG" align="center" scale="100" /> + <imagedata fileref="images/AddPortlet2.png" format="PNG" align="center" scale="110" /> </imageobject> <imageobject role="fo"> - <imagedata fileref="images/AddPortlet2.png" format="PNG" align="center" contentwidth="150mm" /> + <imagedata fileref="images/AddPortlet2.png" format="PNG" align="center" scalefit="1" contentwidth="160mm" /> </imageobject> </mediaobject> <variablelist> @@ -223,10 +223,10 @@ </para> <mediaobject> <imageobject role="html"> - <imagedata fileref="images/PortletPermission.png" format="PNG" align="center" scale="100"/> + <imagedata fileref="images/PortletPermission.png" format="PNG" align="center" scale="110"/> </imageobject> <imageobject role="fo"> - <imagedata fileref="images/PortletPermission.png" format="PNG" align="center" contentwidth="150mm"/> + <imagedata fileref="images/PortletPermission.png" format="PNG" align="center" scalefit="1" contentwidth="160mm"/> </imageobject> </mediaobject> </step> @@ -249,7 +249,7 @@ <imagedata fileref="images/AddPermission.png" format="PNG" align="center" scale="110" /> </imageobject> <imageobject role="fo"> - <imagedata fileref="images/AddPermission.png" format="PNG" align="center" contentwidth="150" /> + <imagedata fileref="images/AddPermission.png" format="PNG" align="center" scalefit="1" contentwidth="150mm" /> </imageobject> </mediaobject> </listitem> @@ -273,10 +273,10 @@ </para> <mediaobject> <imageobject role="html"> - <imagedata fileref="images/Org1.png" format="PNG" align="center" scale="100" /> + <imagedata fileref="images/Org1.png" format="PNG" align="center" scale="110" /> </imageobject> <imageobject role="fo"> - <imagedata fileref="images/Org1.png" format="PNG" align="center" contentwidth="150mm" /> + <imagedata fileref="images/Org1.png" format="PNG" align="center" scalefit="1" contentwidth="150mm" /> </imageobject> </mediaobject> <variablelist> @@ -305,18 +305,18 @@ </para> <mediaobject> <imageobject role="html"> - <imagedata fileref="images/EditApplication.png" format="PNG" align="center" scale="100" /> + <imagedata fileref="images/EditApplication.png" format="PNG" align="center" scale="110" /> </imageobject> <imageobject role="fo"> - <imagedata fileref="images/EditApplication.png" format="PNG" align="center" contentwidth="150mm" /> + <imagedata fileref="images/EditApplication.png" format="PNG" align="center" scalefit="1" contentwidth="150mm" /> </imageobject> </mediaobject> <mediaobject> <imageobject role="html"> - <imagedata fileref="images/EditApplicationInformation.png" format="PNG" align="center" scale="100" /> + <imagedata fileref="images/EditApplicationInformation.png" format="PNG" align="center" scale="110" /> </imageobject> <imageobject role="fo"> - <imagedata fileref="images/EditApplicationInformation.png" format="PNG" align="center" contentwidth="150mm" /> + <imagedata fileref="images/EditApplicationInformation.png" format="PNG" align="center" scalefit="1" contentwidth="90mm" /> </imageobject> </mediaobject> </section> @@ -324,14 +324,14 @@ <section id="sect-User_Guide-Manage_Portlets_and_Gadgets-Add_a_Gadget"> <title>Add a Gadget</title> <para> - In the <emphasis role="bold">Group</emphasis> menu, select <emphasis role="bold">Administration</emphasis> -> <emphasis role="bold">Application Registry</emphasis>. Then click on the <emphasis role="bold">Gadget</emphasis> icon. + In the <emphasis role="bold">Group</emphasis> menu, select <emphasis role="bold">Administration</emphasis> then <emphasis role="bold">Application Registry</emphasis>. Click on the <emphasis role="bold">Gadget</emphasis> icon. </para> <mediaobject> <imageobject role="html"> - <imagedata fileref="images/Gadgetnew.png" format="PNG" align="center" scale="100" /> + <imagedata fileref="images/Gadgetnew.png" format="PNG" align="center" scale="110" /> </imageobject> <imageobject role="fo"> - <imagedata fileref="images/Gadgetnew.png" format="PNG" align="center" contentwidth="150mm" /> + <imagedata fileref="images/Gadgetnew.png" format="PNG" align="center" scalefit="1" contentwidth="150mm" /> </imageobject> </mediaobject> <para> @@ -356,10 +356,10 @@ </para> <mediaobject> <imageobject role="html"> - <imagedata fileref="images/AddGadgetnewUrl.png" format="PNG" align="center" scale="100" /> + <imagedata fileref="images/AddGadgetnewUrl.png" format="PNG" align="center" scale="110" /> </imageobject> <imageobject role="fo"> - <imagedata fileref="images/AddGadgetnewUrl.png" format="PNG" align="center" contentwidth="150mm" /> + <imagedata fileref="images/AddGadgetnewUrl.png" format="PNG" align="center" scalefit="1" contentwidth="150mm" /> </imageobject> </mediaobject> </step> @@ -377,10 +377,10 @@ </para> <mediaobject> <imageobject role="html"> - <imagedata fileref="images/CreateGadget1.png" format="PNG" align="center" scale="100"/> + <imagedata fileref="images/CreateGadget1.png" format="PNG" align="center" scale="110"/> </imageobject> <imageobject role="fo"> - <imagedata fileref="images/CreateGadget1.png" format="PNG" align="center" contentwidth="150mm"/> + <imagedata fileref="images/CreateGadget1.png" format="PNG" align="center" scalefit="1" contentwidth="150mm"/> </imageobject> </mediaobject> </step> @@ -408,47 +408,6 @@ <para> See <xref linkend="sect-User_Guide-Dashboard_Portlet-Add_Gadgets"/> for instructions on how to add new gadgets to the dashboard. </para> - </section> <section id="sect-User_Guide-Manage_Portlets_and_Gadgets-Manage_Gadgets"> Modified: portal/trunk/docs/user-guide/en/modules/language/Change_Interface_Language.xml =================================================================== --- portal/trunk/docs/user-guide/en/modules/language/Change_Interface_Language.xml 2010-03-11 03:31:57 UTC (rev 2143) +++ portal/trunk/docs/user-guide/en/modules/language/Change_Interface_Language.xml 2010-03-11 06:26:25 UTC (rev 2144) @@ -47,10 +47,10 @@ </para> <mediaobject> <imageobject role="html"> - <imagedata fileref="images/StarPortlet.png" format="PNG" align="center" scale="100" /> + <imagedata fileref="images/StarPortlet.png" format="PNG" align="center" scale="110" /> </imageobject> <imageobject role="fo"> - <imagedata fileref="images/StarPortlet.png" format="PNG" align="center" contentwidth="150mm" /> + <imagedata fileref="images/StarPortlet.png" format="PNG" align="center" scalefit="1" contentwidth="150mm" /> </imageobject> </mediaobject> </step> @@ -60,10 +60,10 @@ </para> <mediaobject> <imageobject role="html"> - <imagedata fileref="images/InterfaceLanguage.png" format="PNG" align="center" scale="100"/> + <imagedata fileref="images/InterfaceLanguage.png" format="PNG" align="center" scale="110"/> </imageobject> <imageobject role="fo"> - <imagedata fileref="images/InterfaceLanguage.png" format="PNG" align="center" contentwidth="150mm" /> + <imagedata fileref="images/InterfaceLanguage.png" format="PNG" align="center" scalefit="1" contentwidth="150mm" /> </imageobject> </mediaobject> </step> @@ -80,151 +80,6 @@ </procedure> </section> - - -  - - - <section id="sect-User_Guide-Change_Interface_Language-Set_language_for_a_user"> <title>Set language for a user</title> <para> @@ -248,12 +103,6 @@ <para> The interface language in <emphasis role="bold">Private Mode</emphasis> is set when registering each user. See step four of the process to register a new account <xref linkend="sect-User_Guide-Register_New_Accounts" />. </para> - </listitem> </varlistentry> </variablelist> Modified: portal/trunk/docs/user-guide/en/modules/language/Multi-Language_Navigation_Nodes.xml =================================================================== --- portal/trunk/docs/user-guide/en/modules/language/Multi-Language_Navigation_Nodes.xml 2010-03-11 03:31:57 UTC (rev 2143) +++ portal/trunk/docs/user-guide/en/modules/language/Multi-Language_Navigation_Nodes.xml 2010-03-11 06:26:25 UTC (rev 2144) @@ -28,19 +28,19 @@ <section id="sect-User_Guide-Multi_Language_Navigation_Nodes-Creating_Keys"> <title>Creating Keys</title> <para> - There are three ways to create a key for a node: + There are two  ways to create a key for a node: </para> <orderedlist numeration="arabic"> <listitem> <para> - <xref linkend="sect-User_Guide-Multi_Language_Navigation_Nodes-Creating_Keys_using_the_Create_Page_Wizard"/>; + <xref linkend="sect-User_Guide-Multi_Language_Navigation_Nodes-Creating_Keys_using_the_Create_Page_Wizard"/> </para> </listitem> - <listitem> + <listitem> <para> <xref linkend="sect-User_Guide-Multi_Language_Navigation_Nodes-CreatingEditing_Keys_using_the_Edit_Page_and_Navigation"/> @@ -70,10 +70,10 @@ </para> <mediaobject> <imageobject role="html"> - <imagedata fileref="images/PageWizard.png" format="PNG" align="center" scale="100" /> + <imagedata fileref="images/PageWizard.png" format="PNG" align="center" scale="110" /> </imageobject> <imageobject role="fo"> - <imagedata fileref="images/PageWizard.png" format="PNG" align="center" contentwidth="150mm" /> + <imagedata fileref="images/PageWizard.png" format="PNG" align="center" scalefit="1" contentwidth="160mm" /> </imageobject> </mediaobject> </step> @@ -91,7 +91,7 @@ </section> - <section id="sect-User_Guide-Multi_Language_Navigation_Nodes-CreatingEditing_Keys_by_Edit_Page_Wizard"> + <emphasis role="bold">Edit Page Wizard</emphasis> + Go to <emphasis role="bold">GateIn Start</emphasis> -> <emphasis role="bold">Administration</emphasis> -> <emphasis role="bold">Basic</emphasis> > <emphasis role="bold">Edit Page Wizard</emphasis> </para> </step> <step> @@ -120,7 +120,7 @@ </para> </step> </procedure> - </section> + </section> --> <section id="sect-User_Guide-Multi_Language_Navigation_Nodes-CreatingEditing_Keys_using_the_Edit_Page_and_Navigation"> <title>Creating/Editing Keys using <emphasis role="bold">Navigation Management</emphasis></title> @@ -131,10 +131,10 @@ </para> <mediaobject> <imageobject role="html"> - <imagedata fileref="images/NavigationManagement.png" format="PNG" align="center" scale="110" /> + <imagedata fileref="images/NavigationManagement.png" format="PNG" align="center" scale="100" /> </imageobject> <imageobject role="fo"> - <imagedata fileref="images/NavigationManagement.png" format="PNG" align="center" contentwidth="150" /> + <imagedata fileref="images/NavigationManagement.png" format="PNG" align="center" scalefit="1" contentwidth="90mm" /> </imageobject> </mediaobject> </step> @@ -149,10 +149,10 @@ </para> <mediaobject> <imageobject role="html"> - <imagedata fileref="images/CreateEditNode.png" format="PNG" align="center" scale="100" /> + <imagedata fileref="images/CreateEditNode.png" format="PNG" align="center" scale="110" /> </imageobject> <imageobject role="fo"> - <imagedata fileref="images/CreateEditNode.png" format="PNG" align="center" contentwidth="150" /> + <imagedata fileref="images/CreateEditNode.png" format="PNG" align="center" scalefit="1" contentwidth="160mm" /> </imageobject> </mediaobject> </step> Modified: portal/trunk/docs/user-guide/en/modules/language/Right_To_Left_Support_(RTL).xml =================================================================== --- portal/trunk/docs/user-guide/en/modules/language/Right_To_Left_Support_(RTL).xml 2010-03-11 03:31:57 UTC (rev 2143) +++ portal/trunk/docs/user-guide/en/modules/language/Right_To_Left_Support_(RTL).xml 2010-03-11 06:26:25 UTC (rev 2144) @@ -10,10 +10,10 @@ </para> <mediaobject> <imageobject role="html"> - <imagedata fileref="images/HomePage2.png" format="PNG" align="center" scale="100" /> + <imagedata fileref="images/HomePage2.png" format="PNG" align="center" scale="110" /> </imageobject> <imageobject role="fo"> - <imagedata fileref="images/HomePage2.png" format="PNG" align="center" contentwidth="150mm" /> + <imagedata fileref="images/HomePage2.png" format="PNG" align="center" scalefit="1" contentwidth="150mm" /> </imageobject> </mediaobject> <formalpara> @@ -21,10 +21,10 @@ <para> <mediaobject> <imageobject role="html"> - <imagedata fileref="images/NewAccount3.png" format="PNG" align="center" scale="100" /> + <imagedata fileref="images/NewAccount3.png" format="PNG" align="center" scale="110" /> </imageobject> <imageobject role="fo"> - <imagedata fileref="images/NewAccount3.png" format="PNG" align="center" contentwidth="150mm" /> + <imagedata fileref="images/NewAccount3.png" format="PNG" align="center" scalefit="1" contentwidth="150mm" /> </imageobject> </mediaobject> </para> @@ -35,10 +35,10 @@ <para> <mediaobject> <imageobject role="html"> - <imagedata fileref="images/ApplicationRegistry2.png" format="PNG" align="center" scale="100"/> + <imagedata fileref="images/ApplicationRegistry2.png" format="PNG" align="center" scale="110"/> </imageobject> <imageobject role="fo"> - <imagedata fileref="images/ApplicationRegistry2.png" format="PNG" align="center" contentwidth="150mm" /> + <imagedata fileref="images/ApplicationRegistry2.png" format="PNG" align="center" scalefit="1" contentwidth="150mm" /> </imageobject> </mediaobject> </para> @@ -53,7 +53,7 @@ <imagedata fileref="images/Organization5.png" format="PNG" align="center" scale="120" /> </imageobject> <imageobject role="fo"> - <imagedata fileref="images/Organization5.png" format="PNG" align="center" contentwidth="150mm" /> + <imagedata fileref="images/Organization5.png" format="PNG" align="center" scalefit="1" contentwidth="150mm" /> </imageobject> </mediaobject> </para> Modified: portal/trunk/docs/user-guide/en/modules/portal/Manage_Navigation_Nodes.xml =================================================================== --- portal/trunk/docs/user-guide/en/modules/portal/Manage_Navigation_Nodes.xml 2010-03-11 03:31:57 UTC (rev 2143) +++ portal/trunk/docs/user-guide/en/modules/portal/Manage_Navigation_Nodes.xml 2010-03-11 06:26:25 UTC (rev 2144) @@ -6,7 +6,7 @@ <section id="sect-User_Guide-Manage_Navigation_Nodes"> <title>Manage Navigation Nodes</title> <para> - With enough privileges you can take all actions related to a node such as : add a new node, edit, copy, cut, delete and clone node. + If you are the portal administrator (or the administrator has granted you the appropriate permission privileges) you can execute all actions related to portal nodes. These actions include adding new nodes or editing, copying, moving, deleting or cloning existing nodes. </para> <section id="sect-User_Guide-Manage_Navigation_Nodes-Add_a_new_node"> <title>Add a new node</title> @@ -142,8 +142,11 @@ </varlistentry> </variablelist> <para> - You do not have to input values in these fields. It is automatically displayed after selecting an existing page by clicking the <emphasis role="bold">Search and Select Page</emphasis> button. The <emphasis role="bold">Select a page</emphasis> form appears: + You do not have to enter values in these fields. They are automatically populated after selecting an existing page by clicking the <emphasis role="bold">Search and Select Page</emphasis> button. </para> + <para> + The <emphasis role="bold">Select a page</emphasis> form appears: + </para> <mediaobject> <imageobject role="html"> <imagedata fileref="images/SelectPage1.png" format="PNG" align="center" scale="110" /> @@ -153,7 +156,7 @@ </imageobject> </mediaobject> <para> - This window lists of all existing pages is displayed with basic information. You can follow these guides to select a page for creating a node: + This window lists of all existing pages, each displayed with basic information. You can follow this guide to select a page for creating a node: </para> <para> Select a page from list or search a specific page : @@ -161,7 +164,7 @@ <procedure id="proc-User_Guide-Manage_Navigation_Nodes-Search_for_a_page"> <step> <para> - Enter a search term related to the page which you want to search: + Enter a search term related to the page which you want to search for: </para> <mediaobject> <imageobject role="html"> @@ -202,7 +205,7 @@ </step> </procedure> <para> - After configuring the page node settings, the page selector and the node's icon, click the <emphasis role="bold">Save</emphasis> button to accept or the <emphasis role="bold">Cancel</emphasis> button to quit without creating a new node. + After configuring the page node settings, the page selector and the node's icon, click the <emphasis role="bold">Save</emphasis> button to accept or the <emphasis role="bold">Cancel</emphasis> button to quit without creating a new node. </para> </step> </procedure> @@ -320,7 +323,7 @@ The differences between <emphasis role="bold">clone node</emphasis> and <emphasis role="bold">copy node</emphasis> is that the clone node has its own page and which has the same content as the selected node. </para> <para> -Therefore there will be a new page that has the same name as the cloned node's page shown in the page list when you access <emphasis role="bold">Manage Pages</emphasis>. + Therefore there will be a new page that has the same name as the cloned node's page shown in the page list when you access <emphasis role="bold">Manage Pages</emphasis>. </para> <procedure> <step> @@ -354,7 +357,7 @@ </imageobject> </mediaobject> <para> - You will see the new pages appear in the in page lists + The new pages will appear in the page lists: </para> <!-- <mediaobject> <imageobject> Modified: portal/trunk/docs/user-guide/en/modules/portal/Manage_Pages.xml =================================================================== --- portal/trunk/docs/user-guide/en/modules/portal/Manage_Pages.xml 2010-03-11 03:31:57 UTC (rev 2143) +++ portal/trunk/docs/user-guide/en/modules/portal/Manage_Pages.xml 2010-03-11 06:26:25 UTC (rev 2144) @@ -13,51 +13,46 @@ <section id="sect-User_Guide-Page_Creation_Wizard"> <title>Adding a new Page using Page Creation Wizard</title> <para> - A page creation wizard is available to administrators in order to create and publish a page quickly and easily. + A page creation wizard is available to administrators in order to create and publish portal pages quickly and easily. </para> <procedure> <step> <para> - Click on <emphasis role="bold">Site Editor</emphasis> then select <emphasis role="bold">Add New Page</emphasis>. + Mouse over <emphasis role="bold">Site Editor</emphasis> then select <emphasis role="bold">Add New Page</emphasis>. </para> -<note> -<title>DOC TODO</title> -<para> -please redo screenshot -</para> -</note> <mediaobject> - <imageobject> - <imagedata fileref="images/Wizard1.png" format="PNG" width="444" /> + <imageobject role="html"> + <imagedata fileref="images/Wizard1.png" format="PNG" align="center" scale="110" /> </imageobject> + <imageobject role="fo"> + <imagedata fileref="images/Wizard1.png" format="PNG" align="center" contentwidth="150mm" /> + </imageobject> </mediaobject> </step> <step> <para> - The wizard window is divided in two sections: the left pane contains the existing page/node hierarchy and the right pane displays the Page editor. + The wizard window is divided into two sections: the left pane contains the existing page/node hierarchy and the right pane displays the <emphasis role="bold">Page Editor</emphasis>. </para> </step> <step> <para> - In the left pane, you may navigate the node/page structure up and down + In the left pane, you can navigate up and down the node/page structure: </para> - </step> - <step> -<note> -<title>DOC TODO</title> -<para> -please redo screenshot -</para> -</note> <mediaobject> <imageobject> - <imagedata fileref="images/Pagewizard1.png" format="PNG" width="444" /> + <imagedata fileref="images/Pagewizard1.png" format="PNG" /> </imageobject> </mediaobject> - <variablelist> + + </step> + <step> + <para> + In the right pane are the required paramters for a new page: + </para> + <variablelist> <varlistentry> - <term>Current Selected Page Node</term> + <term><emphasis role="bold">Current Selected Page Node</emphasis></term> <listitem> <para> The path of the selected node to add a new sub page @@ -65,7 +60,7 @@ </listitem> </varlistentry> <varlistentry> - <term>Node Name</term> + <term><emphasis role="bold">Node Name</emphasis></term> <listitem> <para> The node name of the added page. It is required field. This field must start with a character and must have a length between 3 and 30 characters. @@ -73,7 +68,7 @@ </listitem> </varlistentry> <varlistentry> - <term>Display Name</term> + <term><emphasis role="bold">Display Name</emphasis></term> <listitem> <para> The display name of the node which contains the added page and must have a length between 3 and 30 characters. @@ -81,15 +76,21 @@ </listitem> </varlistentry> <varlistentry> - <term>Visible</term> + <term><emphasis role="bold">Visible</emphasis></term> <listitem> <para> - This checkbox toggles the global visibility of this page. If not checked the page is under no circumstances shown, even if the publication period is OK. If checked the page or the page node appears on on the navigation bar, the page navigation and the site map. If "visible" is checked the visibility depends on the "publication date & time" attribute if set. + This checkbox toggles the global visibility of this page. </para> + <para> + If checked the page or the page node appears on on the navigation bar, the page navigation and the site map. If "visible" is checked the visibility depends on the "publication date & time" attribute. + </para> + <para> + If unchecked the page is not shown under any circumstances, even if the publication period valid. + </para> </listitem> </varlistentry> <varlistentry> - <term>Publication date &time</term> + <term><emphasis role="bold">Publication date &time</emphasis></term> <listitem> <para> This option allows publishing the page for a period of time. If this option is checked the visibility of the page depends on the publication period start and end date. @@ -97,7 +98,7 @@ </listitem> </varlistentry> <varlistentry> - <term>Start Publication Date</term> + <term><emphasis role="bold">Start Publication Date</emphasis></term> <listitem> <para> The start date and time to publish the page @@ -105,7 +106,7 @@ </listitem> </varlistentry> <varlistentry> - <term>End Publication Date</term> + <term><emphasis role="bold">End Publication Date</emphasis></term> <listitem> <para> The end date and time to publish the page. @@ -114,7 +115,7 @@ </varlistentry> </variablelist> <note> - <title>Setting Time and Date</title> + <title><emphasis role="bold">Setting Time and Date</emphasis></title> <para> You can set date and time by clicking the <emphasis role="bold">Start Publication Date</emphasis> field and <emphasis role="bold">End Publication Date</emphasis> field and select a date in the calendar pop up </para> @@ -208,7 +209,7 @@ </step> <step> <para> - Click on Add New Page + Click on <emphasis role="bold">Add New Page</emphasis>. </para> </step> <step> @@ -231,7 +232,7 @@ <term><emphasis role="bold">Owner type</emphasis></term> <listitem> <para> - If the page <emphasis role="bold">Owner type</emphasis> is <emphasis>portal</emphasis> the page is created for a portal. Therefore only users who have edit permissions on the portal level can create this page type. + If the page <emphasis role="bold">Owner type</emphasis> is <emphasis>portal</emphasis> the page is created for a portal. Therefore only users who have <emphasis>edit</emphasis> permissions on the portal level can create this page type. </para> <para> The name of the current portal is automatically selected for <emphasis role="bold">Owner id</emphasis> ensuring the edit permissions are assigned to users who can edit the current portal. @@ -239,12 +240,6 @@ <para> If the page <emphasis role="bold">Owner type</emphasis> is <emphasis>group</emphasis> the page is created for a group. Therefore only users who have <emphasis>manager</emphasis> permissions for that group can create this page type. </para> -<note> -<title>DOC TODO</title> -<para> -please redo screenshot -</para> -</note> <mediaobject> <imageobject role="html"> <imagedata fileref="images/PageSetting1.png" format="PNG" align="center" scale="110" /> @@ -384,16 +379,25 @@ <term>Access right</term> <listitem> <para> - The page <emphasis role="bold">Access right</emphasis> can be set to specific user groups or set to everyone (this includes unregistered users). Current access permissions on page are listed and you can remove permissions (by clicking the delete icon) or add further permission (by click the <emphasis role="bold">Add Permission</emphasis> button). Populating the <emphasis role="bold">Make it public</emphasis> check box will allow all users (registered or unregistered) to access the page. + The page <emphasis role="bold">Access right</emphasis> can be set to specific user groups or set to everyone (this includes unregistered users). </para> + <para> + Current access permissions on page are listed and you can remove permissions (by clicking the delete icon) or add further permission (by click the <emphasis role="bold">Add Permission</emphasis> button). + </para> + <para> + Populating the <emphasis role="bold">Make it public</emphasis> check box will allow all users (registered or unregistered) to access the page. + </para> </listitem> </varlistentry> <varlistentry> <term>Edit right</term> <listitem> <para> - The <emphasis role="bold">Edit right</emphasis> allows users to change information on a page. <emphasis role="bold">Edit right</emphasis> only is set for a group of users. <emphasis role="bold">Edit right</emphasis> can be set for one specific membership type within a particular group (<emphasis role="bold">*</emphasis> allows every membership type in a group). If you want to re-assign this right to another group, click <emphasis role="bold">Select Permission</emphasis> to choose another one. + The <emphasis role="bold">Edit right</emphasis> allows users to change information on a page. <emphasis role="bold">Edit right</emphasis> only is set for a group of users. </para> + <para> + <emphasis role="bold">Edit right</emphasis> can be set for one specific membership type within a particular group (<emphasis role="bold">*</emphasis> allows every membership type in a group). If you want to re-assign this right to another group, click <emphasis role="bold">Select Permission</emphasis> to choose another one. + </para> </listitem> </varlistentry> </variablelist> @@ -407,8 +411,11 @@ Click the Show Container icon to show current container layout of selected page on your right and all the container layouts list on the left pane. </para> <para> - If you want to change the current layout, select a layout type from the list on the left pane, then drag the template you want into the right pane. The new container will be displayed on the right pane. You can change the position of the current container by dragging it to another place on the right pane or remove it completely by clicking the delete icon in the right corner. + If you want to change the current layout, select a layout type from the list on the left pane, then drag the template you want into the right pane. The new container will be displayed on the right pane. </para> + <para> + You can change the position of the current container by dragging it to another place on the right pane or remove it completely by clicking the delete icon in the right corner. + </para> </listitem> </varlistentry> </variablelist> @@ -458,7 +465,7 @@ </step> <step> <para> - Click the <emphasis role="bold">OK</emphasis> button to process the deletion or <emphasis role="bold">Cancel</emphasis> button to quit without deleting the page. + Click the <emphasis role="bold">OK</emphasis> button to complete the deletion or <emphasis role="bold">Cancel</emphasis> button to quit without deleting the page. </para> </step> </procedure> Modified: portal/trunk/docs/user-guide/en/modules/portal/Manage_Permission.xml =================================================================== --- portal/trunk/docs/user-guide/en/modules/portal/Manage_Permission.xml 2010-03-11 03:31:57 UTC (rev 2143) +++ portal/trunk/docs/user-guide/en/modules/portal/Manage_Permission.xml 2010-03-11 06:26:25 UTC (rev 2144) @@ -38,13 +38,14 @@ <para> On the Toolbar click <emphasis role="bold">Site</emphasis> then <emphasis role="bold">Edit Portal's Properties</emphasis>. Last select the <emphasis role="bold">Permission Setting</emphasis> tab. </para> - -<note> -<title>DOC TODO</title> -<para> -please redo screenshot with mouse on "edit portal's properties" -</para> -</note> + <mediaobject> + <imageobject role="html"> + <imagedata fileref="images/EditActivePortals.png" format="PNG" align="center" scale="110" /> + </imageobject> + <imageobject role="fo"> + <imagedata fileref="images/EditActivePortals.png" format="PNG" align="center" contentwidth="150mm" /> + </imageobject> + </mediaobject> </listitem> </varlistentry> </variablelist> Modified: portal/trunk/docs/user-guide/en/modules/portal/Manage_Portals.xml =================================================================== --- portal/trunk/docs/user-guide/en/modules/portal/Manage_Portals.xml 2010-03-11 03:31:57 UTC (rev 2143) +++ portal/trunk/docs/user-guide/en/modules/portal/Manage_Portals.xml 2010-03-11 06:26:25 UTC (rev 2144) @@ -10,17 +10,25 @@ <section id="sect-User_Guide-Create_a_New_Portal"> <title>Create a New Portal</title> <para> - Creating a new portal requires proper access credentials that only an administrator may set up. + Creating a new portal requires access credentials that only an administrator may set up. </para> <procedure> <step> <para> - Click on <emphasis role="bold">Site</emphasis> in the toolbar. + Click on <emphasis role="bold">Site</emphasis> in the toolbar then click the <emphasis role="bold">Add New Portal</emphasis> button. </para> + <mediaobject> + <imageobject role="html"> + <imagedata fileref="images/AddPortal.png" format="PNG" align="center" scale="110" /> + </imageobject> + <imageobject role="fo"> + <imagedata fileref="images/AddPortal.png" format="PNG" align="center" contentwidth="150mm" /> + </imageobject> + </mediaobject> </step> <step> <para> - Click the <emphasis role="bold">Add New Portal</emphasis> button. By default, the <emphasis role="bold">Create New Portal</emphasis> window is shown with the <emphasis role="bold">Portal Templates</emphasis> tab. + This opens the <emphasis role="bold">Create New Portal</emphasis> window which contains the <emphasis role="bold">Portal Templates</emphasis> tab. By default, the template used in new portals is 'Classic'. <mediaobject> <imageobject role="html"> <imagedata fileref="images/PortalTemplate.png" format="PNG" align="center" scale="100" /> @@ -31,14 +39,8 @@ </mediaobject> </para> <para> - By default, Portal template is Classic. Select the <emphasis role="bold">Portal Setting</emphasis> tab. - -<note> -<title>DOC TODO</title> -<para> -please redo screenshot -</para> -</note> + Select the <emphasis role="bold">Portal Setting</emphasis> tab. + </para> <mediaobject> <imageobject role="html"> <imagedata fileref="images/PortalSetting2.5.png" format="PNG" align="center" scale="100" /> @@ -47,7 +49,7 @@ <imagedata fileref="images/PortalSetting2.5.png" format="PNG" align="center" contentwidth="150mm" /> </imageobject> </mediaobject> - </para> + </step> <step> <para> @@ -56,12 +58,12 @@ </step> <step> <para> - Select the default display language for the portal + Select the default display language for the portal. </para> </step> <step> <para> - Select a skin for a portal + Select a skin for a portal. </para> </step> <step> @@ -100,7 +102,7 @@ Click on the <emphasis role="bold">Permission Setting</emphasis> tab and set the permissions for the Portal. </para> <para> - By default the access permissions list for the portal is empty. You have to select at least one or tick on the <emphasis role="bold">Make it public</emphasis> check box to assign access permission to everyone. + The access permissions list for the portal is empty by default. You have to select at least one or tick on the <emphasis role="bold">Make it public</emphasis> check box to assign access permission to everyone. </para> </step> <step> @@ -110,7 +112,7 @@ </step> </procedure> <para> - You also can edit or delete a portal. See more details in <xref linkend="sect-User_Guide-Manage_Portals" /> + You also can edit or delete a portal. See <xref linkend="sect-User_Guide-Manage_Portals-Edit_a_Portal" /> or <xref linkend="sect-User_Guide-Manage_Portals-Delete_a_Portal" /> for more details. </para> </section> @@ -118,51 +120,115 @@ <section id="sect-User_Guide-Manage_Portals-Edit_a_Portal"> <title>Edit a Portal</title> <para> - An administrater is allowed to alter many aspects of a portal: + An administrator can chagne many aspects of a portal: </para> <para> - Click <emphasis role="bold">Site</emphasis> on the Toolbar. A list of active portals will appear as such: + Click <emphasis role="bold">Site</emphasis> on the Toolbar. A list of active portals will appear: </para> -<note> -<title>DOC TODO</title> -<para> -please add screenshot -</para> -</note> + <mediaobject> + <imageobject role="html"> + <imagedata fileref="images/ActivePortals.png" format="PNG" align="center" scale="110" /> + </imageobject> + <imageobject role="fo"> + <imagedata fileref="images/ActivePortals.png" format="PNG" align="center" contentwidth="150mm" /> + </imageobject> + </mediaobject> </section> <section id="proc-User_Guide-Manage_Portals-Edit_Layout"> <title>Edit Layout</title> -<note> -<title>DOC TODO</title> -<para> -please add screenshot -</para> -</note> - + <para> + To edit the layout of a portal, click the <emphasis>Edit Layout</emphasis> key beside the active portal you wish to edit: + </para> + <mediaobject> + <imageobject role="html"> + <imagedata fileref="images/EditLayout.png" format="PNG" align="center" scale="110" /> + </imageobject> + <imageobject role="fo"> + <imagedata fileref="images/EditLayout.png" format="PNG" align="center" contentwidth="150mm" /> + </imageobject> + </mediaobject> + <para> + New applications, containers or gadgets can be dragged from the <emphasis role="bold">Edit Inline Composer</emphasis> window (inset on the right of the screen) onto the main portal body. + </para> + <mediaobject> + <imageobject role="html"> + <imagedata fileref="images/EditLayout2.png" format="PNG" align="center" scale="110" /> + </imageobject> + <imageobject role="fo"> + <imagedata fileref="images/EditLayout2.png" format="PNG" align="center" contentwidth="150mm" /> + </imageobject> + </mediaobject> + <para> + Elements already in place in the portal body can be rearranged or removed as required. Use the relevent button in the overlay that appears when you mouse-over each element: + </para> + <mediaobject> + <imageobject role="html"> + <imagedata fileref="images/EditLayout3.png" format="PNG" align="center" scale="110" /> + </imageobject> + <imageobject role="fo"> + <imagedata fileref="images/EditLayout3.png" format="PNG" align="center" contentwidth="150mm" /> + </imageobject> + </mediaobject> </section> <section id="proc-User_Guide-Manage_Portals-Edit_Navigation"> <title>Edit Navigation</title> -<note> -<title>DOC TODO</title> -<para> -please add screenshot -</para> -</note> - + <para> + The portal navigation can be edited by clicking <emphasis role="bold">Site</emphasis> in the <emphasis role="bold">Toolbar</emphasis> and selecting the <emphasis>Edit Navigation</emphasis> link next to the portal you wish to edit: + </para> + <mediaobject> + <imageobject role="html"> + <imagedata fileref="images/EditNavigation1.png" format="PNG" align="center" scale="110" /> + </imageobject> + <imageobject role="fo"> + <imagedata fileref="images/EditNavigation1.png" format="PNG" align="center" contentwidth="150mm" /> + </imageobject> + </mediaobject> + <para> + The <emphasis>Navigation Management</emphasis> window appears: + </para> + <mediaobject> + <imageobject role="html"> + <imagedata fileref="images/NavigationManagement.png" format="PNG" align="center" scale="100" /> + </imageobject> + <imageobject role="fo"> + <imagedata fileref="images/NavigationManagement.png" format="PNG" align="center" contentwidth="150mm" /> + </imageobject> + </mediaobject> + <para> + More information about actions possible in this window can be found in <xref linkend="sect-User_Guide-Manage_Navigation_Nodes"/> + </para> </section> <section id="proc-User_Guide-Manage_Portals-Edit_Properties"> <title>Edit Properties</title> -<note> -<title>DOC TODO</title> -<para> -please add screenshot -</para> -</note> - + <para> + Portal properties such as language, skin and permissions can be set by clicking on <emphasis role="bold">Site</emphasis> in the <emphasis role="bold">Toolbar</emphasis> and selecting the <emphasis>Edit Portal Properties</emphasis> link for the portal you wish to edit: + </para> + <mediaobject> + <imageobject role="html"> + <imagedata fileref="images/PortalProperties.png" format="PNG" align="center" scale="110" /> + </imageobject> + <imageobject role="fo"> + <imagedata fileref="images/PortalProperties.png" format="PNG" align="center" contentwidth="150mm" /> + </imageobject> + </mediaobject> + <para> + The various tabs available in the edit properties window give access to the properties that can be edited for the chosen portal: + </para> + <mediaobject> + <imageobject role="html"> + <imagedata fileref="images/EditPortal2.6New.png" format="PNG" align="center" scale="110" /> + </imageobject> + <imageobject role="fo"> + <imagedata fileref="images/EditPortal2.6New.png" format="PNG" align="center" contentwidth="150mm" /> + </imageobject> + </mediaobject> + <para> + Click on <emphasis role="bold">Save</emphasis> or <emphasis role="bold">Cancel</emphasis> to either set or discard any changes you have made in the portal. + </para> </section> <section id="sect-User_Guide-Manage_Portals-Delete_a_Portal"> @@ -170,14 +236,20 @@ <procedure> <step> <para> - Click on the Delete icon.The confirmation message will appear. + To delete a portal click on the Delete icon beside the portal you no longer require. </para> - </step> + <para> + The confirmation message will appear: + </para> <mediaobject> - <imageobject> - <imagedata fileref="images/SureDelete.png" format="PNG" /> + <imageobject role="html"> + <imagedata fileref="images/SureDelete.png" format="PNG" align="center" scale="100" /> </imageobject> + <imageobject role="fo"> + <imagedata fileref="images/SureDelete.png" format="PNG" align="center" contentwidth="100mm" /> + </imageobject> </mediaobject> + </step> <step> <para> Click <emphasis role="bold">OK</emphasis> @@ -196,27 +268,29 @@ </para> <variablelist> <varlistentry> - <term>Change the skin temporarily</term> + <term><emphasis role="bold">Change the skin temporarily</emphasis></term> <listitem> <procedure> <step> <para> Mouse over the Start menu and click on <emphasis role="bold">Change Skin</emphasis>. </para> + <mediaobject> + <imageobject role="html"> + <imagedata fileref="images/StarPortlet.png" format="PNG" align="center" scale="110" /> + </imageobject> + <imageobject role="fo"> + <imagedata fileref="images/StarPortlet.png" format="PNG" align="center" contentwidth="150mm" /> + </imageobject> + </mediaobject> </step> <step> <para> Select a new skin from the Skin list. By clicking on the skin name a picture will appear in the preview pane. </para> -<note> -<title>DOC TODO</title> -<para> -please redo screenshot -</para> -</note> <mediaobject> <imageobject role="html"> - <imagedata fileref="images/SkinSet1.png" format="PNG" width="444" /> + <imagedata fileref="images/SkinSet1.png" format="PNG" scale="100"/> </imageobject> <imageobject role="fo"> <imagedata fileref="images/SkinSet1.png" format="PNG" contentwidth="120mm" /> @@ -225,14 +299,14 @@ </step> <step> <para> - lick <emphasis role="bold">Apply</emphasis> to apply to the portal. + Click <emphasis role="bold">Apply</emphasis> to apply to the portal. </para> </step> </procedure> </listitem> </varlistentry> <varlistentry> - <term>Change the skin permanently</term> + <term><emphasis role="bold">Change the skin permanently</emphasis></term> <listitem> <procedure> <step> @@ -245,15 +319,9 @@ <para> In the <emphasis role="bold">Portal Setting</emphasis> tab, select another skin <emphasis role="bold">Skin</emphasis> list </para> -<note> -<title>DOC TODO</title> -<para> -please redo screenshot -</para> -</note> - <mediaobject> + <mediaobject> <imageobject role="html"> - <imagedata fileref="images/Skin1.png" format="PNG" width="444" /> + <imagedata fileref="images/Skin1.png" format="PNG" scale="100"/> </imageobject> <imageobject role="fo"> <imagedata fileref="images/Skin1.png" format="PNG" contentwidth="120mm"/> @@ -270,7 +338,7 @@ </varlistentry> </variablelist> <para> - More information about adding skins to a portal check out the &PRODUCT; Reference Guide at <ulink type="http" url="www.redhat.com/docs"></ulink> + More information about adding skins to a portal can be found in the Reference Guide for this product. </para> </section> @@ -278,19 +346,15 @@ <section id="sect-User_Guide-Switching_between_Portals"> <title>Switching between Portals</title> <para> - Mouse over <emphasis role="bold">Site</emphasis> on the Toolbar for a list all portals in which you have at least access right + Mouse over <emphasis role="bold">Site</emphasis> on the Toolbar for a list all portals in which you have at least access rights: </para> - <note> - <title>DOC TODO</title> - <para> - please redo screenshot - </para> - </note> - <mediaobject> - <imageobject> - <imagedata fileref="images/SitePortlet.png" format="PNG" /> + <imageobject role="html"> + <imagedata fileref="images/SitePortlet.png" format="PNG" align="center" scale="110" /> </imageobject> + <imageobject role="fo"> + <imagedata fileref="images/SitePortlet.png" format="PNG" align="center" scalefit="1" contentwidth="150mm" /> + </imageobject> </mediaobject> <para> Users switch between Portals by clicking on the desired portal. Please wait a few seconds for the change to take effect. Modified: portal/trunk/docs/user-guide/en/modules/portal/Toolbar.xml =================================================================== --- portal/trunk/docs/user-guide/en/modules/portal/Toolbar.xml 2010-03-11 03:31:57 UTC (rev 2143) +++ portal/trunk/docs/user-guide/en/modules/portal/Toolbar.xml 2010-03-11 06:26:25 UTC (rev 2144) @@ -6,11 +6,11 @@ <section id="sect-User_Guide-Toolbar"> <title>Toolbar</title> <para> - The Toolbar offers a convenient way for users and administrators to undertake portal actions quickly and easily. + The Toolbar offers a convenient way for users and administrators to execute tasks within the portal quickly and easily. </para> <mediaobject> <imageobject role="html"> - <imagedata fileref="images/Toolbar.png" format="PNG" align="center" /> + <imagedata fileref="images/Toolbar.png" format="PNG" align="center" scale="110"/> </imageobject> <imageobject role="fo"> <imagedata fileref="images/Toolbar.png" format="PNG" align="center" contentwidth="150mm"/> @@ -28,7 +28,7 @@ </para> <mediaobject> <imageobject role="html"> - <imagedata fileref="images/StarPortlet.png" format="PNG" align="center" /> + <imagedata fileref="images/StarPortlet.png" format="PNG" align="center" scale="110"/> </imageobject> <imageobject role="fo"> <imagedata fileref="images/StarPortlet.png" format="PNG" align="center" contentwidth="150mm"/> @@ -44,7 +44,7 @@ </para> <mediaobject> <imageobject role="html"> - <imagedata fileref="images/SitePortlet.png" format="PNG" align="center" /> + <imagedata fileref="images/SitePortlet.png" format="PNG" align="center" scale="110"/> </imageobject> <imageobject role="fo"> <imagedata fileref="images/SitePortlet.png" format="PNG" align="center" contentwidth="150mm"/> @@ -60,7 +60,7 @@ </para> <mediaobject> <imageobject role="html"> - <imagedata fileref="images/GroupPortlet.png" format="PNG" align="center" /> + <imagedata fileref="images/GroupPortlet.png" format="PNG" align="center" scale="110"/> </imageobject> <imageobject role="fo"> <imagedata fileref="images/GroupPortlet.png" format="PNG" align="center" contentwidth="150mm" /> @@ -76,7 +76,7 @@ </para> <mediaobject> <imageobject role="html"> - <imagedata fileref="images/DashboardPortlet.png" format="PNG" align="center" /> + <imagedata fileref="images/DashboardPortlet.png" format="PNG" align="center" scale="110"/> </imageobject> <imageobject role="fo"> <imagedata fileref="images/DashboardPortlet.png" format="PNG" align="center" contentwidth="150mm"/> @@ -97,11 +97,14 @@ <term> <emphasis role="bold">Editor</emphasis></term> <listitem> <para> - Portal Administrators have access to another navigation that allows them to; add a new page to the current portal, edit a particular page's properties or to change a page's layout. This navigation appears next to the Dashboard navigation in the Toolbar and is contextually-named. It will appear as either <emphasis role="bold">Site Editor</emphasis>, <emphasis role="bold">Dashboard Editor</emphasis> or <emphasis role="bold">Group Editor</emphasis> depending on the user's location within the portal. + Portal Administrators have access to another navigation that allows them to; add a new page to the current portal, edit a particular page's properties or to change a page's layout. </para> + <para> + This navigation appears next to the Dashboard navigation in the Toolbar and is contextually-named. It will appear as either <emphasis role="bold">Site Editor</emphasis>, <emphasis role="bold">Dashboard Editor</emphasis> or <emphasis role="bold">Group Editor</emphasis> depending on the user's location within the portal. + </para> <mediaobject> <imageobject role="html"> - <imagedata fileref="images/EditorPortlet.png" format="PNG" align="center" /> + <imagedata fileref="images/EditorPortlet.png" format="PNG" align="center" scale="110"/> </imageobject> <imageobject role="fo"> <imagedata fileref="images/EditorPortlet.png" format="PNG" align="center" contentwidth="150mm"/> Modified: portal/trunk/docs/user-guide/en/modules/portal/User_Management.xml =================================================================== --- portal/trunk/docs/user-guide/en/modules/portal/User_Management.xml 2010-03-11 03:31:57 UTC (rev 2143) +++ portal/trunk/docs/user-guide/en/modules/portal/User_Management.xml 2010-03-11 06:26:25 UTC (rev 2144) @@ -26,14 +26,48 @@ <section id="sect-User_Guide-User_Management-Add_a_user"> <title>Add a user</title> - - -<note> -<title>DOC TODO</title> -<para> -add Group/Organization/New Staff workflow -</para> -</note> + <para> + To add a new user to the portal user lists follow these steps: + </para> + <procedure> + <step> + <para> + Mouse-over <emphasis role="bold">Group</emphasis> in the <emphasis role="bold">Toolbar</emphasis>. + </para> + </step> + <step> + <para> + Highlight <emphasis role="bold">Organization</emphasis> and then click on <emphasis role="bold">New Staff</emphasis>. + </para> + <para> + The <emphasis role="bold">New Staff</emphasis> window will open: + </para> + <mediaobject> + <imageobject role="html"> + <imagedata fileref="images/NewStaff.png" format="PNG" align="center" scale="110" /> + </imageobject> + <imageobject role="fo"> + <imagedata fileref="images/NewStaff.png" format="PNG" align="center" contentwidth="150mm" /> + </imageobject> + </mediaobject> + <para> + This window has two tabs; <emphasis role="bold">Account Settings</emphasis> and <emphasis role="bold">User Profile</emphasis>. + </para> + </step> + <step> + <para> + To create a new user all of the fields in the <emphasis role="bold">Account Settings</emphasis> tab must be completed. + </para> + <para> + Further information about the user (such as nickname and birthday) can be added in the <emphasis role="bold">User Profile</emphasis> tab. This information is not required for the creation of the account. + </para> + </step> + <step> + <para> + Click either <emphasis role="bold">Save</emphasis> or <emphasis role="bold">Reset</emphasis> to create or discard the new account. + </para> + </step> + </procedure> </section> <section id="sect-User_Guide-User_Management-Search_a_user"> @@ -350,12 +384,14 @@ <para> Click the trash icon. </para> -<note> -<title>DOC TODO</title> -<para> -missing screenshot -</para> -</note> + <mediaobject> + <imageobject role="html"> + <imagedata fileref="images/DeleteGroup.png" format="PNG" align="center" scale="110" /> + </imageobject> + <imageobject role="fo"> + <imagedata fileref="images/DeleteGroup.png" format="PNG" align="center" contentwidth="150mm" /> + </imageobject> + </mediaobject> </step> <step> <para> Modified: portal/trunk/docs/user-guide/en/modules/portletsUser/Dashboard_Portlet.xml =================================================================== --- portal/trunk/docs/user-guide/en/modules/portletsUser/Dashboard_Portlet.xml 2010-03-11 03:31:57 UTC (rev 2143) +++ portal/trunk/docs/user-guide/en/modules/portletsUser/Dashboard_Portlet.xml 2010-03-11 06:26:25 UTC (rev 2144) @@ -12,9 +12,12 @@ Gadgets within the Dashboard portlet can be moved and rearranged. New gadgets can be created and unnecessary ones deleted. More than one instance of the same gadget can be opened at the same time and each instance of the same gadget can have different settings. The gadgets instances are completely independent. </para> <mediaobject> - <imageobject> - <imagedata fileref="images/Dashboard1.png" format="PNG" align="center" /> + <imageobject role="html"> + <imagedata fileref="images/Dashboard1.png" format="PNG" align="center" scale="110" /> </imageobject> + <imageobject role="fo"> + <imagedata fileref="images/Dashboard1.png" format="PNG" align="center" scalefit="1" contentwidth="90mm" /> + </imageobject> </mediaobject> <section id="sect-User_Guide-Dashboard_Portlet-Using_the_Dashboard_Workspace"> @@ -37,10 +40,10 @@ </para> <mediaobject> <imageobject role="html"> - <imagedata fileref="images/Dashname.png" format="PNG" align="center" /> + <imagedata fileref="images/Dashname.png" format="PNG" align="center" scale="150"/> </imageobject> <imageobject role="fo"> - <imagedata fileref="images/Dashname.png" format="PNG" align="center" contentwidth="150mm" /> + <imagedata fileref="images/Dashname.png" format="PNG" align="center" scalefit="1" contentwidth="120mm"/> </imageobject> </mediaobject> <para> @@ -48,10 +51,10 @@ </para> <mediaobject> <imageobject role="html"> - <imagedata fileref="images/Dashname1.png" format="PNG" align="center" /> + <imagedata fileref="images/Dashname1.png" format="PNG" align="center" scale="150"/> </imageobject> <imageobject role="fo"> - <imagedata fileref="images/Dashname1.png" format="PNG" align="center" contentwidth="150mm" /> + <imagedata fileref="images/Dashname1.png" format="PNG" align="center" scalefit="1" contentwidth="120mm"/> </imageobject> </mediaobject> @@ -60,10 +63,10 @@ </para> <mediaobject> <imageobject role="html"> - <imagedata fileref="images/Dash2.png" format="PNG" align="center" /> + <imagedata fileref="images/Dash2.png" format="PNG" align="center" scale="110"/> </imageobject> <imageobject role="fo"> - <imagedata fileref="images/Dash2.png" format="PNG" align="center" contentwidth="150mm" /> + <imagedata fileref="images/Dash2.png" format="PNG" align="center" scalefit="1" contentwidth="150mm"/> </imageobject> </mediaobject> @@ -77,10 +80,10 @@ </para> <mediaobject> <imageobject role="html"> - <imagedata fileref="images/Calendar.png" format="PNG" align="center" /> + <imagedata fileref="images/Calendar.png" format="PNG" align="center" scale="110"/> </imageobject> <imageobject role="fo"> - <imagedata fileref="images/Calendar.png" format="PNG" align="center" contentwidth="70mm"/> + <imagedata fileref="images/Calendar.png" format="PNG" align="center" scalefit="1" contentwidth="70mm"/> </imageobject> </mediaobject> </listitem> @@ -93,10 +96,10 @@ </para> <mediaobject> <imageobject role="html"> - <imagedata fileref="images/Todo.png" format="PNG" align="center" /> + <imagedata fileref="images/Todo.png" format="PNG" align="center" scale="110"/> </imageobject> <imageobject role="fo"> - <imagedata fileref="images/Todo.png" format="PNG" align="center" contentwidth="70mm" /> + <imagedata fileref="images/Todo.png" format="PNG" align="center" scalefit="1" contentwidth="70mm"/> </imageobject> </mediaobject> </listitem> @@ -109,10 +112,10 @@ </para> <mediaobject> <imageobject role="html"> - <imagedata fileref="images/Calculator.png" format="PNG" align="center" /> + <imagedata fileref="images/Calculator.png" format="PNG" align="center" scale="110"/> </imageobject> <imageobject role="fo"> - <imagedata fileref="images/Calculator.png" format="PNG" align="center" contentwidth="70mm"/> + <imagedata fileref="images/Calculator.png" format="PNG" align="center" scalefit="1" contentwidth="70mm"/> </imageobject> </mediaobject> </listitem> @@ -125,10 +128,10 @@ </para> <mediaobject> <imageobject role="html"> - <imagedata fileref="images/RSSReader.png" format="PNG" align="center" /> + <imagedata fileref="images/RSSReader.png" format="PNG" align="center" scale="110"/> </imageobject> <imageobject role="fo"> - <imagedata fileref="images/RSSReader.png" format="PNG" align="center" contentwidth="70mm"/> + <imagedata fileref="images/RSSReader.png" format="PNG" align="center" scalefit="1" contentwidth="70mm"/> </imageobject> </mediaobject> </listitem> @@ -141,10 +144,10 @@ </para> <mediaobject> <imageobject role="html"> - <imagedata fileref="images/GoogleGadgets.png" format="PNG" align="center" /> + <imagedata fileref="images/GoogleGadgets.png" format="PNG" align="center" scale="110"/> </imageobject> <imageobject role="fo"> - <imagedata fileref="images/GoogleGadgets.png" format="PNG" align="center" contentwidth="150mm"/> + <imagedata fileref="images/GoogleGadgets.png" format="PNG" align="center" scalefit="1" contentwidth="160mm"/> </imageobject> </mediaobject> </listitem> @@ -170,10 +173,10 @@ </para> <mediaobject> <imageobject role="html"> - <imagedata fileref="images/XMLURL.png" format="PNG" align="center" /> + <imagedata fileref="images/XMLURL.png" format="PNG" align="center" scale="110"/> </imageobject> <imageobject role="fo"> - <imagedata fileref="images/XMLURL.png" format="PNG" align="center" contentwidth="150mm"/> + <imagedata fileref="images/XMLURL.png" format="PNG" align="center" scalefit="1" contentwidth="160mm"/> </imageobject> </mediaobject> <note> @@ -188,9 +191,12 @@ Return to your portal and click the Dashboard link in the toolbar. </para> <mediaobject> - <imageobject> - <imagedata fileref="images/DashboardLink.png" format="PNG" align="center" contentwidth="150mm"/> + <imageobject role="html"> + <imagedata fileref="images/DashboardLink.png" format="PNG" align="center" scale="110"/> </imageobject> + <imageobject role="fo"> + <imagedata fileref="images/DashboardLink.png" format="PNG" align="center" scalefit="1" contentwidth="150mm"/> + </imageobject> </mediaobject> </step> @@ -200,10 +206,10 @@ </para> <mediaobject> <imageobject role="html"> - <imagedata fileref="images/Dashboard1.png" format="PNG" align="center"/> + <imagedata fileref="images/Dashboard1.png" format="PNG" align="center" scale="110"/> </imageobject> <imageobject role="fo"> - <imagedata fileref="images/Dashboard1.png" format="PNG" align="center" contentwidth="100mm"/> + <imagedata fileref="images/Dashboard1.png" format="PNG" align="center" scalefit="1" contentwidth="90mm"/> </imageobject> </mediaobject> </step> @@ -212,10 +218,10 @@ The Dashboard Workspace dialog appears: <mediaobject> <imageobject role="html"> - <imagedata fileref="images/EnterLink.png" format="PNG" align="center" /> + <imagedata fileref="images/EnterLink.png" format="PNG" align="center" scale="110"/> </imageobject> <imageobject role="fo"> - <imagedata fileref="images/EnterLink.png" format="PNG" align="center" contentwidth="50mm"/> + <imagedata fileref="images/EnterLink.png" format="PNG" align="center" scalefit="1" contentwidth="50mm"/> </imageobject> </mediaobject> </para> @@ -226,10 +232,10 @@ </para> <mediaobject> <imageobject role="html"> - <imagedata fileref="images/CodePaste.png" format="PNG" align="center" /> + <imagedata fileref="images/CodePaste.png" format="PNG" align="center" scale="110"/> </imageobject> <imageobject role="fo"> - <imagedata fileref="images/CodePaste.png" format="PNG" align="center" contentwidth="120mm"/> + <imagedata fileref="images/CodePaste.png" format="PNG" align="center" scalefit="1" contentwidth="100mm" /> </imageobject> </mediaobject> @@ -240,10 +246,10 @@ </para> <mediaobject> <imageobject role="html"> - <imagedata fileref="images/NewGadget.png" format="PNG" align="center" /> + <imagedata fileref="images/NewGadget.png" format="PNG" align="center" scale="110"/> </imageobject> <imageobject role="fo"> - <imagedata fileref="images/NewGadget.png" format="PNG" align="center" contentwidth="120mm" /> + <imagedata fileref="images/NewGadget.png" format="PNG" align="center" scalefit="1" contentwidth="150mm"/> </imageobject> </mediaobject> Modified: portal/trunk/docs/user-guide/en/modules/portletsUser/Functional_Portlets.xml =================================================================== --- portal/trunk/docs/user-guide/en/modules/portletsUser/Functional_Portlets.xml 2010-03-11 03:31:57 UTC (rev 2143) +++ portal/trunk/docs/user-guide/en/modules/portletsUser/Functional_Portlets.xml 2010-03-11 06:26:25 UTC (rev 2144) @@ -21,7 +21,7 @@ </para> <mediaobject> <imageobject> - <imagedata fileref="images/Account.png" format="PNG" align="center" contentwidth="150mm" /> + <imagedata fileref="images/Account.png" format="PNG" align="center" scalefit="1" contentwidth="150mm" /> </imageobject> </mediaobject> </listitem> @@ -34,7 +34,7 @@ </para> <mediaobject> <imageobject> - <imagedata fileref="images/OrganizationPortlet1.png" format="PNG" align="center" contentwidth="150mm"/> + <imagedata fileref="images/OrganizationPortlet1.png" format="PNG" align="center" scalefit="1" contentwidth="150mm"/> </imageobject> </mediaobject> </listitem> @@ -47,7 +47,7 @@ </para> <mediaobject> <imageobject> - <imagedata fileref="images/ApplicationRegistry.png" format="PNG" align="center" contentwidth="150mm"/> + <imagedata fileref="images/ApplicationRegistry.png" format="PNG" align="center" scalefit="1" contentwidth="150mm"/> </imageobject> </mediaobject> </listitem> @@ -93,7 +93,7 @@ <imagedata fileref="images/StarPortlet.png" format="PNG" align="center" scale="110"/> </imageobject> <imageobject role="fo"> - <imagedata fileref="images/StarPortlet.png" format="PNG" align="center" contentwidth="150mm"/> + <imagedata fileref="images/StarPortlet.png" format="PNG" align="center" scalefit="1" contentwidth="150mm"/> </imageobject> </mediaobject> </listitem> Modified: portal/trunk/docs/user-guide/en/modules/portletsUser/Interface_Portlets.xml =================================================================== --- portal/trunk/docs/user-guide/en/modules/portletsUser/Interface_Portlets.xml 2010-03-11 03:31:57 UTC (rev 2143) +++ portal/trunk/docs/user-guide/en/modules/portletsUser/Interface_Portlets.xml 2010-03-11 06:26:25 UTC (rev 2144) @@ -18,7 +18,7 @@ <imagedata fileref="images/BannerPortlet.png" format="PNG" align="center" scale="110"/> </imageobject> <imageobject role="fo"> - <imagedata fileref="images/BannerPortlet.png" format="PNG" align="center" contentwidth="150mm"/> + <imagedata fileref="images/BannerPortlet.png" format="PNG" align="center" scalefit="1" contentwidth="150mm"/> </imageobject> </mediaobject> <para> @@ -34,10 +34,10 @@ </para> <mediaobject> <imageobject role="html"> - <imagedata fileref="images/PortalHome.png" format="PNG" align="center" /> + <imagedata fileref="images/PortalHome.png" format="PNG" align="center" scale="110"/> </imageobject> <imageobject role="fo"> - <imagedata fileref="images/PortalHome.png" format="PNG" align="center" contentwidth="150mm" /> + <imagedata fileref="images/PortalHome.png" format="PNG" align="center" scalefit="1" contentwidth="150mm" /> </imageobject> </mediaobject> </listitem> @@ -50,10 +50,10 @@ </para> <mediaobject> <imageobject role="html"> - <imagedata fileref="images/NavigationPortlet.png" format="PNG" align="center"/> + <imagedata fileref="images/NavigationPortlet.png" format="PNG" align="center" scale="110"/> </imageobject> <imageobject role="fo"> - <imagedata fileref="images/NavigationPortlet.png" format="PNG" align="center" contentwidth="110mm"/> + <imagedata fileref="images/NavigationPortlet.png" format="PNG" align="center" scalefit="1" contentwidth="100mm"/> </imageobject> </mediaobject> </listitem> @@ -66,10 +66,10 @@ </para> <mediaobject> <imageobject role="html"> - <imagedata fileref="images/SiteMap.png" format="PNG" align="center" /> + <imagedata fileref="images/SiteMap.png" format="PNG" align="center" scale="110"/> </imageobject> <imageobject role="fo"> - <imagedata fileref="images/SiteMap.png" format="PNG" align="center" contentwidth="150mm"/> + <imagedata fileref="images/SiteMap.png" format="PNG" align="center" scalefit="1" contentwidth="130mm"/> </imageobject> </mediaobject> </listitem> @@ -82,10 +82,10 @@ </para> <mediaobject> <imageobject role="html"> - <imagedata fileref="images/Breadcrumbs.png" format="PNG" align="center" /> + <imagedata fileref="images/Breadcrumbs.png" format="PNG" align="center" scale="110"/> </imageobject> <imageobject role="fo"> - <imagedata fileref="images/Breadcrumbs.png" format="PNG" align="center" contentwidth="110mm"/> + <imagedata fileref="images/Breadcrumbs.png" format="PNG" align="center" scalefit="1" contentwidth="150mm"/> </imageobject> </mediaobject> </listitem> @@ -111,10 +111,10 @@ </para> <mediaobject> <imageobject role="html"> - <imagedata fileref="images/Dashboard.png" format="PNG" align="center" /> + <imagedata fileref="images/Dashboard.png" format="PNG" align="center" scale="110"/> </imageobject> <imageobject role="fo"> - <imagedata fileref="images/Dashboard.png" format="PNG" align="center" contentwidth="150mm" /> + <imagedata fileref="images/Dashboard.png" format="PNG" align="center" scalefit="1" contentwidth="150mm" /> </imageobject> </mediaobject> <para> @@ -158,10 +158,10 @@ </para> <mediaobject> <imageobject role="html"> - <imagedata fileref="images/GadgetWrapper.png" format="PNG" align="center" /> + <imagedata fileref="images/GadgetWrapper.png" format="PNG" align="center" scale="110"/> </imageobject> <imageobject role="fo"> - <imagedata fileref="images/GadgetWrapper.png" format="PNG" align="center" contentwidth="150mm"/> + <imagedata fileref="images/GadgetWrapper.png" format="PNG" align="center" scalefit="1" contentwidth="150mm"/> </imageobject> </mediaobject> </listitem> @@ -190,10 +190,10 @@ <mediaobject> <imageobject role="html"> - <imagedata fileref="images/Footer.png" format="PNG" align="center" /> + <imagedata fileref="images/Footer.png" format="PNG" align="center" scale="110"/> </imageobject> <imageobject role="fo"> - <imagedata fileref="images/Footer.png" format="PNG" align="center" contentwidth="150mm"/> + <imagedata fileref="images/Footer.png" format="PNG" align="center" scalefit="1" contentwidth="120mm"/> </imageobject> </mediaobject> </listitem> Modified: portal/trunk/docs/user-guide/en/modules/terms/Toolbar_concept.xml =================================================================== --- portal/trunk/docs/user-guide/en/modules/terms/Toolbar_concept.xml 2010-03-11 03:31:57 UTC (rev 2143) +++ portal/trunk/docs/user-guide/en/modules/terms/Toolbar_concept.xml 2010-03-11 06:26:25 UTC (rev 2144) @@ -13,7 +13,7 @@ <imagedata fileref="images/Toolbar.png" format="PNG" align="center" scale="110"/> </imageobject> <imageobject role="fo"> - <imagedata fileref="images/Toolbar.png" format="PNG" align="center" contentwidth="150mm"/> + <imagedata fileref="images/Toolbar.png" format="PNG" align="center" scalefit="1" contentwidth="150mm"/> </imageobject> </mediaobject> <para>

14 years, 9 months

1
0
0 / 0

gatein SVN: r2143 - portal/trunk/testsuite.

by do-not-reply＠jboss.org

Author: hangnguyen Date: 2010-03-10 22:31:57 -0500 (Wed, 10 Mar 2010) New Revision: 2143 Modified: portal/trunk/testsuite/GateIn_v3.0_MainFucntions_TestDefinition.ods Log: Update "GateIn_v3.0_MainFucntions_TestDefinition.ods" Modified: portal/trunk/testsuite/GateIn_v3.0_MainFucntions_TestDefinition.ods =================================================================== (Binary files differ)

14 years, 9 months

1
0
0 / 0

gatein SVN: r2142 - portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate.

by do-not-reply＠jboss.org

Author: hangnguyen Date: 2010-03-10 21:22:11 -0500 (Wed, 10 Mar 2010) New Revision: 2142 Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_POR_09_002.html Log: Update "Test_POR_09_002.html" Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_POR_09_002.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_POR_09_002.html 2010-03-11 01:22:58 UTC (rev 2141) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_POR_09_002.html 2010-03-11 02:22:11 UTC (rev 2142) @@ -192,13 +192,23 @@ <td></td> </tr> <tr> + <td>clickAt</td> + <td>link=Site</td> + <td></td> +</tr> +<tr> <td>waitForElementPresent</td> + <td>Portal Navigation</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> <td>xpath=//div[@id='UISiteManagement']/table[2]/tbody/tr/td[3]/a[4]</td> <td></td> </tr> <tr> <td>clickAt</td> - <td>xpath=//div[@id='UISiteManagement']/table[2]/tbody/tr/td[3]/a[4]</td> + <td>xpath=//div[@id='UISiteManagement']/table[2]//a[@class='DeleteIcon']</td> <td></td> </tr> <tr> @@ -212,19 +222,19 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>waitForElementPresent</td> <td>link=Site</td> <td></td> </tr> <tr> - <td>waitForTextNotPresent</td> - <td>Test_POR_09_002</td> + <td>clickAt</td> + <td>link=Site</td> <td></td> </tr> <tr> - <td>verifyTextNotPresent</td> - <td>Test_POR_09_002</td> - <td>1,1</td> + <td>waitForTextPresent</td> + <td>Portal Navigation</td> + <td></td> </tr> <tr> <td>waitForElementPresent</td>

14 years, 9 months

1
0
0 / 0

gatein SVN: r2141 - in portal/trunk: examples/extension/war/src/main/webapp/login/jsp and 2 other directories.

by do-not-reply＠jboss.org

Author: julien_viet Date: 2010-03-10 20:22:58 -0500 (Wed, 10 Mar 2010) New Revision: 2141 Modified: portal/trunk/component/web/src/main/java/org/exoplatform/web/login/ErrorLoginServlet.java portal/trunk/component/web/src/main/java/org/exoplatform/web/login/InitiateLoginServlet.java portal/trunk/examples/extension/war/src/main/webapp/login/jsp/login.jsp portal/trunk/examples/portal/war/src/main/webapp/login/jsp/login.jsp portal/trunk/web/portal/src/main/webapp/login/jsp/login.jsp Log: GTNPORTAL-854 : Login Exception when input invalid password in Sign In form Modified: portal/trunk/component/web/src/main/java/org/exoplatform/web/login/ErrorLoginServlet.java =================================================================== --- portal/trunk/component/web/src/main/java/org/exoplatform/web/login/ErrorLoginServlet.java 2010-03-11 00:50:04 UTC (rev 2140) +++ portal/trunk/component/web/src/main/java/org/exoplatform/web/login/ErrorLoginServlet.java 2010-03-11 01:22:58 UTC (rev 2141) @@ -27,6 +27,7 @@ import org.exoplatform.web.security.security.CookieTokenService; import java.io.IOException; +import java.util.Enumeration; import javax.servlet.ServletContext; import javax.servlet.ServletException; Modified: portal/trunk/component/web/src/main/java/org/exoplatform/web/login/InitiateLoginServlet.java =================================================================== --- portal/trunk/component/web/src/main/java/org/exoplatform/web/login/InitiateLoginServlet.java 2010-03-11 00:50:04 UTC (rev 2140) +++ portal/trunk/component/web/src/main/java/org/exoplatform/web/login/InitiateLoginServlet.java 2010-03-11 01:22:58 UTC (rev 2141) @@ -89,7 +89,7 @@ // This allows the customer to define another login page without // changing the portal - context.getRequestDispatcher("/login/jsp/login.jsp").include(req, resp); + showLoginForm(req, resp); } else { @@ -104,7 +104,7 @@ // This allows the customer to define another login page without // changing the portal log.debug("Login initiated with no credentials in session and no token cookie, redirecting to login page"); - context.getRequestDispatcher("/login/jsp/login.jsp").include(req, resp); + showLoginForm(req, resp); } } else @@ -120,6 +120,19 @@ } } + private void showLoginForm(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException + { + try + { + req.setAttribute("org.gatein.portal.login.initial_uri", "javax.servlet.forward.request_uri"); + getServletContext().getRequestDispatcher("/login/jsp/login.jsp").include(req, resp); + } + finally + { + req.removeAttribute("org.gatein.portal.login.initial_uri"); + } + } + protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { doGet(req, resp); Modified: portal/trunk/examples/extension/war/src/main/webapp/login/jsp/login.jsp =================================================================== --- portal/trunk/examples/extension/war/src/main/webapp/login/jsp/login.jsp 2010-03-11 00:50:04 UTC (rev 2140) +++ portal/trunk/examples/extension/war/src/main/webapp/login/jsp/login.jsp 2010-03-11 01:22:58 UTC (rev 2141) @@ -39,6 +39,8 @@ ResourceBundleService service = (ResourceBundleService) portalContainer.getComponentInstanceOfType(ResourceBundleService.class); ResourceBundle res = service.getResourceBundle(service.getSharedResourceBundleNames(), request.getLocale()) ; + String uri = (String)request.getAttribute("org.gatein.portal.login.initial_uri"); + Cookie cookie = new Cookie(InitiateLoginServlet.COOKIE_NAME, ""); cookie.setPath(request.getContextPath()); cookie.setMaxAge(0); @@ -68,8 +70,10 @@ %> <font color="red">Sign in failed. Wrong username or password.</font><%}%> <form name="loginForm" action="<%= contextPath + "/login"%>" method="post" style="margin: 0px;"> - <input type="hidden" name="uri" value="<%=session.getAttribute("initialURI") %>"/> - <table> + <% if (uri != null) { %> + <input type="hidden" name="initialURI" value="<%=uri%>"/> + <% } %> + <table> <tr class="FieldContainer"> <td class="FieldLabel"><%=res.getString("UILoginForm.label.UserName")%></td> <td><input class="UserName" name="username" value="<%=username%>"/></td> Modified: portal/trunk/examples/portal/war/src/main/webapp/login/jsp/login.jsp =================================================================== --- portal/trunk/examples/portal/war/src/main/webapp/login/jsp/login.jsp 2010-03-11 00:50:04 UTC (rev 2140) +++ portal/trunk/examples/portal/war/src/main/webapp/login/jsp/login.jsp 2010-03-11 01:22:58 UTC (rev 2141) @@ -39,6 +39,8 @@ ResourceBundleService service = (ResourceBundleService) portalContainer.getComponentInstanceOfType(ResourceBundleService.class); ResourceBundle res = service.getResourceBundle(service.getSharedResourceBundleNames(), request.getLocale()) ; + String uri = (String)request.getAttribute("org.gatein.portal.login.initial_uri"); + Cookie cookie = new Cookie(InitiateLoginServlet.COOKIE_NAME, ""); cookie.setPath(request.getContextPath()); cookie.setMaxAge(0); @@ -68,8 +70,10 @@ %> <font color="red">Sign in failed. Wrong username or password.</font><%}%> <form name="loginForm" action="<%= contextPath + "/login"%>" method="post" style="margin: 0px;"> - <input type="hidden" name="uri" value="<%=session.getAttribute("initialURI") %>"/> - <table> + <% if (uri != null) { %> + <input type="hidden" name="initialURI" value="<%=uri%>"/> + <% } %> + <table> <tr class="FieldContainer"> <td class="FieldLabel"><%=res.getString("UILoginForm.label.UserName")%></td> <td><input class="UserName" name="username" value="<%=username%>"/></td> Modified: portal/trunk/web/portal/src/main/webapp/login/jsp/login.jsp =================================================================== --- portal/trunk/web/portal/src/main/webapp/login/jsp/login.jsp 2010-03-11 00:50:04 UTC (rev 2140) +++ portal/trunk/web/portal/src/main/webapp/login/jsp/login.jsp 2010-03-11 01:22:58 UTC (rev 2141) @@ -29,9 +29,9 @@ <% String contextPath = request.getContextPath() ; - String username = (String)request.getParameter("j_username"); + String username = request.getParameter("j_username"); if(username == null) username = ""; - String password = (String)request.getParameter("j_password"); + String password = request.getParameter("j_password"); if(password == null) password = ""; ResourceBundleService service = (ResourceBundleService) PortalContainer.getCurrentInstance(session.getServletContext()) @@ -42,7 +42,9 @@ cookie.setPath(request.getContextPath()); cookie.setMaxAge(0); response.addCookie(cookie); - + + String uri = (String)request.getAttribute("org.gatein.portal.login.initial_uri"); + response.setCharacterEncoding("UTF-8"); response.setContentType("text/html; charset=UTF-8"); %> @@ -69,8 +71,10 @@ if(username.length() > 0 || password.length() > 0) { %> <font color="red"><%=res.getString("UILoginForm.label.SigninFail")%></font><%}%> - <form name="loginForm" action="<%= contextPath + "/login"%>" method="post" style="margin: 0px;"> - <input type="hidden" name="initialURI" value="<%=request.getAttribute("javax.servlet.forward.request_uri")%>"/> + <form name="loginForm" action="<%= contextPath + "/login"%>" method="post" style="margin: 0px;"> + <% if (uri != null) { %> + <input type="hidden" name="initialURI" value="<%=uri%>"/> + <% } %> <table> <tr class="FieldContainer"> <td class="FieldLabel"><%=res.getString("UILoginForm.label.UserName")%></td>

14 years, 9 months

1
0
0 / 0

gatein SVN: r2140 - portal/trunk/webui/eXo/src/main/java/org/exoplatform/webui/organization.

by do-not-reply＠jboss.org

Author: julien_viet Date: 2010-03-10 19:50:04 -0500 (Wed, 10 Mar 2010) New Revision: 2140 Modified: portal/trunk/webui/eXo/src/main/java/org/exoplatform/webui/organization/UIListPermissionSelector.java Log: GTNPORTAL-691 : java.io.NotSerializableException in ApplicationRegistry (cluster profile test) Modified: portal/trunk/webui/eXo/src/main/java/org/exoplatform/webui/organization/UIListPermissionSelector.java =================================================================== --- portal/trunk/webui/eXo/src/main/java/org/exoplatform/webui/organization/UIListPermissionSelector.java 2010-03-11 00:33:25 UTC (rev 2139) +++ portal/trunk/webui/eXo/src/main/java/org/exoplatform/webui/organization/UIListPermissionSelector.java 2010-03-11 00:50:04 UTC (rev 2140) @@ -22,7 +22,6 @@ import java.io.Serializable; import java.util.*; -import org.exoplatform.commons.utils.LazyPageList; import org.exoplatform.commons.utils.SerializablePageList; import org.exoplatform.portal.config.UserACL; import org.exoplatform.portal.config.UserACL.Permission; @@ -66,7 +65,7 @@ uiGrid.setLabel("UIListPermissionSelector"); uiGrid.configure("expression", new String[]{"groupId", "membership"}, new String[]{"Delete"}); UIFormPageIterator uiIterator = (UIFormPageIterator)uiGrid.getUIPageIterator(); - uiIterator.setPageList(new SerializablePageList(Permission.class, Collections.emptyList(), 10)); + uiIterator.setPageList(new SerializablePageList<Permission>(Permission.class, Collections.<Permission>emptyList(), 10)); addChild(uiIterator); uiIterator.setRendered(false); UIFormPopupWindow uiPopup = addChild(UIFormPopupWindow.class, null, null); @@ -107,9 +106,8 @@ public void clearGroups() throws Exception { - List<Object> list = new ArrayList<Object>(); UIPageIterator uiIterator = getChild(UIGrid.class).getUIPageIterator(); - uiIterator.setPageList(new LazyPageList(new AccessGroupListAccess(list), 10)); + uiIterator.setPageList(new SerializablePageList<Permission>(Permission.class, new ArrayList<Permission>(), 10)); } @SuppressWarnings("unchecked") @@ -156,7 +154,7 @@ list.add(permission); } UIPageIterator uiIterator = getChild(UIGrid.class).getUIPageIterator(); - uiIterator.setPageList(new SerializablePageList(Permission.class, list, 10)); + uiIterator.setPageList(new SerializablePageList<Permission>(Permission.class, list, 10)); return this; } @@ -175,7 +173,7 @@ break; } } - uiIterator.setPageList(new LazyPageList(new AccessGroupListAccess(list), 10)); + uiIterator.setPageList(new SerializablePageList(Permission.class, list, 10)); } @SuppressWarnings("unchecked") @@ -197,7 +195,7 @@ return; } list.add(permission); - uiIterator.setPageList(new LazyPageList(new AccessGroupListAccess(list), 10)); + uiIterator.setPageList(new SerializablePageList(Permission.class, list, 10)); } public Class<String[]> getTypeValue() @@ -236,7 +234,7 @@ uiGrid.setRendered(!publicMode_); if (publicMode_) { - uiGrid.getUIPageIterator().setPageList(new LazyPageList(new AccessGroupListAccess(null), 10)); + uiGrid.getUIPageIterator().setPageList(new SerializablePageList<Permission>(Permission.class, new ArrayList<Permission>(), 10)); } } @@ -283,12 +281,11 @@ { uiPermission.setRendered(false); } - if (uiForm != null) - { - uiForm.broadcast(event, event.getExecutionPhase()); - //event.getRequestContext().addUIComponentToUpdateByAjax(uiForm.getParent()); - event.getRequestContext().addUIComponentToUpdateByAjax(uicom); - } + + // julien: UIForm cannot be null otherwise the uiForm.findFirstComponentOfType would have thrown an NPE + uiForm.broadcast(event, event.getExecutionPhase()); + //event.getRequestContext().addUIComponentToUpdateByAjax(uiForm.getParent()); + event.getRequestContext().addUIComponentToUpdateByAjax(uicom); } }

14 years, 9 months

1
0
0 / 0

gatein SVN: r2139 - portal/trunk/docs/user-guide/en.

by do-not-reply＠jboss.org

Author: smumford Date: 2010-03-10 19:33:25 -0500 (Wed, 10 Mar 2010) New Revision: 2139 Modified: portal/trunk/docs/user-guide/en/master.xml Log: Updated releaseinfo para Modified: portal/trunk/docs/user-guide/en/master.xml =================================================================== --- portal/trunk/docs/user-guide/en/master.xml 2010-03-11 00:30:48 UTC (rev 2138) +++ portal/trunk/docs/user-guide/en/master.xml 2010-03-11 00:33:25 UTC (rev 2139) @@ -9,9 +9,10 @@ <bookinfo> <title>GateIn Documentation</title> <subtitle>GateIn</subtitle> - <releaseinfo>This is a very rough documentation issued from the merge, - content still has to be validated, we still hope that it can help the - beta testers. Thanks !</releaseinfo> + <releaseinfo>This document provides an easy to follow guide to the functions and +options available in &PRODUCT;. It is intended to +be accessible and useful to both experienced and novice portal +users.</releaseinfo> </bookinfo> <toc />

14 years, 9 months

1
0
0 / 0

gatein SVN: r2138 - in portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/spi: portlet and 1 other directory.

by do-not-reply＠jboss.org

Author: julien_viet Date: 2010-03-10 19:30:48 -0500 (Wed, 10 Mar 2010) New Revision: 2138 Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/spi/gadget/Gadget.java portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/spi/portlet/Portlet.java portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/spi/portlet/Preference.java Log: make more stuff serializable for mop replication Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/spi/gadget/Gadget.java =================================================================== --- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/spi/gadget/Gadget.java 2010-03-11 00:21:59 UTC (rev 2137) +++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/spi/gadget/Gadget.java 2010-03-11 00:30:48 UTC (rev 2138) @@ -23,13 +23,14 @@ import org.json.JSONException; import org.json.JSONObject; +import java.io.Serializable; import java.util.Iterator; /** * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> * @version $Revision$ */ -public class Gadget +public class Gadget implements Serializable { /** . */ Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/spi/portlet/Portlet.java =================================================================== --- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/spi/portlet/Portlet.java 2010-03-11 00:21:59 UTC (rev 2137) +++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/spi/portlet/Portlet.java 2010-03-11 00:30:48 UTC (rev 2138) @@ -21,6 +21,7 @@ import org.gatein.mop.api.content.ContentType; +import java.io.Serializable; import java.util.Collections; import java.util.HashMap; import java.util.Iterator; @@ -31,7 +32,7 @@ * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> * @version $Revision$ */ -public final class Portlet implements Iterable<Preference> +public final class Portlet implements Iterable<Preference>, Serializable { /** . */ Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/spi/portlet/Preference.java =================================================================== --- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/spi/portlet/Preference.java 2010-03-11 00:21:59 UTC (rev 2137) +++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/spi/portlet/Preference.java 2010-03-11 00:30:48 UTC (rev 2138) @@ -19,6 +19,7 @@ package org.exoplatform.portal.pom.spi.portlet; +import java.io.Serializable; import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -27,7 +28,7 @@ * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> * @version $Revision$ */ -public final class Preference +public final class Preference implements Serializable { /** . */

14 years, 9 months

1
0
0 / 0

gatein SVN: r2137 - portal/trunk/component/common/src/test/java/org/exoplatform/commons/chromattic.

by do-not-reply＠jboss.org

Author: julien_viet Date: 2010-03-10 19:21:59 -0500 (Wed, 10 Mar 2010) New Revision: 2137 Modified: portal/trunk/component/common/src/test/java/org/exoplatform/commons/chromattic/ChromatticIntegrationTestCase.java Log: temporarily commented out Modified: portal/trunk/component/common/src/test/java/org/exoplatform/commons/chromattic/ChromatticIntegrationTestCase.java =================================================================== --- portal/trunk/component/common/src/test/java/org/exoplatform/commons/chromattic/ChromatticIntegrationTestCase.java 2010-03-10 23:32:57 UTC (rev 2136) +++ portal/trunk/component/common/src/test/java/org/exoplatform/commons/chromattic/ChromatticIntegrationTestCase.java 2010-03-11 00:21:59 UTC (rev 2137) @@ -237,6 +237,7 @@ } public void testTwoLifeCycleWithSameRepository() { +/* chromatticManager.beginRequest(); SessionContext ctx1 = test1LF.openContext(); @@ -246,6 +247,7 @@ // assertSame(session1, session2); chromatticManager.endRequest(false); +*/ } }

14 years, 9 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

gatein-commits March 2010