gatein SVN: r2704 - portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal.
by do-not-reply＠jboss.org
Author: kien_nguyen
Date: 2010-04-20 23:21:13 -0400 (Tue, 20 Apr 2010)
New Revision: 2704
Modified:
portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_vi.properties
Log:
GTNPORTAL-959 Clean redundant keys declaration in resource bundle (missing file)
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-04-21 03:14:09 UTC (rev 2703)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_vi.properties 2010-04-21 03:21:13 UTC (rev 2704)
@@ -335,6 +335,7 @@
UIPortalForm.tab.label.PortalTemplate=Các Portal mẫu
UIPortalForm.tab.label.PermissionSetting=Tùy chọn phân quyền sử dụng
UIPortalForm.tab.label.FactoryId=Mã Factory
+UIPortalForm.tab.label.Properties=Thuộc tính
PortalTemplate.title=Các Portal mẫu
PortalTemplate.left.title=Xem tham khảo các Portal mẫu
@@ -707,56 +708,18 @@
UIPageCreationWizardStepForm.label.pageName=Tên Node
#############################################################################
- # org.exoplatform.portal.component.customization.UIAdvancedCustomization #
+ # UIPortalManagement #
#############################################################################
-UIAdvancedCustomization.icon.UIPortalManagement=Portal
-UIAdvancedCustomization.icon.UIPageManagement=Trang
-UIAdvancedCustomization.label.UIPortalManagement=Quản lý Portal
-UIAdvancedCustomization.label.UIPageManagement=Quản lý trang
UIPortalManagement.msg.Invalid-EditLayout-Permission=B\u1EA1n kh\u00F4ng c\u00F3 quy\u1EC1n ch\u1EC9nh s\u1EEDa layout.
UIPortalManagement.msg.Invalid-EditPage-Permission=B\u1EA1n kh\u00F4ng c\u00F3 quy\u1EC1n ch\u1EC9nh s\u1EEDa trang n\u00E0y.
UIPortalManagement.title.EDIT=Chỉnh sửa Portal hiện tại
UIPortalManagement.title.BROWSE=Khảo sát các Portal
#############################################################################
- # org.exoplatform.portal.component.customization.UIContainerConfigOptions #
#############################################################################
-
-UIContainerConfigOptions.label.ContainerConfigTitle=Danh mục Container
-UIContainerConfigOptions.label.selectContainerCategory=Nhấp chuột ở đây để chọn một danh mục Container !
-UIContainerConfigOptions.tab.row=Container dạng hàng
-UIContainerConfigOptions.tab.column=Container dạng cột
-UIContainerConfigOptions.tab.tabs=Container dạng thẻ
-UIContainerConfigOptions.tab.mixed=Container dạng phức hợp
-UIContainerConfigOptions.UIDropDown.title=Container dạng hàng
-UIContainerConfigOptions.UIDropDown.label.ContainerCategory=Danh mục Container
-UIContainerConfigOptions.UIDropDown.label.row=Container dạng hàng
-UIContainerConfigOptions.UIDropDown.label.column=Container dạng cột
-UIContainerConfigOptions.UIDropDown.label.tabs=Container dạng thẻ
-UIContainerConfigOptions.UIDropDown.label.mixed=Container dạng phức hợp
-UIContainerConfigOptions.template.oneRow=Container một hàng
-UIContainerConfigOptions.template.twoRows=Container hai hàng
-UIContainerConfigOptions.template.threeRows=Container 3 hàng
-UIContainerConfigOptions.template.oneColumns=Container 1 cột
-UIContainerConfigOptions.template.twoColumns=Container 2 cột
-UIContainerConfigOptions.template.threeColumns=Container 3 cột
-UIContainerConfigOptions.template.twoTabs=Container 2 thẻ
-UIContainerConfigOptions.template.threeTabs=Container 3 thẻ
-UIContainerConfigOptions.template.twoColumnsOneRow=Container 2 cột, 1 hàng
-UIContainerConfigOptions.template.oneRowTwoColumns=Container 1 hàng, 2 cột
-UIContainerConfigOptions.template.oneRow2Column1Row=Container 1 hàng, 2 cột, 1 hàng
-
#############################################################################
- # org.exoplatform.portal.component.customization.UIDecoratorConfigOptions #
- #############################################################################
-UIDecoratorConfigOptions.label.selectDecorator=Lựa chọn kiểu trang trí
-
- #############################################################################
- #############################################################################
- #############################################################################
-
UIPortlet.label.portletContent=Mô tả Portlet
UIPortlet.label.protectedContent=Nội dung bị hạn chế
UIPortlet.label.View=Xem
@@ -794,13 +757,6 @@
UIFormAvailablePortlet.label.UIFormTableInputSet=Portlet
#############################################################################
- # org.exoplatform.portal.component.control.UIQuickBar #
- #############################################################################
-
-UIQuickBar.tooltip.BasicCustomization=Quản trị cơ bản
-UIQuickBar.tooltip.AdvanceCustomization=Quản trị nâng cao
-
- #############################################################################
# org.exoplatform.portal.component.customization.UIPageEditBar #
#############################################################################
@@ -1126,6 +1082,7 @@
UIAccountProfiles.label.lastName=Họ:
UIAccountProfiles.label.email=Hộp thư:
UIAccountProfiles.msg.update.success=Update thông tin tài khoản thành công!
+UIAccountProfiles.msg.NotExistingAccount=Tài khỏan này hiện không tồn tại, có thể ai đó vừa mới xóa nó!
UIAccountChangePass.action.Save=Lưu
UIAccountChangePass.action.Reset=Làm lại
UIAccountChangePass.label.currentpass=Mật khẩu hiện thời :
@@ -1232,7 +1189,7 @@
UIDashboardEditForm.label.owner=Chủ nhân:
UIDashboardEditForm.action.Save=Lưu
UIDashboard.msg.required=Trường này không được để trống.
-UIDashboard.msg.addGadget=Kéo thả Garget của bạn vào đây.
+UIDashboard.msg.addGadget=Kéo thả Gadget của bạn vào đây.
UIDashboard.msg.notUrl=Nhập URL không hợp lệ! Hãy nhập một URL đúng của Gadget hoặc RSS!
UIDashboard.msg.ApplicationNotExisted=Ứng dụng không tồn tại hoặc đã bị xóa.
@@ -1339,7 +1296,7 @@
# org.exoplatform.navigation.webui.component.UIAddGroupNavigation #
############################################################################
-UIAddGroupNavigation.Action.Add=Add Navigation
+UIAddGroupNavigation.Action.Add=Thêm Navigation
UIAddGroupNavigation.header.Group=Group
UIAddGroupNavigation.Label.NoPermission=This user doesn't have permisson to add navigation
14 years, 5 months
- 1
- 0
gatein SVN: r2703 - portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal.
by do-not-reply＠jboss.org
Author: kien_nguyen
Date: 2010-04-20 23:14:09 -0400 (Tue, 20 Apr 2010)
New Revision: 2703
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_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_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_pt_BR.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
Log:
GTNPORTAL-959 Clean redundant keys declaration in resource bundle
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-04-21 02:09:40 UTC (rev 2702)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_de.properties 2010-04-21 03:14:09 UTC (rev 2703)
@@ -722,66 +722,18 @@
UIPageCreationWizardStepForm.label.pageName=Seitenname
#############################################################################
- # org.exoplatform.portal.component.customization.UIAdvancedCustomization #
+ # UIPortalManagement #
#############################################################################
-UIAdvancedCustomization.icon.UIPortalManagement=Portal
-UIAdvancedCustomization.icon.UIPageManagement=Seite
-UIAdvancedCustomization.label.UIPortalManagement=Portal-Verwaltung
-UIAdvancedCustomization.label.UIPageManagement=Seiten-Verwaltung
UIPortalManagement.msg.Invalid-EditLayout-Permission=Ihnen fehlt die Berechtigung, um dieses Layout zu bearbeiten.
UIPortalManagement.msg.Invalid-EditPage-Permission=Ihnen fehlt die Berechtigung, um diese Seite zu bearbeiten.
UIPortalManagement.title.EDIT=Aktuelles Portal bearbeiten
UIPortalManagement.title.BROWSE=Portale verwalten
#############################################################################
- # org.exoplatform.portal.component.customization.UIContainerConfigOptions #
#############################################################################
-
-UIContainerConfigOptions.label.ContainerConfigTitle=Container-Kategorie
-UIContainerConfigOptions.label.selectContainerCategory=Hier klicken und eine Container-Kategorie auswählen
-UIContainerConfigOptions.tab.row=Rows Container-Layout
-UIContainerConfigOptions.tab.column=Spalten-Container-Layout
-UIContainerConfigOptions.tab.tabs=Registerkarten-Container-Layout
-UIContainerConfigOptions.tab.mixed=Gemischtes Container-Layout
-UIContainerConfigOptions.UIDropDown.title=Reihen-Layout
-UIContainerConfigOptions.UIDropDown.label.ContainerCategory=Container-Kategorie
-UIContainerConfigOptions.UIDropDown.label.row=Reihen-Layout
-UIContainerConfigOptions.UIDropDown.label.column=Spalten-Layout
-UIContainerConfigOptions.UIDropDown.label.tabs=Registerkarten-Layout
-UIContainerConfigOptions.UIDropDown.label.mixed=Gemischtes Layout
- UIWizardPageSelectLayoutForm.label.columnPage.TwoColumnsLayout=Zwei-Spalten-Layout
- UIWizardPageSelectLayoutForm.label.columnPage.ThreeColumnsLayout=Drei-Spalten-Layout
- UIWizardPageSelectLayoutForm.label.rowPage.TwoRowsLayout=Zwei-Reihen-Layout
- UIWizardPageSelectLayoutForm.label.rowPage.ThreeRowsLayout=Drei-Reihen-Layout
- UIWizardPageSelectLayoutForm.label.tabsPage.TwoTabsLayout=Zwei Registerkarten
- UIWizardPageSelectLayoutForm.label.tabsPage.ThreeTabsLayout=Drei Registerkarten
- UIWizardPageSelectLayoutForm.label.mixPage.TwoColumnsOneRowLayout=Zwei Spalten und eine Reihe
- UIWizardPageSelectLayoutForm.label.mixPage.OneRowTwoColumnsLayout=Eine Reihe und zwei Spalten
- UIWizardPageSelectLayoutForm.label.mixPage.ThreeRowsTwoColumnsLayout=Zwei Spalten und drei Reihen
-
-UIContainerConfigOptions.template.oneRow=Ein-Reihen-Container
-UIContainerConfigOptions.template.twoRows=Zwei-Reihen-Container
-UIContainerConfigOptions.template.threeRows=Drei-Reihen-Container
-UIContainerConfigOptions.template.oneColumns=Ein-Spalten-Container
-UIContainerConfigOptions.template.twoColumns=Zwei-Spalten-Container
-UIContainerConfigOptions.template.threeColumns=Drei-Spalten-Container
-UIContainerConfigOptions.template.twoTabs=Zwei Registerkarten
-UIContainerConfigOptions.template.threeTabs=Drei Registerkarten
-UIContainerConfigOptions.template.twoColumnsOneRow=Zwei Spalten und eine Reihe
-UIContainerConfigOptions.template.oneRowTwoColumns=Eine Reihe und zwei Spalten
-UIContainerConfigOptions.template.oneRow2Column1Row=Eine Reihe, zwei Spalten und eine Reihe
-
#############################################################################
- # org.exoplatform.portal.component.customization.UIDecoratorConfigOptions #
- #############################################################################
-UIDecoratorConfigOptions.label.selectDecorator=Dekorateur auswählen
-
- #############################################################################
- #############################################################################
- #############################################################################
-
UIPortlet.label.portlet=Portlet
UIPortlet.label.protectedContent=Protected Content
UIPortlet.label.title=Portlet
@@ -822,13 +774,6 @@
UIFormAvailablePortlet.label.UIFormTableInputSet=Portlet
#############################################################################
- # org.exoplatform.portal.component.control.UIQuickBar #
- #############################################################################
-
-UIQuickBar.tooltip.BasicCustomization=Einfache Anpassung
-UIQuickBar.tooltip.AdvanceCustomization=Erweiterte Anpassung
-
- #############################################################################
# org.exoplatform.portal.component.customization.UIPageEditBar #
#############################################################################
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-04-21 02:09:40 UTC (rev 2702)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties 2010-04-21 03:14:09 UTC (rev 2703)
@@ -366,6 +366,7 @@
UIPortalForm.tab.label.PortalTemplate=Portal Templates
UIPortalForm.tab.label.PermissionSetting=Permission Setting
UIPortalForm.tab.label.FactoryId=Factory Id
+UIPortalForm.tab.label.Properties=Properties
PortalTemplate.title=Portal Templates
PortalTemplate.left.title=Sample Portal Template preview
@@ -738,56 +739,18 @@
UIPageCreationWizardStepForm.label.pageName=Page Name
#############################################################################
- # org.exoplatform.portal.component.customization.UIAdvancedCustomization #
+ # UIPortalManagement #
#############################################################################
-UIAdvancedCustomization.icon.UIPortalManagement=Portal
-UIAdvancedCustomization.icon.UIPageManagement=Page
-UIAdvancedCustomization.label.UIPortalManagement=Portal Management
-UIAdvancedCustomization.label.UIPageManagement=Page Management
UIPortalManagement.msg.Invalid-EditLayout-Permission=You have no right to edit this layout.
UIPortalManagement.msg.Invalid-EditPage-Permission=You have no right to edit this page.
UIPortalManagement.title.EDIT=Edit current Portal
UIPortalManagement.title.BROWSE=Manage Portals
#############################################################################
- # org.exoplatform.portal.component.customization.UIContainerConfigOptions #
#############################################################################
-
-UIContainerConfigOptions.label.ContainerConfigTitle=Container Category
-UIContainerConfigOptions.label.selectContainerCategory=Click here to select a container category
-UIContainerConfigOptions.tab.row=Rows Container Layout
-UIContainerConfigOptions.tab.column=Columns Container Layout
-UIContainerConfigOptions.tab.tabs=Tabs Container Layout
-UIContainerConfigOptions.tab.mixed=Mix Container Layout
-UIContainerConfigOptions.UIDropDown.title=Rows Layout
-UIContainerConfigOptions.UIDropDown.label.ContainerCategory=Container Category
-UIContainerConfigOptions.UIDropDown.label.row=Rows Layout
-UIContainerConfigOptions.UIDropDown.label.column=Columns Layout
-UIContainerConfigOptions.UIDropDown.label.tabs=Tabs Layout
-UIContainerConfigOptions.UIDropDown.label.mixed=Mix Layout
-UIContainerConfigOptions.template.oneRow=One Row Container
-UIContainerConfigOptions.template.twoRows=Two Rows Container
-UIContainerConfigOptions.template.threeRows=Three Rows Container
-UIContainerConfigOptions.template.oneColumns=One Column Container
-UIContainerConfigOptions.template.twoColumns=Two Columns Container
-UIContainerConfigOptions.template.threeColumns=Three Columns Container
-UIContainerConfigOptions.template.twoTabs=Two Tabs Container
-UIContainerConfigOptions.template.threeTabs=Three Tabs Container
-UIContainerConfigOptions.template.twoColumnsOneRow=Two Columns, One Row Container
-UIContainerConfigOptions.template.oneRowTwoColumns=One Row, Two Columns Container
-UIContainerConfigOptions.template.oneRow2Column1Row=One Row, Two Columns, One Row Container
-
#############################################################################
- # org.exoplatform.portal.component.customization.UIDecoratorConfigOptions #
- #############################################################################
-UIDecoratorConfigOptions.label.selectDecorator=Select Decorator
-
- #############################################################################
- #############################################################################
- #############################################################################
-
UIPortlet.label.portletContent=Portlet Description
UIPortlet.label.protectedContent=Protected Content
UIPortlet.label.View=View
@@ -825,13 +788,6 @@
UIFormAvailablePortlet.label.UIFormTableInputSet=Portlet
#############################################################################
- # org.exoplatform.portal.component.control.UIQuickBar #
- #############################################################################
-
-UIQuickBar.tooltip.BasicCustomization=Basic customization
-UIQuickBar.tooltip.AdvanceCustomization=Advanced customization
-
- #############################################################################
# org.exoplatform.portal.component.customization.UIPageEditBar #
#############################################################################
@@ -1166,6 +1122,7 @@
UIAccountProfiles.label.lastName=Last Name :
UIAccountProfiles.label.email=Email :
UIAccountProfiles.msg.update.success=The account information has been updated.
+UIAccountProfiles.msg.NotExistingAccount=Your account is not existing, maybe it was deleted by another user!
UIAccountChangePass.action.Save=Save
UIAccountChangePass.action.Reset=Reset
UIAccountChangePass.label.currentpass=Current Password :
@@ -1175,6 +1132,7 @@
UIAccountChangePass.msg.password-is-not-match=New Password and Confirm New Password do not match.
UIAccountChangePass.msg.currentpassword-is-not-match=Current Password is not correct.
+
################################################################################
# UIDropDownControl # tungnd
################################################################################
@@ -1409,24 +1367,6 @@
UIGadget.tooltip.editGadget=Edit Gadget
UIGadget.tooltip.deleteGadget=Delete Gadget
- ############################################################################
- # org.exoplatform.wsrp.webui.component.UIWsrp #
- ############################################################################
-
-UIWsrp.consumer.action.add.success=Consumer Successfully Added
-UIWsrp.consumer.action.add.exists=Consumer already exists!
-UIWsrp.consumer.action.edit.success=Edit Consumer Successful!
-UIWsrp.consumer.action.edit.fail=Edit Consumer Problem!
-UIWsrp.consumer.grid.action.delete.success=Consumer has been deleted.
-UIWsrp.consumer.grid.action.delete.fail=Failed to delete Consumer. Cause: {0}
-UIWsrp.consumer.grid.action.refresh.success=Consumer Refreshed Successfully.
-UIWsrp.consumer.grid.action.refresh.needfix=Consumer refresh resulted in errors that need to be fixed.
-UIWsrp.consumer.grid.action.refresh.fail=Failed to refresh Consumer. Cause: {0}
-UIWsrp.consumer.grid.action.activate.success=Consumer successfully activated.
-UIWsrp.consumer.grid.action.activate.fail=Problem Activating Consumer: {0}
-UIWsrp.consumer.grid.action.deactivate.success=Consumer successfully deactivated.
-UIWsrp.consumer.grid.action.deactivate.fail=Consumer Must be Active to Deactivate.
-
UIListPermissionSelectorPopup.title.ListPermissionSelector=Select Permission
UIUserToolBarDashboard.page.ClickAndType=Click & Type Page Name
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-04-21 02:09:40 UTC (rev 2702)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_es.properties 2010-04-21 03:14:09 UTC (rev 2703)
@@ -720,56 +720,18 @@
UIPageCreationWizardStepForm.label.pageName=Nombre de P\u00e1gina
#############################################################################
- # org.exoplatform.portal.component.customization.UIAdvancedCustomization #
+ # UIPortalManagement #
#############################################################################
-UIAdvancedCustomization.icon.UIPortalManagement=Portal
-UIAdvancedCustomization.icon.UIPageManagement=P\u00e1gina
-UIAdvancedCustomization.label.UIPortalManagement=Gesti\u00f3n del Portal
-UIAdvancedCustomization.label.UIPageManagement=Gesti\u00f3n de la P\u00e1gina
UIPortalManagement.msg.Invalid-EditLayout-Permission=No tienes permisos para editar esta distribuci\u00f3n.
UIPortalManagement.msg.Invalid-EditPage-Permission=No tienes permisos para editar esta p\u00e1gina.
UIPortalManagement.title.EDIT=Editar el portal actual
UIPortalManagement.title.BROWSE=Getionar Portales
#############################################################################
- # org.exoplatform.portal.component.customization.UIContainerConfigOptions #
#############################################################################
-
-UIContainerConfigOptions.label.ContainerConfigTitle=Categor\u00eda del Contenedor
-UIContainerConfigOptions.label.selectContainerCategory=Haz Click aqu\u00ed para selccionar otra categor\u00eda de Contenedor
-UIContainerConfigOptions.tab.row=Distribuci\u00f3n en filas del Contenedor
-UIContainerConfigOptions.tab.column=Distribuci\u00f3n en columnas del Contenedor
-UIContainerConfigOptions.tab.tabs=Distribuci\u00f3n en Tabs del Contenedor
-UIContainerConfigOptions.tab.mixed=Distribuci\u00f3n Mixta del Contenedor
-UIContainerConfigOptions.UIDropDown.title=Distribuci\u00f3n en filas
-UIContainerConfigOptions.UIDropDown.label.ContainerCategory=Categor\u00eda del Contenedor
-UIContainerConfigOptions.UIDropDown.label.row=Distribuci\u00f3n en filas
-UIContainerConfigOptions.UIDropDown.label.column=Distribuci\u00f3n en columnas
-UIContainerConfigOptions.UIDropDown.label.tabs=Distribuci\u00f3n en Tabs
-UIContainerConfigOptions.UIDropDown.label.mixed=Distribuci\u00f3n Mixta
-UIContainerConfigOptions.template.oneRow=Contenedor de una Fila
-UIContainerConfigOptions.template.twoRows=Contenedor de dos Filas
-UIContainerConfigOptions.template.threeRows=Contenedor de tres Filas
-UIContainerConfigOptions.template.oneColumns=Contenedor de una Columna
-UIContainerConfigOptions.template.twoColumns=Contenedor de dos Columnas
-UIContainerConfigOptions.template.threeColumns=Contenedor de tres Columnas
-UIContainerConfigOptions.template.twoTabs=Contenedor de dos Tabs
-UIContainerConfigOptions.template.threeTabs=Contenedor de tres Tabs
-UIContainerConfigOptions.template.twoColumnsOneRow=Contenedor de dos Columnas, una Fila
-UIContainerConfigOptions.template.oneRowTwoColumns=Contenedor de una Fila, dos Columnas
-UIContainerConfigOptions.template.oneRow2Column1Row=Contenedor de una Fila, dos Columnas, una Fila
-
#############################################################################
- # org.exoplatform.portal.component.customization.UIDecoratorConfigOptions #
- #############################################################################
-UIDecoratorConfigOptions.label.selectDecorator=Select Decorator
-
- #############################################################################
- #############################################################################
- #############################################################################
-
UIPortlet.label.portletContent=Descripci\u00f3n del Portlet
UIPortlet.label.protectedContent=Protected Content
UIPortlet.label.View=Ver
@@ -806,12 +768,6 @@
UIFormAvailablePortlet.label.UIFormTableInputSet=Portlet
- #############################################################################
- # org.exoplatform.portal.component.control.UIQuickBar #
- #############################################################################
-
-UIQuickBar.tooltip.BasicCustomization=Personalizaci\u00f3n B\u00e1sica
-UIQuickBar.tooltip.AdvanceCustomization=Personalizaci\u00f3n Avanzada
#############################################################################
# org.exoplatform.portal.component.customization.UIPageEditBar #
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-04-21 02:09:40 UTC (rev 2702)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_fr.properties 2010-04-21 03:14:09 UTC (rev 2703)
@@ -698,47 +698,15 @@
UIPageCreationWizardStepForm.label.pageName=Nom de la page
#############################################################################
- # org.exoplatform.portal.component.customization.UIAdvancedCustomization #
+ # UIPortalManagement #
#############################################################################
-
-UIAdvancedCustomization.icon.UIPortalManagement=Portail
-UIAdvancedCustomization.icon.UIPageManagement=Page
-UIAdvancedCustomization.label.UIPortalManagement=Gestion de portail
-UIAdvancedCustomization.label.UIPageManagement=Gestion de page
+
UIPortalManagement.msg.Invalid-EditLayout-Permission=Vous n'avez pas le droit de modifier cette disposition.
UIPortalManagement.msg.Invalid-EditPage-Permission=Vous n'avez pas le droit de modifier cette page.
UIPortalManagement.title.EDIT=Editer le portail en cours
UIPortalManagement.title.BROWSE=Parcourir les portails existants
#############################################################################
- # org.exoplatform.portal.component.customization.UIContainerConfigOptions #
- #############################################################################
-
-UIContainerConfigOptions.label.ContainerConfigTitle=Catégories de conteneurs
-UIContainerConfigOptions.label.selectContainerCategory=Cliquer ici pour sélectionner une catégorie de conteneurs
-UIContainerConfigOptions.tab.row=Organisation des conteneurs en lignes
-UIContainerConfigOptions.tab.column=Organisation des conteneurs en colonnes
-UIContainerConfigOptions.tab.tabs=Organisation des conteneurs en onglets
-UIContainerConfigOptions.tab.mixed=Organisation des conteneurs mixtes
-UIContainerConfigOptions.UIDropDown.title=Organisations
-UIContainerConfigOptions.UIDropDown.label.ContainerCategory=Catégories de conteneurs
-UIContainerConfigOptions.UIDropDown.label.row=Organisation en lignes
-UIContainerConfigOptions.UIDropDown.label.column=Organisation en colonnes
-UIContainerConfigOptions.UIDropDown.label.tabs=Organisation en onglets
-UIContainerConfigOptions.UIDropDown.label.mixed=Organisation mixte
-UIContainerConfigOptions.template.oneRow=1 ligne
-UIContainerConfigOptions.template.twoRows=2 lignes
-UIContainerConfigOptions.template.threeRows=3 lignes
-UIContainerConfigOptions.template.oneColumns=1 colonne
-UIContainerConfigOptions.template.twoColumns=2 colonnes
-UIContainerConfigOptions.template.threeColumns=3 colonnes
-UIContainerConfigOptions.template.twoTabs=2 onglets
-UIContainerConfigOptions.template.threeTabs=3 onglets
-UIContainerConfigOptions.template.twoColumnsOneRow=2 colonnes + 1 ligne
-UIContainerConfigOptions.template.oneRowTwoColumns=1 ligne + 2 colonnes
-UIContainerConfigOptions.template.oneRow2Column1Row=1 ligne + 2 colonnes + 1 ligne
-
- #############################################################################
# org.exoplatform.portal.component.customization.UIDropDownConfigs #
#############################################################################
@@ -748,14 +716,8 @@
UIDropDownConfigs.item.mix=Mixte
#############################################################################
- # org.exoplatform.portal.component.customization.UIDecoratorConfigOptions #
#############################################################################
-
-UIDecoratorConfigOptions.label.selectDecorator=Sélectionner un décorateur
-
#############################################################################
- #############################################################################
- #############################################################################
UIPortlet.label.portletContent=Description de portlet
UIPortlet.label.protectedContent=Protected Content
@@ -794,13 +756,6 @@
UIFormAvailablePortlet.label.UIFormTableInputSet=Portlet
#############################################################################
- # org.exoplatform.portal.component.control.UIQuickBar #
- #############################################################################
-
-UIQuickBar.tooltip.BasicCustomization=Personnalisation basique
-UIQuickBar.tooltip.AdvanceCustomization=Personnalisation avancée
-
- #############################################################################
# org.exoplatform.portal.component.customization.UIPageEditBar #
#############################################################################
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-04-21 02:09:40 UTC (rev 2702)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_it.properties 2010-04-21 03:14:09 UTC (rev 2703)
@@ -728,56 +728,18 @@
UIPageCreationWizardStepForm.label.pageName=Nome della Pagina
#############################################################################
- # org.exoplatform.portal.component.customization.UIAdvancedCustomization #
+ # UIPortalManagement #
#############################################################################
-
-UIAdvancedCustomization.icon.UIPortalManagement=Portale
-UIAdvancedCustomization.icon.UIPageManagement=Pagina
-UIAdvancedCustomization.label.UIPortalManagement=Amministrazione del Portale
-UIAdvancedCustomization.label.UIPageManagement=Amministrazione della Pagina
+
UIPortalManagement.msg.Invalid-EditLayout-Permission=Non hai i permessi per modificare il layout.
UIPortalManagement.msg.Invalid-EditPage-Permission=Non hai i permessi per modificare la pagina.
UIPortalManagement.title.EDIT=Modifica il Portale corrente
UIPortalManagement.title.BROWSE=Gestisci i Portali
#############################################################################
- # org.exoplatform.portal.component.customization.UIContainerConfigOptions #
#############################################################################
-
-UIContainerConfigOptions.label.ContainerConfigTitle=Categoria del Contenitore
-UIContainerConfigOptions.label.selectContainerCategory=Clicca qui per selezionare la categoria del contenitore
-UIContainerConfigOptions.tab.row=Layout delle Righe del Contenitore
-UIContainerConfigOptions.tab.column=Layout delle Colonne del Contenitore
-UIContainerConfigOptions.tab.tabs=Layout dei Tab del Contenitore
-UIContainerConfigOptions.tab.mixed=Layout del Contenitore Misto
-UIContainerConfigOptions.UIDropDown.title=Layout delle Righe
-UIContainerConfigOptions.UIDropDown.label.ContainerCategory=Categoria del Contenitore
-UIContainerConfigOptions.UIDropDown.label.row=Layout delle Righe
-UIContainerConfigOptions.UIDropDown.label.column=Layout delle Colonne
-UIContainerConfigOptions.UIDropDown.label.tabs=Layout dei Tab
-UIContainerConfigOptions.UIDropDown.label.mixed=Layout Misto
-UIContainerConfigOptions.template.oneRow=Contenitore di Una Riga
-UIContainerConfigOptions.template.twoRows=Contenitore di Due Righe
-UIContainerConfigOptions.template.threeRows=Contenitore di Tre Righe
-UIContainerConfigOptions.template.oneColumns=Contenitore di Una Colonna
-UIContainerConfigOptions.template.twoColumns=Contenitore di Due Colonne
-UIContainerConfigOptions.template.threeColumns=Contenitore di Tre Colonne
-UIContainerConfigOptions.template.twoTabs=Contenitore di Due Tab
-UIContainerConfigOptions.template.threeTabs=Contenitore di Tre Tab
-UIContainerConfigOptions.template.twoColumnsOneRow=Contenitore di Due Colonne, Una Riga
-UIContainerConfigOptions.template.oneRowTwoColumns=Contenitore di Una Riga, Due Colonne
-UIContainerConfigOptions.template.oneRow2Column1Row=Contenitore di Una Riga, Due Colonne, Una Riga
-
#############################################################################
- # org.exoplatform.portal.component.customization.UIDecoratorConfigOptions #
- #############################################################################
-UIDecoratorConfigOptions.label.selectDecorator=Seleziona il Decorator
-
- #############################################################################
- #############################################################################
- #############################################################################
-
UIPortlet.label.portletContent=Descrizione della Portlet
UIPortlet.label.protectedContent=Protected Content
UIPortlet.label.View=Visualizza
@@ -814,12 +776,6 @@
UIFormAvailablePortlet.label.UIFormTableInputSet=Portlet
- #############################################################################
- # org.exoplatform.portal.component.control.UIQuickBar #
- #############################################################################
-
-UIQuickBar.tooltip.BasicCustomization=Personalizzazione Base
-UIQuickBar.tooltip.AdvanceCustomization=Personalizzazione Avanzata
#############################################################################
# org.exoplatform.portal.component.customization.UIPageEditBar #
@@ -1391,22 +1347,4 @@
UIGadget.tooltip.editGadget=Modifica Gadget
UIGadget.tooltip.deleteGadget=Elimina Gadget
- ############################################################################
- # org.exoplatform.wsrp.webui.component.UIWsrp #
- ############################################################################
-
-UIWsrp.consumer.action.add.success=Consumer Aggiunto con Successo
-UIWsrp.consumer.action.add.exists=Il Consumer esiste gi\u00E0!
-UIWsrp.consumer.action.edit.success=Consumer Modificato con Successo!
-UIWsrp.consumer.action.edit.fail=Errore nella Modifica del Consumer!
-UIWsrp.consumer.grid.action.delete.success=Il Consumer \u00E8 stato cancellato.
-UIWsrp.consumer.grid.action.delete.fail=Cancellazione del Consumer fallita. Motivo: {0}
-UIWsrp.consumer.grid.action.refresh.success=Consumer Aggiornato con Successo.
-UIWsrp.consumer.grid.action.refresh.needfix=L'aggiornamento del Consumer ritorna degli errori che devono essere corretti.
-UIWsrp.consumer.grid.action.refresh.fail=Aggiornamento del Consumer fallito. Motivo: {0}
-UIWsrp.consumer.grid.action.activate.success=Consumer attivato con successo.
-UIWsrp.consumer.grid.action.activate.fail=Problema nell'Attivazione del Consumer: {0}
-UIWsrp.consumer.grid.action.deactivate.success=Consumer disattivato con successo.
-UIWsrp.consumer.grid.action.deactivate.fail=Il Consumer deve essere Attivo per poter essere Disattivato.
-
UIListPermissionSelectorPopup.title.ListPermissionSelector=Seleziona il Permesso
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-04-21 02:09:40 UTC (rev 2702)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ja.properties 2010-04-21 03:14:09 UTC (rev 2703)
@@ -722,56 +722,18 @@
UIPageCreationWizardStepForm.label.pageName=\u30da\u30fc\u30b8\u540d
#############################################################################
- # org.exoplatform.portal.component.customization.UIAdvancedCustomization #
+ # UIPortalManagement #
#############################################################################
-
-UIAdvancedCustomization.icon.UIPortalManagement=\u30dd\u30fc\u30bf\u30eb
-UIAdvancedCustomization.icon.UIPageManagement=\u30da\u30fc\u30b8
-UIAdvancedCustomization.label.UIPortalManagement=\u30dd\u30fc\u30bf\u30eb\u7ba1\u7406
-UIAdvancedCustomization.label.UIPageManagement=\u30da\u30fc\u30b8\u7ba1\u7406
+
UIPortalManagement.msg.Invalid-EditLayout-Permission=\u3053\u306e\u30ec\u30a4\u30a2\u30a6\u30c8\u3092\u7de8\u96c6\u3059\u308b\u6a29\u9650\u304c\u3042\u308a\u307e\u305b\u3093
UIPortalManagement.msg.Invalid-EditPage-Permission=\u3053\u306e\u30da\u30fc\u30b8\u3092\u7de8\u96c6\u3059\u308b\u6a29\u9650\u304c\u3042\u308a\u307e\u305b\u3093
UIPortalManagement.title.EDIT=\u73fe\u5728\u306e\u30dd\u30fc\u30bf\u30eb\u3092\u7de8\u96c6
UIPortalManagement.title.BROWSE=\u30dd\u30fc\u30bf\u30eb\u3092\u7ba1\u7406
#############################################################################
- # org.exoplatform.portal.component.customization.UIContainerConfigOptions #
#############################################################################
-
-UIContainerConfigOptions.label.ContainerConfigTitle=\u30b3\u30f3\u30c6\u30ca\u30ab\u30c6\u30b4\u30ea\u30fc
-UIContainerConfigOptions.label.selectContainerCategory=\u30af\u30ea\u30c3\u30af\u3057\u3066\u30b3\u30f3\u30c6\u30ca\u30ab\u30c6\u30b4\u30ea\u30fc\u3092\u9078\u629e
-UIContainerConfigOptions.tab.row=\u30ed\u30a6\u30b3\u30f3\u30c6\u30ca\u30ec\u30a4\u30a2\u30a6\u30c8
-UIContainerConfigOptions.tab.column=\u30ab\u30e9\u30e0\u30b3\u30f3\u30c6\u30ca\u30ec\u30a4\u30a2\u30a6\u30c8
-UIContainerConfigOptions.tab.tabs=\u30bf\u30d6\u30b3\u30f3\u30c6\u30ca\u30ec\u30a4\u30a2\u30a6\u30c8
-UIContainerConfigOptions.tab.mixed=\u30df\u30c3\u30af\u30b9\u30b3\u30f3\u30c6\u30ca\u30ec\u30a4\u30a2\u30a6\u30c8
-UIContainerConfigOptions.UIDropDown.title=\u30ed\u30a6\u30ec\u30a4\u30a2\u30a6\u30c8
-UIContainerConfigOptions.UIDropDown.label.ContainerCategory=\u30b3\u30f3\u30c6\u30ca\u30ab\u30c6\u30b4\u30ea\u30fc
-UIContainerConfigOptions.UIDropDown.label.row=\u30ed\u30a6\u30ec\u30a4\u30a2\u30a6\u30c8
-UIContainerConfigOptions.UIDropDown.label.column=\u30ab\u30e9\u30e0\u30ec\u30a4\u30a2\u30a6\u30c8
-UIContainerConfigOptions.UIDropDown.label.tabs=\u30bf\u30d6\u30ec\u30a4\u30a2\u30a6\u30c8
-UIContainerConfigOptions.UIDropDown.label.mixed=\u30df\u30c3\u30af\u30b9\u30ec\u30a4\u30a2\u30a6\u30c8
-UIContainerConfigOptions.template.oneRow=1\u30ed\u30a6\u30b3\u30f3\u30c6\u30ca
-UIContainerConfigOptions.template.twoRows=2\u30ed\u30a6\u30b3\u30f3\u30c6\u30ca
-UIContainerConfigOptions.template.threeRows=3\u30ed\u30a6\u30b3\u30f3\u30c6\u30ca
-UIContainerConfigOptions.template.oneColumns=1\u30ab\u30e9\u30e0\u30b3\u30f3\u30c6\u30ca
-UIContainerConfigOptions.template.twoColumns=2\u30ab\u30e9\u30e0\u30b3\u30f3\u30c6\u30ca
-UIContainerConfigOptions.template.threeColumns=3\u30ab\u30e9\u30e0\u30b3\u30f3\u30c6\u30ca
-UIContainerConfigOptions.template.twoTabs=2\u30bf\u30d6\u30b3\u30f3\u30c6\u30ca
-UIContainerConfigOptions.template.threeTabs=3\u30bf\u30d6\u30b3\u30f3\u30c6\u30ca
-UIContainerConfigOptions.template.twoColumnsOneRow=2\u30ab\u30e9\u30e0, 1\u30ed\u30a6\u30b3\u30f3\u30c6\u30ca
-UIContainerConfigOptions.template.oneRowTwoColumns=1\u30ed\u30a6, 2\u30ab\u30e9\u30e0\u30b3\u30f3\u30c6\u30ca
-UIContainerConfigOptions.template.oneRow2Column1Row=1\u30ed\u30a6, 2\u30ab\u30e9\u30e0, 1\u30ed\u30a6\u30b3\u30f3\u30c6\u30ca
-
#############################################################################
- # org.exoplatform.portal.component.customization.UIDecoratorConfigOptions #
- #############################################################################
-UIDecoratorConfigOptions.label.selectDecorator=\u30c7\u30b3\u30ec\u30fc\u30bf\u30fc\u3092\u9078\u629e
-
- #############################################################################
- #############################################################################
- #############################################################################
-
UIPortlet.label.portlet=\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8
UIPortlet.label.protectedContent=Protected Content
UIPortlet.label.title=\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8
@@ -812,13 +774,6 @@
UIFormAvailablePortlet.label.UIFormTableInputSet=\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8
#############################################################################
- # org.exoplatform.portal.component.control.UIQuickBar #
- #############################################################################
-
-UIQuickBar.tooltip.BasicCustomization=\u57fa\u672c\u7684\u306a\u30ab\u30b9\u30bf\u30de\u30a4\u30ba
-UIQuickBar.tooltip.AdvanceCustomization=\u9ad8\u5ea6\u306a\u30ab\u30b9\u30bf\u30de\u30a4\u30ba
-
- #############################################################################
# org.exoplatform.portal.component.customization.UIPageEditBar #
#############################################################################
@@ -1401,22 +1356,3 @@
UIGadget.tooltip.editGadget=\u30ac\u30b8\u30a7\u30c3\u30c8\u306e\u7de8\u96c6
UIGadget.tooltip.deleteGadget=\u30ac\u30b8\u30a7\u30c3\u30c8\u306e\u524a\u9664
- ############################################################################
- # org.exoplatform.wsrp.webui.component.UIWsrp #
- ############################################################################
-
-UIWsrp.consumer.action.add.success=\u30b3\u30f3\u30b7\u30e5\u30fc\u30de\u30fc\u306f\u6b63\u5e38\u306b\u8ffd\u52a0\u3055\u308c\u307e\u3057\u305f
-UIWsrp.consumer.action.add.exists=\u30b3\u30f3\u30b7\u30e5\u30fc\u30de\u30fc\u306f\u3059\u3067\u306b\u5b58\u5728\u3057\u307e\u3059\uff01
-UIWsrp.consumer.action.edit.success=\u30b3\u30f3\u30b7\u30e5\u30fc\u30de\u30fc\u306e\u7de8\u96c6\u306f\u6b63\u5e38\u306b\u5b8c\u4e86\u3057\u307e\u3057\u305f\uff01
-UIWsrp.consumer.action.edit.fail=\u30b3\u30f3\u30b7\u30e5\u30fc\u30de\u30fc\u306e\u7de8\u96c6\u4e2d\u306b\u554f\u984c\u304c\u767a\u751f\u3057\u307e\u3057\u305f\uff01
-UIWsrp.consumer.grid.action.delete.success=\u30b3\u30f3\u30b7\u30e5\u30fc\u30de\u30fc\u304c\u524a\u9664\u3055\u308c\u307e\u3057\u305f\u3002
-UIWsrp.consumer.grid.action.delete.fail=\u30b3\u30f3\u30b7\u30e5\u30fc\u30de\u30fc\u306e\u524a\u9664\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002\u539f\u56e0: {0}
-UIWsrp.consumer.grid.action.refresh.success=\u30b3\u30f3\u30b7\u30e5\u30fc\u30de\u30fc\u306e\u30ea\u30d5\u30ec\u30c3\u30b7\u30e5\u304c\u6b63\u5e38\u306b\u5b8c\u4e86\u3057\u307e\u3057\u305f\u3002
-UIWsrp.consumer.grid.action.refresh.needfix=\u30b3\u30f3\u30b7\u30e5\u30fc\u30de\u30fc\u306e\u30ea\u30d5\u30ec\u30c3\u30b7\u30e5\u306e\u7d50\u679c\u304c\u4fee\u6b63\u3059\u3079\u304d\u30a8\u30e9\u30fc\u306b\u306a\u308a\u307e\u3057\u305f\u3002
-UIWsrp.consumer.grid.action.refresh.fail=\u30b3\u30f3\u30b7\u30e5\u30fc\u30de\u30fc\u306e\u30ea\u30d5\u30ec\u30c3\u30b7\u30e5\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002\u539f\u56e0: {0}
-UIWsrp.consumer.grid.action.activate.success=\u30b3\u30f3\u30b7\u30e5\u30fc\u30de\u30fc\u306f\u6b63\u5e38\u306b\u30a2\u30af\u30c6\u30a3\u30d9\u30fc\u30c8\u3055\u308c\u307e\u3057\u305f
-UIWsrp.consumer.grid.action.activate.fail=\u30b3\u30f3\u30b7\u30e5\u30fc\u30de\u30fc\u306e\u30a2\u30af\u30c6\u30a3\u30d9\u30fc\u30b7\u30e7\u30f3\u4e2d\u306b\u554f\u984c\u304c\u767a\u751f\u3057\u307e\u3057\u305f: {0}
-UIWsrp.consumer.grid.action.deactivate.success=\u30b3\u30f3\u30b7\u30e5\u30fc\u30de\u30fc\u306f\u6b63\u5e38\u306b\u30c7\u30a3\u30a2\u30af\u30c6\u30a3\u30d9\u30fc\u30c8\u3055\u308c\u307e\u3057\u305f\u3002
-UIWsrp.consumer.grid.action.deactivate.fail=\u30b3\u30f3\u30b7\u30e5\u30fc\u30de\u30fc\u3092\u30c7\u30a3\u30a2\u30af\u30c6\u30a3\u30d9\u30fc\u30c8\u3059\u308b\u305f\u3081\u306b\u306f\u30a2\u30af\u30c6\u30a3\u30d6\u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002
-
-
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-04-21 02:09:40 UTC (rev 2702)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ne.properties 2010-04-21 03:14:09 UTC (rev 2703)
@@ -722,56 +722,18 @@
UIPageCreationWizardStepForm.label.pageName=\u092a\u0947\u091c\u0915\u094b \u0928\u093e\u092e
#############################################################################
- # org.exoplatform.portal.component.customization.UIAdvancedCustomization #
+ # UIPortalManagement #
#############################################################################
-UIAdvancedCustomization.icon.UIPortalManagement=\u092a\u094b\u0930\u094d\u091f\u0932
-UIAdvancedCustomization.icon.UIPageManagement=\u092a\u0947\u091c
-UIAdvancedCustomization.label.UIPortalManagement=\u092a\u094b\u0930\u094d\u091f\u0932 \u0935\u094d\u092f\u0935\u0938\u094d\u0925\u093e\u092a\u0928
-UIAdvancedCustomization.label.UIPageManagement=\u092a\u0947\u091c \u0935\u094d\u092f\u0935\u0938\u094d\u0925\u093e\u092a\u0928
UIPortalManagement.msg.Invalid-EditLayout-Permission=\u0924\u092a\u093e\u0908\u0902\u0932\u093e\u0908 \u092f\u094b \u0922\u093e\u0901\u091a\u093e \u0938\u092e\u094d\u092a\u093e\u0926\u0928 \u0917\u0930\u094d\u0928\u0947 \u0905\u0927\u093f\u0915\u093e\u0930 \u091b\u0948\u0928\u0964
UIPortalManagement.msg.Invalid-EditPage-Permission=\u0924\u092a\u093e\u0908\u0902\u0932\u093e\u0908 \u092f\u094b \u092a\u0947\u091c \u0938\u092e\u094d\u092a\u093e\u0926\u0928 \u0917\u0930\u094d\u0928\u0947 \u0905\u0927\u093f\u0915\u093e\u0930 \u091b\u0948\u0928\u0964
UIPortalManagement.title.EDIT=\u0905\u0939\u0940\u0932\u0947\u0915\u094b \u092a\u094b\u0930\u094d\u091f\u0932 \u0938\u092e\u094d\u092a\u093e\u0926\u0928 \u0917\u0930\u094d\u0928\u0941\u0939\u094b\u0938\u094d
UIPortalManagement.title.BROWSE=\u092a\u094b\u0930\u094d\u091f\u0932\u0939\u0930\u0941 \u0938\u092e\u094d\u0939\u093e\u0932\u094d\u0928\u0941\u0939\u094b\u0938\u094d
#############################################################################
- # org.exoplatform.portal.component.customization.UIContainerConfigOptions #
#############################################################################
-
-UIContainerConfigOptions.label.ContainerConfigTitle=\u0915\u0928\u094d\u091f\u0948\u0928\u0930 \u0935\u0930\u094d\u0917
-UIContainerConfigOptions.label.selectContainerCategory=\u0915\u0928\u094d\u091f\u0948\u0928\u0930 \u0935\u0930\u094d\u0917 \u091b\u0928\u094c\u091f \u0917\u0930\u094d\u0928 \u092f\u0939\u093e\u0901 \u0915\u094d\u0932\u093f\u0915 \u0917\u0930\u094d\u0928\u0941\u0939\u094b\u0938\u094d
-UIContainerConfigOptions.tab.row=\u0930\u094b-\u0939\u0930\u0941\u0915\u094b \u0915\u0928\u094d\u091f\u0948\u0928\u0930 \u0922\u093e\u0901\u091a\u093e
-UIContainerConfigOptions.tab.column=\u0915\u094b\u0932\u0941\u092e-\u0939\u0930\u0941\u0915\u094b \u0915\u0928\u094d\u091f\u0948\u0928\u0930 \u0922\u093e\u0901\u091a\u093e
-UIContainerConfigOptions.tab.tabs=\u091f\u094d\u092f\u093e\u092c\u094d\u0938 \u0915\u0928\u094d\u091f\u0948\u0928\u0930 \u0922\u093e\u0901\u091a\u093e
-UIContainerConfigOptions.tab.mixed=\u092e\u093f\u0938\u094d\u0930\u093f\u0924 \u0915\u0928\u094d\u091f\u0948\u0928\u0930 \u0922\u093e\u0901\u091a\u093e
-UIContainerConfigOptions.UIDropDown.title=\u0930\u094b-\u0939\u0930\u0941\u0915\u094b \u0922\u093e\u0901\u091a\u093e
-UIContainerConfigOptions.UIDropDown.label.ContainerCategory=\u0915\u0928\u094d\u091f\u0948\u0928\u0930 \u0935\u0930\u094d\u0917
-UIContainerConfigOptions.UIDropDown.label.row=\u0930\u094b-\u0939\u0930\u0941\u0915\u094b \u0922\u093e\u0901\u091a\u093e
-UIContainerConfigOptions.UIDropDown.label.column=\u0915\u094b\u0932\u0941\u092e\u0939\u0930\u0941\u0915\u094b \u0922\u093e\u0901\u091a\u093e
-UIContainerConfigOptions.UIDropDown.label.tabs=\u091f\u094d\u092f\u093e\u092c\u094d\u0938 \u0922\u093e\u0901\u091a\u093e
-UIContainerConfigOptions.UIDropDown.label.mixed=\u092e\u093f\u0938\u094d\u0930\u093f\u0924 \u0922\u093e\u0901\u091a\u093e
-UIContainerConfigOptions.template.oneRow=\u090f\u0915 \u0930\u094b \u0915\u0928\u094d\u091f\u0948\u0928\u0930
-UIContainerConfigOptions.template.twoRows=\u0926\u0941\u0908 \u0930\u094b-\u0939\u0930\u0941\u0915\u094b \u0915\u0928\u094d\u091f\u0948\u0928\u0930
-UIContainerConfigOptions.template.threeRows=\u0924\u0940\u0928 \u0930\u094b-\u0939\u0930\u0941\u0915\u094b \u0915\u0928\u094d\u091f\u0948\u0928\u0930
-UIContainerConfigOptions.template.oneColumns=\u090f\u0915 \u0915\u094b\u0932\u0941\u092e \u0915\u0928\u094d\u091f\u0948\u0928\u0930
-UIContainerConfigOptions.template.twoColumns=\u0926\u0941\u0908 \u0915\u094b\u0932\u0941\u092e\u0939\u0930\u0941\u0915\u094b \u0915\u0928\u094d\u091f\u0948\u0928\u0930
-UIContainerConfigOptions.template.threeColumns=\u0924\u0940\u0928 \u0915\u094b\u0932\u0941\u092e\u0939\u0930\u0941\u0915\u094b \u0915\u0928\u094d\u091f\u0948\u0928\u0930
-UIContainerConfigOptions.template.twoTabs=\u0926\u0941\u0908 \u091f\u094d\u092f\u093e\u092c\u094d\u0938 \u0915\u0928\u094d\u091f\u0948\u0928\u0930
-UIContainerConfigOptions.template.threeTabs=\u0924\u0940\u0928 \u091f\u094d\u092f\u093e\u092c\u094d\u0938 \u0915\u0928\u094d\u091f\u0948\u0928\u0930
-UIContainerConfigOptions.template.twoColumnsOneRow=\u0926\u0941\u0908 \u0915\u094b\u0932\u0941\u092e\u0939\u0930\u0941,\u090f\u0915 \u0930\u094b \u0915\u0928\u094d\u091f\u0948\u0928\u0930
-UIContainerConfigOptions.template.oneRowTwoColumns=\u090f\u0915 \u0930\u094b, \u0926\u0941\u0908 \u0915\u094b\u0932\u0941\u092e\u0939\u0930\u0941\u0915\u094b \u0915\u0928\u094d\u091f\u0948\u0928\u0930
-UIContainerConfigOptions.template.oneRow2Column1Row=\u090f\u0915 \u0930\u094b, \u0926\u0941\u0908 \u0915\u094b\u0932\u0941\u092e\u0939\u0930\u0941,\u090f\u0915 \u0930\u094b \u0915\u0928\u094d\u091f\u0948\u0928\u0930
-
#############################################################################
- # org.exoplatform.portal.component.customization.UIDecoratorConfigOptions #
- #############################################################################
-UIDecoratorConfigOptions.label.selectDecorator=\u0938\u091c\u093e\u0935\u0915 \u091b\u0928\u094c\u091f \u0917\u0930\u094d\u0928\u0941\u0939\u094b\u0938\u094d
-
- #############################################################################
- #############################################################################
- #############################################################################
-
UIPortlet.label.portlet=\u092a\u094b\u0930\u094d\u091f\u094d\u0932\u0947\u091f
UIPortlet.label.protectedContent=Protected Content
UIPortlet.label.title=\u092a\u094b\u0930\u094d\u091f\u094d\u0932\u0947\u091f
@@ -812,13 +774,6 @@
UIFormAvailablePortlet.label.UIFormTableInputSet=\u092a\u094b\u0930\u094d\u091f\u094d\u0932\u0947\u091f
#############################################################################
- # org.exoplatform.portal.component.control.UIQuickBar #
- #############################################################################
-
-UIQuickBar.tooltip.BasicCustomization=Basic customization
-UIQuickBar.tooltip.AdvanceCustomization=Advanced customization
-
- #############################################################################
# org.exoplatform.portal.component.customization.UIPageEditBar #
#############################################################################
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-04-21 02:09:40 UTC (rev 2702)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_nl.properties 2010-04-21 03:14:09 UTC (rev 2703)
@@ -722,56 +722,18 @@
UIPageCreationWizardStepForm.label.pageName=Pagina naam
#############################################################################
-# org.exoplatform.portal.component.customization.UIAdvancedCustomization #
+# UIPortalManagement #
#############################################################################
-UIAdvancedCustomization.icon.UIPortalManagement=Portaal
-UIAdvancedCustomization.icon.UIPageManagement=Pagina
-UIAdvancedCustomization.label.UIPortalManagement=Portaal beheer
-UIAdvancedCustomization.label.UIPageManagement=Pagina beheer
UIPortalManagement.msg.Invalid-EditLayout-Permission=U heeft het recht niet om deze lay-out te wijzigen.
UIPortalManagement.msg.Invalid-EditPage-Permission=U heeft het recht niet om deze pagina te wijzigen.
UIPortalManagement.title.EDIT=Wijzig huidige portaal
UIPortalManagement.title.BROWSE=Beheer portalen
#############################################################################
-# org.exoplatform.portal.component.customization.UIContainerConfigOptions #
#############################################################################
-
-UIContainerConfigOptions.label.ContainerConfigTitle=Container categorie\u00EBn
-UIContainerConfigOptions.label.selectContainerCategory=Klik hier om een container categorie te selecteren
-UIContainerConfigOptions.tab.row=Rijen container lay-out
-UIContainerConfigOptions.tab.column=Kolommen container lay-out
-UIContainerConfigOptions.tab.tabs=Tabbladen container lay-out
-UIContainerConfigOptions.tab.mixed=Gemixte container lay-out
-UIContainerConfigOptions.UIDropDown.title=Rijen lay-out
-UIContainerConfigOptions.UIDropDown.label.ContainerCategory=Container categorie\u00EBn
-UIContainerConfigOptions.UIDropDown.label.row=Rijen lay-out
-UIContainerConfigOptions.UIDropDown.label.column=Kolommen lay-out
-UIContainerConfigOptions.UIDropDown.label.tabs=Tabbladen lay-out
-UIContainerConfigOptions.UIDropDown.label.mixed=Gemixte lay-out
-UIContainerConfigOptions.template.oneRow=1 rij
-UIContainerConfigOptions.template.twoRows=2 rijen
-UIContainerConfigOptions.template.threeRows=3 rijen
-UIContainerConfigOptions.template.oneColumns=1 kolom
-UIContainerConfigOptions.template.twoColumns=2 kolommen
-UIContainerConfigOptions.template.threeColumns=3 kolommen
-UIContainerConfigOptions.template.twoTabs=2 tabbladen
-UIContainerConfigOptions.template.threeTabs=3 tabbladen
-UIContainerConfigOptions.template.twoColumnsOneRow=2 kolommen en 1 rij
-UIContainerConfigOptions.template.oneRowTwoColumns=1 rij en 2 kolommen
-UIContainerConfigOptions.template.oneRow2Column1Row=1 rij, 2 kolommen en 1 rij
-
#############################################################################
-# org.exoplatform.portal.component.customization.UIDecoratorConfigOptions #
-#############################################################################
-UIDecoratorConfigOptions.label.selectDecorator=Selecteer decorateur
-
-#############################################################################
-#############################################################################
-#############################################################################
-
UIPortlet.label.portletContent=Portlet omschrijving
UIPortlet.label.protectedContent=Protected Content
UIPortlet.label.View=Tonen
@@ -809,13 +771,6 @@
UIFormAvailablePortlet.label.UIFormTableInputSet=Portlet
#############################################################################
-# org.exoplatform.portal.component.control.UIQuickBar #
-#############################################################################
-
-UIQuickBar.tooltip.BasicCustomization=Basis aanpassing
-UIQuickBar.tooltip.AdvanceCustomization=Geavanceerde aanpassing
-
-#############################################################################
# org.exoplatform.portal.component.customization.UIPageEditBar #
#############################################################################
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_pt_BR.properties
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_pt_BR.properties 2010-04-21 02:09:40 UTC (rev 2702)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_pt_BR.properties 2010-04-21 03:14:09 UTC (rev 2703)
@@ -720,56 +720,18 @@
UIPageCreationWizardStepForm.label.pageName=Nome da Página
#############################################################################
- # org.exoplatform.portal.component.customization.UIAdvancedCustomization #
+ # UIPortalManagement #
#############################################################################
-
-UIAdvancedCustomization.icon.UIPortalManagement=Portal
-UIAdvancedCustomization.icon.UIPageManagement=Página
-UIAdvancedCustomization.label.UIPortalManagement=Gerência de Portal
-UIAdvancedCustomization.label.UIPageManagement=Gerência de Páginas
+
UIPortalManagement.msg.Invalid-EditLayout-Permission=Usuário sem permissão para editar este layout.
UIPortalManagement.msg.Invalid-EditPage-Permission=Usuário sem permissão para editar esta página.
UIPortalManagement.title.EDIT=Editar Portal Atual
UIPortalManagement.title.BROWSE=Gerenciar Portais
#############################################################################
- # org.exoplatform.portal.component.customization.UIContainerConfigOptions #
#############################################################################
-
-UIContainerConfigOptions.label.ContainerConfigTitle=Categorias de Contêineres
-UIContainerConfigOptions.label.selectContainerCategory=Selecioner Categoria de Contêiner
-UIContainerConfigOptions.tab.row=Layout de Contêineres em Linhas
-UIContainerConfigOptions.tab.column=Layout de Contêineres em Colunas
-UIContainerConfigOptions.tab.tabs=Layout de Contêineres em Abas
-UIContainerConfigOptions.tab.mixed=Layout de Contêineres Misto
-UIContainerConfigOptions.UIDropDown.title=Layout em Linhas
-UIContainerConfigOptions.UIDropDown.label.ContainerCategory=Categoria de Contêiner
-UIContainerConfigOptions.UIDropDown.label.row=Layout em Linhas
-UIContainerConfigOptions.UIDropDown.label.column=Layout em Colunas
-UIContainerConfigOptions.UIDropDown.label.tabs=Layout em Abas
-UIContainerConfigOptions.UIDropDown.label.mixed=Layout em Misto
-UIContainerConfigOptions.template.oneRow=Uma Linha de Contêiner
-UIContainerConfigOptions.template.twoRows=Duas Linhas de Contêiner
-UIContainerConfigOptions.template.threeRows=Três Linhas de Contêiner
-UIContainerConfigOptions.template.oneColumns=Uma Coluna de Contêiner
-UIContainerConfigOptions.template.twoColumns=Duas Colunas de Contêiner
-UIContainerConfigOptions.template.threeColumns=Três Colunas de Contêiner
-UIContainerConfigOptions.template.twoTabs=Duas Abas de Contêiner
-UIContainerConfigOptions.template.threeTabs=Três Abas de Contêiner
-UIContainerConfigOptions.template.twoColumnsOneRow=Duas Colunas e Uma Linha de Contêiner
-UIContainerConfigOptions.template.oneRowTwoColumns=Uma Linha e Duas Colunas de Contêiner
-UIContainerConfigOptions.template.oneRow2Column1Row=Uma Linha, Duas Colunas e Uma Linha de Contêiner
-
#############################################################################
- # org.exoplatform.portal.component.customization.UIDecoratorConfigOptions #
- #############################################################################
-UIDecoratorConfigOptions.label.selectDecorator=Selecione uma Decoração
-
- #############################################################################
- #############################################################################
- #############################################################################
-
UIPortlet.label.portlet=Portlet
UIPortlet.label.title=Portlet
UIPortlet.label.description=Portlet do GateIn
@@ -809,13 +771,6 @@
UIFormAvailablePortlet.label.UIFormTableInputSet=Portlet
#############################################################################
- # org.exoplatform.portal.component.control.UIQuickBar #
- #############################################################################
-
-UIQuickBar.tooltip.BasicCustomization=Personalizações Básicas
-UIQuickBar.tooltip.AdvanceCustomization=Personalizações Avançadas
-
- #############################################################################
# org.exoplatform.portal.component.customization.UIPageEditBar #
#############################################################################
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-04-21 02:09:40 UTC (rev 2702)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ru.properties 2010-04-21 03:14:09 UTC (rev 2703)
@@ -706,56 +706,18 @@
UIPageCreationWizardStepForm.label.pageName=Название страницы
#############################################################################
- # org.exoplatform.portal.component.customization.UIAdvancedCustomization #
+ # UIPortalManagement #
#############################################################################
-UIAdvancedCustomization.icon.UIPortalManagement=Портал
-UIAdvancedCustomization.icon.UIPageManagement=Страница
-UIAdvancedCustomization.label.UIPortalManagement=Управление порталом
-UIAdvancedCustomization.label.UIPageManagement=Управление страницами
UIPortalManagement.msg.Invalid-EditLayout-Permission=\u0412\u044B \u043D\u0435 \u0438\u043C\u0435\u0435\u0442\u0435 \u043F\u0440\u0430\u0432\u0430 \u043D\u0430 \u0440\u0435\u0434\u0430\u043A\u0442\u0438\u0440\u043E\u0432\u0430\u043D\u0438\u0435 \u043C\u0430\u043A\u0435\u0442\u0430.
UIPortalManagement.msg.Invalid-EditPage-Permission=\u0412\u044B \u043D\u0435 \u0438\u043C\u0435\u0435\u0442\u0435 \u043F\u0440\u0430\u0432\u0430 \u0440\u0435\u0434\u0430\u043A\u0442\u0438\u0440\u043E\u0432\u0430\u0442\u044C \u044D\u0442\u0443 \u0441\u0442\u0440\u0430\u043D\u0438\u0446\u0443.
UIPortalManagement.title.EDIT=Изменить портал
UIPortalManagement.title.BROWSE=Управление порталами
#############################################################################
- # org.exoplatform.portal.component.customization.UIContainerConfigOptions #
#############################################################################
-
-UIContainerConfigOptions.label.ContainerConfigTitle=Контейнер
-UIContainerConfigOptions.label.selectContainerCategory=Выбрать категорию контейнера
-UIContainerConfigOptions.tab.row=Макет стоками
-UIContainerConfigOptions.tab.column=Макет колонками
-UIContainerConfigOptions.tab.tabs=Макет вкладками
-UIContainerConfigOptions.tab.mixed=Смешанный макет
-UIContainerConfigOptions.UIDropDown.title=Рядок
-UIContainerConfigOptions.UIDropDown.label.ContainerCategory=Категория контейнера
-UIContainerConfigOptions.UIDropDown.label.row=Макет строками
-UIContainerConfigOptions.UIDropDown.label.column=Макет колонками
-UIContainerConfigOptions.UIDropDown.label.tabs=Макет вкладками
-UIContainerConfigOptions.UIDropDown.label.mixed=Смешанный макет
-UIContainerConfigOptions.template.oneRow=Контейнер с одной строкой
-UIContainerConfigOptions.template.twoRows=Контейнер с 2-мя строкой
-UIContainerConfigOptions.template.threeRows=Контейнер с 3-мя строкой
-UIContainerConfigOptions.template.oneColumns=Контейнер с одной колонкой
-UIContainerConfigOptions.template.twoColumns=Контейнер с 2-мя колонкой
-UIContainerConfigOptions.template.threeColumns=Контейнер с 3-мя колонкой
-UIContainerConfigOptions.template.twoTabs=Контейнер с 2-мя вкладками
-UIContainerConfigOptions.template.threeTabs=Контейнер с 3-мя вкладками
-UIContainerConfigOptions.template.twoColumnsOneRow=Контейнер с 2-мя колонками и строкой
-UIContainerConfigOptions.template.oneRowTwoColumns=Контейнер со строкой и 2-мя колонками
-UIContainerConfigOptions.template.oneRow2Column1Row=Контейнер со строкой, 2-мя колонками и строкой
-
#############################################################################
- # org.exoplatform.portal.component.customization.UIDecoratorConfigOptions #
- #############################################################################
-UIDecoratorConfigOptions.label.selectDecorator=Выбрать оформление
-
- #############################################################################
- #############################################################################
- #############################################################################
-
UIPortlet.label.portletContent=Описание портлета
UIPortlet.label.protectedContent=Protected Content
UIPortlet.label.View=Показать
@@ -793,13 +755,6 @@
UIFormAvailablePortlet.label.UIFormTableInputSet=Портлет
#############################################################################
- # org.exoplatform.portal.component.control.UIQuickBar #
- #############################################################################
-
-UIQuickBar.tooltip.BasicCustomization=Общая настройка
-UIQuickBar.tooltip.AdvanceCustomization=Тонкая настройка
-
- #############################################################################
# org.exoplatform.portal.component.customization.UIPageEditBar #
#############################################################################
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-04-21 02:09:40 UTC (rev 2702)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_uk.properties 2010-04-21 03:14:09 UTC (rev 2703)
@@ -697,56 +697,18 @@
UIPageCreationWizardStepForm.label.pageName=Назва сторінки
#############################################################################
- # org.exoplatform.portal.component.customization.UIAdvancedCustomization #
+ # UIPortalManagement #
#############################################################################
-
-UIAdvancedCustomization.icon.UIPortalManagement=Портал
-UIAdvancedCustomization.icon.UIPageManagement=Сторінка
-UIAdvancedCustomization.label.UIPortalManagement=Управління порталом
-UIAdvancedCustomization.label.UIPageManagement=Управління сторінкою
+
UIPortalManagement.msg.Invalid-EditLayout-Permission=\u0412\u0438 \u043D\u0435 \u043C\u0430\u0454\u0442\u0435 \u043D\u0456\u044F\u043A\u043E\u0433\u043E \u043F\u0440\u0430\u0432\u0430 \u0440\u0435\u0434\u0430\u0433\u0443\u0432\u0430\u0442\u0438 \u0446\u0435 \u0440\u043E\u0437\u0442\u0430\u0448\u0443\u0432\u0430\u043D\u043D\u044F.
UIPortalManagement.msg.Invalid-EditPage-Permission=\u0412\u0438 \u043D\u0435 \u043C\u0430\u0454\u0442\u0435 \u0436\u043E\u0434\u043D\u043E\u0433\u043E \u043F\u0440\u0430\u0432\u0430 \u0440\u0435\u0434\u0430\u0433\u0443\u0432\u0430\u0442\u0438 \u0446\u044E \u0441\u0442\u043E\u0440\u0456\u043D\u043A\u0443.
UIPortalManagement.title.EDIT=Редагувати поточний портал
UIPortalManagement.title.BROWSE=Управління порталами
#############################################################################
- # org.exoplatform.portal.component.customization.UIContainerConfigOptions #
#############################################################################
-
-UIContainerConfigOptions.label.ContainerConfigTitle=Категорія контейнеру
-UIContainerConfigOptions.label.selectContainerCategory=Натисніть тут, щоб вибрати категорію контейнеру
-UIContainerConfigOptions.tab.row=Схема рядків контейнеру
-UIContainerConfigOptions.tab.column=Схема стовпчиків контейнеру
-UIContainerConfigOptions.tab.tabs=Схема табуляції контейнеру
-UIContainerConfigOptions.tab.mixed=Змішана схема контейнеру
-UIContainerConfigOptions.UIDropDown.title=Схема рядків
-UIContainerConfigOptions.UIDropDown.label.ContainerCategory=Категорія контейнеру
-UIContainerConfigOptions.UIDropDown.label.row=Схема рядків
-UIContainerConfigOptions.UIDropDown.label.column=Схема стовпчиків
-UIContainerConfigOptions.UIDropDown.label.tabs=Схема табуляції
-UIContainerConfigOptions.UIDropDown.label.mixed=Змішана схема
-UIContainerConfigOptions.template.oneRow=Контейнер з одним рядком
-UIContainerConfigOptions.template.twoRows=Контейнер з двома рядками
-UIContainerConfigOptions.template.threeRows=Контейнер з трьома рядками
-UIContainerConfigOptions.template.oneColumns=Контейнер з одним стовпчиком
-UIContainerConfigOptions.template.twoColumns=Контейнер з двома стовпчиками
-UIContainerConfigOptions.template.threeColumns=Контейнер з трьома стовпчиками
-UIContainerConfigOptions.template.twoTabs=Контейнер з подвійною табуляцією
-UIContainerConfigOptions.template.threeTabs=Контейнер з потрійною табуляцією
-UIContainerConfigOptions.template.twoColumnsOneRow=Контейнер з двома стовпчиками, одним рядком
-UIContainerConfigOptions.template.oneRowTwoColumns=Контейнер з одним рядком, двома колонками
-UIContainerConfigOptions.template.oneRow2Column1Row=Контейнер з одним рядком, двома колонками, одним рядком
-
#############################################################################
- # org.exoplatform.portal.component.customization.UIDecoratorConfigOptions #
- #############################################################################
-UIDecoratorConfigOptions.label.selectDecorator=Вибір декоратора
-
- #############################################################################
- #############################################################################
- #############################################################################
-
UIPortlet.label.portletContent=Опис портлету
UIPortlet.label.protectedContent=Protected Content
UIPortlet.label.View=Перегляд
@@ -784,13 +746,6 @@
UIFormAvailablePortlet.label.UIFormTableInputSet=Портлет
#############################################################################
- # org.exoplatform.portal.component.control.UIQuickBar #
- #############################################################################
-
-UIQuickBar.tooltip.BasicCustomization=Базове пристосування
-UIQuickBar.tooltip.AdvanceCustomization=Розширене пристосування
-
- #############################################################################
# org.exoplatform.portal.component.customization.UIPageEditBar #
#############################################################################
14 years, 5 months
- 1
- 0
gatein SVN: r2702 - in portal/trunk: portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component and 2 other directories.
by do-not-reply＠jboss.org
Author: ndkhoiits
Date: 2010-04-20 22:09:40 -0400 (Tue, 20 Apr 2010)
New Revision: 2702
Added:
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageNodeForm2.java
Removed:
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageNodeForm2.java
Modified:
portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/model/PageNode.java
portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UIGroupNavigationManagement.java
portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UISiteManagement.java
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_vi.properties
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/UIWizardPageSetInfo.java
Log:
GTNPORTAL-1065 Fix bugs relate publication date when create new page node or edit a node.
allow Start date or end date is null
Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/model/PageNode.java
===================================================================
--- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/model/PageNode.java 2010-04-21 01:23:26 UTC (rev 2701)
+++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/model/PageNode.java 2010-04-21 02:09:40 UTC (rev 2702)
@@ -289,14 +289,21 @@
private boolean isInPublicationDate()
{
- if (startPublicationDate != null && endPublicationDate != null)
- {
- Date currentDate = new Date();
-
- //
- return currentDate.compareTo(startPublicationDate) >= 0 && currentDate.compareTo(endPublicationDate) <= 0;
- }
- else return startPublicationDate == null && endPublicationDate == null;
+ Date currentDate = new Date();
+
+ // Case 1: start date, end date are not null and current date is between start and end date
+ boolean case1 = (startPublicationDate != null) && (endPublicationDate != null) && (currentDate.compareTo(startPublicationDate) >= 0 && currentDate.compareTo(endPublicationDate) <= 0);
+
+ // Case 2: start date is null, end date is not null and current date is before end date
+ boolean case2 = (startPublicationDate == null) && (endPublicationDate != null) && (currentDate.compareTo(endPublicationDate) <= 0);
+
+ // Case 3: start date is not null, end date is null and current date is after start date
+ boolean case3 = (startPublicationDate != null) && (endPublicationDate == null) && (currentDate.compareTo(startPublicationDate) >= 0);
+
+ // Case 4: start date and end date are null both
+ boolean case4 = (startPublicationDate == null) && (endPublicationDate == null);
+
+ return case1 || case2 || case3 || case4;
}
public void setShowPublicationDate(Boolean show)
Modified: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UIGroupNavigationManagement.java
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UIGroupNavigationManagement.java 2010-04-21 01:23:26 UTC (rev 2701)
+++ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UIGroupNavigationManagement.java 2010-04-21 02:09:40 UTC (rev 2702)
@@ -72,6 +72,7 @@
@EventConfig(listeners = UIPageNodeForm2.SaveActionListener.class),
@EventConfig(listeners = UIGroupNavigationManagement.BackActionListener.class, phase = Phase.DECODE),
@EventConfig(listeners = UIPageNodeForm2.SwitchPublicationDateActionListener.class, phase = Phase.DECODE),
+ @EventConfig(listeners = UIPageNodeForm2.SwitchVisibleActionListener.class, phase = Phase.DECODE),
@EventConfig(listeners = UIPageNodeForm2.ClearPageActionListener.class, phase = Phase.DECODE),
@EventConfig(listeners = UIPageNodeForm2.CreatePageActionListener.class, phase = Phase.DECODE)})})
public class UIGroupNavigationManagement extends UIContainer
Modified: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UISiteManagement.java
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UISiteManagement.java 2010-04-21 01:23:26 UTC (rev 2701)
+++ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UISiteManagement.java 2010-04-21 02:09:40 UTC (rev 2702)
@@ -73,6 +73,7 @@
@EventConfig(listeners = UIPageNodeForm2.SaveActionListener.class),
@EventConfig(listeners = UISiteManagement.BackActionListener.class, phase = Phase.DECODE),
@EventConfig(listeners = UIPageNodeForm2.SwitchPublicationDateActionListener.class, phase = Phase.DECODE),
+ @EventConfig(listeners = UIPageNodeForm2.SwitchVisibleActionListener.class, phase = Phase.DECODE),
@EventConfig(listeners = UIPageNodeForm2.ClearPageActionListener.class, phase = Phase.DECODE),
@EventConfig(listeners = UIPageNodeForm2.CreatePageActionListener.class, phase = Phase.DECODE)})})
public class UISiteManagement extends UIContainer
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-04-21 01:23:26 UTC (rev 2701)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties 2010-04-21 02:09:40 UTC (rev 2702)
@@ -510,6 +510,8 @@
UIPageNodeForm2.msg.SameName=This node name already exists.
UIPageNodeForm2.msg.selectPage=You have to select a page.
UIPageNodeForm2.msg.startDateBeforeEndDate=The end date must be after the start date.
+UIPageNodeForm2.msg.currentDateBeforeStartDate=The start date must be after the current date or empty.
+UIPageNodeForm2.msg.currentDateBeforeEndDate=The end date must be after the current date or empty.
UIPageNodeForm2.action.Save=#{word.save}
UIPageNodeForm2.action.Back=#{word.back}
UIPageNodeForm2.action.Close=#{word.cancel}
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-04-21 01:23:26 UTC (rev 2701)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_vi.properties 2010-04-21 02:09:40 UTC (rev 2702)
@@ -480,6 +480,8 @@
UIPageNodeForm2.msg.SameName=Tên của node mà bạn nhập đang tồn tại, hãy thử với tên khác!
UIPageNodeForm2.msg.selectPage=Bạn phải chọn một trang!
UIPageNodeForm2.msg.startDateBeforeEndDate=Thời gian kết thúc phải lớn hơn hoặc bằng thời gian hiện tại.
+UIPageNodeForm2.msg.currentDateBeforeStartDate=Thời gian bắt đầu phải sau thời gian hiện tại hoặc để trống.
+UIPageNodeForm2.msg.currentDateBeforeEndDate=Thời gian kết thúc phải sau thời gian hiện tại hoặc để trống.
UIPageNodeForm2.action.Save=#{word.save}
UIPageNodeForm2.action.Back=#{word.back}
UIPageNodeForm2.action.Close=#{word.cancel}
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-04-21 01:23:26 UTC (rev 2701)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageCreationWizard.java 2010-04-21 02:09:40 UTC (rev 2702)
@@ -61,7 +61,7 @@
final public static int FIRST_STEP = 1;
- final public static int SECONDE_STEP = 2;
+ final public static int SECOND_STEP = 2;
final public static int THIRD_STEP = 3;
@@ -194,9 +194,9 @@
UIPortalApplication uiPortalApp = uiWizard.getAncestorOfType(UIPortalApplication.class);
UIWorkingWorkspace uiWorkingWS = uiWizard.getAncestorOfType(UIWorkingWorkspace.class);
uiWorkingWS.findFirstComponentOfType(UIPortalComposer.class).setRendered(false);
- uiWizard.viewStep(SECONDE_STEP);
+ uiWizard.viewStep(SECOND_STEP);
- if (uiWizard.getSelectedStep() < SECONDE_STEP)
+ if (uiWizard.getSelectedStep() < SECOND_STEP)
{
uiPortalApp.addMessage(new ApplicationMessage("UIPageCreationWizard.msg.StepByStep", null));
uiWizard.viewStep(FIRST_STEP);
@@ -226,21 +226,45 @@
if (uiPageSetInfo.getUIFormCheckBoxInput(UIWizardPageSetInfo.SHOW_PUBLICATION_DATE).isChecked())
{
+
+ Calendar currentCalendar = Calendar.getInstance();
+ currentCalendar.set(currentCalendar.get(Calendar.YEAR), currentCalendar.get(Calendar.MONTH), currentCalendar.get(Calendar.DAY_OF_MONTH), 0, 0, 0);
+ Date currentDate = currentCalendar.getTime();
+
Calendar startCalendar =
uiPageSetInfo.getUIFormDateTimeInput(UIWizardPageSetInfo.START_PUBLICATION_DATE).getCalendar();
- Date startDate = startCalendar.getTime();
+ Date startDate = (startCalendar != null) ? startCalendar.getTime() : currentDate;
Calendar endCalendar =
uiPageSetInfo.getUIFormDateTimeInput(UIWizardPageSetInfo.END_PUBLICATION_DATE).getCalendar();
- Date endDate = endCalendar.getTime();
- if (startDate.after(endDate))
+ Date endDate = (endCalendar != null) ? endCalendar.getTime() : null;
+
+ // Case 1: current date after start date
+ if (currentDate.after(startDate))
{
- uiPortalApp.addMessage(new ApplicationMessage("UIPageNodeForm2.msg.startDateBeforeEndDate", null));
+ Object[] args = {};
+ uiPortalApp.addMessage(new ApplicationMessage("UIPageNodeForm2.msg.currentDateBeforeStartDate", args, ApplicationMessage.WARNING));
uiWizard.viewStep(FIRST_STEP);
return;
}
+ // Case 2: start date after end date
+ else if ((endCalendar != null) && (startCalendar != null) && (startDate.after(endDate)))
+ {
+ Object[] args = {};
+ uiPortalApp.addMessage(new ApplicationMessage("UIPageNodeForm2.msg.startDateBeforeEndDate", args, ApplicationMessage.WARNING));
+ uiWizard.viewStep(FIRST_STEP);
+ return;
+ }
+ // Case 3: start date is null and current date after end date
+ else if((endCalendar != null) && (currentDate.after(endDate)))
+ {
+ Object[] args = {};
+ uiPortalApp.addMessage(new ApplicationMessage("UIPageNodeForm2.msg.currentDateBeforeEndDate", args, ApplicationMessage.WARNING));
+ uiWizard.viewStep(FIRST_STEP);
+ return;
+ }
}
-
}
+
}
static public class ViewStep3ActionListener extends EventListener<UIPageCreationWizard>
Deleted: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageNodeForm2.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageNodeForm2.java 2010-04-21 01:23:26 UTC (rev 2701)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageNodeForm2.java 2010-04-21 02:09:40 UTC (rev 2702)
@@ -1,426 +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.portal.application.PortalRequestContext;
-import org.exoplatform.portal.config.DataStorage;
-import org.exoplatform.portal.config.UserACL;
-import org.exoplatform.portal.config.model.ModelObject;
-import org.exoplatform.portal.config.model.Page;
-import org.exoplatform.portal.config.model.PageNavigation;
-import org.exoplatform.portal.config.model.PageNode;
-import org.exoplatform.portal.config.model.PortalConfig;
-import org.exoplatform.portal.webui.navigation.PageNavigationUtils;
-import org.exoplatform.portal.webui.portal.UIPortal;
-import org.exoplatform.portal.webui.util.Util;
-import org.exoplatform.portal.webui.workspace.UIPortalApplication;
-import org.exoplatform.web.application.ApplicationMessage;
-import org.exoplatform.webui.application.WebuiRequestContext;
-import org.exoplatform.webui.core.UIApplication;
-import org.exoplatform.webui.core.UIComponent;
-import org.exoplatform.webui.core.UIPopupWindow;
-import org.exoplatform.webui.event.Event;
-import org.exoplatform.webui.event.EventListener;
-import org.exoplatform.webui.event.Event.Phase;
-import org.exoplatform.webui.exception.MessageException;
-import org.exoplatform.webui.form.UIFormCheckBoxInput;
-import org.exoplatform.webui.form.UIFormDateTimeInput;
-import org.exoplatform.webui.form.UIFormInputBase;
-import org.exoplatform.webui.form.UIFormInputIconSelector;
-import org.exoplatform.webui.form.UIFormInputSet;
-import org.exoplatform.webui.form.UIFormStringInput;
-import org.exoplatform.webui.form.UIFormTabPane;
-import org.exoplatform.webui.form.validator.DateTimeValidator;
-import org.exoplatform.webui.form.validator.IdentifierValidator;
-import org.exoplatform.webui.form.validator.MandatoryValidator;
-import org.exoplatform.webui.form.validator.StringLengthValidator;
-import org.exoplatform.webui.form.validator.Validator;
-
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.List;
-
-/**
- * Author : Dang Van Minh, Pham Tuan minhdv81(a)yahoo.com Jun 14, 2006
- */
-public class UIPageNodeForm2 extends UIFormTabPane
-{
-
- private PageNode pageNode_;
-
- private String owner_;
-
- private String ownerType_;
-
- private Object selectedParent;
-
- final private static String SHOW_PUBLICATION_DATE = "showPublicationDate";
-
- final private static String START_PUBLICATION_DATE = "startPublicationDate";
-
- final private static String END_PUBLICATION_DATE = "endPublicationDate";
-
- public UIPageNodeForm2() throws Exception
- {
- super("UIPageNodeForm");
-
- UIFormInputSet uiSettingSet = new UIFormInputSet("PageNodeSetting");
- UIFormCheckBoxInput<Boolean> uiDateInputCheck =
- new UIFormCheckBoxInput<Boolean>(SHOW_PUBLICATION_DATE, SHOW_PUBLICATION_DATE, false);
- uiDateInputCheck.setOnChange("SwitchPublicationDate");
- uiSettingSet.addUIFormInput(new UIFormStringInput("uri", "uri", null).setEditable(false)).addUIFormInput(
- new UIFormStringInput("name", "name", null).addValidator(MandatoryValidator.class).addValidator(
- StringLengthValidator.class, 3, 30).addValidator(IdentifierValidator.class)).addUIFormInput(
- new UIFormStringInput("label", "label", null).addValidator(StringLengthValidator.class, 3, 120))
- .addUIFormInput(new UIFormCheckBoxInput<Boolean>("visible", "visible", true).setChecked(true)).addUIFormInput(
- uiDateInputCheck).addUIFormInput(
- new UIFormDateTimeInput(START_PUBLICATION_DATE, null, null).addValidator(MandatoryValidator.class)
- .addValidator(DateTimeValidator.class)).addUIFormInput(
- new UIFormDateTimeInput(END_PUBLICATION_DATE, null, null).addValidator(MandatoryValidator.class)
- .addValidator(DateTimeValidator.class));
- addUIFormInput(uiSettingSet);
- setSelectedTab(uiSettingSet.getId());
-
- UIPageSelector2 uiPageSelector = createUIComponent(UIPageSelector2.class, null, null);
- uiPageSelector.configure("UIPageSelector2", "pageReference");
- addUIFormInput(uiPageSelector);
-
- UIFormInputIconSelector uiIconSelector = new UIFormInputIconSelector("Icon", "icon");
- addUIFormInput(uiIconSelector);
- setActions(new String[]{"Save", "Back"});
- }
-
- public PageNode getPageNode()
- {
- return pageNode_;
- }
-
- public void setValues(PageNode pageNode) throws Exception
- {
- pageNode_ = pageNode;
- if (pageNode == null)
- {
- getUIStringInput("name").setEditable(UIFormStringInput.ENABLE);
- getChild(UIFormInputIconSelector.class).setSelectedIcon("Default");
- setShowPublicationDate(false);
- return;
- }
- getUIStringInput("name").setEditable(UIFormStringInput.DISABLE);
- invokeGetBindingBean(pageNode_);
- }
-
- public void invokeGetBindingBean(Object bean) throws Exception
- {
- super.invokeGetBindingBean(bean);
- PageNode pageNode = (PageNode)bean;
- String icon = pageNode_.getIcon();
- if (icon == null || icon.length() < 0)
- icon = "Default";
- getChild(UIFormInputIconSelector.class).setSelectedIcon(icon);
- getUIStringInput("label").setValue(pageNode_.getLabel());
- getUIFormCheckBoxInput("visible").setChecked(pageNode_.isVisible());
- setShowPublicationDate(pageNode.isShowPublicationDate());
- Calendar cal = Calendar.getInstance();
- if (pageNode.getStartPublicationDate() != null)
- {
- cal.setTime(pageNode.getStartPublicationDate());
- getUIFormDateTimeInput(START_PUBLICATION_DATE).setCalendar(cal);
- }
- else
- getUIFormDateTimeInput(START_PUBLICATION_DATE).setValue(null);
- if (pageNode.getEndPublicationDate() != null)
- {
- cal.setTime(pageNode.getEndPublicationDate());
- getUIFormDateTimeInput(END_PUBLICATION_DATE).setCalendar(cal);
- }
- else
- getUIFormDateTimeInput(END_PUBLICATION_DATE).setValue(null);
- }
-
- public void invokeSetBindingBean(Object bean) throws Exception
- {
- super.invokeSetBindingBean(bean);
- PageNode node = (PageNode)bean;
- Calendar cal = getUIFormDateTimeInput(START_PUBLICATION_DATE).getCalendar();
- Date date = (cal != null) ? cal.getTime() : null;
- node.setStartPublicationDate(date);
- cal = getUIFormDateTimeInput(END_PUBLICATION_DATE).getCalendar();
- date = (cal != null) ? cal.getTime() : null;
- node.setEndPublicationDate(date);
- }
-
- public void setShowPublicationDate(boolean show)
- {
- getUIFormCheckBoxInput(SHOW_PUBLICATION_DATE).setChecked(show);
- getUIFormDateTimeInput(START_PUBLICATION_DATE).setRendered(show);
- getUIFormDateTimeInput(END_PUBLICATION_DATE).setRendered(show);
- }
-
- public Object getSelectedParent()
- {
- return selectedParent;
- }
-
- public void setSelectedParent(Object obj)
- {
- this.selectedParent = obj;
- }
-
- public void processRender(WebuiRequestContext context) throws Exception
- {
- super.processRender(context);
-
- UIPageSelector2 uiPageSelector = getChild(UIPageSelector2.class);
- if (uiPageSelector == null)
- return;
- UIPopupWindow uiPopupWindowPage = uiPageSelector.getChild(UIPopupWindow.class);
- if (uiPopupWindowPage == null)
- return;
- uiPopupWindowPage.processRender(context);
- }
-
- public void setOwner(String owner_)
- {
- this.owner_ = owner_;
- }
-
- public String getOwner()
- {
- return owner_;
- }
-
- public void setOwnerType(String ownerType_)
- {
- this.ownerType_ = ownerType_;
- }
-
- public String getOwnerType()
- {
- return ownerType_;
- }
-
- static public class SaveActionListener extends EventListener<UIPageNodeForm2>
- {
- public void execute(Event<UIPageNodeForm2> event) throws Exception
- {
- WebuiRequestContext ctx = event.getRequestContext();
- UIPageNodeForm2 uiPageNodeForm = event.getSource();
- UIApplication uiApp = ctx.getUIApplication();
- if (uiPageNodeForm.getUIFormCheckBoxInput(SHOW_PUBLICATION_DATE).isChecked())
- {
- Calendar startCalendar =
- uiPageNodeForm.getUIFormDateTimeInput(UIWizardPageSetInfo.START_PUBLICATION_DATE).getCalendar();
- Date startDate = startCalendar.getTime();
- Calendar endCalendar =
- uiPageNodeForm.getUIFormDateTimeInput(UIWizardPageSetInfo.END_PUBLICATION_DATE).getCalendar();
- Date endDate = endCalendar.getTime();
- if (startDate.after(endDate))
- {
- uiApp.addMessage(new ApplicationMessage("UIPageNodeForm2.msg.startDateBeforeEndDate", null));
- return;
- }
- }
-
- PageNode pageNode = uiPageNodeForm.getPageNode();
- if (pageNode == null)
- pageNode = new PageNode();
- uiPageNodeForm.invokeSetBindingBean(pageNode);
- UIPageSelector2 pageSelector = uiPageNodeForm.getChild(UIPageSelector2.class);
- if (pageSelector.getPage() == null)
- pageNode.setPageReference(null);
- UIFormInputIconSelector uiIconSelector = uiPageNodeForm.getChild(UIFormInputIconSelector.class);
- if (uiIconSelector.getSelectedIcon().equals("Default"))
- pageNode.setIcon(null);
- else
- pageNode.setIcon(uiIconSelector.getSelectedIcon());
- if (pageNode.getLabel() == null)
- pageNode.setLabel(pageNode.getName());
-
- String remoteUser = ctx.getRemoteUser();
- Object selectedParent = uiPageNodeForm.getSelectedParent();
- PageNavigation pageNav = null;
-
- if (selectedParent instanceof PageNavigation)
- {
- pageNav = (PageNavigation)selectedParent;
- pageNode.setUri(pageNode.getName());
- if (!pageNav.getNodes().contains(pageNode))
- {
- if (PageNavigationUtils.searchPageNodeByUri(pageNav, pageNode.getUri()) != null)
- {
- uiApp.addMessage(new ApplicationMessage("UIPageNodeForm2.msg.SameName", null));
- return;
- }
- pageNav.addNode(pageNode);
- }
- }
- else if (selectedParent instanceof PageNode)
- {
- PageNode parentNode = (PageNode)selectedParent;
- List<PageNode> children = parentNode.getChildren();
- if (children == null)
- {
- children = new ArrayList<PageNode>();
- parentNode.setChildren((ArrayList<PageNode>)children);
- }
- pageNode.setUri(parentNode.getUri() + "/" + pageNode.getName());
- if (!children.contains(pageNode))
- {
- if (PageNavigationUtils.searchPageNodeByUri(parentNode, pageNode.getUri()) != null)
- {
- uiApp.addMessage(new ApplicationMessage("UIPageNodeForm2.msg.SameName", null));
- return;
- }
- children.add(pageNode);
- }
- }
- uiPageNodeForm.createEvent("Back", Phase.DECODE, ctx).broadcast();
- }
- }
-
- static public class BackActionListener extends EventListener<UIPageNodeForm2>
- {
-
- public void execute(Event<UIPageNodeForm2> event) throws Exception
- {
- }
-
- }
-
- static public class SwitchPublicationDateActionListener extends EventListener<UIPageNodeForm2>
- {
- public void execute(Event<UIPageNodeForm2> event) throws Exception
- {
- UIPageNodeForm2 uiForm = event.getSource();
- boolean isCheck = uiForm.getUIFormCheckBoxInput(SHOW_PUBLICATION_DATE).isChecked();
- uiForm.getUIFormDateTimeInput(START_PUBLICATION_DATE).setRendered(isCheck);
- uiForm.getUIFormDateTimeInput(END_PUBLICATION_DATE).setRendered(isCheck);
- event.getRequestContext().addUIComponentToUpdateByAjax(uiForm);
- }
- }
-
- static public class ClearPageActionListener extends EventListener<UIPageNodeForm2>
- {
- public void execute(Event<UIPageNodeForm2> event) throws Exception
- {
- UIPageNodeForm2 uiForm = event.getSource();
- UIPageSelector2 pageSelector = uiForm.findFirstComponentOfType(UIPageSelector2.class);
- pageSelector.setPage(null);
- event.getRequestContext().addUIComponentToUpdateByAjax(pageSelector);
- }
- }
-
- static public class CreatePageActionListener extends EventListener<UIPageNodeForm2>
- {
- public void execute(Event<UIPageNodeForm2> event) throws Exception
- {
- UIPageNodeForm2 uiForm = event.getSource();
- UIPageSelector2 pageSelector = uiForm.findFirstComponentOfType(UIPageSelector2.class);
-
- PortalRequestContext pcontext = Util.getPortalRequestContext();
- UIPortalApplication uiPortalApp = Util.getUIPortalApplication();
-
- UIFormInputSet uiInputSet = pageSelector.getChild(UIFormInputSet.class);
- List<UIComponent> children = uiInputSet.getChildren();
- /*********************************************************************/
- for (UIComponent uiChild : children)
- {
- if (uiChild instanceof UIFormInputBase)
- {
- UIFormInputBase uiInput = (UIFormInputBase)uiChild;
- if (!uiInput.isValid())
- continue;
- List<Validator> validators = uiInput.getValidators();
- if (validators == null)
- continue;
- try
- {
- for (Validator validator : validators)
- validator.validate(uiInput);
- }
- catch (MessageException ex)
- {
- uiPortalApp.addMessage(ex.getDetailMessage());
- return;
- }
- catch (Exception ex)
- {
- //TODO: This is a critical exception and should be handle in the UIApplication
- uiPortalApp.addMessage(new ApplicationMessage(ex.getMessage(), null));
- return;
- }
- }
- }
-
- UserACL userACL = uiForm.getApplicationComponent(UserACL.class);
-
- String ownerId = uiForm.getOwner();
- String[] accessPermission = new String[1];
- accessPermission[0] = "*:" + ownerId;
- String editPermission = userACL.getMakableMT() + ":" + ownerId;
-
- if (PortalConfig.PORTAL_TYPE.equals(uiForm.getOwnerType()))
- {
- UIPortal uiPortal = Util.getUIPortal();
- accessPermission = uiPortal.getAccessPermissions();
- editPermission = uiPortal.getEditPermission();
- }
-
-
- UIFormStringInput uiPageName = uiInputSet.getChildById("pageName");
- UIFormStringInput uiPageTitle = uiInputSet.getChildById("pageTitle");
-
- Page page = new Page();
- page.setOwnerType(uiForm.getOwnerType());
- page.setOwnerId(ownerId);
- page.setName(uiPageName.getValue());
- String title = uiPageTitle.getValue();;
- if (title == null || title.trim().length() < 1)
- title = page.getName();
- page.setTitle(title);
-
- page.setShowMaxWindow(false);
-
- page.setAccessPermissions(accessPermission);
- page.setEditPermission(editPermission);
-
- userACL.hasPermission(page);
-
- page.setModifiable(true);
- if (page.getChildren() == null)
- page.setChildren(new ArrayList<ModelObject>());
-
- // check page is exist
- DataStorage dataService = uiForm.getApplicationComponent(DataStorage.class);
- Page existPage = dataService.getPage(page.getPageId());
- if (existPage != null)
- {
- uiPortalApp.addMessage(new ApplicationMessage("UIPageForm.msg.sameName", null));
- pcontext.addUIComponentToUpdateByAjax(uiPortalApp.getUIPopupMessages());
- return;
- }
-
- // save page to database
- dataService.create(page);
- pageSelector.setValue(page.getPageId());
- }
- }
-}
Copied: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageNodeForm2.java (from rev 2683, portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageNodeForm2.java)
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageNodeForm2.java (rev 0)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageNodeForm2.java 2010-04-21 02:09:40 UTC (rev 2702)
@@ -0,0 +1,469 @@
+/**
+ * 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.portal.application.PortalRequestContext;
+import org.exoplatform.portal.config.DataStorage;
+import org.exoplatform.portal.config.UserACL;
+import org.exoplatform.portal.config.model.ModelObject;
+import org.exoplatform.portal.config.model.Page;
+import org.exoplatform.portal.config.model.PageNavigation;
+import org.exoplatform.portal.config.model.PageNode;
+import org.exoplatform.portal.config.model.PortalConfig;
+import org.exoplatform.portal.webui.navigation.PageNavigationUtils;
+import org.exoplatform.portal.webui.portal.UIPortal;
+import org.exoplatform.portal.webui.util.Util;
+import org.exoplatform.portal.webui.workspace.UIPortalApplication;
+import org.exoplatform.web.application.ApplicationMessage;
+import org.exoplatform.webui.application.WebuiRequestContext;
+import org.exoplatform.webui.core.UIApplication;
+import org.exoplatform.webui.core.UIComponent;
+import org.exoplatform.webui.core.UIPopupWindow;
+import org.exoplatform.webui.event.Event;
+import org.exoplatform.webui.event.EventListener;
+import org.exoplatform.webui.event.Event.Phase;
+import org.exoplatform.webui.exception.MessageException;
+import org.exoplatform.webui.form.UIFormCheckBoxInput;
+import org.exoplatform.webui.form.UIFormDateTimeInput;
+import org.exoplatform.webui.form.UIFormInputBase;
+import org.exoplatform.webui.form.UIFormInputIconSelector;
+import org.exoplatform.webui.form.UIFormInputSet;
+import org.exoplatform.webui.form.UIFormStringInput;
+import org.exoplatform.webui.form.UIFormTabPane;
+import org.exoplatform.webui.form.validator.DateTimeValidator;
+import org.exoplatform.webui.form.validator.IdentifierValidator;
+import org.exoplatform.webui.form.validator.MandatoryValidator;
+import org.exoplatform.webui.form.validator.StringLengthValidator;
+import org.exoplatform.webui.form.validator.Validator;
+
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * Author : Dang Van Minh, Pham Tuan minhdv81(a)yahoo.com Jun 14, 2006
+ */
+public class UIPageNodeForm2 extends UIFormTabPane
+{
+
+ private PageNode pageNode_;
+
+ private String owner_;
+
+ private String ownerType_;
+
+ private Object selectedParent;
+
+ final private static String SHOW_PUBLICATION_DATE = "showPublicationDate";
+
+ final private static String START_PUBLICATION_DATE = "startPublicationDate";
+
+ final private static String END_PUBLICATION_DATE = "endPublicationDate";
+
+ final private static String VISIBLE = "visible";
+
+ public UIPageNodeForm2() throws Exception
+ {
+ super("UIPageNodeForm");
+
+ UIFormInputSet uiSettingSet = new UIFormInputSet("PageNodeSetting");
+ UIFormCheckBoxInput<Boolean> uiDateInputCheck =
+ new UIFormCheckBoxInput<Boolean>(SHOW_PUBLICATION_DATE, SHOW_PUBLICATION_DATE, false);
+ UIFormCheckBoxInput<Boolean> uiVisibleCheck = new UIFormCheckBoxInput<Boolean>(VISIBLE, VISIBLE, true);
+
+ uiDateInputCheck.setOnChange("SwitchPublicationDate");
+ uiVisibleCheck.setOnChange("SwitchVisible");
+ uiSettingSet.addUIFormInput(new UIFormStringInput("uri", "uri", null).setEditable(false))
+ .addUIFormInput(new UIFormStringInput("name", "name", null).addValidator(MandatoryValidator.class).addValidator(StringLengthValidator.class, 3, 30).addValidator(IdentifierValidator.class))
+ .addUIFormInput(new UIFormStringInput("label", "label", null).addValidator(StringLengthValidator.class, 3, 120))
+ .addUIFormInput(uiVisibleCheck.setChecked(true))
+ .addUIFormInput(uiDateInputCheck)
+ .addUIFormInput(new UIFormDateTimeInput(START_PUBLICATION_DATE, null, null).addValidator(DateTimeValidator.class))
+ .addUIFormInput(new UIFormDateTimeInput(END_PUBLICATION_DATE, null, null).addValidator(DateTimeValidator.class));
+
+ addUIFormInput(uiSettingSet);
+ setSelectedTab(uiSettingSet.getId());
+
+ UIPageSelector2 uiPageSelector = createUIComponent(UIPageSelector2.class, null, null);
+ uiPageSelector.configure("UIPageSelector2", "pageReference");
+ addUIFormInput(uiPageSelector);
+
+ UIFormInputIconSelector uiIconSelector = new UIFormInputIconSelector("Icon", "icon");
+ addUIFormInput(uiIconSelector);
+ setActions(new String[]{"Save", "Back"});
+ }
+
+ public PageNode getPageNode()
+ {
+ return pageNode_;
+ }
+
+ public void setValues(PageNode pageNode) throws Exception
+ {
+ pageNode_ = pageNode;
+ if (pageNode == null)
+ {
+ getUIStringInput("name").setEditable(UIFormStringInput.ENABLE);
+ getChild(UIFormInputIconSelector.class).setSelectedIcon("Default");
+ setShowPublicationDate(false);
+ return;
+ }
+ getUIStringInput("name").setEditable(UIFormStringInput.DISABLE);
+ invokeGetBindingBean(pageNode_);
+ }
+
+ public void invokeGetBindingBean(Object bean) throws Exception
+ {
+ super.invokeGetBindingBean(bean);
+ PageNode pageNode = (PageNode)bean;
+ String icon = pageNode_.getIcon();
+ if (icon == null || icon.length() < 0)
+ icon = "Default";
+ getChild(UIFormInputIconSelector.class).setSelectedIcon(icon);
+ getUIStringInput("label").setValue(pageNode_.getLabel());
+ getUIFormCheckBoxInput(VISIBLE).setChecked(pageNode_.isVisible());
+ getUIFormCheckBoxInput(SHOW_PUBLICATION_DATE).setChecked(pageNode.isShowPublicationDate());
+ setShowCheckPublicationDate(pageNode_.isVisible());
+ Calendar cal = Calendar.getInstance();
+ if (pageNode.getStartPublicationDate() != null)
+ {
+ cal.setTime(pageNode.getStartPublicationDate());
+ getUIFormDateTimeInput(START_PUBLICATION_DATE).setCalendar(cal);
+ }
+ else
+ getUIFormDateTimeInput(START_PUBLICATION_DATE).setValue(null);
+ if (pageNode.getEndPublicationDate() != null)
+ {
+ cal.setTime(pageNode.getEndPublicationDate());
+ getUIFormDateTimeInput(END_PUBLICATION_DATE).setCalendar(cal);
+ }
+ else
+ getUIFormDateTimeInput(END_PUBLICATION_DATE).setValue(null);
+ }
+
+ public void invokeSetBindingBean(Object bean) throws Exception
+ {
+ super.invokeSetBindingBean(bean);
+ PageNode node = (PageNode)bean;
+ Calendar cal = getUIFormDateTimeInput(START_PUBLICATION_DATE).getCalendar();
+ Date date = (cal != null) ? cal.getTime() : null;
+ node.setStartPublicationDate(date);
+ cal = getUIFormDateTimeInput(END_PUBLICATION_DATE).getCalendar();
+ date = (cal != null) ? cal.getTime() : null;
+ node.setEndPublicationDate(date);
+ }
+
+ public void setShowCheckPublicationDate(boolean show)
+ {
+ getUIFormCheckBoxInput(VISIBLE).setChecked(show);
+ UIFormCheckBoxInput<Boolean> uiForm = getUIFormCheckBoxInput(SHOW_PUBLICATION_DATE);
+ uiForm.setRendered(show);
+ setShowPublicationDate(show && uiForm.isChecked());
+ }
+
+ public void setShowPublicationDate(boolean show)
+ {
+ getUIFormDateTimeInput(START_PUBLICATION_DATE).setRendered(show);
+ getUIFormDateTimeInput(END_PUBLICATION_DATE).setRendered(show);
+ }
+
+ public Object getSelectedParent()
+ {
+ return selectedParent;
+ }
+
+ public void setSelectedParent(Object obj)
+ {
+ this.selectedParent = obj;
+ }
+
+ public void processRender(WebuiRequestContext context) throws Exception
+ {
+ super.processRender(context);
+
+ UIPageSelector2 uiPageSelector = getChild(UIPageSelector2.class);
+ if (uiPageSelector == null)
+ return;
+ UIPopupWindow uiPopupWindowPage = uiPageSelector.getChild(UIPopupWindow.class);
+ if (uiPopupWindowPage == null)
+ return;
+ uiPopupWindowPage.processRender(context);
+ }
+
+ public void setOwner(String owner_)
+ {
+ this.owner_ = owner_;
+ }
+
+ public String getOwner()
+ {
+ return owner_;
+ }
+
+ public void setOwnerType(String ownerType_)
+ {
+ this.ownerType_ = ownerType_;
+ }
+
+ public String getOwnerType()
+ {
+ return ownerType_;
+ }
+
+ static public class SaveActionListener extends EventListener<UIPageNodeForm2>
+ {
+ public void execute(Event<UIPageNodeForm2> event) throws Exception
+ {
+ WebuiRequestContext ctx = event.getRequestContext();
+ UIPageNodeForm2 uiPageNodeForm = event.getSource();
+ UIApplication uiPortalApp = ctx.getUIApplication();
+ if (uiPageNodeForm.getUIFormCheckBoxInput(SHOW_PUBLICATION_DATE).isChecked())
+ {
+ Calendar currentCalendar = Calendar.getInstance();
+ currentCalendar.set(currentCalendar.get(Calendar.YEAR), currentCalendar.get(Calendar.MONTH), currentCalendar.get(Calendar.DAY_OF_MONTH), 0, 0, 0);
+ Date currentDate = currentCalendar.getTime();
+
+ Calendar startCalendar =
+ uiPageNodeForm.getUIFormDateTimeInput(UIWizardPageSetInfo.START_PUBLICATION_DATE).getCalendar();
+ Date startDate = startCalendar != null ? startCalendar.getTime() : currentDate;
+ Calendar endCalendar =
+ uiPageNodeForm.getUIFormDateTimeInput(UIWizardPageSetInfo.END_PUBLICATION_DATE).getCalendar();
+ Date endDate = endCalendar != null ? endCalendar.getTime() : null;
+
+ // Case 1: current date after start date
+ if (currentDate.after(startDate))
+ {
+ Object[] args = {};
+ uiPortalApp.addMessage(new ApplicationMessage("UIPageNodeForm2.msg.currentDateBeforeStartDate", args, ApplicationMessage.WARNING));
+ return;
+ }
+ // Case 2: start date after end date
+ else if ((endCalendar != null) && (startCalendar != null) && (startDate.after(endDate)))
+ {
+ Object[] args = {};
+ uiPortalApp.addMessage(new ApplicationMessage("UIPageNodeForm2.msg.startDateBeforeEndDate", args, ApplicationMessage.WARNING));
+ return;
+ }
+ // Case 3: start date is null and current date after end date
+ else if((endCalendar != null) && (currentDate.after(endDate)))
+ {
+ Object[] args = {};
+ uiPortalApp.addMessage(new ApplicationMessage("UIPageNodeForm2.msg.currentDateBeforeEndDate", args, ApplicationMessage.WARNING));
+ return;
+ }
+
+ }
+
+ PageNode pageNode = uiPageNodeForm.getPageNode();
+ if (pageNode == null)
+ pageNode = new PageNode();
+ uiPageNodeForm.invokeSetBindingBean(pageNode);
+ UIPageSelector2 pageSelector = uiPageNodeForm.getChild(UIPageSelector2.class);
+ if (pageSelector.getPage() == null)
+ pageNode.setPageReference(null);
+ UIFormInputIconSelector uiIconSelector = uiPageNodeForm.getChild(UIFormInputIconSelector.class);
+ if (uiIconSelector.getSelectedIcon().equals("Default"))
+ pageNode.setIcon(null);
+ else
+ pageNode.setIcon(uiIconSelector.getSelectedIcon());
+ if (pageNode.getLabel() == null)
+ pageNode.setLabel(pageNode.getName());
+
+ Object selectedParent = uiPageNodeForm.getSelectedParent();
+ PageNavigation pageNav = null;
+
+ if (selectedParent instanceof PageNavigation)
+ {
+ pageNav = (PageNavigation)selectedParent;
+ pageNode.setUri(pageNode.getName());
+ if (!pageNav.getNodes().contains(pageNode))
+ {
+ if (PageNavigationUtils.searchPageNodeByUri(pageNav, pageNode.getUri()) != null)
+ {
+ uiPortalApp.addMessage(new ApplicationMessage("UIPageNodeForm2.msg.SameName", null));
+ return;
+ }
+ pageNav.addNode(pageNode);
+ }
+ }
+ else if (selectedParent instanceof PageNode)
+ {
+ PageNode parentNode = (PageNode)selectedParent;
+ List<PageNode> children = parentNode.getChildren();
+ if (children == null)
+ {
+ children = new ArrayList<PageNode>();
+ parentNode.setChildren((ArrayList<PageNode>)children);
+ }
+ pageNode.setUri(parentNode.getUri() + "/" + pageNode.getName());
+ if (!children.contains(pageNode))
+ {
+ if (PageNavigationUtils.searchPageNodeByUri(parentNode, pageNode.getUri()) != null)
+ {
+ uiPortalApp.addMessage(new ApplicationMessage("UIPageNodeForm2.msg.SameName", null));
+ return;
+ }
+ children.add(pageNode);
+ }
+ }
+ uiPageNodeForm.createEvent("Back", Phase.DECODE, ctx).broadcast();
+ }
+ }
+
+ static public class BackActionListener extends EventListener<UIPageNodeForm2>
+ {
+
+ public void execute(Event<UIPageNodeForm2> event) throws Exception
+ {
+ }
+
+ }
+
+ static public class SwitchPublicationDateActionListener extends EventListener<UIPageNodeForm2>
+ {
+ public void execute(Event<UIPageNodeForm2> event) throws Exception
+ {
+ UIPageNodeForm2 uiForm = event.getSource();
+ boolean isCheck = uiForm.getUIFormCheckBoxInput(SHOW_PUBLICATION_DATE).isChecked();
+ uiForm.setShowPublicationDate(isCheck);
+ event.getRequestContext().addUIComponentToUpdateByAjax(uiForm);
+ }
+ }
+
+ static public class SwitchVisibleActionListener extends EventListener<UIPageNodeForm2>
+ {
+ @Override
+ public void execute(Event<UIPageNodeForm2> event) throws Exception
+ {
+ UIPageNodeForm2 uiForm = event.getSource();
+ boolean isCheck = uiForm.getUIFormCheckBoxInput(VISIBLE).isChecked();
+ uiForm.setShowCheckPublicationDate(isCheck);
+ event.getRequestContext().addUIComponentToUpdateByAjax(uiForm);
+ }
+ }
+
+ static public class ClearPageActionListener extends EventListener<UIPageNodeForm2>
+ {
+ public void execute(Event<UIPageNodeForm2> event) throws Exception
+ {
+ UIPageNodeForm2 uiForm = event.getSource();
+ UIPageSelector2 pageSelector = uiForm.findFirstComponentOfType(UIPageSelector2.class);
+ pageSelector.setPage(null);
+ event.getRequestContext().addUIComponentToUpdateByAjax(pageSelector);
+ }
+ }
+
+ static public class CreatePageActionListener extends EventListener<UIPageNodeForm2>
+ {
+ public void execute(Event<UIPageNodeForm2> event) throws Exception
+ {
+ UIPageNodeForm2 uiForm = event.getSource();
+ UIPageSelector2 pageSelector = uiForm.findFirstComponentOfType(UIPageSelector2.class);
+
+ PortalRequestContext pcontext = Util.getPortalRequestContext();
+ UIPortalApplication uiPortalApp = Util.getUIPortalApplication();
+
+ UIFormInputSet uiInputSet = pageSelector.getChild(UIFormInputSet.class);
+ List<UIComponent> children = uiInputSet.getChildren();
+ /*********************************************************************/
+ for (UIComponent uiChild : children)
+ {
+ if (uiChild instanceof UIFormInputBase)
+ {
+ UIFormInputBase uiInput = (UIFormInputBase)uiChild;
+ if (!uiInput.isValid())
+ continue;
+ List<Validator> validators = uiInput.getValidators();
+ if (validators == null)
+ continue;
+ try
+ {
+ for (Validator validator : validators)
+ validator.validate(uiInput);
+ }
+ catch (MessageException ex)
+ {
+ uiPortalApp.addMessage(ex.getDetailMessage());
+ return;
+ }
+ catch (Exception ex)
+ {
+ //TODO: This is a critical exception and should be handle in the UIApplication
+ uiPortalApp.addMessage(new ApplicationMessage(ex.getMessage(), null));
+ return;
+ }
+ }
+ }
+
+ UserACL userACL = uiForm.getApplicationComponent(UserACL.class);
+
+ String ownerId = uiForm.getOwner();
+ String[] accessPermission = new String[1];
+ accessPermission[0] = "*:" + ownerId;
+ String editPermission = userACL.getMakableMT() + ":" + ownerId;
+
+ if (PortalConfig.PORTAL_TYPE.equals(uiForm.getOwnerType()))
+ {
+ UIPortal uiPortal = Util.getUIPortal();
+ accessPermission = uiPortal.getAccessPermissions();
+ editPermission = uiPortal.getEditPermission();
+ }
+
+
+ UIFormStringInput uiPageName = uiInputSet.getChildById("pageName");
+ UIFormStringInput uiPageTitle = uiInputSet.getChildById("pageTitle");
+
+ Page page = new Page();
+ page.setOwnerType(uiForm.getOwnerType());
+ page.setOwnerId(ownerId);
+ page.setName(uiPageName.getValue());
+ String title = uiPageTitle.getValue();;
+ if (title == null || title.trim().length() < 1)
+ title = page.getName();
+ page.setTitle(title);
+
+ page.setShowMaxWindow(false);
+
+ page.setAccessPermissions(accessPermission);
+ page.setEditPermission(editPermission);
+
+ userACL.hasPermission(page);
+
+ page.setModifiable(true);
+ if (page.getChildren() == null)
+ page.setChildren(new ArrayList<ModelObject>());
+
+ // check page is exist
+ DataStorage dataService = uiForm.getApplicationComponent(DataStorage.class);
+ Page existPage = dataService.getPage(page.getPageId());
+ if (existPage != null)
+ {
+ uiPortalApp.addMessage(new ApplicationMessage("UIPageForm.msg.sameName", null));
+ pcontext.addUIComponentToUpdateByAjax(uiPortalApp.getUIPopupMessages());
+ return;
+ }
+
+ // save page to database
+ dataService.create(page);
+ pageSelector.setValue(page.getPageId());
+ }
+ }
+}
Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIWizardPageSetInfo.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIWizardPageSetInfo.java 2010-04-21 01:23:26 UTC (rev 2701)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIWizardPageSetInfo.java 2010-04-21 02:09:40 UTC (rev 2702)
@@ -60,6 +60,7 @@
*/
@ComponentConfigs({@ComponentConfig(lifecycle = UIFormLifecycle.class, template = "system:/groovy/portal/webui/page/UIWizardPageSetInfo.gtmpl", events = {
@EventConfig(listeners = UIWizardPageSetInfo.ChangeNodeActionListener.class, phase = Phase.DECODE),
+ @EventConfig(listeners = UIWizardPageSetInfo.SwitchVisibleActionListener.class, phase = Phase.DECODE),
@EventConfig(listeners = UIWizardPageSetInfo.SwitchPublicationDateActionListener.class, phase = Phase.DECODE)})})
public class UIWizardPageSetInfo extends UIForm
{
@@ -82,20 +83,21 @@
public UIWizardPageSetInfo() throws Exception
{
+ UIFormCheckBoxInput<Boolean> uiDateInputCheck =
+ new UIFormCheckBoxInput<Boolean>(SHOW_PUBLICATION_DATE, SHOW_PUBLICATION_DATE, false);
+ UIFormCheckBoxInput<Boolean> uiVisibleCheck = new UIFormCheckBoxInput<Boolean>(VISIBLE, VISIBLE, false);
+ uiDateInputCheck.setOnChange("SwitchPublicationDate");
+ uiVisibleCheck.setOnChange("SwitchVisible");
+
addChild(UIPageNodeSelector.class, null, null);
addUIFormInput(new UIFormStringInput(PAGE_NAME, "name", null).addValidator(MandatoryValidator.class)
- .addValidator(StringLengthValidator.class, 3, 30).addValidator(IdentifierValidator.class));
- addUIFormInput(new UIFormStringInput(PAGE_DISPLAY_NAME, "label", null).setMaxLength(255).addValidator(
- StringLengthValidator.class, 3, 120));
- addUIFormInput(new UIFormCheckBoxInput<Boolean>(VISIBLE, VISIBLE, false).setChecked(true));
- UIFormCheckBoxInput<Boolean> uiDateInputCheck =
- new UIFormCheckBoxInput<Boolean>(SHOW_PUBLICATION_DATE, SHOW_PUBLICATION_DATE, false);
- uiDateInputCheck.setOnChange("SwitchPublicationDate");
+ .addValidator(StringLengthValidator.class, 3, 30).addValidator(IdentifierValidator.class));
+ addUIFormInput(new UIFormStringInput(PAGE_DISPLAY_NAME, "label", null)
+ .setMaxLength(255).addValidator(StringLengthValidator.class, 3, 120));
+ addUIFormInput(uiVisibleCheck.setChecked(true));
addUIFormInput(uiDateInputCheck);
- addUIFormInput(new UIFormDateTimeInput(START_PUBLICATION_DATE, null, null).addValidator(DateTimeValidator.class)
- .addValidator(MandatoryValidator.class));
- addUIFormInput(new UIFormDateTimeInput(END_PUBLICATION_DATE, null, null).addValidator(DateTimeValidator.class)
- .addValidator(MandatoryValidator.class));
+ addUIFormInput(new UIFormDateTimeInput(START_PUBLICATION_DATE, null, null).addValidator(DateTimeValidator.class));
+ addUIFormInput(new UIFormDateTimeInput(END_PUBLICATION_DATE, null, null).addValidator(DateTimeValidator.class));
}
public void setEditMode() throws Exception
@@ -114,7 +116,10 @@
{
super.invokeSetBindingBean(bean);
PageNode node = (PageNode)bean;
- node.setVisible(getUIFormCheckBoxInput(VISIBLE).isChecked());
+ if(!getUIFormCheckBoxInput(SHOW_PUBLICATION_DATE).isChecked())
+ {
+ node.setVisible(getUIFormCheckBoxInput(VISIBLE).isChecked());
+ }
Calendar cal = getUIFormDateTimeInput(START_PUBLICATION_DATE).getCalendar();
Date date = (cal != null) ? cal.getTime() : null;
node.setStartPublicationDate(date);
@@ -161,9 +166,16 @@
return pageNode;
}
+ public void setShowCheckPublicationDate(boolean show)
+ {
+ getUIFormCheckBoxInput(VISIBLE).setChecked(show);
+ UIFormCheckBoxInput<Boolean> uiForm = getUIFormCheckBoxInput(SHOW_PUBLICATION_DATE);
+ uiForm.setRendered(show);
+ setShowPublicationDate(show && uiForm.isChecked());
+ }
+
public void setShowPublicationDate(boolean show)
{
- getUIFormCheckBoxInput(SHOW_PUBLICATION_DATE).setChecked(show);
getUIFormDateTimeInput(START_PUBLICATION_DATE).setRendered(show);
getUIFormDateTimeInput(END_PUBLICATION_DATE).setRendered(show);
}
@@ -304,5 +316,17 @@
}
}
+
+ static public class SwitchVisibleActionListener extends EventListener<UIWizardPageSetInfo>
+ {
+ @Override
+ public void execute(Event<UIWizardPageSetInfo> event) throws Exception
+ {
+ UIWizardPageSetInfo uiForm = event.getSource();
+ boolean isCheck = uiForm.getUIFormCheckBoxInput(VISIBLE).isChecked();
+ uiForm.setShowCheckPublicationDate(isCheck);
+ event.getRequestContext().addUIComponentToUpdateByAjax(uiForm);
+ }
+ }
}
14 years, 5 months
- 1
- 0
gatein SVN: r2701 - portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/images.
by do-not-reply＠jboss.org
Author: smumford
Date: 2010-04-20 21:23:26 -0400 (Tue, 20 Apr 2010)
New Revision: 2701
Added:
portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/images/EmailError.png
portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/images/NodeIcons.png
portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/images/httpNode.png
portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/images/httpPage.png
Log:
Add new images
Added: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/images/EmailError.png
===================================================================
(Binary files differ)
Property changes on: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/images/EmailError.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/images/NodeIcons.png
===================================================================
(Binary files differ)
Property changes on: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/images/NodeIcons.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/images/httpNode.png
===================================================================
(Binary files differ)
Property changes on: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/images/httpNode.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/images/httpPage.png
===================================================================
(Binary files differ)
Property changes on: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/images/httpPage.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
14 years, 5 months
- 1
- 0
gatein SVN: r2700 - in portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US: modules/account and 3 other directories.
by do-not-reply＠jboss.org
Author: smumford
Date: 2010-04-20 21:18:56 -0400 (Tue, 20 Apr 2010)
New Revision: 2700
Removed:
portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/images/AAANavi.png
portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/images/Add.png
portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/images/Add3.png
portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/images/Administration.png
portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/images/AfterEdit1.png
portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/images/ChangePortal2.6.png
portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/images/DashboardLink.png
portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/images/Delete.png
portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/images/Downloads.png
portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/images/Edit.png
portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/images/Edit2.6.png
portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/images/EditActivePortals.png
portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/images/EditCurrentPortal.png
portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/images/EditGroupNavigation.png
portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/images/EditGroupNavigation2.png
portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/images/EditInline.png
portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/images/EditPermission1.png
portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/images/EditPermission2.png
portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/images/EditPortal.png
portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/images/EditPortalNavigation.png
portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/images/EditPortalNavigation2.png
portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/images/GateIn.png
portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/images/In3.png
portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/images/InterfaceLanguage2.6.png
portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/images/Internal2.png
portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/images/InternationalizationPortlet1.png
portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/images/ManagePage2.png
portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/images/Nouvel.png
portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/images/PageList.png
portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/images/PageSelector6.png
portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/images/PasteCloneNode2.png
portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/images/PasteCutNode4.png
portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/images/PortalAccessPermissions.png
portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/images/PortalHome.png
portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/images/PortalSet.png
portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/images/Portlet.png
portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/images/RememberMe2.6.png
portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/images/Root1.png
portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/images/Search.png
portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/images/SelectUser.png
portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/images/SignIn2.6.png
portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/images/SignOut.png
portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/images/Step32.6.png
portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/images/UserProfile.png
portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/images/UserWorkspace2.png
portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/images/WebExplorer1.png
portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/images/Welcome.png
portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/images/gatein_logo.png
portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/images/http.png
Modified:
portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/images/AccountSetting.png
portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/images/Column.png
portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/images/NewGadget.png
portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/images/SureDelete.png
portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/images/Verification.png
portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/images/local.png
portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/modules/account/Account_and_Password_Retrieval.xml
portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/modules/account/Register_New_Accounts.xml
portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/modules/gadgetsAdmin/Manage_Portlets_and_Gadgets.xml
portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/modules/portal/Create_a_New_Portal.xml
portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/modules/portal/Manage_Navigation_Nodes.xml
portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/modules/portal/Manage_Pages.xml
portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/modules/portal/Manage_Portals.xml
portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/modules/portal/User_Management.xml
portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/modules/portletsUser/Dashboard_Portlet.xml
Log:
QE changes, minor edits and cleanup
Deleted: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/images/AAANavi.png
===================================================================
(Binary files differ)
Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/images/AccountSetting.png
===================================================================
(Binary files differ)
Deleted: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/images/Add.png
===================================================================
(Binary files differ)
Deleted: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/images/Add3.png
===================================================================
(Binary files differ)
Deleted: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/images/Administration.png
===================================================================
(Binary files differ)
Deleted: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/images/AfterEdit1.png
===================================================================
(Binary files differ)
Deleted: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/images/ChangePortal2.6.png
===================================================================
(Binary files differ)
Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/images/Column.png
===================================================================
(Binary files differ)
Deleted: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/images/DashboardLink.png
===================================================================
(Binary files differ)
Deleted: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/images/Delete.png
===================================================================
(Binary files differ)
Deleted: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/images/Downloads.png
===================================================================
(Binary files differ)
Deleted: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/images/Edit.png
===================================================================
(Binary files differ)
Deleted: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/images/Edit2.6.png
===================================================================
(Binary files differ)
Deleted: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/images/EditActivePortals.png
===================================================================
(Binary files differ)
Deleted: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/images/EditCurrentPortal.png
===================================================================
(Binary files differ)
Deleted: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/images/EditGroupNavigation.png
===================================================================
(Binary files differ)
Deleted: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/images/EditGroupNavigation2.png
===================================================================
(Binary files differ)
Deleted: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/images/EditInline.png
===================================================================
(Binary files differ)
Deleted: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/images/EditPermission1.png
===================================================================
(Binary files differ)
Deleted: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/images/EditPermission2.png
===================================================================
(Binary files differ)
Deleted: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/images/EditPortal.png
===================================================================
(Binary files differ)
Deleted: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/images/EditPortalNavigation.png
===================================================================
(Binary files differ)
Deleted: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/images/EditPortalNavigation2.png
===================================================================
(Binary files differ)
Deleted: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/images/GateIn.png
===================================================================
(Binary files differ)
Deleted: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/images/In3.png
===================================================================
(Binary files differ)
Deleted: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/images/InterfaceLanguage2.6.png
===================================================================
(Binary files differ)
Deleted: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/images/Internal2.png
===================================================================
(Binary files differ)
Deleted: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/images/InternationalizationPortlet1.png
===================================================================
(Binary files differ)
Deleted: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/images/ManagePage2.png
===================================================================
(Binary files differ)
Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/images/NewGadget.png
===================================================================
(Binary files differ)
Deleted: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/images/Nouvel.png
===================================================================
(Binary files differ)
Deleted: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/images/PageList.png
===================================================================
(Binary files differ)
Deleted: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/images/PageSelector6.png
===================================================================
(Binary files differ)
Deleted: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/images/PasteCloneNode2.png
===================================================================
(Binary files differ)
Deleted: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/images/PasteCutNode4.png
===================================================================
(Binary files differ)
Deleted: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/images/PortalAccessPermissions.png
===================================================================
(Binary files differ)
Deleted: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/images/PortalHome.png
===================================================================
(Binary files differ)
Deleted: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/images/PortalSet.png
===================================================================
(Binary files differ)
Deleted: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/images/Portlet.png
===================================================================
(Binary files differ)
Deleted: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/images/RememberMe2.6.png
===================================================================
(Binary files differ)
Deleted: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/images/Root1.png
===================================================================
(Binary files differ)
Deleted: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/images/Search.png
===================================================================
(Binary files differ)
Deleted: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/images/SelectUser.png
===================================================================
(Binary files differ)
Deleted: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/images/SignIn2.6.png
===================================================================
(Binary files differ)
Deleted: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/images/SignOut.png
===================================================================
(Binary files differ)
Deleted: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/images/Step32.6.png
===================================================================
(Binary files differ)
Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/images/SureDelete.png
===================================================================
(Binary files differ)
Deleted: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/images/UserProfile.png
===================================================================
(Binary files differ)
Deleted: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/images/UserWorkspace2.png
===================================================================
(Binary files differ)
Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/images/Verification.png
===================================================================
(Binary files differ)
Deleted: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/images/WebExplorer1.png
===================================================================
(Binary files differ)
Deleted: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/images/Welcome.png
===================================================================
(Binary files differ)
Deleted: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/images/gatein_logo.png
===================================================================
(Binary files differ)
Deleted: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/images/http.png
===================================================================
(Binary files differ)
Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/images/local.png
===================================================================
(Binary files differ)
Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/modules/account/Account_and_Password_Retrieval.xml
===================================================================
--- portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/modules/account/Account_and_Password_Retrieval.xml 2010-04-20 19:49:36 UTC (rev 2699)
+++ portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/modules/account/Account_and_Password_Retrieval.xml 2010-04-21 01:18:56 UTC (rev 2700)
@@ -91,6 +91,24 @@
<para>
If you forgot your password you will be sent a new (temporary) password. Your original password will not be valid after this email is sent. You will be directed to a page to update your password the next time you sign in.
</para>
+ <important>
+ <title>Email Error</title>
+ <para>
+ If you receive an error message advising that the email could not be sent, you may need to configure (or reconfigure) your email settings in the <filename>configuration.properties</filename> file.
+ </para>
+ <para>
+ More information about this configuration can be found in <emphasis role="bold">Section 5.2.2</emphasis> of the <emphasis role="bold">&PRODUCT; Installation Guide</emphasis> at <ulink type="http" url="http://www.redhat.com/docs">www.redhat.com/docs</ulink>.
+ </para>
+ <mediaobject>
+ <imageobject role="html">
+ <imagedata fileref="images/EmailError.png" format="PNG" align="center" scale="90" />
+ </imageobject>
+ <imageobject role="fo">
+ <imagedata fileref="images/EmailError.png" format="PNG" align="center" contentwidth="120mm" />
+ </imageobject>
+ <caption>Incorrect email settings error message</caption>
+ </mediaobject>
+ </important>
</section>
Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/modules/account/Register_New_Accounts.xml
===================================================================
--- portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/modules/account/Register_New_Accounts.xml 2010-04-20 19:49:36 UTC (rev 2699)
+++ portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/modules/account/Register_New_Accounts.xml 2010-04-21 01:18:56 UTC (rev 2700)
@@ -41,7 +41,7 @@
</mediaobject>
<para>
- The required information includes:
+ Complete the form with the required information:
</para>
<variablelist>
@@ -49,7 +49,7 @@
<term><emphasis role="bold">User Name</emphasis></term>
<listitem>
<para>
- The name used to log in.
+ The name used to log in. Click the magnifying glass icon beside the user name to check whether the chosen username is available.
</para>
</listitem>
</varlistentry>
@@ -73,7 +73,7 @@
<term><emphasis role="bold">First Name</emphasis></term>
<listitem>
<para>
- The user's first name.
+ The user's first name. This name must be between 3 and 45 characters long.
</para>
</listitem>
</varlistentry>
@@ -81,7 +81,7 @@
<term><emphasis role="bold">Last Name</emphasis></term>
<listitem>
<para>
- The user's last name.
+ The user's last name. This name must also be between 3 and 45 characters long.
</para>
</listitem>
</varlistentry>
@@ -97,18 +97,8 @@
</step>
<step>
<para>
- Fill in the form.
+ Enter the text displayed at <literal>Text Validation</literal> into the empty field below it:
</para>
- </step>
- <step>
- <para>
- Click the 'find' icon beside the user name field to check whether the chosen username is available.
- </para>
- </step>
- <step>
- <para>
- Enter the text next to <literal>verification:</literal> into the text box that appears below it:
- </para>
<mediaobject>
<imageobject role="html">
<imagedata fileref="images/Verification.png" format="PNG" align="center" scale="100" />
Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/modules/gadgetsAdmin/Manage_Portlets_and_Gadgets.xml
===================================================================
--- portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/modules/gadgetsAdmin/Manage_Portlets_and_Gadgets.xml 2010-04-20 19:49:36 UTC (rev 2699)
+++ portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/modules/gadgetsAdmin/Manage_Portlets_and_Gadgets.xml 2010-04-21 01:18:56 UTC (rev 2700)
@@ -17,12 +17,12 @@
<procedure>
<step>
<para>
- Click on <emphasis role="bold">Site Editor</emphasis> : <emphasis role="bold">Edit Page</emphasis>
+ Hover over <emphasis role="bold">Site Editor</emphasis> and click <emphasis role="bold">Edit Page</emphasis> in the dropdown menu.
</para>
</step>
<step>
<para>
- Click on <emphasis role="bold">Edit Portlet</emphasis> button (which is displayed a pencil icon when you mouse-over the portlet in edit mode). It will show a dialog to change the number of columns to display gadgets.
+ The Page editor applet will appear to the right of the screen. Click on the <emphasis role="bold">Containers</emphasis> tab and then select the <emphasis role="bold">Columns Layout</emphasis> entry:
</para>
<mediaobject>
<imageobject role="html">
@@ -35,9 +35,14 @@
</step>
<step>
<para>
- Change the number of columns and click the <emphasis role="bold">Save</emphasis> button to accept the changes.
+ Choose the container with the number of columns you want and drag it into the desired place on the main screen.
</para>
</step>
+ <step>
+ <para>
+ Click the <emphasis role="bold">Save</emphasis> button to accept the change (the <emphasis role="bold">Save</emphasis> buttons appears as a small disk in the top right of the <emphasis role="bold">Page Editor</emphasis> applet).
+ </para>
+ </step>
</procedure>
</section>
Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/modules/portal/Create_a_New_Portal.xml
===================================================================
--- portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/modules/portal/Create_a_New_Portal.xml 2010-04-20 19:49:36 UTC (rev 2699)
+++ portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/modules/portal/Create_a_New_Portal.xml 2010-04-21 01:18:56 UTC (rev 2700)
@@ -88,9 +88,23 @@
<para>
Click on the <emphasis role="bold">Permission Setting</emphasis> tab and set the permissions for the Portal.
</para>
- <para>
- By default the access permissions list for the portal is empty. You have to select at least one or tick on the <emphasis role="bold">Make it public</emphasis> check box to assign access permission to everyone.
- </para>
+ <itemizedlist>
+ <listitem>
+ <para>
+ Two types of permissions need to be set for a new portal; <emphasis>Access Permission</emphasis> and <emphasis>Edit Permission</emphasis>.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <emphasis>Access Permission</emphasis> can be set to allow global access by checking the <emphasis role="bold">Make it Public</emphasis> box. Alternatively, specific permission for groups can be added by clicking <emphasis role="bold">Add Permission</emphasis>, then selecting a group in the left pane of the box and then a membership level in the right pane.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <emphasis>Edit Permission</emphasis> requires specific permissions to be set. Click on <emphasis role="bold">Select Permission</emphasis> and choose a group and level as above.
+ </para>
+ </listitem>
+ </itemizedlist>
</step>
<step>
<para>
Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/modules/portal/Manage_Navigation_Nodes.xml
===================================================================
--- portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/modules/portal/Manage_Navigation_Nodes.xml 2010-04-20 19:49:36 UTC (rev 2699)
+++ portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/modules/portal/Manage_Navigation_Nodes.xml 2010-04-21 01:18:56 UTC (rev 2700)
@@ -26,12 +26,12 @@
</step>
<step>
<para>
- Select a node from list (to create a new node like sub-node of the selected node) or click the <emphasis role="bold">Up</emphasis> icon to create a new node at the root level of the portal.
+ Select a node from list (to create a new sub-node of the selected node) or click the <emphasis role="bold">Up</emphasis> icon to create a new node at the root level of the portal.
</para>
</step>
<step>
<para>
- Right-click on the selected navigation or node and select <emphasis role="bold">Add new Node</emphasis> option. The <emphasis role="bold">Add new node</emphasis> form appears:
+ Once the chosen parent node is selected, either click on <emphasis role="bold">Add Node</emphasis> at the bottom of the <emphasis role="bold">Navigation Management</emphasis> window or right-click the selected node and select the <emphasis role="bold">Add new Node</emphasis> option.
</para>
<mediaobject>
<imageobject role="html">
@@ -91,7 +91,7 @@
<term><emphasis role="bold">Start Publication Date</emphasis></term>
<listitem>
<para>
- The start date and time to publish the node.
+ The start date and time to publish the node. <emphasis role="bold">This field is only visible if the <emphasis>Publication date & time</emphasis> box is checked</emphasis>
</para>
</listitem>
</varlistentry>
@@ -99,7 +99,7 @@
<term><emphasis role="bold">End Publication Date</emphasis></term>
<listitem>
<para>
- The end date and time to publish the node.
+ The end date and time to publish the node.<emphasis role="bold">This field is only visible if the <emphasis>Publication date & time</emphasis> box is checked</emphasis>
</para>
</listitem>
</varlistentry>
@@ -164,7 +164,7 @@
<procedure id="proc-User_Guide-Manage_Navigation_Nodes-Search_for_a_page">
<step>
<para>
- Enter a search term related to the page which you want to search for:
+ Enter a search term related to the page you want to search for:
</para>
<mediaobject>
<imageobject role="html">
@@ -204,10 +204,25 @@
</para>
</step>
</procedure>
- <para>
- After configuring the page node settings, the page selector and the node's icon, click the <emphasis role="bold">Save</emphasis> button to accept or the <emphasis role="bold">Cancel</emphasis> button to quit without creating a new node.
- </para>
</step>
+ <step>
+ <para>
+ Click on the third tab in the <emphasis role="bold">Add/Edit Page Node</emphasis> window to select an icon for the new node from the categorized icons available.
+ </para>
+ <mediaobject>
+ <imageobject role="html">
+ <imagedata fileref="images/NodeIcons.png" format="PNG" align="center" scale="100" />
+ </imageobject>
+ <imageobject role="fo">
+ <imagedata fileref="images/NodeIcons.png" format="PNG" align="center" contentwidth="150mm" />
+ </imageobject>
+ </mediaobject>
+ </step>
+ <step>
+ <para>
+ After configuring the page node settings, the page selector and the node's icon, click the <emphasis role="bold">Save</emphasis> button to accept or the <emphasis role="bold">Cancel</emphasis> button to quit without creating a new node.
+ </para>
+ </step>
</procedure>
</section>
@@ -433,7 +448,7 @@
</para>
<mediaobject>
<imageobject>
- <imagedata fileref="images/http.png" format="PNG" align="center" />
+ <imagedata fileref="images/httpNode.png" format="PNG" align="center" />
</imageobject>
</mediaobject>
</step>
Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/modules/portal/Manage_Pages.xml
===================================================================
--- portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/modules/portal/Manage_Pages.xml 2010-04-20 19:49:36 UTC (rev 2699)
+++ portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/modules/portal/Manage_Pages.xml 2010-04-21 01:18:56 UTC (rev 2700)
@@ -103,7 +103,7 @@
<term><emphasis role="bold">Start Publication Date</emphasis></term>
<listitem>
<para>
- The start date and time to publish the page
+ The start date and time to publish the page. <emphasis role="bold">This field is only visible if the <emphasis>Publication date & time</emphasis> box is checked</emphasis>
</para>
</listitem>
</varlistentry>
@@ -111,7 +111,7 @@
<term><emphasis role="bold">End Publication Date</emphasis></term>
<listitem>
<para>
- The end date and time to publish the page.
+ The end date and time to publish the page. <emphasis role="bold">This field is only visible if the <emphasis>Publication date & time</emphasis> box is checked</emphasis>
</para>
</listitem>
</varlistentry>
@@ -195,8 +195,11 @@
</step>
<step>
<para>
- Click <emphasis role="bold">Save</emphasis> to accept creating a new page, <emphasis role="bold">Back</emphasis> button to return the previous step or <emphasis role="bold">Abort</emphasis> button to quit without creating a new page.
+ Once you have configured the new page, use the icons located in the top right corner of the <emphasis role="bold">Page Editor</emphasis> window to navigate as required:
</para>
+ <para>
+ Click <emphasis role="bold">Back</emphasis> (the small left-facing arrow) to return the previous step, <emphasis role="bold">Save</emphasis> (the small disk icon) to create the new page or <emphasis role="bold">Abort</emphasis> (the small cross) to quit without creating a new page.
+ </para>
</step>
</procedure>
</section>
@@ -292,7 +295,7 @@
</varlistentry>
</variablelist>
</step>
- <step>
+ <!-- <step>
<para>
Enter values for fields in the <emphasis role="bold">Permission Setting</emphasis> tab
</para>
@@ -341,7 +344,7 @@
</listitem>
</varlistentry>
</variablelist>
- </step>
+ </step> -->
<step>
<para>
Click <emphasis role="bold">Save</emphasis>.
@@ -467,7 +470,7 @@
</para>
<mediaobject>
<imageobject>
- <imagedata fileref="images/http.png" format="PNG" align="center" />
+ <imagedata fileref="images/httpPage.png" format="PNG" align="center" />
</imageobject>
</mediaobject>
</step>
Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/modules/portal/Manage_Portals.xml
===================================================================
--- portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/modules/portal/Manage_Portals.xml 2010-04-20 19:49:36 UTC (rev 2699)
+++ portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/modules/portal/Manage_Portals.xml 2010-04-21 01:18:56 UTC (rev 2700)
@@ -101,8 +101,25 @@
<para>
Click on the <emphasis role="bold">Permission Setting</emphasis> tab and set the permissions for the Portal.
</para>
+ <itemizedlist>
+ <listitem>
+ <para>
+ Two types of permissions need to be set for a new portal; <emphasis>Access Permission</emphasis> and <emphasis>Edit Permission</emphasis>.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <emphasis>Access Permission</emphasis> can be set to allow global access by checking the <emphasis role="bold">Make it Public</emphasis> box. Alternatively, specific permission for groups can be added by clicking <emphasis role="bold">Add Permission</emphasis>, then selecting a group in the left pane of the box and then a membership level in the right pane.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <emphasis>Edit Permission</emphasis> requires specific permissions to be set. Click on <emphasis role="bold">Select Permission</emphasis> and choose a group and level as above.
+ </para>
+ </listitem>
+ </itemizedlist>
<para>
- The access permissions list for the portal is empty by default. You have to select at least one or tick on the <emphasis role="bold">Make it public</emphasis> check box to assign access permission to everyone.
+ See <xref linkend="sect-User_Guide-User_management"/> and <xref linkend="sect-User_Guide-Manage_Permissions"/> for further information.
</para>
</step>
<step>
Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/modules/portal/User_Management.xml
===================================================================
--- portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/modules/portal/User_Management.xml 2010-04-20 19:49:36 UTC (rev 2699)
+++ portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/modules/portal/User_Management.xml 2010-04-21 01:18:56 UTC (rev 2700)
@@ -94,7 +94,7 @@
</step>
<step>
<para>
- Type in a partial/full string which identifies the user record being searched. Note that wild cards are not supported at this release.
+ Type in a partial/full string which identifies the user record being searched. The <emphasis role="bold">*</emphasis> character can be used as a wildcard.
</para>
</step>
<step>
@@ -431,7 +431,9 @@
<para>
Mouse over <emphasis role="bold">Group</emphasis> on the Toolbar. Highlight <emphasis role="bold">Organization</emphasis> and select <emphasis>Users and Groups Management</emphasis>. Select the <emphasis role="bold">Membership Management</emphasis> tab.
</para>
-
+ <para>
+ This tab remembers the last action taken by a user in this page. CLicking <emphasis role="bold">Reset</emphasis> will clear any legacy details.
+ </para>
<mediaobject>
<imageobject role="html">
<imagedata fileref="images/MembershipManage1.png" format="PNG" align="center" scale="100" />
Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/modules/portletsUser/Dashboard_Portlet.xml
===================================================================
--- portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/modules/portletsUser/Dashboard_Portlet.xml 2010-04-20 19:49:36 UTC (rev 2699)
+++ portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/modules/portletsUser/Dashboard_Portlet.xml 2010-04-21 01:18:56 UTC (rev 2700)
@@ -8,33 +8,6 @@
<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.
</para>
- <para>
- Gadgets within the Dashboard portlet can be moved and rearranged. New gadgets can be created and unnecessary ones deleted. More than one instance of the same gadget can be opened at the same time and each instance of the same gadget can have different settings. The gadgets instances are completely independent.
- </para>
- <mediaobject>
- <imageobject role="html">
- <imagedata fileref="images/Dashboard1.png" format="PNG" align="center" scale="90" />
- </imageobject>
- <imageobject role="fo">
- <imagedata fileref="images/Dashboard1.png" format="PNG" align="center" scalefit="1" contentwidth="100mm" />
- </imageobject>
- </mediaobject>
-
- <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>
The active Dashboard can be individually named by clicking on the default name ("<emphasis>Click and Type Page Name</emphasis>")...
</para>
@@ -57,22 +30,35 @@
<imagedata fileref="images/Dashname1.png" format="PNG" align="center" scalefit="1" contentwidth="120mm"/>
</imageobject>
</mediaobject>
+ <para>
+ Gadgets within the Dashboard portlet can be moved and rearranged. New gadgets can be created and unnecessary ones deleted. More than one instance of the same gadget can be opened at the same time and each instance of the same gadget can have different settings. The gadgets instances are completely independent.
+ </para>
+ <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>
+ <mediaobject>
+ <imageobject role="html">
+ <imagedata fileref="images/Dashboard1.png" format="PNG" align="center" scale="100" />
+ </imageobject>
+ <imageobject role="fo">
+ <imagedata fileref="images/Dashboard1.png" format="PNG" align="center" scalefit="1" contentwidth="100mm" />
+ </imageobject>
+ </mediaobject>
+ </step>
+ </procedure>
<para>
The Dashboard Workspace lists all available gadgets. Four gadgets are provided by default with &PRODUCT;, however you can add many more.
</para>
- <para>
- To use one of the default gadgets, simply drag it from the <emphasis role="bold">Dashboard Workspace</emphasis> onto your Dashboard as illustrated below:
- </para>
- <mediaobject>
- <imageobject role="html">
- <imagedata fileref="images/Dash2.png" format="PNG" align="center" scale="100"/>
- </imageobject>
- <imageobject role="fo">
- <imagedata fileref="images/Dash2.png" format="PNG" align="center" scalefit="1" contentwidth="150mm"/>
- </imageobject>
- </mediaobject>
-
<variablelist id="vari-User_Guide-Using_the_Dashboard_Workspace-Default_Gadgets">
<title>Default Gadgets:</title>
<varlistentry>
@@ -139,29 +125,36 @@
</mediaobject>
</listitem>
</varlistentry>
- <varlistentry>
- <term><emphasis role="bold">More Gadgets</emphasis></term>
- <listitem>
- <para>
- Many more gadgets can be found at <ulink type="http" url="http://www.google.com/ig/directory?synd=open">Google Gadgets</ulink>. &PRODUCT; is compatible with most of the gadgets available there.
- </para>
- <mediaobject>
- <imageobject role="html">
- <imagedata fileref="images/GoogleGadgets.png" format="PNG" align="center" scale="100"/>
- </imageobject>
- <imageobject role="fo">
- <imagedata fileref="images/GoogleGadgets.png" format="PNG" align="center" scalefit="1" contentwidth="160mm"/>
- </imageobject>
- </mediaobject>
- </listitem>
- </varlistentry>
</variablelist>
+ <para>
+ To use one of the default gadgets, simply drag it from the <emphasis role="bold">Dashboard Workspace</emphasis> onto your Dashboard as illustrated below:
+ </para>
+ <mediaobject>
+ <imageobject role="html">
+ <imagedata fileref="images/Dash2.png" format="PNG" align="center" scale="100"/>
+ </imageobject>
+ <imageobject role="fo">
+ <imagedata fileref="images/Dash2.png" format="PNG" align="center" scalefit="1" contentwidth="150mm"/>
+ </imageobject>
+ </mediaobject>
</section>
<section id="sect-User_Guide-Dashboard_Portlet-Add_Gadgets">
<title>Add Gadgets</title>
+ <para>
+ Many more gadgets can be found at <ulink type="http" url="http://www.google.com/ig/directory?synd=open">Google Gadgets</ulink>. &PRODUCT; is compatible with most of the gadgets available there.
+ </para>
+ <mediaobject>
+ <imageobject role="html">
+ <imagedata fileref="images/GoogleGadgets.png" format="PNG" align="center" scale="100"/>
+ </imageobject>
+ <imageobject role="fo">
+ <imagedata fileref="images/GoogleGadgets.png" format="PNG" align="center" scalefit="1" contentwidth="160mm"/>
+ </imageobject>
+ </mediaobject>
+
<para>
- To add more gadgets from external sources:
+ To add gadgets from external sources:
</para>
<procedure>
<step>
@@ -248,6 +241,9 @@
<para>
Click on the <emphasis role="bold">plus</emphasis> icon to add the new gadget to the page.
</para>
+ <para>
+ The new gadget will appear on the Dashboard alongside any other gadgets already in use. If required, the new gadget can be dragged to another position on the page.
+ </para>
<mediaobject>
<imageobject role="html">
<imagedata fileref="images/NewGadget.png" format="PNG" align="center" scale="100"/>
14 years, 5 months
- 1
- 0
gatein SVN: r2699 - in portal/branches/EPP_5_0_Branch: examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/jcr and 1 other directories.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2010-04-20 15:49:36 -0400 (Tue, 20 Apr 2010)
New Revision: 2699
Modified:
portal/branches/EPP_5_0_Branch/component/test/jcr/src/main/resources/conf/exo.portal.component.test.jcr-repository-configuration.xml
portal/branches/EPP_5_0_Branch/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/jcr/repository-configuration.xml
portal/branches/EPP_5_0_Branch/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/jcr/repository-configuration.xml
Log:
JBEPP-191: WebDAV access doesn't check for authorization
Modified: portal/branches/EPP_5_0_Branch/component/test/jcr/src/main/resources/conf/exo.portal.component.test.jcr-repository-configuration.xml
===================================================================
--- portal/branches/EPP_5_0_Branch/component/test/jcr/src/main/resources/conf/exo.portal.component.test.jcr-repository-configuration.xml 2010-04-20 19:49:17 UTC (rev 2698)
+++ portal/branches/EPP_5_0_Branch/component/test/jcr/src/main/resources/conf/exo.portal.component.test.jcr-repository-configuration.xml 2010-04-20 19:49:36 UTC (rev 2699)
@@ -96,7 +96,7 @@
<initializer class="org.exoplatform.services.jcr.impl.core.ScratchWorkspaceInitializer">
<properties>
<property name="root-nodetype" value="nt:unstructured"/>
- <property name="root-permissions" value="any read;*:/platform/administrators read;*:/platform/administrators add_node;*:/platform/administrators set_property;*:/platform/administrators remove"/>
+ <property name="root-permissions" value="*:/platform/administrators read;*:/platform/administrators add_node;*:/platform/administrators set_property;*:/platform/administrators remove"/>
</properties>
</initializer>
<cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache">
Modified: portal/branches/EPP_5_0_Branch/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/jcr/repository-configuration.xml
===================================================================
--- portal/branches/EPP_5_0_Branch/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/jcr/repository-configuration.xml 2010-04-20 19:49:17 UTC (rev 2698)
+++ portal/branches/EPP_5_0_Branch/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/jcr/repository-configuration.xml 2010-04-20 19:49:36 UTC (rev 2699)
@@ -50,7 +50,7 @@
<initializer class="org.exoplatform.services.jcr.impl.core.ScratchWorkspaceInitializer">
<properties>
<property name="root-nodetype" value="nt:unstructured" />
- <property name="root-permissions" value="any read;*:/platform/administrators read;*:/platform/administrators add_node;*:/platform/administrators set_property;*:/platform/administrators remove" />
+ <property name="root-permissions" value="*:/platform/administrators read;*:/platform/administrators add_node;*:/platform/administrators set_property;*:/platform/administrators remove" />
</properties>
</initializer>
<cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache">
Modified: portal/branches/EPP_5_0_Branch/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/jcr/repository-configuration.xml
===================================================================
--- portal/branches/EPP_5_0_Branch/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/jcr/repository-configuration.xml 2010-04-20 19:49:17 UTC (rev 2698)
+++ portal/branches/EPP_5_0_Branch/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/jcr/repository-configuration.xml 2010-04-20 19:49:36 UTC (rev 2699)
@@ -50,7 +50,7 @@
<initializer class="org.exoplatform.services.jcr.impl.core.ScratchWorkspaceInitializer">
<properties>
<property name="root-nodetype" value="nt:unstructured" />
- <property name="root-permissions" value="any read;*:/platform/administrators read;*:/platform/administrators add_node;*:/platform/administrators set_property;*:/platform/administrators remove" />
+ <property name="root-permissions" value="*:/platform/administrators read;*:/platform/administrators add_node;*:/platform/administrators set_property;*:/platform/administrators remove" />
</properties>
</initializer>
<cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache">
14 years, 5 months
- 1
- 0
gatein SVN: r2698 - in portal/branches/EPP_5_0_0_CR01_Branch: examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/jcr and 1 other directories.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2010-04-20 15:49:17 -0400 (Tue, 20 Apr 2010)
New Revision: 2698
Modified:
portal/branches/EPP_5_0_0_CR01_Branch/component/test/jcr/src/main/resources/conf/exo.portal.component.test.jcr-repository-configuration.xml
portal/branches/EPP_5_0_0_CR01_Branch/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/jcr/repository-configuration.xml
portal/branches/EPP_5_0_0_CR01_Branch/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/jcr/repository-configuration.xml
Log:
JBEPP-191: WebDAV access doesn't check for authorization
Modified: portal/branches/EPP_5_0_0_CR01_Branch/component/test/jcr/src/main/resources/conf/exo.portal.component.test.jcr-repository-configuration.xml
===================================================================
--- portal/branches/EPP_5_0_0_CR01_Branch/component/test/jcr/src/main/resources/conf/exo.portal.component.test.jcr-repository-configuration.xml 2010-04-20 19:48:07 UTC (rev 2697)
+++ portal/branches/EPP_5_0_0_CR01_Branch/component/test/jcr/src/main/resources/conf/exo.portal.component.test.jcr-repository-configuration.xml 2010-04-20 19:49:17 UTC (rev 2698)
@@ -96,7 +96,7 @@
<initializer class="org.exoplatform.services.jcr.impl.core.ScratchWorkspaceInitializer">
<properties>
<property name="root-nodetype" value="nt:unstructured"/>
- <property name="root-permissions" value="any read;*:/platform/administrators read;*:/platform/administrators add_node;*:/platform/administrators set_property;*:/platform/administrators remove"/>
+ <property name="root-permissions" value="*:/platform/administrators read;*:/platform/administrators add_node;*:/platform/administrators set_property;*:/platform/administrators remove"/>
</properties>
</initializer>
<cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache">
Modified: portal/branches/EPP_5_0_0_CR01_Branch/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/jcr/repository-configuration.xml
===================================================================
--- portal/branches/EPP_5_0_0_CR01_Branch/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/jcr/repository-configuration.xml 2010-04-20 19:48:07 UTC (rev 2697)
+++ portal/branches/EPP_5_0_0_CR01_Branch/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/jcr/repository-configuration.xml 2010-04-20 19:49:17 UTC (rev 2698)
@@ -50,7 +50,7 @@
<initializer class="org.exoplatform.services.jcr.impl.core.ScratchWorkspaceInitializer">
<properties>
<property name="root-nodetype" value="nt:unstructured" />
- <property name="root-permissions" value="any read;*:/platform/administrators read;*:/platform/administrators add_node;*:/platform/administrators set_property;*:/platform/administrators remove" />
+ <property name="root-permissions" value="*:/platform/administrators read;*:/platform/administrators add_node;*:/platform/administrators set_property;*:/platform/administrators remove" />
</properties>
</initializer>
<cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache">
Modified: portal/branches/EPP_5_0_0_CR01_Branch/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/jcr/repository-configuration.xml
===================================================================
--- portal/branches/EPP_5_0_0_CR01_Branch/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/jcr/repository-configuration.xml 2010-04-20 19:48:07 UTC (rev 2697)
+++ portal/branches/EPP_5_0_0_CR01_Branch/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/jcr/repository-configuration.xml 2010-04-20 19:49:17 UTC (rev 2698)
@@ -50,7 +50,7 @@
<initializer class="org.exoplatform.services.jcr.impl.core.ScratchWorkspaceInitializer">
<properties>
<property name="root-nodetype" value="nt:unstructured" />
- <property name="root-permissions" value="any read;*:/platform/administrators read;*:/platform/administrators add_node;*:/platform/administrators set_property;*:/platform/administrators remove" />
+ <property name="root-permissions" value="*:/platform/administrators read;*:/platform/administrators add_node;*:/platform/administrators set_property;*:/platform/administrators remove" />
</properties>
</initializer>
<cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache">
14 years, 5 months
- 1
- 0
gatein SVN: r2697 - portal/branches/EPP_5_0_0_CR01_Branch/web/portal/src/main/webapp/WEB-INF/conf/jcr.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2010-04-20 15:48:07 -0400 (Tue, 20 Apr 2010)
New Revision: 2697
Modified:
portal/branches/EPP_5_0_0_CR01_Branch/web/portal/src/main/webapp/WEB-INF/conf/jcr/jcr-configuration.xml
portal/branches/EPP_5_0_0_CR01_Branch/web/portal/src/main/webapp/WEB-INF/conf/jcr/repository-configuration.xml
Log:
JBEPP-191: WebDAV access doesn't check for authorization
Modified: portal/branches/EPP_5_0_0_CR01_Branch/web/portal/src/main/webapp/WEB-INF/conf/jcr/jcr-configuration.xml
===================================================================
--- portal/branches/EPP_5_0_0_CR01_Branch/web/portal/src/main/webapp/WEB-INF/conf/jcr/jcr-configuration.xml 2010-04-20 19:47:40 UTC (rev 2696)
+++ portal/branches/EPP_5_0_0_CR01_Branch/web/portal/src/main/webapp/WEB-INF/conf/jcr/jcr-configuration.xml 2010-04-20 19:48:07 UTC (rev 2697)
@@ -51,7 +51,7 @@
<component>
<key>org.exoplatform.services.jcr.ext.hierarchy.NodeHierarchyCreator</key>
<type>org.exoplatform.services.jcr.ext.hierarchy.impl.NodeHierarchyCreatorImpl</type>
- </component>
+ </component>
<component>
<key>org.exoplatform.services.jcr.webdav.WebDavServiceImpl</key>
@@ -127,4 +127,70 @@
</init-params>
</component-plugin>
</external-component-plugins>
+ <external-component-plugins>
+ <target-component>org.exoplatform.services.jcr.ext.hierarchy.NodeHierarchyCreator</target-component>
+ <component-plugin>
+ <name>addPaths</name>
+ <set-method>addPlugin</set-method>
+ <type>org.exoplatform.services.jcr.ext.hierarchy.impl.AddPathPlugin</type>
+ <init-params>
+ <object-param>
+ <name>gadgets.root</name>
+ <description>Create gadget root node</description>
+ <object type="org.exoplatform.services.jcr.ext.hierarchy.impl.HierarchyConfig">
+ <field name="repository"><string>repository</string></field>
+ <field name="workspaces">
+ <collection type="java.util.ArrayList">
+ <value><string>portal-system</string></value>
+ </collection>
+ </field>
+ <field name="jcrPaths">
+ <collection type="java.util.ArrayList">
+ <value>
+ <object type="org.exoplatform.services.jcr.ext.hierarchy.impl.HierarchyConfig$JcrPath">
+ <field name="alias"><string>production</string></field>
+ <field name="path"><string>/production</string></field>
+ <field name="permissions">
+ <collection type="java.util.ArrayList">
+ </collection>
+ </field>
+ </object>
+ </value>
+ <value>
+ <object type="org.exoplatform.services.jcr.ext.hierarchy.impl.HierarchyConfig$JcrPath">
+ <field name="alias"><string>gadgets</string></field>
+ <field name="path"><string>/production/app:gadgets</string></field>
+ <field name="nodeType"><string>app:gadgetregistry</string></field>
+ <field name="permissions">
+ <collection type="java.util.ArrayList">
+ <value>
+ <object type="org.exoplatform.services.jcr.ext.hierarchy.impl.HierarchyConfig$Permission">
+ <field name="identity"><string>*:/platform/administrators</string></field>
+ <field name="read"><string>true</string></field>
+ <field name="addNode"><string>true</string></field>
+ <field name="setProperty"><string>true</string></field>
+ <field name="remove"><string>true</string></field>
+ </object>
+ </value>
+ <value>
+ <object type="org.exoplatform.services.jcr.ext.hierarchy.impl.HierarchyConfig$Permission">
+ <field name="identity"><string>any</string></field>
+ <field name="read"><string>true</string></field>
+ <field name="addNode"><string>false</string></field>
+ <field name="setProperty"><string>false</string></field>
+ <field name="remove"><string>false</string></field>
+ </object>
+ </value>
+ </collection>
+ </field>
+ </object>
+ </value>
+ </collection>
+ </field>
+ </object>
+ </object-param>
+ </init-params>
+ </component-plugin>
+ </external-component-plugins>
+
</configuration>
Modified: portal/branches/EPP_5_0_0_CR01_Branch/web/portal/src/main/webapp/WEB-INF/conf/jcr/repository-configuration.xml
===================================================================
--- portal/branches/EPP_5_0_0_CR01_Branch/web/portal/src/main/webapp/WEB-INF/conf/jcr/repository-configuration.xml 2010-04-20 19:47:40 UTC (rev 2696)
+++ portal/branches/EPP_5_0_0_CR01_Branch/web/portal/src/main/webapp/WEB-INF/conf/jcr/repository-configuration.xml 2010-04-20 19:48:07 UTC (rev 2697)
@@ -118,7 +118,7 @@
<initializer class="org.exoplatform.services.jcr.impl.core.ScratchWorkspaceInitializer">
<properties>
<property name="root-nodetype" value="nt:unstructured"/>
- <property name="root-permissions" value="any read;*:/platform/administrators read;*:/platform/administrators add_node;*:/platform/administrators set_property;*:/platform/administrators remove"/>
+ <property name="root-permissions" value="*:/platform/administrators read;*:/platform/administrators add_node;*:/platform/administrators set_property;*:/platform/administrators remove"/>
</properties>
</initializer>
<cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache">
@@ -184,7 +184,7 @@
<initializer class="org.exoplatform.services.jcr.impl.core.ScratchWorkspaceInitializer">
<properties>
<property name="root-nodetype" value="nt:unstructured"/>
- <property name="root-permissions" value="any read;*:/platform/administrators read;*:/platform/administrators add_node;*:/platform/administrators set_property;*:/platform/administrators remove"/>
+ <property name="root-permissions" value="*:/platform/administrators read;*:/platform/administrators add_node;*:/platform/administrators set_property;*:/platform/administrators remove"/>
</properties>
</initializer>
<cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache">
@@ -251,7 +251,7 @@
<initializer class="org.exoplatform.services.jcr.impl.core.ScratchWorkspaceInitializer">
<properties>
<property name="root-nodetype" value="nt:unstructured"/>
- <property name="root-permissions" value="any read;*:/platform/administrators read;*:/platform/administrators add_node;*:/platform/administrators set_property;*:/platform/administrators remove"/>
+ <property name="root-permissions" value="*:/platform/administrators read;*:/platform/administrators add_node;*:/platform/administrators set_property;*:/platform/administrators remove"/>
</properties>
</initializer>
<cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache">
@@ -317,7 +317,7 @@
<initializer class="org.exoplatform.services.jcr.impl.core.ScratchWorkspaceInitializer">
<properties>
<property name="root-nodetype" value="nt:unstructured"/>
- <property name="root-permissions" value="any read;*:/platform/administrators read;*:/platform/administrators add_node;*:/platform/administrators set_property;*:/platform/administrators remove"/>
+ <property name="root-permissions" value="*:/platform/administrators read;*:/platform/administrators add_node;*:/platform/administrators set_property;*:/platform/administrators remove"/>
</properties>
</initializer>
<cache enabled="true"
14 years, 5 months
- 1
- 0
gatein SVN: r2696 - portal/branches/EPP_5_0_Branch/web/portal/src/main/webapp/WEB-INF/conf/jcr.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2010-04-20 15:47:40 -0400 (Tue, 20 Apr 2010)
New Revision: 2696
Modified:
portal/branches/EPP_5_0_Branch/web/portal/src/main/webapp/WEB-INF/conf/jcr/jcr-configuration.xml
portal/branches/EPP_5_0_Branch/web/portal/src/main/webapp/WEB-INF/conf/jcr/repository-configuration.xml
Log:
JBEPP-191: WebDAV access doesn't check for authorization
Modified: portal/branches/EPP_5_0_Branch/web/portal/src/main/webapp/WEB-INF/conf/jcr/jcr-configuration.xml
===================================================================
--- portal/branches/EPP_5_0_Branch/web/portal/src/main/webapp/WEB-INF/conf/jcr/jcr-configuration.xml 2010-04-20 19:39:13 UTC (rev 2695)
+++ portal/branches/EPP_5_0_Branch/web/portal/src/main/webapp/WEB-INF/conf/jcr/jcr-configuration.xml 2010-04-20 19:47:40 UTC (rev 2696)
@@ -51,7 +51,7 @@
<component>
<key>org.exoplatform.services.jcr.ext.hierarchy.NodeHierarchyCreator</key>
<type>org.exoplatform.services.jcr.ext.hierarchy.impl.NodeHierarchyCreatorImpl</type>
- </component>
+ </component>
<component>
<key>org.exoplatform.services.jcr.webdav.WebDavServiceImpl</key>
@@ -127,4 +127,70 @@
</init-params>
</component-plugin>
</external-component-plugins>
+ <external-component-plugins>
+ <target-component>org.exoplatform.services.jcr.ext.hierarchy.NodeHierarchyCreator</target-component>
+ <component-plugin>
+ <name>addPaths</name>
+ <set-method>addPlugin</set-method>
+ <type>org.exoplatform.services.jcr.ext.hierarchy.impl.AddPathPlugin</type>
+ <init-params>
+ <object-param>
+ <name>gadgets.root</name>
+ <description>Create gadget root node</description>
+ <object type="org.exoplatform.services.jcr.ext.hierarchy.impl.HierarchyConfig">
+ <field name="repository"><string>repository</string></field>
+ <field name="workspaces">
+ <collection type="java.util.ArrayList">
+ <value><string>portal-system</string></value>
+ </collection>
+ </field>
+ <field name="jcrPaths">
+ <collection type="java.util.ArrayList">
+ <value>
+ <object type="org.exoplatform.services.jcr.ext.hierarchy.impl.HierarchyConfig$JcrPath">
+ <field name="alias"><string>production</string></field>
+ <field name="path"><string>/production</string></field>
+ <field name="permissions">
+ <collection type="java.util.ArrayList">
+ </collection>
+ </field>
+ </object>
+ </value>
+ <value>
+ <object type="org.exoplatform.services.jcr.ext.hierarchy.impl.HierarchyConfig$JcrPath">
+ <field name="alias"><string>gadgets</string></field>
+ <field name="path"><string>/production/app:gadgets</string></field>
+ <field name="nodeType"><string>app:gadgetregistry</string></field>
+ <field name="permissions">
+ <collection type="java.util.ArrayList">
+ <value>
+ <object type="org.exoplatform.services.jcr.ext.hierarchy.impl.HierarchyConfig$Permission">
+ <field name="identity"><string>*:/platform/administrators</string></field>
+ <field name="read"><string>true</string></field>
+ <field name="addNode"><string>true</string></field>
+ <field name="setProperty"><string>true</string></field>
+ <field name="remove"><string>true</string></field>
+ </object>
+ </value>
+ <value>
+ <object type="org.exoplatform.services.jcr.ext.hierarchy.impl.HierarchyConfig$Permission">
+ <field name="identity"><string>any</string></field>
+ <field name="read"><string>true</string></field>
+ <field name="addNode"><string>false</string></field>
+ <field name="setProperty"><string>false</string></field>
+ <field name="remove"><string>false</string></field>
+ </object>
+ </value>
+ </collection>
+ </field>
+ </object>
+ </value>
+ </collection>
+ </field>
+ </object>
+ </object-param>
+ </init-params>
+ </component-plugin>
+ </external-component-plugins>
+
</configuration>
Modified: portal/branches/EPP_5_0_Branch/web/portal/src/main/webapp/WEB-INF/conf/jcr/repository-configuration.xml
===================================================================
--- portal/branches/EPP_5_0_Branch/web/portal/src/main/webapp/WEB-INF/conf/jcr/repository-configuration.xml 2010-04-20 19:39:13 UTC (rev 2695)
+++ portal/branches/EPP_5_0_Branch/web/portal/src/main/webapp/WEB-INF/conf/jcr/repository-configuration.xml 2010-04-20 19:47:40 UTC (rev 2696)
@@ -118,7 +118,7 @@
<initializer class="org.exoplatform.services.jcr.impl.core.ScratchWorkspaceInitializer">
<properties>
<property name="root-nodetype" value="nt:unstructured"/>
- <property name="root-permissions" value="any read;*:/platform/administrators read;*:/platform/administrators add_node;*:/platform/administrators set_property;*:/platform/administrators remove"/>
+ <property name="root-permissions" value="*:/platform/administrators read;*:/platform/administrators add_node;*:/platform/administrators set_property;*:/platform/administrators remove"/>
</properties>
</initializer>
<cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache">
@@ -184,7 +184,7 @@
<initializer class="org.exoplatform.services.jcr.impl.core.ScratchWorkspaceInitializer">
<properties>
<property name="root-nodetype" value="nt:unstructured"/>
- <property name="root-permissions" value="any read;*:/platform/administrators read;*:/platform/administrators add_node;*:/platform/administrators set_property;*:/platform/administrators remove"/>
+ <property name="root-permissions" value="*:/platform/administrators read;*:/platform/administrators add_node;*:/platform/administrators set_property;*:/platform/administrators remove"/>
</properties>
</initializer>
<cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache">
@@ -251,7 +251,7 @@
<initializer class="org.exoplatform.services.jcr.impl.core.ScratchWorkspaceInitializer">
<properties>
<property name="root-nodetype" value="nt:unstructured"/>
- <property name="root-permissions" value="any read;*:/platform/administrators read;*:/platform/administrators add_node;*:/platform/administrators set_property;*:/platform/administrators remove"/>
+ <property name="root-permissions" value="*:/platform/administrators read;*:/platform/administrators add_node;*:/platform/administrators set_property;*:/platform/administrators remove"/>
</properties>
</initializer>
<cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache">
@@ -317,7 +317,7 @@
<initializer class="org.exoplatform.services.jcr.impl.core.ScratchWorkspaceInitializer">
<properties>
<property name="root-nodetype" value="nt:unstructured"/>
- <property name="root-permissions" value="any read;*:/platform/administrators read;*:/platform/administrators add_node;*:/platform/administrators set_property;*:/platform/administrators remove"/>
+ <property name="root-permissions" value="*:/platform/administrators read;*:/platform/administrators add_node;*:/platform/administrators set_property;*:/platform/administrators remove"/>
</properties>
</initializer>
<cache enabled="true"
14 years, 5 months
- 1
- 0
gatein SVN: r2695 - in portal/branches/EPP_5_0_0_CR01_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui: portal and 1 other directory.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2010-04-20 15:39:13 -0400 (Tue, 20 Apr 2010)
New Revision: 2695
Modified:
portal/branches/EPP_5_0_0_CR01_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageForm.java
portal/branches/EPP_5_0_0_CR01_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalForm.java
Log:
JBEPP-318: Remove screens to select layouts
Modified: portal/branches/EPP_5_0_0_CR01_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageForm.java
===================================================================
--- portal/branches/EPP_5_0_0_CR01_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageForm.java 2010-04-20 19:36:51 UTC (rev 2694)
+++ portal/branches/EPP_5_0_0_CR01_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageForm.java 2010-04-20 19:39:13 UTC (rev 2695)
@@ -129,13 +129,13 @@
addUIFormInput(uiSettingSet);
setSelectedTab(uiSettingSet.getId());
- WebuiRequestContext context = WebuiRequestContext.getCurrentInstance();
- Param param = initParams.getParam("PageTemplate");
- List<SelectItemCategory> itemCategories = (List<SelectItemCategory>)param.getMapGroovyObject(context);
+// WebuiRequestContext context = WebuiRequestContext.getCurrentInstance();
+// Param param = initParams.getParam("PageTemplate");
+// List<SelectItemCategory> itemCategories = (List<SelectItemCategory>)param.getMapGroovyObject(context);
- UIFormInputItemSelector uiTemplate = new UIFormInputItemSelector("Template", "template");
- uiTemplate.setItemCategories(itemCategories);
- addUIFormInput(uiTemplate);
+// UIFormInputItemSelector uiTemplate = new UIFormInputItemSelector("Template", "template");
+// uiTemplate.setItemCategories(itemCategories);
+// addUIFormInput(uiTemplate);
uiPermissionSetting = createUIComponent(UIFormInputSet.class, "PermissionSetting", null);
UIListPermissionSelector uiListPermissionSelector = createUIComponent(UIListPermissionSelector.class, null, null);
@@ -470,4 +470,4 @@
event.getRequestContext().addUIComponentToUpdateByAjax(uiForm.getParent());
}
}
-}
\ No newline at end of file
+}
Modified: portal/branches/EPP_5_0_0_CR01_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalForm.java
===================================================================
--- portal/branches/EPP_5_0_0_CR01_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalForm.java 2010-04-20 19:36:51 UTC (rev 2694)
+++ portal/branches/EPP_5_0_0_CR01_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalForm.java 2010-04-20 19:39:13 UTC (rev 2695)
@@ -101,14 +101,16 @@
{
super("UIPortalForm");
UIFormInputItemSelector uiTemplateInput = new UIFormInputItemSelector("PortalTemplate", null);
- addUIFormInput(uiTemplateInput);
- setSelectedTab(uiTemplateInput.getId());
+// addUIFormInput(uiTemplateInput);
+// setSelectedTab(uiTemplateInput.getId());
createDefaultItem();
UIFormInputSet uiPortalSetting = this.<UIFormInputSet> getChildById("PortalSetting");
UIFormStringInput uiNameInput = uiPortalSetting.getUIStringInput(FIELD_NAME);
uiNameInput.setEditable(true);
+ setSelectedTab(uiPortalSetting.getId());
+
setActions(new String[]{"Save", "Close"});
if (initParams == null)
@@ -319,7 +321,8 @@
{
UIPortalForm uiForm = event.getSource();
PortalRequestContext pcontext = (PortalRequestContext)event.getRequestContext();
- String template = uiForm.getChild(UIFormInputItemSelector.class).getSelectedItemOption().getValue().toString();
+ String template = "classic";
+// String template = uiForm.getChild(UIFormInputItemSelector.class).getSelectedItemOption().getValue().toString();
String portalName = uiForm.getUIStringInput(FIELD_NAME).getValue();
DataStorage dataService = uiForm.getApplicationComponent(DataStorage.class);
PortalConfig config = dataService.getPortalConfig(portalName);
14 years, 5 months
- 1
- 0