[gatein-commits] gatein SVN: r2693 - in portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui: portal and 1 other directory.

[do-not-reply at jboss.org]

Author: thomas.heute at jboss.com
Date: 2010-04-20 15:33:19 -0400 (Tue, 20 Apr 2010)
New Revision: 2693

Modified:
   portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageForm.java
   portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalForm.java
Log:
GTNPORTAL-1106: Remove screens to select layouts


Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageForm.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageForm.java	2010-04-20 16:46:24 UTC (rev 2692)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageForm.java	2010-04-20 19:33:19 UTC (rev 2693)
@@ -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/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalForm.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalForm.java	2010-04-20 16:46:24 UTC (rev 2692)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalForm.java	2010-04-20 19:33:19 UTC (rev 2693)
@@ -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);