Author: trong.tran Date: 2010-03-06 13:34:42 -0500 (Sat, 06 Mar 2010) New Revision: 2016 Modified: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_ar.xml portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_de.properties portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_en.properties portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_es.properties portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_it.properties portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_ja.properties portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_ko.xml portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_ne.properties portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_nl.properties portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_vi.xml portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_zh.xml portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_zh_TW.xml portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/portal/UIPortalComposer.gtmpl portal/trunk/web/portal/src/main/webapp/groovy/webui/form/UIForm.gtmpl portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/PortalRequestContext.java portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageBody.java portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortal.java 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/UIPortalApplication.java Log: GTNPORTAL-799 Fix non displaying of field labels in form, Clean up code and resource bundle files Modified: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_ar.xml =================================================================== --- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_ar.xml 2010-03-06 15:19:32 UTC (rev 2015) +++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_ar.xml 2010-03-06 18:34:42 UTC (rev 2016) @@ -98,11 +98,6 @@ <!-- ##org.exoplatform.applicationregistry.webui.component.UIApplicationInfo --> - <UIPermissionForm> - <label> - <UIListPermissionSelector /> - </label> - </UIPermissionForm> <UIApplicationInfo> <label> <name>:الاسم</name> @@ -160,7 +155,6 @@ <name>:اسم الفئة</name> <displayName>#{label.displayName}</displayName> <description>#{label.description}</description> - <UIListPermissionSelector /> </label> <action> <Save>#{word.save}</Save> Modified: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_de.properties =================================================================== --- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_de.properties 2010-03-06 15:19:32 UTC (rev 2015) +++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_de.properties 2010-03-06 18:34:42 UTC (rev 2016) @@ -52,7 +52,6 @@ UIApplicationRegistryEditMode.label.showImport=Import anzeigen ##org.exoplatform.applicationregistry.webui.component.UIApplicationInfo -UIPermissionForm.label.UIListPermissionSelector= UIApplicationInfo.label.name=Name: UIApplicationInfo.label.displayName=#{label.displayName} UIApplicationInfo.label.description=#{label.description} @@ -87,7 +86,6 @@ UICategoryForm.action.Save=#{word.save} UICategoryForm.action.Cancel=#{word.cancel} UICategoryForm.msg.SameName=Diese Kategorie existiert bereits! -UICategoryForm.label.UIListPermissionSelector= UICategoryForm.tab.label.categoryPermission=Berechtigungs-Einstellungen UICategoryForm.tab.label.categorySetting=Kategorie-Einstellungen Modified: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_en.properties =================================================================== --- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_en.properties 2010-03-06 15:19:32 UTC (rev 2015) +++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_en.properties 2010-03-06 18:34:42 UTC (rev 2016) @@ -52,7 +52,6 @@ UIApplicationRegistryEditMode.label.showImport=Change Show Import ##org.exoplatform.applicationregistry.webui.component.UIApplicationInfo -UIPermissionForm.label.UIListPermissionSelector=Select Permission UIApplicationInfo.label.name=Name: UIApplicationInfo.label.displayName=#{label.displayName} UIApplicationInfo.label.description=#{label.description} @@ -88,7 +87,6 @@ UICategoryForm.action.Save=#{word.save} UICategoryForm.action.Cancel=#{word.cancel} UICategoryForm.msg.SameName=This category is existing, please enter another one! -UICategoryForm.label.UIListPermissionSelector= Select Permission UICategoryForm.tab.label.categoryPermission=Permission Setting UICategoryForm.tab.label.categorySetting=Category Setting Modified: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_es.properties =================================================================== --- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_es.properties 2010-03-06 15:19:32 UTC (rev 2015) +++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_es.properties 2010-03-06 18:34:42 UTC (rev 2016) @@ -52,7 +52,6 @@ UIApplicationRegistryEditMode.label.showImport=Change Show Import ##org.exoplatform.applicationregistry.webui.component.UIApplicationInfo -UIPermissionForm.label.UIListPermissionSelector= UIApplicationInfo.label.name=Nombre: UIApplicationInfo.label.displayName=#{label.displayName} UIApplicationInfo.label.description=#{label.description} @@ -88,7 +87,6 @@ UICategoryForm.action.Save=#{word.save} UICategoryForm.action.Cancel=#{word.cancel} UICategoryForm.msg.SameName=Esta categor\u00eda ya existe , por favor seleccione otra! -UICategoryForm.label.UIListPermissionSelector= UICategoryForm.tab.label.categoryPermission=Ajustes de Permisos UICategoryForm.tab.label.categorySetting=Ajustes de la Categor\u00eda Modified: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_it.properties =================================================================== --- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_it.properties 2010-03-06 15:19:32 UTC (rev 2015) +++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_it.properties 2010-03-06 18:34:42 UTC (rev 2016) @@ -52,7 +52,6 @@ UIApplicationRegistryEditMode.label.showImport=Cambia la visuale dell'importazione ##org.exoplatform.applicationregistry.webui.component.UIApplicationInfo -UIPermissionForm.label.UIListPermissionSelector= UIApplicationInfo.label.name=Nome: UIApplicationInfo.label.displayName=#{label.displayName} UIApplicationInfo.label.description=#{label.description} @@ -88,7 +87,6 @@ UICategoryForm.action.Save=#{word.save} UICategoryForm.action.Cancel=#{word.cancel} UICategoryForm.msg.SameName=La categoria esiste gi\u00E0, inseriscine un'altra! -UICategoryForm.label.UIListPermissionSelector= UICategoryForm.tab.label.categoryPermission=Gestione dei Permessi UICategoryForm.tab.label.categorySetting=Gestione della Categoria Modified: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_ja.properties =================================================================== --- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_ja.properties 2010-03-06 15:19:32 UTC (rev 2015) +++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_ja.properties 2010-03-06 18:34:42 UTC (rev 2016) @@ -52,7 +52,6 @@ UIApplicationRegistryEditMode.label.showImport=Change Show Import ##org.exoplatform.applicationregistry.webui.component.UIApplicationInfo -UIPermissionForm.label.UIListPermissionSelector= UIApplicationInfo.label.name=\u540d\u524d: UIApplicationInfo.label.displayName=#{label.displayName} UIApplicationInfo.label.description=#{label.description} @@ -87,7 +86,6 @@ UICategoryForm.action.Save=#{word.save} UICategoryForm.action.Cancel=#{word.cancel} UICategoryForm.msg.SameName=\u3053\u306e\u30ab\u30c6\u30b4\u30ea\u30fc\u306f\u5b58\u5728\u3057\u307e\u3059\u3002\u5225\u306e\u3082\u306e\u3092\u52a0\u3048\u3066\u304f\u3060\u3055\u3044\uff01 -UICategoryForm.label.UIListPermissionSelector= UICategoryForm.tab.label.categoryPermission=\u6a29\u9650\u306e\u8a2d\u5b9a UICategoryForm.tab.label.categorySetting=\u30ab\u30c6\u30b4\u30ea\u306e\u8a2d\u5b9a Modified: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_ko.xml =================================================================== --- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_ko.xml 2010-03-06 15:19:32 UTC (rev 2015) +++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_ko.xml 2010-03-06 18:34:42 UTC (rev 2016) @@ -98,11 +98,6 @@ <!-- ##org.exoplatform.applicationregistry.webui.component.UIApplicationInfo --> - <UIPermissionForm> - <label> - <UIListPermissionSelector /> - </label> - </UIPermissionForm> <UIApplicationInfo> <label> <name>이름:</name> @@ -160,7 +155,6 @@ <name>카테고리 이름:</name> <displayName>#{label.displayName}</displayName> <description>#{label.description}</description> - <UIListPermissionSelector /> </label> <action> <Save>#{word.save}</Save> Modified: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_ne.properties =================================================================== --- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_ne.properties 2010-03-06 15:19:32 UTC (rev 2015) +++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_ne.properties 2010-03-06 18:34:42 UTC (rev 2016) @@ -55,7 +55,6 @@ UIApplicationRegistryEditMode.label.showImport=\u0906\u092f\u093e\u0924 \u0926\u0947\u0916\u093e\u0909\u0928\u0941 \u092a\u0930\u093f\u0935\u0930\u094d\u0924\u0928 \u0917\u0930\u094d\u0928\u0941\u0939\u094b\u0938\u094d ##org.exoplatform.applicationregistry.webui.component.UIApplicationInfo -UIPermissionForm.label.UIListPermissionSelector= UIApplicationInfo.label.name=Name: \u0928\u093e\u092e: UIApplicationInfo.label.displayName=#{label.displayName} UIApplicationInfo.label.description=#{label.description} @@ -90,7 +89,6 @@ UICategoryForm.action.Save=#{word.save} UICategoryForm.action.Cancel=#{word.cancel} UICategoryForm.msg.SameName=\u092f\u094b \u0935\u0930\u094d\u0917 \u092a\u0939\u093f\u0932\u0947 \u0928\u0948 \u0909\u092a\u0932\u092c\u094d\u0927 \u091b, \u0915\u0943\u092a\u092f\u093e \u0905\u0930\u094d\u0915\u094b \u0939\u093e\u0932\u094d\u0928\u0941\u0939\u094b\u0938\u094d! -UICategoryForm.label.UIListPermissionSelector= UICategoryForm.tab.label.categoryPermission=\u0905\u0928\u0941\u092e\u0924\u0940 \u0935\u094d\u092f\u0935\u0938\u094d\u0925\u093e\u092a\u0928 UICategoryForm.tab.label.categorySetting=\u0935\u0930\u094d\u0917 \u0935\u094d\u092f\u0935\u0938\u094d\u0925\u093e\u092a\u0928 Modified: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_nl.properties =================================================================== --- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_nl.properties 2010-03-06 15:19:32 UTC (rev 2015) +++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_nl.properties 2010-03-06 18:34:42 UTC (rev 2016) @@ -52,7 +52,6 @@ UIApplicationRegistryEditMode.label.showImport=Verander toon import ##org.exoplatform.applicationregistry.webui.component.UIApplicationInfo -UIPermissionForm.label.UIListPermissionSelector UIApplicationInfo.label.name=#{word.name} UIApplicationInfo.label.displayName=#{word.displayName} UIApplicationInfo.label.description=#{word.description} @@ -87,7 +86,6 @@ UICategoryForm.action.Save=#{word.save} UICategoryForm.action.Cancel=#{word.cancel} UICategoryForm.msg.SameName=Categorie bestaat reeds, gelieve een andere de kiezen. -UICategoryForm.label.UIListPermissionSelector UICategoryForm.tab.label.categoryPermission=Permissie instellingen UICategoryForm.tab.label.categorySetting=Categorie instellingen Modified: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_vi.xml =================================================================== --- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_vi.xml 2010-03-06 15:19:32 UTC (rev 2015) +++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_vi.xml 2010-03-06 18:34:42 UTC (rev 2016) @@ -98,11 +98,6 @@ <!-- ##org.exoplatform.applicationregistry.webui.component.UIApplicationInfo --> - <UIPermissionForm> - <label> - <UIListPermissionSelector>Lựa chọn quyền</UIListPermissionSelector> - </label> - </UIPermissionForm> <UIApplicationInfo> <label> <name>Tên:</name> @@ -160,7 +155,6 @@ <name>Tên danh mục:</name> <displayName>#{label.displayName}</displayName> <description>#{label.description}</description> - <UIListPermissionSelector>Lựa chọn quyền</UIListPermissionSelector> </label> <action> <Save>#{word.save}</Save> Modified: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_zh.xml =================================================================== --- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_zh.xml 2010-03-06 15:19:32 UTC (rev 2015) +++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_zh.xml 2010-03-06 18:34:42 UTC (rev 2016) @@ -60,11 +60,6 @@ <showImport>修改显示导入</showImport> </label> </UIApplicationRegistryEditMode> - <UIPermissionForm> - <label> - <UIListPermissionSelector></UIListPermissionSelector> - </label> - </UIPermissionForm> <UIApplicationInfo> <label> <name>名称： </name> @@ -116,7 +111,6 @@ <name>分类名称：</name> <displayName>#{label.displayName}</displayName> <description>#{label.description}</description> - <UIListPermissionSelector></UIListPermissionSelector> </label> <action> <Save>#{word.save}</Save> Modified: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_zh_TW.xml =================================================================== --- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_zh_TW.xml 2010-03-06 15:19:32 UTC (rev 2015) +++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_zh_TW.xml 2010-03-06 18:34:42 UTC (rev 2016) @@ -60,11 +60,6 @@ <showImport>Change Show Import</showImport> </label> </UIApplicationRegistryEditMode> - <UIPermissionForm> - <label> - <UIListPermissionSelector></UIListPermissionSelector> - </label> - </UIPermissionForm> <UIApplicationInfo> <label> <name>名稱: </name> @@ -116,7 +111,6 @@ <name>類別名稱: </name> <displayName>#{label.displayName}</displayName> <description>#{label.description}</description> - <UIListPermissionSelector></UIListPermissionSelector> </label> <action> <Save>#{word.save}</Save> Modified: portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/portal/UIPortalComposer.gtmpl =================================================================== --- portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/portal/UIPortalComposer.gtmpl 2010-03-06 15:19:32 UTC (rev 2015) +++ portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/portal/UIPortalComposer.gtmpl 2010-03-06 18:34:42 UTC (rev 2016) @@ -12,7 +12,7 @@ <div class="TRPortalComposer"> <div class="TCPortalComposer"> <div class="OverflowContainer"> - <div class="<%=uicomponent.isCollapse ? "CollapseIcon" : "ExpandIcon"%>" onclick="eXo.portal.UIPortal.toggleComposer(this)"><span></span></div> + <div class="<%=uicomponent.isCollapsed ? "CollapseIcon" : "ExpandIcon"%>" onclick="eXo.portal.UIPortal.toggleComposer(this)"><span></span></div> <% if(uicomponent.isShowControl) { %> <a class="CloseButton" title="<%=_ctx.appRes("word.abort")%>" href="<%=uicomponent.event("Abort")%>"><span></span></a> <a class="<%= isEditted ? "EdittedSaveButton" : "SaveButton" %>" title="<%=_ctx.appRes("word.finish")%>" href="<%=uicomponent.event("Finish")%>"><span></span></a> @@ -28,7 +28,7 @@ </div> </div> - <div class="MLPortalComposer" style="display: <%=uicomponent.isCollapse ? "none": "block"%>"> + <div class="MLPortalComposer" style="display: <%=uicomponent.isCollapsed ? "none": "block"%>"> <div class="MRPortalComposer"> <div class="MCPortalComposer"> <div class="UIWindowContent"> @@ -42,7 +42,7 @@ </div> </div> - <div class="BLPortalComposer" style="display: <%=uicomponent.isCollapse ? "none": "block"%>"> + <div class="BLPortalComposer" style="display: <%=uicomponent.isCollapsed ? "none": "block"%>"> <div class="BRPortalComposer"> <div class="BCPortalComposer"> <div class="UIAction"> Modified: portal/trunk/web/portal/src/main/webapp/groovy/webui/form/UIForm.gtmpl =================================================================== --- portal/trunk/web/portal/src/main/webapp/groovy/webui/form/UIForm.gtmpl 2010-03-06 15:19:32 UTC (rev 2015) +++ portal/trunk/web/portal/src/main/webapp/groovy/webui/form/UIForm.gtmpl 2010-03-06 18:34:42 UTC (rev 2016) @@ -8,8 +8,18 @@ for(field in uiform.getChildren()) { if(field.isRendered()) { %> - <tr> + <tr> + <%fieldName = uicomponent.getLabel(field.getName());%> + <% + if(fieldName != null && fieldName.length() > 0 && !fieldName.equals(uicomponent.getId()) && !fieldName.equals(field.getName())) { + %> + <td class="FieldLabel"> + <%=uicomponent.getLabel(field.getName()) %> + </td> <td class="FieldComponent"><% uiform.renderField(field) %></td> + <%} else {%> + <td class="FieldComponent" colspan="2"><% uiform.renderField(field) %></td> + <%}%> </tr> <% } Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/PortalRequestContext.java =================================================================== --- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/PortalRequestContext.java 2010-03-06 15:19:32 UTC (rev 2015) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/PortalRequestContext.java 2010-03-06 18:34:42 UTC (rev 2016) @@ -20,11 +20,7 @@ package org.exoplatform.portal.application; import org.exoplatform.Constants; -import org.exoplatform.commons.utils.CharsetCharEncoder; -import org.exoplatform.commons.utils.CharsetTextEncoder; import org.exoplatform.commons.utils.PortalPrinter; -import org.exoplatform.commons.utils.TableCharEncoder; -import org.exoplatform.commons.utils.TextEncoder; import org.exoplatform.commons.utils.WriterPrinter; import org.exoplatform.container.ExoContainer; import org.exoplatform.portal.config.UserPortalConfigService; @@ -44,8 +40,6 @@ import org.exoplatform.webui.core.lifecycle.HtmlValidator; import org.w3c.dom.Element; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import javax.xml.transform.OutputKeys; import javax.xml.transform.Transformer; import javax.xml.transform.TransformerFactory; @@ -65,10 +59,13 @@ import java.util.Map; import java.util.Set; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + /** * This class extends the abstract WebuiRequestContext which itself extends the RequestContext one - * <p/> - * It mainly implements the abstract methods and overide some. + * + * <p>It mainly implements the abstract methods and overide some. */ public class PortalRequestContext extends WebuiRequestContext { Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageBody.java =================================================================== --- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageBody.java 2010-03-06 15:19:32 UTC (rev 2015) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageBody.java 2010-03-06 18:34:42 UTC (rev 2016) @@ -194,11 +194,21 @@ super.processRender(context); } + /** + * Retrieve the UIApplication which is maximized to cover whole the PageBody + * + * @return the maximized portlet + */ public UIPortalComponent getMaximizedUIComponent() { return maximizedUIComponent; } + /** + * Store the portlet maximized into the current PageBody + * + * @param uiMaximizedComponent the portlet to be stored in UIPageBody + */ public void setMaximizedUIComponent(UIPortalComponent uiMaximizedComponent) { this.maximizedUIComponent = uiMaximizedComponent; Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortal.java =================================================================== --- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortal.java 2010-03-06 15:19:32 UTC (rev 2015) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortal.java 2010-03-06 18:34:42 UTC (rev 2016) @@ -229,7 +229,11 @@ this.navigation = _navigation; } - /** Refresh the UIPage under UIPortal */ + /** + * Refresh the UIPage under UIPortal + * + * @throws Exception + */ public void refreshUIPage() throws Exception { if(selectedNode_ == null) 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-03-06 15:19:32 UTC (rev 2015) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComposer.java 2010-03-06 18:34:42 UTC (rev 2016) @@ -86,7 +86,7 @@ private boolean isEditted = false; - private boolean isCollapse = false; + private boolean isCollapsed = false; private boolean isShowControl = true; @@ -98,6 +98,7 @@ uiTabPane.setSelectedTab(1); } + //TODO: this seems not to be used public void setPortalMode(int mode) { if (mode < 0 || mode > 4) @@ -112,6 +113,15 @@ return getAncestorOfType(UIPortalApplication.class).getModeState(); } + /** + * Returns <code>true</code> there was at least one change + * has been done in this edition time. + * + * <p>This value is used in the template of this component + * to notice the user if there was something has been changed + * + * @return + */ public boolean isEditted() { return isEditted; @@ -122,14 +132,19 @@ isEditted = b; } + /** + * Return a value of <code>boolean</code> to tell current state of the composer + * + * @return <code>true</code> if the composer is collapsed currently + */ public boolean isCollapse() { - return isCollapse; + return isCollapsed; } public void setCollapse(boolean isCollapse) { - this.isCollapse = isCollapse; + this.isCollapsed = isCollapse; } public boolean isShowControl() @@ -142,7 +157,7 @@ isShowControl = state; } - public boolean isUsedInWizard() + private boolean isUsedInWizard() { UIWorkingWorkspace uiWorkingWS = getAncestorOfType(UIWorkingWorkspace.class); UIPortalToolPanel uiToolPanel = uiWorkingWS.findFirstComponentOfType(UIPortalToolPanel.class); @@ -154,7 +169,12 @@ return false; } - public void save() throws Exception + /** + * Perform saving changes of the edition of SiteConfig into database + * + * @throws Exception if there is anything wrong in saving process + */ + private void save() throws Exception { PortalRequestContext prContext = Util.getPortalRequestContext(); UIPortalApplication uiPortalApp = (UIPortalApplication)prContext.getUIApplication(); @@ -169,14 +189,12 @@ UserPortalConfigService configService = getApplicationComponent(UserPortalConfigService.class); DataStorage dataStorage = getApplicationComponent(DataStorage.class); - if (isPortalExist(editPortal)) + if (!isPortalExist(editPortal)) { - dataStorage.save(portalConfig); - } - else - { return; } + + dataStorage.save(portalConfig); uiPortalApp.getUserPortalConfig().setPortal(portalConfig); UserPortalConfig userPortalConfig = configService.getUserPortalConfig(ownerUser, remoteUser); @@ -219,7 +237,14 @@ skinService.invalidatePortalSkinCache(editPortal.getName(), editPortal.getSkin()); } - public boolean isPortalExist(UIPortal editPortal) throws Exception + /** + * Check the <code>editPortal</code> whether it is existing in database or not + * + * @param editPortal + * @return + * @throws Exception + */ + private boolean isPortalExist(UIPortal editPortal) throws Exception { String remoteUser = Util.getPortalRequestContext().getRemoteUser(); @@ -238,6 +263,11 @@ return configService.getUserPortalConfig(portalOwner, remoteUser) != null; } + /** + * Updates the availability children of the UIEditInlineWorkspace except to the UIPortalComposer + * + * @throws Exception + */ public void updateWorkspaceComponent() throws Exception { UIPortalApplication uiApp = Util.getUIPortalApplication(); @@ -374,6 +404,12 @@ } + /** + * Listens the <code>save</code> action of the composer while editing SiteConfig + * + * @author <a href=&quot;trong.tran(a)exoplatform.com&quot;&gt;Trong Tran</a> + * @version $Revision$ + */ static public class FinishActionListener extends EventListener<UIPortalComposer> { @@ -403,14 +439,8 @@ uiWorkingWS.getChild(UIEditInlineWorkspace.class).setRendered(false); uiPortal = (UIPortal)siteBody.getUIComponent(); - if (PortalProperties.SESSION_ALWAYS.equals(uiPortal.getSessionAlive())) - { - uiPortalApp.setSessionOpen(true); - } - else - { - uiPortalApp.setSessionOpen(false); - } + uiPortalApp.setSessionOpen(PortalProperties.SESSION_ALWAYS.equals(uiPortal.getSessionAlive())); + uiPortalApp.setModeState(UIPortalApplication.NORMAL_MODE); uiWorkingWS.setRenderedChild(UIPortalApplication.UI_VIEWING_WS_ID); prContext.setFullRender(true); Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIPortalApplication.java =================================================================== --- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIPortalApplication.java 2010-03-06 15:19:32 UTC (rev 2015) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIPortalApplication.java 2010-03-06 18:34:42 UTC (rev 2016) @@ -728,7 +728,7 @@ return this.all_Navigations; } - private static class UIPortalKey + private class UIPortalKey { private String ownerType;