February 2010 - gatein-commits - Jboss List Archives

gatein SVN: r1612 - portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application.

by do-not-reply＠jboss.org

Author: tuancn Date: 2010-02-10 05:52:33 -0500 (Wed, 10 Feb 2010) New Revision: 1612 Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortlet.java Log: GTNPORTAL-569: NoSuchDataException when delete page in Manage page Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortlet.java =================================================================== --- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortlet.java 2010-02-10 10:39:21 UTC (rev 1611) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortlet.java 2010-02-10 10:52:33 UTC (rev 1612) @@ -24,6 +24,7 @@ import org.exoplatform.portal.application.PortalRequestContext; import org.exoplatform.portal.application.UserProfileLifecycle; import org.exoplatform.portal.config.DataStorage; +import org.exoplatform.portal.config.NoSuchDataException; import org.exoplatform.portal.config.model.ApplicationType; import org.exoplatform.portal.pom.spi.portlet.Portlet; import org.exoplatform.portal.pom.spi.wsrp.WSRP; @@ -817,6 +818,9 @@ this.producerOfferedPortletContext = producerOfferedPortletContext; this.producedOfferedPortlet = producedOfferedPortlet; this.applicationId = applicationId; + } catch(NoSuchDataException de){ + log.error(de.getMessage()); + throw de; } catch (Exception e) {

14 years, 10 months

1
0
0 / 0

gatein SVN: r1611 - in portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui: workspace and 1 other directory.

by do-not-reply＠jboss.org

Author: tan_pham_dinh Date: 2010-02-10 05:39:21 -0500 (Wed, 10 Feb 2010) New Revision: 1611 Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComposer.java portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIMainActionListener.java Log: GTNPORTAL-572: Still keep the change when click Abort button of Portal Composer Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComposer.java =================================================================== --- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComposer.java 2010-02-10 10:26:47 UTC (rev 1610) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComposer.java 2010-02-10 10:39:21 UTC (rev 1611) @@ -649,6 +649,7 @@ dataService.save(page); uiToolPanel.setUIComponent(null); + PortalDataMapper.toUIPage(uiPage, page); // Update UIPage cache on UIPortal uiPortal.setUIPage(pageId, uiPage); Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIMainActionListener.java =================================================================== --- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIMainActionListener.java 2010-02-10 10:26:47 UTC (rev 1610) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIMainActionListener.java 2010-02-10 10:39:21 UTC (rev 1611) @@ -85,7 +85,9 @@ uiToolPanel.setShowMaskLayer(false); uiApp.setModeState(UIPortalApplication.APP_BLOCK_EDIT_MODE); - uiToolPanel.setWorkingComponent(pageBody.getUIComponent()); + UIPage newUIPage = new UIPage(); + PortalDataMapper.toUIPage(newUIPage, page); + uiToolPanel.setWorkingComponent(newUIPage); event.getRequestContext().addUIComponentToUpdateByAjax(uiWorkingWS); Util.getPortalRequestContext().setFullRender(true); }

14 years, 10 months

1
0
0 / 0

gatein SVN: r1610 - in components/wsrp/trunk/admin-gui/src/main/webapp/jsf: consumers and 1 other directory.

by do-not-reply＠jboss.org

Author: chris.laprun(a)jboss.com Date: 2010-02-10 05:26:47 -0500 (Wed, 10 Feb 2010) New Revision: 1610 Modified: components/wsrp/trunk/admin-gui/src/main/webapp/jsf/common/template.xhtml components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/consumerTemplate.xhtml Log: - Cleaned-up templates a little. Modified: components/wsrp/trunk/admin-gui/src/main/webapp/jsf/common/template.xhtml =================================================================== --- components/wsrp/trunk/admin-gui/src/main/webapp/jsf/common/template.xhtml 2010-02-10 10:23:39 UTC (rev 1609) +++ components/wsrp/trunk/admin-gui/src/main/webapp/jsf/common/template.xhtml 2010-02-10 10:26:47 UTC (rev 1610) @@ -1,6 +1,6 @@  + <h:messages id="status" infoClass="portlet-msg-success" errorClass="portlet-msg-error" fatalClass="portlet-msg-error" warnClass="portlet-msg-warn"/> - <div style="width:98%;margin: 0 auto"> - <ui:insert name="objectpath">Object path if needed</ui:insert> + <div style="width:98%;margin: 0 auto"> - <div class="wsrp-content-container"> - <ui:remove> - <c:if test="#{!empty title}"> - <h3>${title}</h3> - </c:if> - </ui:remove> -  + <ui:insert name="objectpath">Object path if needed</ui:insert> + <div class="wsrp-content-container"> + <ui:remove> + <c:if test="#{!empty title}"> + <h3>${title}</h3> + </c:if> + </ui:remove> -  - <ui:insert name="content">Content</ui:insert> + +  + <ui:insert name="content">Content</ui:insert> + </div> + + </div> </div> - </div> </div> - </div> - </div> </ui:composition> \ No newline at end of file Modified: components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/consumerTemplate.xhtml =================================================================== --- components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/consumerTemplate.xhtml 2010-02-10 10:23:39 UTC (rev 1609) +++ components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/consumerTemplate.xhtml 2010-02-10 10:26:47 UTC (rev 1610) @@ -1,6 +1,6 @@  - <div class="create-container"> - <h:form id="createConsumer" styleClass="createObjectForm"> - <span class="portlet-font bold">#{i18n.consumers_create_title}</span>  - <h:inputText value="#{consumersMgr.selectedId}" id="consumerName" - styleClass="portlet-form-input-field" - label="Consumer Name" required="true"/>   + <webui:blueHeaderBar> + <div class="full-width"> + <f:subview id="add-consumer" rendered="#{showAddConsumer eq true}"> + <div class="float-left half-width"> +  + <div class="create-container"> + <h:form id="createConsumer" styleClass="createObjectForm"> + <span class="portlet-font bold">#{i18n.consumers_create_title}</span>  + <h:inputText value="#{consumersMgr.selectedId}" id="consumerName" + styleClass="portlet-form-input-field" + label="Consumer Name" required="true"/>   - <webui:commandButton id="createConsumerButton" - action="createConsumer" - backingBean="#{consumersMgr}" - value="#{i18n.consumers_create_submit}"/> + <webui:commandButton id="createConsumerButton" + action="createConsumer" + backingBean="#{consumersMgr}" + value="#{i18n.consumers_create_submit}"/> - <ui:remove> - <h:message for="consumerName" errorClass="portlet-msg-error"/> - </ui:remove> - </h:form> - </div> - - - </div> - </f:subview> - - <div class="#{showAddConsumer eq true ? 'float-right half-width' : 'full-width'}"> - - <h:form id="cons-temp-form1"> - <div class="UIControlBar"> - <c:if test="#{empty title}"> - <span - class="#{consumer.active ? 'active' : 'inactive'} #{consumer.refreshNeeded ? 'needsRefresh' : ''} float-left"> - <h:outputFormat value="#{i18n.path_consumers_consumer}"> - <f:param value="#{consumer.id}"/> - </h:outputFormat> - (#{consumer.active ? i18n.path_consumers_active : i18n.path_consumers_inactive}) - #{consumer.refreshNeeded ? i18n.path_consumers_refreshNeeded : ''} - </span> - </c:if> - - <span class="#{!empty title ? 'selected' : 'pathItem'} float-right"> - <h:commandLink id="list-cons-link" class="list-cons-link" action="#{consumersMgr.listConsumers}" - value="#{i18n.path_consumers_root}"/> - </span> - - </div> - </h:form> - + <ui:remove> + <h:message for="consumerName" errorClass="portlet-msg-error"/> + </ui:remove> + </h:form> </div> - </div> - </webui:blueHeaderBar> + </div> + </f:subview> + <c:if test="#{empty showAddConsumer}"> + <span + class="#{consumer.active ? 'active' : 'inactive'} #{consumer.refreshNeeded ? 'needsRefresh' : ''} float-left"> + <h:outputFormat value="#{i18n.path_consumers_consumer}"> + <f:param value="#{consumer.id}"/> + </h:outputFormat> + (#{consumer.active ? i18n.path_consumers_active : i18n.path_consumers_inactive}) + #{consumer.refreshNeeded ? i18n.path_consumers_refreshNeeded : ''} + </span> + </c:if> + </div> + </webui:blueHeaderBar> </ui:define>

14 years, 10 months

1
0
0 / 0

gatein SVN: r1609 - components/wsrp/trunk/admin-gui/src/main/java/org/gatein/wsrp/admin/ui.

by do-not-reply＠jboss.org

Author: chris.laprun(a)jboss.com Date: 2010-02-10 05:23:39 -0500 (Wed, 10 Feb 2010) New Revision: 1609 Modified: components/wsrp/trunk/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/RedirectOnNoConsumerNavigationHandler.java Log: - Really fix the issue with persistent selected consumer id when switching back to consumers tab. Modified: components/wsrp/trunk/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/RedirectOnNoConsumerNavigationHandler.java =================================================================== --- components/wsrp/trunk/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/RedirectOnNoConsumerNavigationHandler.java 2010-02-10 09:06:38 UTC (rev 1608) +++ components/wsrp/trunk/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/RedirectOnNoConsumerNavigationHandler.java 2010-02-10 10:23:39 UTC (rev 1609) @@ -36,6 +36,9 @@ private static final String CONFIGURE_CONSUMER = "configureConsumer"; private static final String CONSUMERS = "consumers"; + /** must match ConsumerManagerBean in faces-config.xml */ + private static final String CONSUMERS_MGR = "consumersMgr"; + public RedirectOnNoConsumerNavigationHandler(NavigationHandler base) { this.base = base; @@ -63,8 +66,9 @@ } else if (CONSUMERS.equals(outcome)) { - // remove any remaining consumer id from session as we only want to list them - JSFBeanContext.getSessionMap(facesContext).remove(ConsumerManagerBean.SESSION_CONSUMER_ID); + // ensure that state is properly reset by calling ConsumerManagerBean.listConsumers() + ConsumerManagerBean consumersMgr = (ConsumerManagerBean)JSFBeanContext.getSessionMap(facesContext).get(CONSUMERS_MGR); + outcome = consumersMgr.listConsumers(); } base.handleNavigation(facesContext, fromAction, outcome);

14 years, 10 months

1
0
0 / 0

gatein SVN: r1608 - portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal.

by do-not-reply＠jboss.org

Author: hoang_to Date: 2010-02-10 04:06:38 -0500 (Wed, 10 Feb 2010) New Revision: 1608 Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComposer.java Log: GTNPORTAL-613: Don't show edit page with root in special case Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComposer.java =================================================================== --- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComposer.java 2010-02-10 07:30:24 UTC (rev 1607) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComposer.java 2010-02-10 09:06:38 UTC (rev 1608) @@ -432,6 +432,11 @@ uiPortal.getChildren().clear(); PortalDataMapper.toUIPortal(uiPortal, uiPortalApp.getUserPortalConfig()); + //To init the UIPage, that fixed a bug on AdminToolbarPortlet when edit the layout. Here is only a + //temporal solution. Complete solution is to avoid mapping UIPortal -- model, that requires + //multiple UIPortal (already available) and concept of SiteConfig + uiPortal.refreshUIPage(); + PageNodeEvent<UIPortal> pnevent = new PageNodeEvent<UIPortal>(uiPortal, PageNodeEvent.CHANGE_PAGE_NODE, uri); uiPortal.broadcast(pnevent, Event.Phase.PROCESS);

14 years, 10 months

1
0
0 / 0

gatein SVN: r1607 - portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl.

by do-not-reply＠jboss.org

Author: tan_pham_dinh Date: 2010-02-10 02:30:24 -0500 (Wed, 10 Feb 2010) New Revision: 1607 Modified: portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/GadgetRegistryServiceImpl.java Log: GTNPORTAL-612: Error when loading content of gadgets which added to dashboard Modified: portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/GadgetRegistryServiceImpl.java =================================================================== --- portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/GadgetRegistryServiceImpl.java 2010-02-10 07:25:36 UTC (rev 1606) +++ portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/GadgetRegistryServiceImpl.java 2010-02-10 07:30:24 UTC (rev 1607) @@ -68,7 +68,8 @@ public GadgetRegistryServiceImpl(ChromatticManager chromatticManager, InitParams params) { - ApplicationRegistryChromatticLifeCycle lifeCycle = (ApplicationRegistryChromatticLifeCycle)chromatticManager.getLifeCycle("app"); + ApplicationRegistryChromatticLifeCycle lifeCycle = + (ApplicationRegistryChromatticLifeCycle)chromatticManager.getLifeCycle("app"); // String gadgetDeveloperGroup = null; @@ -101,7 +102,7 @@ this.language = language; this.moduleId = moduleId; this.hostName = hostName; - this.gadgetDeveloperGroup = gadgetDeveloperGroup; + this.gadgetDeveloperGroup = gadgetDeveloperGroup; this.chromatticManager = chromatticManager; this.chromatticLifeCycle = lifeCycle; } @@ -125,7 +126,6 @@ // *************** - public Gadget getGadget(String name) throws Exception { GadgetRegistry registry = getRegistry(); @@ -179,14 +179,11 @@ LocalGadgetData data = (LocalGadgetData)def.getData(); String fileName = gadget.getName() + ".xml"; data.setFileName(fileName); - data.getResources().createFile(fileName, new Resource( - "application.xml", - "UTF-8", - ("<?xml version=\"1.0\" encoding=\"UTF-8\"?>" + - "<Module><ModulePrefs title=\"\" />" + - "<Content type=\"html\"> <![CDATA[]]>" + - "</Content>" + - "</Module>").getBytes("UTF-8"))); + data.getResources().createFile( + fileName, + new Resource("application.xml", "UTF-8", ("<?xml version=\"1.0\" encoding=\"UTF-8\"?>" + + "<Module><ModulePrefs title=\"\" />" + "<Content type=\"html\"> <![CDATA[]]>" + "</Content>" + + "</Module>").getBytes("UTF-8"))); } else { @@ -238,7 +235,9 @@ if (data instanceof LocalGadgetData) { LocalGadgetData localData = (LocalGadgetData)data; - url = "jcr/repository/portal-system/production/app:gadgets/app:" + def.getName() + "/app:data/app:resources/" + localData.getFileName(); + url = + "jcr/repository/" + chromatticLifeCycle.getWorkspaceName() + "/app:gadgets/app:" + def.getName() + + "/app:data/app:resources/" + localData.getFileName(); } else { @@ -265,12 +264,12 @@ public String getCountry() { - return country ; + return country; } public String getLanguage() { - return language ; + return language; } public String getModuleId() @@ -280,6 +279,6 @@ public String getHostName() { - return hostName ; + return hostName; } }

14 years, 10 months

1
0
0 / 0

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

by do-not-reply＠jboss.org

Author: smumford Date: 2010-02-10 02:25:36 -0500 (Wed, 10 Feb 2010) New Revision: 1606 Added: portal/trunk/docs/user-guide/en/images/Dashname.png Modified: portal/trunk/docs/user-guide/en/images/AccountSetting.png Log: Incorporate RH QE feedback Modified: portal/trunk/docs/user-guide/en/images/AccountSetting.png =================================================================== (Binary files differ) Added: portal/trunk/docs/user-guide/en/images/Dashname.png =================================================================== (Binary files differ) Property changes on: portal/trunk/docs/user-guide/en/images/Dashname.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream

14 years, 10 months

1
0
0 / 0

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

by do-not-reply＠jboss.org

Author: smumford Date: 2010-02-10 02:25:18 -0500 (Wed, 10 Feb 2010) New Revision: 1605 Modified: portal/trunk/docs/user-guide/en/modules/Introduction.xml portal/trunk/docs/user-guide/en/modules/account/Account_and_Password_Retrieval.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/Manage_Gadgets_in_User_Workspace.xml portal/trunk/docs/user-guide/en/modules/language/Internationalization_Portlet.xml portal/trunk/docs/user-guide/en/modules/portal/Change_Portal_Skins.xml portal/trunk/docs/user-guide/en/modules/portal/Manage_Navigation_Nodes.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 Log: Incorporate RH QE feedback Modified: portal/trunk/docs/user-guide/en/modules/Introduction.xml =================================================================== --- portal/trunk/docs/user-guide/en/modules/Introduction.xml 2010-02-10 07:24:32 UTC (rev 1604) +++ portal/trunk/docs/user-guide/en/modules/Introduction.xml 2010-02-10 07:25:18 UTC (rev 1605) @@ -6,23 +6,43 @@ <chapter id="chap-User_Guide-Introduction"> <title>Introduction</title> <para> - GateIn is a merge of two mature projects; JBoss Portal and eXo Portal. It takes the best of both offerings and incorporates them into a single new project. The aim is to provide an intuitive portal for as-is use and a framework to build upon depending on your needs. + &PRODUCT; is a merge of two mature projects; JBoss Portal and eXo Portal. It takes the best of both offerings and incorporates them into a single new project. The aim is to provide an intuitive portal for as-is use and a framework to build upon depending on your needs. </para> <mediaobject> <imageobject> <imagedata fileref="images/Frontpage.png" format="PNG" scalefit="1" width="444" /> </imageobject> </mediaobject> + <section> + <title>Getting Started</title> + <para> + For instructions on how to install and run &PRODUCT;, refer to the Installation guide available at <ulink type="http" url="www.redhat.com/docs"></ulink> + </para> + </section> <section id="sect-User_Guide-Introduction-Links"> <title>Links</title> + <important> + <title>&PRODUCT; Download</title> + <para> + <emphasis role="bold">This link is a placeholder for the final download location:</emphasis> + </para> + <para> + <ulink type="http" url="http://download.devel.redhat.com/devel/candidates/JBEPP/5.0.0_ER2/"></ulink> + </para> + </important> <itemizedlist> <listitem> <para> - GateIn project homepage. GateIn 3.0 is the community project that Enterprise Portal Platform 5.0 is based on. <ulink url="http://www.gatein.org"></ulink> + GateIn project homepage. GateIn 3.0 is the community project that &PRODUCT; is based on. <ulink url="http://www.gatein.org"></ulink> </para> </listitem> <listitem> <para> + GateIn downloads: <ulink url="http://www.jboss.org/gatein/downloads.html">www.jboss.org/gatein/downloads.html</ulink> + </para> + </listitem> + <listitem> + <para> Further documentation about the Red Hat &PRODUCT; and other Red Hat products can be found at <ulink type="http" url="www.redhat.com/docs"></ulink> </para> </listitem> @@ -36,12 +56,7 @@ <para> GateIn documentation: <ulink url="http://www.jboss.org/gatein/documentation.html">www.jboss.org/gatein/documentation.html</ulink> </para> - </listitem> - <listitem> - <para> - GateIn downloads: <ulink url="http://www.jboss.org/gatein/downloads.html">www.jboss.org/gatein/downloads.html</ulink> - </para> - </listitem> --> + </listitem> --> </itemizedlist> </section> 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-02-10 07:24:32 UTC (rev 1604) +++ portal/trunk/docs/user-guide/en/modules/account/Account_and_Password_Retrieval.xml 2010-02-10 07:25:18 UTC (rev 1605) @@ -45,12 +45,12 @@ <itemizedlist> <listitem> <para> - <emphasis role="bold">Forgot my password</emphasis> : If you forget your password, you need to select this option. + <emphasis role="bold">Forgot my password</emphasis>. If you forget your password, you need to select this option. </para> </listitem> <listitem> <para> - <emphasis role="bold">Forgot my username</emphasis> : If you forget your username, you need to select this option. + <emphasis role="bold">Forgot my username</emphasis>. If you forget your username, you need to select this option. </para> </listitem> </itemizedlist> 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-02-10 07:24:32 UTC (rev 1604) +++ portal/trunk/docs/user-guide/en/modules/account/Register_New_Accounts.xml 2010-02-10 07:25:18 UTC (rev 1605) @@ -28,7 +28,7 @@ Users who visit the Portal and who are not registered are limited in the content they can see. Users who need access to deeper content or who need to undertake actions within the prtal should register themselves and then contact the portal administrator to have appropriate permissions added to their account. </para> <para> - Users can quickly and easily register a new account by themselves. Just by completing the steps below, you will have a new account that helps you access more pages and take more actions in &PRODUCT;: + Users can quickly and easily register a new account for themselves. Complete the steps below: </para> <procedure> <step> @@ -58,7 +58,7 @@ <term>User Name</term> <listitem> <para> - The name that the user uses to login. + The name used to login. </para> </listitem> </varlistentry> @@ -82,7 +82,7 @@ <term>First Name</term> <listitem> <para> - The first name of the user. + The user's first name. </para> </listitem> </varlistentry> @@ -90,7 +90,7 @@ <term>Last Name</term> <listitem> <para> - The last name of the user. + The user's last name. </para> </listitem> </varlistentry> @@ -98,7 +98,7 @@ <term>Email Address</term> <listitem> <para> - The email address of the user. It must be in the appropriate format, example: username(a)abc.com. + The user's email address. This must be in the appropriate format. For example: username(a)abc.com. </para> </listitem> </varlistentry> @@ -111,10 +111,10 @@ </step> <step> <para> - Click the magnifying glass icon to search and check if the chosen username is available. + Click the 'find' icon beside the user name field to check if the chosen username is available. </para> </step> - <step> + <step> <para> - Click <emphasis role="bold">Save</emphasis> to register a new account or <emphasis role="bold">Reset</emphasis> to refresh all entered values. You cannot add a new account if one of these cases occurs: + Click <emphasis role="bold">Subscribe</emphasis> to register a new account or <emphasis role="bold">Reset</emphasis> to refresh all entered values. You cannot add a new account if one of these cases occurs: </para> <itemizedlist> <listitem> @@ -149,7 +149,7 @@ </listitem> <listitem> <para> - The <emphasis role="bold">Email Address</emphasis> format is not valid + The <emphasis role="bold">Email Address</emphasis> format is not valid. </para> </listitem> <listitem> @@ -165,7 +165,7 @@ <note> <title>Note</title> <para> - Be sure you enter your email address carefully. If you should forget your user name or password, you can recover it by using this email address. + Be sure you enter your email address carefully. If you should forget your user name or password, you can recover it with this email address. </para> </note> </para> 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-02-10 07:24:32 UTC (rev 1604) +++ portal/trunk/docs/user-guide/en/modules/account/Remember_User_Account.xml 2010-02-10 07:25:18 UTC (rev 1605) @@ -25,7 +25,7 @@ --><title>Remember User Account</title> <para> - This feature allows users to return to the &PRODUCT; and be automatically authenticated based on the value of a cookie provided by the browser. Thus users do not have to perform an explicit authentication again. + Users can return to the &PRODUCT; and be automatically authenticated with a cookie provided by their browser. Thus users do not have to perform an explicit authentication each time they access the portal. </para> <mediaobject> <imageobject> @@ -35,7 +35,7 @@ <procedure> <step> <para> - Input your registered <emphasis role="bold">User name</emphasis> and <emphasis role="bold">Password</emphasis> . + Input your registered user name and password. </para> </step> <step> @@ -50,8 +50,9 @@ </step> </procedure> <para> - You must remember to close your browser without signing out (as signing out will delete the cookie). The next time, you can automatically sign in the portal without signing in again with your first/last name welcome. + You must remember to close your browser without signing out (as signing out will delete the cookie). This will allow you to re-enter the portal without having to sign in again. </para> + </section> 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-02-10 07:24:32 UTC (rev 1604) +++ portal/trunk/docs/user-guide/en/modules/account/Sign_in_and_Sign_out.xml 2010-02-10 07:25:18 UTC (rev 1605) @@ -26,141 +26,135 @@ --><title>Sign In and Sign Out</title> <para> - After registering your account, you can sign in to &PRODUCT; to go into your private mode. + After registering your account, you can sign in to &PRODUCT; to go into private mode. </para> - <procedure> - <title>Sign In</title> - <step> - <para> - Go to a Portal in the public mode by inputting URL in the address bar (e.g: http://localhost:8080/portal) - </para> - </step> - <step> - <para> - Click the <emphasis role="bold">Sign in</emphasis> link at the top right of the page if you are current in the Classic portal. The <emphasis role="bold">Sign in</emphasis> form appears: + <para> + To sign in to a portal, users must complete the <emphasis role="bold">Sign in</emphasis> form. This form contains the following elements: + </para> + <variablelist> + <varlistentry> + <term> + User name + </term> + <listitem> + <para> + The registered user name. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + Password + </term> + <listitem> + <para> + The registered password. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + Remember My Login + </term> + <listitem> + <para> + This option allows users to return to &PRODUCT; and be automatically authenticated based on the value of a cookie provided by the <literal>bvarlistentryser</literal>. Thus users do not have to perform an explicit authentication again. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + Forgot your User Name/Password? + </term> + <listitem> + <para> + To follow some steps to get the forgotten user name or password. Please refer [Portal:Account and Password Retrieval] for more details. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + Sign in + </term> + <listitem> + <para> + To sign into &PRODUCT; with user name and password. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + Discard + </term> + <listitem> + <para> + Close the Sign In form without logging in. + </para> + </listitem> + </varlistentry> + </variablelist> + <procedure> + <title>Sign In</title> + <step> + <para> + Go to your Portal by entering the URL into the address bar of your browser (For example http://localhost:8080/portal). + </para> + </step> + <step> + <para> + Click the <emphasis role="bold">Sign in</emphasis> link at the top right of the page if you are current in the Classic portal. The <emphasis role="bold">Sign in</emphasis> form appears: + </para> + <mediaobject> + <imageobject> + <imagedata fileref="images/SignIn2.6.png" format="PNG" width="444" /> + </imageobject> + </mediaobject> + </step> + <step> + <para> + Input your registered <emphasis role="bold">User name</emphasis> and <emphasis role="bold">Password</emphasis> . + </para> + </step> + <step> + <para> + Select the <emphasis role="bold">Remember My Login</emphasis> check box when you sign in &PRODUCT; at the first time if you want to automatically return to &PRODUCT; without signing in again. You can see <xref linkend="sect-User_Guide-Remember_User_Account" /> for more details. + </para> + </step> + <step> + <para> + Click the <emphasis role="bold">Sign in</emphasis> button to submit the form or <emphasis role="bold">Discard</emphasis> to escape. + </para> + </step> + </procedure> + <para> + If the user name does not exist or the user name and/or password is invalid an alert message will appear. To attempt the login again; click the <emphasis role="bold">OK</emphasis> button on the alert message to be returned to the Sign In form. Enter the user name and password again. </para> + <para> + After signing in, you will be redirected to the homepage and welcomed with your full name in the top right corner of the page. + </para> <mediaobject> <imageobject> - <imagedata fileref="images/SignIn2.6.png" format="PNG" width="444" /> + <imagedata fileref="images/PortalHome.png" format="PNG" width="444" /> </imageobject> </mediaobject> - </step> - <step> - <para> - Input your registered <emphasis role="bold">User name</emphasis> and <emphasis role="bold">Password</emphasis> . - </para> - </step> - <step> - <para> - Select the <emphasis role="bold">Remember My Login</emphasis> check box when you sign in &PRODUCT; at the first time if you want to automatically return to &PRODUCT; without signing in again. You can see <xref linkend="sect-User_Guide-Remember_User_Account" /> for more details. - </para> - </step> - <step> - <para> - Click the <emphasis role="bold">Sign in</emphasis> button to submit the form or <emphasis role="bold">Discard</emphasis> to escape. - </para> - </step> - <step> - <para> - Details: - </para> - <variablelist> - <varlistentry> - <term> - User name - </term> - <listitem> - <para> - The registered user name. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - Password - </term> - <listitem> - <para> - The registered password. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - Remember My Login - </term> - <listitem> - <para> - This option allows users to return to &PRODUCT; and be automatically authenticated based on the value of a cookie provided by the bvarlistentryser. Thus users do not have to perform an explicit authentication again. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - Forgot your User Name/Password? - </term> - <listitem> - <para> - To follow some steps to get the forgotten user name or password. Please refer [Portal:Account and Password Retrieval] for more details. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - Sign in - </term> - <listitem> - <para> - To sign into &PRODUCT; with user name and password. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - Discard - </term> - <listitem> - <para> - To close the *Sign In* form. - </para> - </listitem> - </varlistentry> - </variablelist> - <para> - If <emphasis role="bold">User Name</emphasis> does not exist or the User name/Password is invalid an alert message will appear. This alert requires you to input a recognised value. To attempt the login again; click the <emphasis role="bold">OK</emphasis> button on the alert message to be returned to the Sign In form. Enter <emphasis role="bold">User Name</emphasis> and <emphasis role="bold">Password</emphasis> again. - </para> - <para> - After signing in, you will be redirected to the authenticated homepage: - </para> - <para> - After signing in, you will be redirected to the authenticated homepage and welcomed with your full First Name and Last Name: - </para> - <mediaobject> - <imageobject> - <imagedata fileref="images/PortalHome.png" format="PNG" width="444" /> - </imageobject> - </mediaobject> - </step> - </procedure> - - <procedure> - <title>Sign Out</title> - <step> - <para> - This function lets you get back to the anonymous portal. It ends your current portal session. - </para> - </step> - <step> - <para> - In the upper left corner of the screen, click <emphasis role="bold">Sign out</emphasis> : - </para> - <mediaobject> - <imageobject> - <imagedata fileref="images/SignOut.png" format="PNG" /> - </imageobject> - </mediaobject> - </step> - </procedure> + <procedure> + <title>Sign Out</title> + <step> + <para> + This function lets you get back to the anonymous portal. It ends your current portal session. + </para> + </step> + <step> + <para> + In the upper left corner of the screen, click <emphasis role="bold">Sign out</emphasis> : + </para> + <mediaobject> + <imageobject> + <imagedata fileref="images/SignOut.png" format="PNG" /> + </imageobject> + </mediaobject> + </step> + </procedure> </section> Modified: portal/trunk/docs/user-guide/en/modules/gadgetsAdmin/Manage_Gadgets_in_User_Workspace.xml =================================================================== --- portal/trunk/docs/user-guide/en/modules/gadgetsAdmin/Manage_Gadgets_in_User_Workspace.xml 2010-02-10 07:24:32 UTC (rev 1604) +++ portal/trunk/docs/user-guide/en/modules/gadgetsAdmin/Manage_Gadgets_in_User_Workspace.xml 2010-02-10 07:25:18 UTC (rev 1605) @@ -3,7 +3,7 @@ <!ENTITY % BOOK_ENTITIES SYSTEM "../../User_Guide.ent"> %BOOK_ENTITIES; ]> -<section id="sect-User_Guide-Manage_Gadgets_in_User_Workspace"> +<section id="sect-User_Guide-Manage_Gadgets"> <title>Manage Gadgets</title> <para> Gadgets are a small convenient applications that help portal users perform private actions. &PRODUCT; provides you with some gadgets by default (see <xref linkend="sect-User_Guide-Dashboard_Portlet-Using_the_Dashboard_Workspace"/>. Modified: portal/trunk/docs/user-guide/en/modules/language/Internationalization_Portlet.xml =================================================================== --- portal/trunk/docs/user-guide/en/modules/language/Internationalization_Portlet.xml 2010-02-10 07:24:32 UTC (rev 1604) +++ portal/trunk/docs/user-guide/en/modules/language/Internationalization_Portlet.xml 2010-02-10 07:25:18 UTC (rev 1605) @@ -91,7 +91,7 @@ <section id="sect-User_Guide-Internationalization_Portlet-View_and_Edit_a_Resource"> <title>View and Edit a Resource</title> <para> - Click the magnifying glass icon corresponding to the resource which you want to view. On the view form, you also can edit information by clicking the <emphasis role="bold">Edit</emphasis> button. You can only edit the <emphasis role="bold">Resource</emphasis> field. + Click the 'find' icon corresponding to the resource which you want to view. On the view form, you also can edit information by clicking the <emphasis role="bold">Edit</emphasis> button. You can only edit the <emphasis role="bold">Resource</emphasis> field. </para> <para> Click the <emphasis role="bold">Save</emphasis> button to submit your changes or click the <emphasis role="bold">Cancel</emphasis> button to quit without saving any changes. Modified: portal/trunk/docs/user-guide/en/modules/portal/Change_Portal_Skins.xml =================================================================== --- portal/trunk/docs/user-guide/en/modules/portal/Change_Portal_Skins.xml 2010-02-10 07:24:32 UTC (rev 1604) +++ portal/trunk/docs/user-guide/en/modules/portal/Change_Portal_Skins.xml 2010-02-10 07:25:18 UTC (rev 1605) @@ -77,6 +77,9 @@ </listitem> </varlistentry> </variablelist> + <para> + More information about adding skins to a portal see the &PRODUCT; Reference Guide at <ulink type="http" url="www.redhat.com/docs"></ulink> + </para> </section> 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-02-10 07:24:32 UTC (rev 1604) +++ portal/trunk/docs/user-guide/en/modules/portal/Manage_Navigation_Nodes.xml 2010-02-10 07:25:18 UTC (rev 1605) @@ -175,7 +175,7 @@ </step> <step> <para> - Click the magnifying glass icon to perform the search. All pages matching with search term will be listed. + Click the 'find' icon to perform the search. All pages matching with search term will be listed. </para> </step> <step> Modified: portal/trunk/docs/user-guide/en/modules/portal/User_Management.xml =================================================================== --- portal/trunk/docs/user-guide/en/modules/portal/User_Management.xml 2010-02-10 07:24:32 UTC (rev 1604) +++ portal/trunk/docs/user-guide/en/modules/portal/User_Management.xml 2010-02-10 07:25:18 UTC (rev 1605) @@ -50,7 +50,7 @@ </step> <step> <para> - Click the magnifying glass icon to begin the search. + Click the 'find' icon to begin the search. </para> </step> </procedure> Modified: portal/trunk/docs/user-guide/en/modules/portletsUser/Dashboard_Portlet.xml =================================================================== --- portal/trunk/docs/user-guide/en/modules/portletsUser/Dashboard_Portlet.xml 2010-02-10 07:24:32 UTC (rev 1604) +++ portal/trunk/docs/user-guide/en/modules/portletsUser/Dashboard_Portlet.xml 2010-02-10 07:25:18 UTC (rev 1605) @@ -6,7 +6,7 @@ <section id="sect-User_Guide-Dashboard_Portlet"> <title>Dashboard Portlet</title> <para> - The Dashboard portlet is used for hosting mini applications known as gadgets. The Dashboard uses a variety of graphical effects for displaying, opening and using gadgets. Gadgets can be moved around, rearranged, deleted and created. 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 as independent as different portlets instances. + The Dashboard portlet is used for hosting mini applications known as gadgets. The Dashboard uses a variety of graphical effects for displaying, opening and using gadgets. Gadgets can be moved, rearranged, created and 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 as independent as different portlets instances. </para> <mediaobject> <imageobject> @@ -17,11 +17,30 @@ <section id="sect-User_Guide-Dashboard_Portlet-Using_the_Dashboard_Workspace"> <title>Using the Dashboard Workspace</title> + <procedure> + <step> + <para> + Click on <emphasis role="bold">Dashboard</emphasis> in the toolbar to access the Dashboard portlet. + </para> + </step> + <step> + <para> + Click on <emphasis role="bold">Add Gadgets</emphasis> to open the Dashboard Workspace. + </para> + </step> + + </procedure> <para> - Click on <emphasis role="bold">Add Gadgets</emphasis> to open the Dashboard Workspace. + The active Dashboard can be individually named by clicking on the default name ("<emphasis>Click and Type Page Name</emphasis>") where it appears below the current user name (see image below) and entering a new name. </para> + <mediaobject> + <imageobject> + <imagedata fileref="images/Dashname.png" format="PNG" width="444" /> + </imageobject> + </mediaobject> + <para> - A popup window listing all available gadgets appears. There are four gadgets built into &PRODUCT; by default however you can add many more. + The Dashboard Workspace lists all available gadgets. There are four gadgets built into &PRODUCT; by default, however you can add many more. </para> <mediaobject> <imageobject> @@ -96,21 +115,38 @@ <section id="sect-User_Guide-Dashboard_Portlet-Add_Gadgets"> <title>Add Gadgets</title> <para> - To add more gadgets, do the following: + To add more gadgets from external sources: </para> - <para> - Open the popup to add gadgets - </para> <procedure> <step> <para> - While in the Dashboard portlet, click the <emphasis role="bold">Add Gadgets</emphasis> link + Obtain the URL (.xml or .rss) of the gadget you wish to add from the gadget source. + </para> + <para> + For example; the gadgets available at <ulink type="http" url="http://www.google.com/ig/directory?synd=open">Google Gadget</ulink> provide a link to <emphasis role="bold">View source</emphasis>. Clicking on this will open a page showing the gadget's XML source. Use the URL of this page in the Dashboard Workspace. The URL should end in <literal>.xml</literal> + </para> + <note> + <title>URL Types</title> + <para> + Remote gadgets can be only created using an .xml link or RSS URL. However, if you use a link that generates an RSS feed (for example: http://feeds.feedburner.com/gatein), a new RSS reader gadget will be created automatically. + </para> + </note> + </step> + <step> + <para> + Return to your portal and click the Dashboard link in the toolbar. + </para> + </step> + <step> + <para> + Click on <emphasis role="bold">Add Gadgets</emphasis> in the Dashboard to open the Dashboard Workspace. + </para> <mediaobject> <imageobject> <imagedata fileref="images/Dashboard1.png" format="PNG" width="444" /> </imageobject> </mediaobject> - </para> + </step> <step> <para> @@ -124,21 +160,12 @@ </step> <step> <para> - Enter a link (.xml or .rss) in the text box above the gadgets list. + Paste the URL obtained in step 1 into the text box above the gadget list. </para> - <note> - <title>Note</title> - <para> - If you enter an .rss file or a link that generate an RSS feed (for example: http://feeds.feedburner.com/gatein), a new RSS gadget reader will be created in the dashboard. - </para> - </note> - <para> - Remote gadgets can be only created using the .xml file format (which is the standard gadget format). - </para> </step> <step> <para> - Click on the + icon to add a new gadget to the gadget list. + Click on the <emphasis role="bold">plus</emphasis> icon to add the new gadget to the page. </para> </step> </procedure> Modified: portal/trunk/docs/user-guide/en/modules/portletsUser/Functional_Portlets.xml =================================================================== --- portal/trunk/docs/user-guide/en/modules/portletsUser/Functional_Portlets.xml 2010-02-10 07:24:32 UTC (rev 1604) +++ portal/trunk/docs/user-guide/en/modules/portletsUser/Functional_Portlets.xml 2010-02-10 07:25:18 UTC (rev 1605) @@ -6,8 +6,11 @@ <section id="sect-User_Guide-Functional_Portlets"> <title>Functional Portlets</title> <para> - Portlets are pluggable user interface components that are managed and displayed within a portal. Functional Portlets support all functions of a Portal. &PRODUCT; provides the following portlets by default: + Portlets are pluggable user interface components that are managed and displayed within a portal. Functional Portlets support all functions of a Portal. They are built into the portal and are accessed via toolbar links as required when actioning portal tasks. </para> + <para> + &PRODUCT; provides the following portlets by default. + </para> <variablelist> <varlistentry>

14 years, 10 months

1
0
0 / 0

gatein SVN: r1604 - portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US.

by do-not-reply＠jboss.org

Author: smumford Date: 2010-02-10 02:24:32 -0500 (Wed, 10 Feb 2010) New Revision: 1604 Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/User_Guide.ent portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/User_Guide.xml Log: Incorporate RH QE feedback Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/User_Guide.ent =================================================================== --- portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/User_Guide.ent 2010-02-10 03:41:38 UTC (rev 1603) +++ portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/User_Guide.ent 2010-02-10 07:24:32 UTC (rev 1604) @@ -1,4 +1,4 @@ <!ENTITY PRODUCT "Enterprise Portal Platform 5.0"> <!ENTITY BOOKID "User Guide"> -<!ENTITY YEAR "2009"> +<!ENTITY YEAR "2010"> <!ENTITY HOLDER "Red Hat, Inc"> Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/User_Guide.xml =================================================================== --- portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/User_Guide.xml 2010-02-10 03:41:38 UTC (rev 1603) +++ portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/User_Guide.xml 2010-02-10 07:24:32 UTC (rev 1604) @@ -2,8 +2,6 @@ <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [ <!ENTITY % BOOK_ENTITIES SYSTEM "User_Guide.ent"> %BOOK_ENTITIES; -<!ENTITY % BOOK_ENTITIES SYSTEM "Enterprise_Portal_Platform_User_Guide.ent"> -%BOOK_ENTITIES; ]> <book status="draft"> <xi:include href="Book_Info.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />

14 years, 10 months

1
0
0 / 0

gatein SVN: r1603 - in portal/trunk: webui/eXo/src/main/java/org/exoplatform/webui/organization and 1 other directories.

by do-not-reply＠jboss.org

Author: liem_nguyen Date: 2010-02-09 22:41:38 -0500 (Tue, 09 Feb 2010) New Revision: 1603 Modified: portal/trunk/portlet/exoadmin/src/main/webapp/groovy/navigation/webui/component/UINavigationGrid.gtmpl portal/trunk/webui/eXo/src/main/java/org/exoplatform/webui/organization/OrganizationUtils.java portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UIPageNavigationForm.java Log: GTNPORTAL-616 Remove navigtion description concept and use group description instead Modified: portal/trunk/portlet/exoadmin/src/main/webapp/groovy/navigation/webui/component/UINavigationGrid.gtmpl =================================================================== --- portal/trunk/portlet/exoadmin/src/main/webapp/groovy/navigation/webui/component/UINavigationGrid.gtmpl 2010-02-10 02:25:10 UTC (rev 1602) +++ portal/trunk/portlet/exoadmin/src/main/webapp/groovy/navigation/webui/component/UINavigationGrid.gtmpl 2010-02-10 03:41:38 UTC (rev 1603) @@ -10,8 +10,7 @@ <div id="$uicomponent.id" class="FeedBox"> <% boolean isEvenRow = true; - for(navigation in navigations) { - description = (navigation.getDescription()==null)? "" : navigation.getDescription(); + for(navigation in navigations) { deleteLink = parent.event("DeleteNavigation",String.valueOf(navigation.getId())); editProperties = parent.event("EditProperties",String.valueOf(navigation.getId())); editLink = parent.event("EditNavigation",String.valueOf(navigation.getId()));%> @@ -20,7 +19,7 @@ <td class="Image"><img src="/exoadmin/skin/navigation/webui/component/background/GroupImage.png" alt="" /></td> <td class="Content"> <div class="Label" title="$navigation.ownerId"><%= OrganizationUtils.getGroupLabel(navigation.ownerId) %></div> - <div><%=_ctx.appRes("UIGroupNavigationManagement.Label.Description")%>: <%= description%></div> + <div><%=_ctx.appRes("UIGroupNavigationManagement.Label.Description")%>: <%= OrganizationUtils.getGroupDescription(navigation.ownerId) %></div> </td> <td class="ActionBlock"> <a href="<%=editLink%>" class="EditNavIcon"><%=_ctx.appRes("UIGroupNavigationManagement.Label.EditNavigation")%></a> Modified: portal/trunk/webui/eXo/src/main/java/org/exoplatform/webui/organization/OrganizationUtils.java =================================================================== --- portal/trunk/webui/eXo/src/main/java/org/exoplatform/webui/organization/OrganizationUtils.java 2010-02-10 02:25:10 UTC (rev 1602) +++ portal/trunk/webui/eXo/src/main/java/org/exoplatform/webui/organization/OrganizationUtils.java 2010-02-10 03:41:38 UTC (rev 1603) @@ -49,5 +49,18 @@ cachedGroupLabel = (label != null && label.trim().length() > 0 )? label : group.getGroupName(); return cachedGroupLabel; } + + static public String getGroupDescription(String groupId) throws Exception { + WebuiRequestContext context = WebuiRequestContext.getCurrentInstance(); + ExoContainer container = context.getApplication().getApplicationServiceContainer(); + OrganizationService orgService = + (OrganizationService)container.getComponentInstanceOfType(OrganizationService.class); + String description = ""; + Group group = orgService.getGroupHandler().findGroupById(groupId); + if (group != null) { + description = group.getDescription(); + } + return description; + } } Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UIPageNavigationForm.java =================================================================== --- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UIPageNavigationForm.java 2010-02-10 02:25:10 UTC (rev 1602) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UIPageNavigationForm.java 2010-02-10 03:41:38 UTC (rev 1603) @@ -40,8 +40,6 @@ import org.exoplatform.webui.form.UIForm; import org.exoplatform.webui.form.UIFormSelectBox; import org.exoplatform.webui.form.UIFormStringInput; -import org.exoplatform.webui.form.UIFormTextAreaInput; -import org.exoplatform.webui.form.validator.StringLengthValidator; import java.util.ArrayList; import java.util.List; @@ -62,8 +60,6 @@ private String ownerId; - private String description; - private String ownerType; private String priority; @@ -82,8 +78,6 @@ } addUIFormInput(new UIFormStringInput("ownerType", "ownerType", getOwnerType()).setEditable(false)) .addUIFormInput(new UIFormStringInput("ownerId", "ownerId", ownerId).setEditable(false)).addUIFormInput( - new UIFormTextAreaInput("description", "description", getDescription()).addValidator( - StringLengthValidator.class, 0, 255)).addUIFormInput( new UIFormSelectBox("priority", null, priorties).setValue(getPriority())); } @@ -91,8 +85,7 @@ { setPageNav(pageNavigation); invokeGetBindingBean(pageNavigation); - removeChildById("ownerId"); - // getUIStringInput("creator").setValue(pageNavigation.getCreator()); + removeChildById("ownerId"); UIFormStringInput ownerId = new UIFormStringInput("ownerId", "ownerId", pageNavigation.getOwnerId()); ownerId.setEditable(false); ownerId.setParent(this); @@ -111,16 +104,6 @@ return ownerId; } - public void setDescription(String description) - { - this.description = description; - } - - public String getDescription() - { - return description; - } - public void setOwnerType(String ownerType) { this.ownerType = ownerType;

14 years, 10 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

gatein-commits February 2010