Author: phuong_vu Date: 2011-10-04 23:43:29 -0400 (Tue, 04 Oct 2011) New Revision: 7657 Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/uiconf/portal/webui/container/ContainerConfigOption.groovy Log: GTNPORTAL-2143 Wrong configuration for Mixed Layout container Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/uiconf/portal/webui/container/ContainerConfigOption.groovy =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/uiconf/portal/webui/container/ContainerConfigOption.groovy 2011-10-04 22:55:28 UTC (rev 7656) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/uiconf/portal/webui/container/ContainerConfigOption.groovy 2011-10-05 03:43:29 UTC (rev 7657) @@ -112,37 +112,38 @@ "ThreeTabContainerLayout")) ; templates.add(tabs); - SelectItemCategory mixed = new SelectItemCategory("mix") ; - mixed.addSelectItemOption(new SelectItemOption("twoColumnsOneRow", - "<container template=\"system:/groovy/portal/webui/container/UIContainer.gtmpl\">" + - " <container template=\"system:/groovy/portal/webui/container/UITableColumnContainer.gtmpl\">" + - " <container template=\"system:/groovy/portal/webui/container/UIContainer.gtmpl\"></container>" + - " <container template=\"system:/groovy/portal/webui/container/UIContainer.gtmpl\"></container>" + - " </container>" + - " <container template=\"system:/groovy/portal/webui/container/UIContainer.gtmpl\"></container>" + - "</container>", - "TwoColumnOneRowContainerLayout")) ; - mixed.addSelectItemOption(new SelectItemOption("oneRowTwoColumns", - "<container template=\"system:/groovy/portal/webui/container/UIContainer.gtmpl\">" + - " <container template=\"system:/groovy/portal/webui/container/UIContainer.gtmpl\"></container>" + - " <container template=\"system:/groovy/portal/webui/container/UITableColumnContainer.gtmpl\">" + + SelectItemCategory mixed = new SelectItemCategory("mix") ; + mixed.addSelectItemOption(new SelectItemOption("twoColumnsOneRow", + "<container template=\"system:/groovy/portal/webui/container/UIContainer.gtmpl\">" + + " <container template=\"system:/groovy/portal/webui/container/UITableColumnContainer.gtmpl\">" + " <factory-id>TableColumnContainer</factory-id>" + - " <container template=\"system:/groovy/portal/webui/container/UIContainer.gtmpl\"></container>" + - " <container template=\"system:/groovy/portal/webui/container/UIContainer.gtmpl\"></container>" + - " </container>" + - "</container>", - "OneRowTwoColumnContainerLayout")) ; - mixed.addSelectItemOption(new SelectItemOption("oneRow2Column1Row", - "<container template=\"system:/groovy/portal/webui/container/UIContainer.gtmpl\">" + - " <container template=\"system:/groovy/portal/webui/container/UIContainer.gtmpl\"></container>" + - " <container template=\"system:/groovy/portal/webui/container/UITableColumnContainer.gtmpl\">" + + " <container template=\"system:/groovy/portal/webui/container/UIColumnContainer.gtmpl\"><factory-id>ColumnContainer</factory-id></container>" + + " <container template=\"system:/groovy/portal/webui/container/UIColumnContainer.gtmpl\"><factory-id>ColumnContainer</factory-id></container>" + + " </container>" + + " <container template=\"system:/groovy/portal/webui/container/UIContainer.gtmpl\"></container>" + + "</container>", + "TwoColumnOneRowContainerLayout")) ; + mixed.addSelectItemOption(new SelectItemOption("oneRowTwoColumns", + "<container template=\"system:/groovy/portal/webui/container/UIContainer.gtmpl\">" + + " <container template=\"system:/groovy/portal/webui/container/UIContainer.gtmpl\"></container>" + + " <container template=\"system:/groovy/portal/webui/container/UITableColumnContainer.gtmpl\">" + " <factory-id>TableColumnContainer</factory-id>" + - " <container template=\"system:/groovy/portal/webui/container/UIContainer.gtmpl\"></container>" + - " <container template=\"system:/groovy/portal/webui/container/UIContainer.gtmpl\"></container>" + - " </container>" + - " <container template=\"system:/groovy/portal/webui/container/UIContainer.gtmpl\"></container>" + - "</container>", - "OneRow2Column1RowContainerLayout")) ; + " <container template=\"system:/groovy/portal/webui/container/UIColumnContainer.gtmpl\"><factory-id>ColumnContainer</factory-id></container>" + + " <container template=\"system:/groovy/portal/webui/container/UIColumnContainer.gtmpl\"><factory-id>ColumnContainer</factory-id></container>" + + " </container>" + + "</container>", + "OneRowTwoColumnContainerLayout")) ; + mixed.addSelectItemOption(new SelectItemOption("oneRow2Column1Row", + "<container template=\"system:/groovy/portal/webui/container/UIContainer.gtmpl\">" + + " <container template=\"system:/groovy/portal/webui/container/UIContainer.gtmpl\"></container>" + + " <container template=\"system:/groovy/portal/webui/container/UITableColumnContainer.gtmpl\">" + + " <factory-id>TableColumnContainer</factory-id>" + + " <container template=\"system:/groovy/portal/webui/container/UIColumnContainer.gtmpl\"><factory-id>ColumnContainer</factory-id></container>" + + " <container template=\"system:/groovy/portal/webui/container/UIColumnContainer.gtmpl\"><factory-id>ColumnContainer</factory-id></container>" + + " </container>" + + " <container template=\"system:/groovy/portal/webui/container/UIContainer.gtmpl\"></container>" + + "</container>", + "OneRow2Column1RowContainerLayout")) ; templates.add(mixed); return templates; \ No newline at end of file