[gatein-commits] gatein SVN: r1936 - in portal/trunk: web/portal/src/main/webapp/groovy/portal/webui/page and 1 other directories.

Author: tan_pham_dinh Date: 2010-03-03 01:36:50 -0500 (Wed, 03 Mar 2010) New Revision: 1936 Removed: portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/page/UIPageCreateDescription.gtmpl portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageCreateDescription.java Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ar.xml portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_de.properties portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_es.properties portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_fr.properties portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_it.properties portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ja.properties portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ko.xml portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ne.properties portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_nl.properties portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ru.properties portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_uk.properties portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_vi.properties portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_zh.xml portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_zh_TW.xml portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageCreationWizard.java Log: - GTNPORTAL-786: Apply to save function of PageCreationWizard \n - Remove unnecessary PageCreateDescription Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ar.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ar.xml 2010-03-03 04:55:58 UTC (rev 1935) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ar.xml 2010-03-03 06:36:50 UTC (rev 1936) @@ -1144,12 +1144,6 @@ <pageReference>مراجع الصفحة</pageReference> </label> </UIPageNodeWizardPreview> - <UIPageCreateDescription> - <title> - <create>معالج إنشاء الصحف</create> - <edit>معالج تحرير الصحف</edit> - </title> - </UIPageCreateDescription> <UIPageTemplateOptions> <UIDropDown> Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_de.properties =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_de.properties 2010-03-03 04:55:58 UTC (rev 1935) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_de.properties 2010-03-03 06:36:50 UTC (rev 1936) @@ -660,8 +660,6 @@ UIPageNodeWizardPreview.label.accessPermission=Zugriffsberechtigung UIPageNodeWizardPreview.label.editPermission=Bearbeitungsberechtigung UIPageNodeWizardPreview.label.pageReference=Seitenreferenz -UIPageCreateDescription.title.create=#{UIPageCreationWizard.label.pageCreateWizard} -UIPageCreateDescription.title.edit=Seitenbearbeitungsassistent UIPageTemplateOptions.UIDropDown.title=Seitenlayouts UIPageTemplateOptions.UIDropDown.label.normalPageConfigs=Standard-Layouts UIPageTemplateOptions.UIDropDown.label.columnPageConfigs=Spalten-Layout Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties 2010-03-03 04:55:58 UTC (rev 1935) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties 2010-03-03 06:36:50 UTC (rev 1936) @@ -664,8 +664,6 @@ UIPageNodeWizardPreview.label.accessPermission=Access Permission UIPageNodeWizardPreview.label.editPermission=Edit Permission UIPageNodeWizardPreview.label.pageReference=Page Reference -UIPageCreateDescription.title.create=Page Creation Wizard -UIPageCreateDescription.title.edit=Page Edit Wizard UIPageTemplateOptions.UIDropDown.title=Page Configs UIPageTemplateOptions.UIDropDown.label.normalPageConfigs=Page Configs UIPageTemplateOptions.UIDropDown.label.columnPageConfigs=Column Page Configs Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_es.properties =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_es.properties 2010-03-03 04:55:58 UTC (rev 1935) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_es.properties 2010-03-03 06:36:50 UTC (rev 1936) @@ -658,8 +658,6 @@ UIPageNodeWizardPreview.label.accessPermission=Permisos de Acceso UIPageNodeWizardPreview.label.editPermission=Editar Permisos UIPageNodeWizardPreview.label.pageReference=Referencia de la P\u00e1gina -UIPageCreateDescription.title.create=Asistente Creaci\u00f3n de P\u00e1gina -UIPageCreateDescription.title.edit=Asistente Edici\u00f3n de P\u00e1gina UIPageTemplateOptions.UIDropDown.title=Configuraciones de la P\u00e1gina UIPageTemplateOptions.UIDropDown.label.normalPageConfigs=Configuraciones de la P\u00e1gina UIPageTemplateOptions.UIDropDown.label.columnPageConfigs=Configuraciones de las Columnas de la P\u00e1gina Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_fr.properties =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_fr.properties 2010-03-03 04:55:58 UTC (rev 1935) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_fr.properties 2010-03-03 06:36:50 UTC (rev 1936) @@ -634,8 +634,6 @@ UIPageNodeWizardPreview.label.accessPermission=Droit d'accès UIPageNodeWizardPreview.label.editPermission=Droit d'édition UIPageNodeWizardPreview.label.pageReference=Référence de la page -UIPageCreateDescription.title.create=Assistant de création de page -UIPageCreateDescription.title.edit=Assistant de modification de page UIPageTemplateOptions.UIDropDown.title=Configurations de page UIPageTemplateOptions.UIDropDown.label.normalPageConfigs=Configurations de page UIPageTemplateOptions.UIDropDown.label.columnPageConfigs=En colonne Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_it.properties =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_it.properties 2010-03-03 04:55:58 UTC (rev 1935) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_it.properties 2010-03-03 06:36:50 UTC (rev 1936) @@ -659,8 +659,6 @@ UIPageNodeWizardPreview.label.accessPermission=Permesso di Accesso UIPageNodeWizardPreview.label.editPermission=Modifica il Permesso UIPageNodeWizardPreview.label.pageReference=Collegamento alla Pagina -UIPageCreateDescription.title.create=Wizard della Pagina di Creazione -UIPageCreateDescription.title.edit=Wizard della Pagina di Modifica UIPageTemplateOptions.UIDropDown.title=Configurazioni della Pagina UIPageTemplateOptions.UIDropDown.label.normalPageConfigs=Configurazioni della Pagina UIPageTemplateOptions.UIDropDown.label.columnPageConfigs=Configurazioni della Colonna della Pagina Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ja.properties =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ja.properties 2010-03-03 04:55:58 UTC (rev 1935) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ja.properties 2010-03-03 06:36:50 UTC (rev 1936) @@ -660,8 +660,6 @@ UIPageNodeWizardPreview.label.accessPermission=\u30a2\u30af\u30bb\u30b9\u30d1\u30fc\u30df\u30b7\u30e7\u30f3 UIPageNodeWizardPreview.label.editPermission=\u30d1\u30fc\u30df\u30c3\u30b7\u30e7\u30f3\u3092\u7de8\u96c6 UIPageNodeWizardPreview.label.pageReference=\u30da\u30fc\u30b8\u53c2\u7167 -UIPageCreateDescription.title.create=\u30da\u30fc\u30b8\u4f5c\u6210\u30a6\u30a4\u30b6\u30fc\u30c9 -UIPageCreateDescription.title.edit=\u30da\u30fc\u30b8\u7de8\u96c6\u30a6\u30a4\u30b6\u30fc\u30c9 UIPageTemplateOptions.UIDropDown.title=\u30da\u30fc\u30b8\u69cb\u6210 UIPageTemplateOptions.UIDropDown.label.normalPageConfigs=\u30da\u30fc\u30b8\u69cb\u6210 UIPageTemplateOptions.UIDropDown.label.columnPageConfigs=\u30ab\u30e9\u30e0\u30da\u30fc\u30b8\u69cb\u6210 Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ko.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ko.xml 2010-03-03 04:55:58 UTC (rev 1935) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ko.xml 2010-03-03 06:36:50 UTC (rev 1936) @@ -1025,12 +1025,6 @@ <pageReference>페이지 레퍼런스</pageReference> </label> </UIPageNodeWizardPreview> - <UIPageCreateDescription> - <title> - <create>페이지 생성 마법사</create> - <edit>페이지 편집 마법사</edit> - </title> - </UIPageCreateDescription> <UIPageTemplateOptions> <UIDropDown> <title>페이지 배치</title> Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ne.properties =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ne.properties 2010-03-03 04:55:58 UTC (rev 1935) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ne.properties 2010-03-03 06:36:50 UTC (rev 1936) @@ -659,8 +659,6 @@ UIPageNodeWizardPreview.label.accessPermission=\u092a\u094d\u0930\u092c\u0947\u0936 \u0905\u0928\u0941\u092e\u0924\u0940 UIPageNodeWizardPreview.label.editPermission=\u0938\u092e\u094d\u092a\u093e\u0926\u0928 \u0905\u0928\u0941\u092e\u0924\u0940 UIPageNodeWizardPreview.label.pageReference=\u092a\u0947\u091c \u0930\u093f\u092b\u0947\u0930\u0947\u0928\u094d\u0938 -UIPageCreateDescription.title.create=\u092a\u0947\u091c \u092c\u0928\u093e\u0909\u0928\u0947 \u0935\u093f\u091c\u093e\u0930\u094d\u0921 -UIPageCreateDescription.title.edit=\u092a\u0947\u091c \u0938\u092e\u094d\u092a\u093e\u0926\u0928 \u0917\u0930\u094d\u0928\u0947 \u0935\u093f\u091c\u093e\u0930\u094d\u0921 UIPageTemplateOptions.UIDropDown.title=\u092a\u0947\u091c \u0915\u0928\u094d\u092b\u093f\u0917\u094d\u0938 UIPageTemplateOptions.UIDropDown.label.normalPageConfigs=\u092a\u0947\u091c \u0915\u0928\u094d\u092b\u093f\u0917\u094d\u0938 UIPageTemplateOptions.UIDropDown.label.columnPageConfigs=\u0915\u094b\u0932\u0941\u092e \u092a\u0947\u091c \u0915\u0928\u094d\u092b\u093f\u0917\u094d\u0938 Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_nl.properties =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_nl.properties 2010-03-03 04:55:58 UTC (rev 1935) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_nl.properties 2010-03-03 06:36:50 UTC (rev 1936) @@ -660,8 +660,6 @@ UIPageNodeWizardPreview.label.accessPermission=Toegangsrechten UIPageNodeWizardPreview.label.editPermission=Permissie om te wijzigen UIPageNodeWizardPreview.label.pageReference=Pagina referentie -UIPageCreateDescription.title.create=Pagina creatie wizard -UIPageCreateDescription.title.edit=Pagina wijzigen wizard UIPageTemplateOptions.UIDropDown.title=Pagina configuratie UIPageTemplateOptions.UIDropDown.label.normalPageConfigs=Pagina configuratie UIPageTemplateOptions.UIDropDown.label.columnPageConfigs=In kolommen Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ru.properties =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ru.properties 2010-03-03 04:55:58 UTC (rev 1935) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ru.properties 2010-03-03 06:36:50 UTC (rev 1936) @@ -648,8 +648,6 @@ UIPageNodeWizardPreview.label.accessPermission=Права доступа UIPageNodeWizardPreview.label.editPermission=Изменить права UIPageNodeWizardPreview.label.pageReference=Параметры страницы -UIPageCreateDescription.title.create=Мастер создания страницы -UIPageCreateDescription.title.edit=Мастер редактирования страницы UIPageTemplateOptions.UIDropDown.title=Конфигурация страницы UIPageTemplateOptions.UIDropDown.label.normalPageConfigs=Общие UIPageTemplateOptions.UIDropDown.label.columnPageConfigs=Колонки Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_uk.properties =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_uk.properties 2010-03-03 04:55:58 UTC (rev 1935) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_uk.properties 2010-03-03 06:36:50 UTC (rev 1936) @@ -639,8 +639,6 @@ UIPageNodeWizardPreview.label.accessPermission=Дозвіл на доступ UIPageNodeWizardPreview.label.editPermission=Редагувати права доступу UIPageNodeWizardPreview.label.pageReference=Сторінкове посилання -UIPageCreateDescription.title.create=Wizard-створювач сторінок -UIPageCreateDescription.title.edit=Wizard-редагувач сторінок UIPageTemplateOptions.UIDropDown.title=Конфігурація сторінки UIPageTemplateOptions.UIDropDown.label.normalPageConfigs=Конфігурація сторінки UIPageTemplateOptions.UIDropDown.label.columnPageConfigs=Конфігурація стовпчиків Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_vi.properties =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_vi.properties 2010-03-03 04:55:58 UTC (rev 1935) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_vi.properties 2010-03-03 06:36:50 UTC (rev 1936) @@ -642,8 +642,6 @@ UIPageNodeWizardPreview.label.accessPermission=Phân quyền truy cập UIPageNodeWizardPreview.label.editPermission=Phân quyền Chỉnh sửa UIPageNodeWizardPreview.label.pageReference=Trang liên quan -UIPageCreateDescription.title.create=Trang tạo bằng Wizard -UIPageCreateDescription.title.edit=Trang chỉnh sửa bằng Wizard UIPageTemplateOptions.UIDropDown.title=Định hình trang UIPageTemplateOptions.UIDropDown.label.normalPageConfigs=Định hình trang UIPageTemplateOptions.UIDropDown.label.columnPageConfigs=Định hình trang dạng cột Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_zh.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_zh.xml 2010-03-03 04:55:58 UTC (rev 1935) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_zh.xml 2010-03-03 06:36:50 UTC (rev 1936) @@ -981,12 +981,6 @@ <pageReference>页面选项</pageReference> </label> </UIPageNodeWizardPreview> - <UIPageCreateDescription> - <title> - <create>页面创建向导</create> - <edit>页面编辑向导</edit> - </title> - </UIPageCreateDescription> <UIPageTemplateOptions> <UIDropDown> <title>页面配置</title> Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_zh_TW.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_zh_TW.xml 2010-03-03 04:55:58 UTC (rev 1935) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_zh_TW.xml 2010-03-03 06:36:50 UTC (rev 1936) @@ -1129,12 +1129,6 @@ <pageReference>頁面選項</pageReference> </label> </UIPageNodeWizardPreview> - <UIPageCreateDescription> - <title> - <create>頁面建立導覽器</create> - <edit>頁面編輯導覽器</edit> - </title> - </UIPageCreateDescription> <UIPageTemplateOptions> <UIDropDown> <title>頁面配置</title> Deleted: portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/page/UIPageCreateDescription.gtmpl =================================================================== --- portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/page/UIPageCreateDescription.gtmpl 2010-03-03 04:55:58 UTC (rev 1935) +++ portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/page/UIPageCreateDescription.gtmpl 2010-03-03 06:36:50 UTC (rev 1936) @@ -1,24 +0,0 @@ -<div class="TopTitleBar"> - <div class="DecoratorBox"> - <div class="BarDecorator"> - <div class="TopLeftBar"> - <div class="TopRightBar"> - <div class="TopCenterBar"><span></span></div> - </div> - </div> - <div class="MiddleLeftBar"> - <div class="MiddleRightBar"> - <div class="MiddleCenterBar"><%=_ctx.appRes(uicomponent.getTitleKey())%></div> - </div> - </div> - <div class="BottomLeftBar"> - <div class="BottomRightBar"> - <div class="BottomCenterBar"><span></span></div> - </div> - </div> - </div> - </div> -</div> - -<div><%uicomponent.renderChildren();%></div> - Deleted: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageCreateDescription.java =================================================================== --- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageCreateDescription.java 2010-03-03 04:55:58 UTC (rev 1935) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageCreateDescription.java 2010-03-03 06:36:50 UTC (rev 1936) @@ -1,61 +0,0 @@ -/** - * Copyright (C) 2009 eXo Platform SAS. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ - -package org.exoplatform.portal.webui.page; - -import org.exoplatform.webui.config.annotation.ComponentConfig; -import org.exoplatform.webui.core.UIContainer; - -/** - * Created by The eXo Platform SARL - * Author : lxchiati - * lebienthuy(a)gmail.com - * Jul 11, 2006 - */ -@ComponentConfig(template = "system:/groovy/portal/webui/page/UIPageCreateDescription.gtmpl") -public class UIPageCreateDescription extends UIContainer -{ - - private String titleKey_; - - // private String title_ ; - - public UIPageCreateDescription() throws Exception - { - } - - public String getTitleKey() - { - return titleKey_; - } - - public void setTitleKey(String titleKey_) - { - this.titleKey_ = titleKey_; - } - - // public void setTitle(String key){ - // WebuiRequestContext context = WebuiRequestContext.getCurrentInstance(); - // ResourceBundle res = context.getApplicationResourceBundle(); - // title_ = res.getString(key); - // } - // - // public String getTitle(){ return title_; } - -} \ No newline at end of file Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageCreationWizard.java =================================================================== --- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageCreationWizard.java 2010-03-03 04:55:58 UTC (rev 1935) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageCreationWizard.java 2010-03-03 06:36:50 UTC (rev 1936) @@ -382,6 +382,7 @@ return; } uiPortalApp.setModeState(UIPortalApplication.NORMAL_MODE); + uiWorkingWS.setRenderedChild(UIPortalApplication.UI_VIEWING_WS_ID); uiWizard.saveData(); UIPortalToolPanel toolPanel = uiWorkingWS.findFirstComponentOfType(UIPortalToolPanel.class); toolPanel.setUIComponent(null);