svn commit: r825280 - in /ofbiz/trunk/applications/prod
Locked
 
|
Author: buscob
Date: Wed Oct 14 21:02:58 2009 New Revision: 825280 URL: http://svn.apache.org/viewvc?rev=825280&view=rev Log: Changed <container style="screenlet"> pattern to <screenlet...>. Modified: ofbiz/trunk/applications/product/widget/catalog/CatalogScreens.xml ofbiz/trunk/applications/product/widget/catalog/CategoryScreens.xml ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml Modified: ofbiz/trunk/applications/product/widget/catalog/CatalogScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/CatalogScreens.xml?rev=825280&r1=825279&r2=825280&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/catalog/CatalogScreens.xml (original) +++ ofbiz/trunk/applications/product/widget/catalog/CatalogScreens.xml Wed Oct 14 21:02:58 2009 @@ -38,20 +38,9 @@ <container> <label style="h1">${uiLabelMap.ProductCatalog} ${uiLabelMap.CommonFor} "${prodCatalog.catalogName}" [${prodCatalogId}]</label> </container> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.PageTitleEditProductCatalog}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <include-form name="EditProdCatalog" location="component://product/webapp/catalog/catalog/ProdCatalogForms.xml"/> - </widgets> - </section> - </container> - </container> + <screenlet title="${uiLabelMap.PageTitleEditProductCatalog}"> + <include-form name="EditProdCatalog" location="component://product/webapp/catalog/catalog/ProdCatalogForms.xml"/> + </screenlet> </decorator-section> </decorator-screen> </widgets> @@ -85,34 +74,12 @@ <container> <label style="h1">${uiLabelMap.ProductCategories} ${uiLabelMap.CommonFor} "${prodCatalog.catalogName}" [${prodCatalogId}]</label> </container> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.PageTitleEditProductCatalogCategories}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <include-form name="EditProdCatalogCategories" location="component://product/webapp/catalog/catalog/ProdCatalogForms.xml"/> - </widgets> - </section> - </container> - </container> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.ProductAddCatalogProdCat}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <include-form name="addProductCategoryToProdCatalog" location="component://product/webapp/catalog/catalog/ProdCatalogForms.xml"/> - </widgets> - </section> - </container> - </container> + <screenlet title="${uiLabelMap.PageTitleEditProductCatalogCategories}"> + <include-form name="EditProdCatalogCategories" location="component://product/webapp/catalog/catalog/ProdCatalogForms.xml"/> + </screenlet> + <screenlet title="${uiLabelMap.ProductAddCatalogProdCat}"> + <include-form name="addProductCategoryToProdCatalog" location="component://product/webapp/catalog/catalog/ProdCatalogForms.xml"/> + </screenlet> </decorator-section> </decorator-screen> </widgets> @@ -142,34 +109,12 @@ <container> <label style="h1">${uiLabelMap.PartyParties} ${uiLabelMap.CommonFor} "${prodCatalog.catalogName}" [${prodCatalogId}]</label> </container> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.PageTitleEditProductCatalogParties}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <include-form name="UpdateProdCatalogToParty" location="component://product/webapp/catalog/catalog/ProdCatalogForms.xml"/> - </widgets> - </section> - </container> - </container> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.PageTitleAddProductCatalogParties}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <include-form name="AddProdCatalogToParty" location="component://product/webapp/catalog/catalog/ProdCatalogForms.xml"/> - </widgets> - </section> - </container> - </container> + <screenlet title="${uiLabelMap.PageTitleEditProductCatalogParties}"> + <include-form name="UpdateProdCatalogToParty" location="component://product/webapp/catalog/catalog/ProdCatalogForms.xml"/> + </screenlet> + <screenlet title="${uiLabelMap.PageTitleAddProductCatalogParties}"> + <include-form name="AddProdCatalogToParty" location="component://product/webapp/catalog/catalog/ProdCatalogForms.xml"/> + </screenlet> </decorator-section> </decorator-screen> </widgets> @@ -199,34 +144,12 @@ <container> <label style="h1">${uiLabelMap.ProductStores} ${uiLabelMap.CommonFor} "${prodCatalog.catalogName}" [${prodCatalogId}]</label> </container> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.PageTitleEditProductCatalogStores}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <include-form name="UpdateProductStoreCatalog" location="component://product/webapp/catalog/catalog/ProdCatalogForms.xml"/> - </widgets> - </section> - </container> - </container> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.PageTitleAddProductCatalogStores}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <include-form name="CreateProductStoreCatalog" location="component://product/webapp/catalog/catalog/ProdCatalogForms.xml"/> - </widgets> - </section> - </container> - </container> + <screenlet title="${uiLabelMap.PageTitleEditProductCatalogStores}"> + <include-form name="UpdateProductStoreCatalog" location="component://product/webapp/catalog/catalog/ProdCatalogForms.xml"/> + </screenlet> + <screenlet title="${uiLabelMap.PageTitleAddProductCatalogStores}"> + <include-form name="CreateProductStoreCatalog" location="component://product/webapp/catalog/catalog/ProdCatalogForms.xml"/> + </screenlet> </decorator-section> </decorator-screen> </widgets> Modified: ofbiz/trunk/applications/product/widget/catalog/CategoryScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/CategoryScreens.xml?rev=825280&r1=825279&r2=825280&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/catalog/CategoryScreens.xml (original) +++ ofbiz/trunk/applications/product/widget/catalog/CategoryScreens.xml Wed Oct 14 21:02:58 2009 @@ -58,7 +58,9 @@ </container> </widgets> </section> - <decorator-section-include name="body"/> + <container style="no-clear"> + <decorator-section-include name="body"/> + </container> </widgets> <fail-widgets> <label style="h3">${uiLabelMap.ProductCatalogViewPermissionError}</label> @@ -116,50 +118,15 @@ <widgets> <decorator-screen name="CommonCategoryDecorator"> <decorator-section name="body"> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.ProductUpdateCategoryContentAssoc}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <include-form name="UpdateCategoryContentAssoc" location="component://product/webapp/catalog/category/CategoryForms.xml"/> - </widgets> - </section> - </container> - </container> - - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.ProductAddProductCategoryContentFromDate}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <include-form name="PrepareAddCategoryContentAssoc" location="component://product/webapp/catalog/category/CategoryForms.xml"/> - </widgets> - </section> - </container> - </container> - - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.ProductAddContentCategory}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <include-form name="AddCategoryContentAssoc" location="component://product/webapp/catalog/category/CategoryForms.xml"/> - </widgets> - </section> - </container> - </container> + <screenlet title="${uiLabelMap.ProductUpdateCategoryContentAssoc}"> + <include-form name="UpdateCategoryContentAssoc" location="component://product/webapp/catalog/category/CategoryForms.xml"/> + </screenlet> + <screenlet title="${uiLabelMap.ProductAddProductCategoryContentFromDate}"> + <include-form name="PrepareAddCategoryContentAssoc" location="component://product/webapp/catalog/category/CategoryForms.xml"/> + </screenlet> + <screenlet title="${uiLabelMap.ProductAddContentCategory}"> + <include-form name="AddCategoryContentAssoc" location="component://product/webapp/catalog/category/CategoryForms.xml"/> + </screenlet> <platform-specific> <html><html-template location="component://product/webapp/catalog/category/EditCategoryContent.ftl"/></html> @@ -199,51 +166,15 @@ </link> </widgets> </section> - - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.ProductUpdateSimpleTextContentCategory}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <include-form name="EditCategoryContentSimpleText" location="component://product/webapp/catalog/category/CategoryForms.xml"/> - </widgets> - </section> - </container> - </container> - - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.ProductListAssociatedContentInfos}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <include-form name="ListAssociatedContentInfos" location="component://product/webapp/catalog/product/ProductForms.xml"/> - </widgets> - </section> - </container> - </container> - - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.ProductCreateSimpleTextContentForAlternateLocale}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <include-form name="CreateSimpleTextContentForAlternateLocale" location="component://product/webapp/catalog/category/CategoryForms.xml"/> - </widgets> - </section> - </container> - </container> + <screenlet title="${uiLabelMap.ProductUpdateSimpleTextContentCategory}"> + <include-form name="EditCategoryContentSimpleText" location="component://product/webapp/catalog/category/CategoryForms.xml"/> + </screenlet> + <screenlet title="${uiLabelMap.ProductListAssociatedContentInfos}"> + <include-form name="ListAssociatedContentInfos" location="component://product/webapp/catalog/product/ProductForms.xml"/> + </screenlet> + <screenlet title="${uiLabelMap.ProductCreateSimpleTextContentForAlternateLocale}"> + <include-form name="CreateSimpleTextContentForAlternateLocale" location="component://product/webapp/catalog/category/CategoryForms.xml"/> + </screenlet> </decorator-section> </decorator-screen> </widgets> @@ -424,34 +355,12 @@ <widgets> <decorator-screen name="CommonCategoryDecorator"> <decorator-section name="body"> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.PageTitleCreateCategoryAttributes}"></label> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <include-form name="CreateProductCategoryAttribute" location="component://product/webapp/catalog/category/CategoryForms.xml"/> - </widgets> - </section> - </container> - </container> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.PageTitleEditCategoryAttributes}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <include-form name="EditProductCategoryAttributes" location="component://product/webapp/catalog/category/CategoryForms.xml"/> - </widgets> - </section> - </container> - </container> + <screenlet title="${uiLabelMap.PageTitleCreateCategoryAttributes}"> + <include-form name="CreateProductCategoryAttribute" location="component://product/webapp/catalog/category/CategoryForms.xml"/> + </screenlet> + <screenlet title="${uiLabelMap.PageTitleEditCategoryAttributes}"> + <include-form name="EditProductCategoryAttributes" location="component://product/webapp/catalog/category/CategoryForms.xml"/> + </screenlet> </decorator-section> </decorator-screen> </widgets> @@ -520,34 +429,12 @@ <widgets> <decorator-screen name="CommonCategoryDecorator"> <decorator-section name="body"> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.PageTitleEditProductCategoryLink}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <include-form name="ListProductCategoryLinks" location="component://product/webapp/catalog/category/CategoryForms.xml"/> - </widgets> - </section> - </container> - </container> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.PageTitleCreateProductCategoryLink}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <include-form name="AddProductCategoryLink" location="component://product/webapp/catalog/category/CategoryForms.xml"/> - </widgets> - </section> - </container> - </container> + <screenlet title="${uiLabelMap.PageTitleEditProductCategoryLink}"> + <include-form name="ListProductCategoryLinks" location="component://product/webapp/catalog/category/CategoryForms.xml"/> + </screenlet> + <screenlet title="${uiLabelMap.PageTitleCreateProductCategoryLink}"> + <include-form name="AddProductCategoryLink" location="component://product/webapp/catalog/category/CategoryForms.xml"/> + </screenlet> </decorator-section> </decorator-screen> </widgets> Modified: ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml?rev=825280&r1=825279&r2=825280&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml (original) +++ ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml Wed Oct 14 21:02:58 2009 @@ -99,7 +99,9 @@ </widgets> </section> - <decorator-section-include name="body"/> + <container style="no-clear"> + <decorator-section-include name="body"/> + </container> </widgets> <fail-widgets> <label style="h3">${uiLabelMap.ProductCatalogViewPermissionError}</label> @@ -139,7 +141,9 @@ </container> <!-- add Create Product and View Product (in ecommerce) links --> - <decorator-section-include name="body"/> + <container style="no-clear"> + <decorator-section-include name="body"/> + </container> </widgets> <fail-widgets> <label style="h3">${uiLabelMap.ProductCatalogViewPermissionError}</label> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |