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);