svn commit: r607120 - in /ofbiz/trunk/applications/prod
Locked
 
|
Author: mrisaliti
Date: Thu Dec 27 12:55:12 2007 New Revision: 607120 URL: http://svn.apache.org/viewvc?rev=607120&view=rev Log: Product AGGREGATE & ASSET_USAGE forms (ftl/widgets screen) has now the same look and feel (Part of issue OFBIZ-1544) Modified: ofbiz/trunk/applications/product/config/ProductUiLabels.properties ofbiz/trunk/applications/product/config/ProductUiLabels_it.properties ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.xml ofbiz/trunk/applications/product/widget/catalog/ProductScreens.xml Modified: ofbiz/trunk/applications/product/config/ProductUiLabels.properties URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/config/ProductUiLabels.properties?rev=607120&r1=607119&r2=607120&view=diff ============================================================================== --- ofbiz/trunk/applications/product/config/ProductUiLabels.properties (original) +++ ofbiz/trunk/applications/product/config/ProductUiLabels.properties Thu Dec 27 12:55:12 2007 @@ -92,6 +92,7 @@ PageTitleCreateProductCategoryLink=Create Product Category Link PageTitleCreateProductCategoryStart=Create Product in Category - Start PageTitleCreateProductGoodIdentifications=Add Good Identifications +PageTitleCreateSimpleTextContentForAlternateLocale=Create Simple Text Content For Alternate Locale PageTitleCreateVirtualWithVariants=Create Virtual with Variants PageTitleEditCategory=Edit Category PageTitleEditCategoryAttributes=Edit Product Category Attributes @@ -194,6 +195,7 @@ PageTitleFindSubscriptionResource=Find Subscription Resource PageTitleViewProductStoreSegments=View Product Store Segments PageTitleLabelPrinting=Label Printing +PageTitleListAssociatedContentInfos=List Associated Content Infos PageTitleListCarrierShipmentMethods=List Carrier Shipment Methods PageTitleListProductFeatureApplAttrs=List Product Feature Appl Attrs PageTitleListShipmentMethodTypes=List Shipment Method Types @@ -1934,4 +1936,6 @@ FormFieldTitle_deleteLink=Delete Link FormFieldTitle_vendorPartyId=Vendor Party Id FormFieldTitle_productStoreGroupId=Product Store Group Id -FormFieldTitle_defaultConfigOptionId=Default Config Option Id \ No newline at end of file +FormFieldTitle_defaultConfigOptionId=Default Config Option Id +FormFieldTitle_caContentAssocTypeId=Content Assoc Type Id +FormFieldTitle_editDataResource=Edit Data Resource \ No newline at end of file Modified: ofbiz/trunk/applications/product/config/ProductUiLabels_it.properties URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/config/ProductUiLabels_it.properties?rev=607120&r1=607119&r2=607120&view=diff ============================================================================== --- ofbiz/trunk/applications/product/config/ProductUiLabels_it.properties (original) +++ ofbiz/trunk/applications/product/config/ProductUiLabels_it.properties Thu Dec 27 12:55:12 2007 @@ -90,6 +90,7 @@ PageTitleCreateProductCategoryCheckExisting=Creare Prodotto nella Categoria - Controlla Esistenza PageTitleCreateProductCategoryStart=Creare Prodotto nella Categoria - Inizio PageTitleCreateProductGoodIdentifications=Aggiungi Identificazione Prodotto +PageTitleCreateSimpleTextContentForAlternateLocale=Creare Testo Semplice Contenuto per Locale Alternativi PageTitleCreateVirtualWithVariants=Creare Virtuale Con Varianti PageTitleEditCategory=Mostra Categoria PageTitleEditCategoryAttributes=Aggiorna Attributi Categoria Prodotto @@ -189,6 +190,7 @@ PageTitleFindSubscriptionResource=Ricerca Risorse Abbonamenti PageTitleViewProductStoreSegments=Mostra Segmenti Negozio PageTitleLabelPrinting=Stampa Etichette +PageTitleListAssociatedContentInfos=Lista Associazioni Infomazioni Contenuto PageTitleListCarrierShipmentMethods=Lista Corriere Metodi Spedizione PageTitleListProductFeatureApplAttrs=Lista Prodotti Attributi Caratteristiche PageTitleListShipmentMethodTypes=Lista Tipi Metodo Spedizione @@ -1898,4 +1900,6 @@ FormFieldTitle_deleteLink=Cancella FormFieldTitle_vendorPartyId=Soggetto Fornitore FormFieldTitle_productStoreGroupId=Gruppo Negozio -FormFieldTitle_defaultConfigOptionId=Opzione di Default Configurazione \ No newline at end of file +FormFieldTitle_defaultConfigOptionId=Opzione di Default Configurazione +FormFieldTitle_caContentAssocTypeId=Tipo Associazione Contenuto +FormFieldTitle_editDataResource=Aggiorna Risorsa Dati \ No newline at end of file Modified: ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.xml?rev=607120&r1=607119&r2=607120&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.xml (original) +++ ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.xml Thu Dec 27 12:55:12 2007 @@ -21,7 +21,7 @@ <forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd"> <form name="EditProductSimpleTest" type="single" target="updateProduct" title="" - default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext"> + header-row-style="header-row" default-table-style="basic-table"> <auto-fields-service service-name="updateProduct" map-name="product"/> </form> <form name="EditProduct" type="single" target="updateProduct" title="" default-map-name="product" @@ -429,7 +429,7 @@ <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> <form name="PrepareAddProductContentAssoc" type="single" target="prepareAddContentToProduct" title="${uiLabelMap.ProductAddProductContentFromDate}" - header-row-style="header-row" default-table-style="basic-table"> + header-row-style="header-row" default-table-style="basic-table"> <field name="productId" map-name="product"><hidden/></field> <field name="productContentTypeId" title="${uiLabelMap.ProductProductContentTypeId}"> <drop-down> @@ -442,7 +442,7 @@ <field name="submitButton" title="${uiLabelMap.ProductPrepareCreate}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> <form name="UpdateProductContentAssoc" type="list" target="updateContentToProduct" title="" list-name="productContentDatas" - default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext"> + odd-row-style="alternate-row" default-table-style="basic-table"> <!-- each entry in the list will be a Map with the entries: productContent and content --> <auto-fields-service service-name="updateProductContent" map-name="productContent"/> <field name="productId"><hidden/></field> @@ -463,7 +463,8 @@ description="${uiLabelMap.CommonDelete}" also-hidden="false"/> </field> </form> - <form name="ListAssociatedContentInfos" type="list" title="" list-name="contentInfos"> + <form name="ListAssociatedContentInfos" type="list" title="" list-name="contentInfos" + odd-row-style="alternate-row" default-table-style="basic-table"> <actions> <entity-and entity-name="ContentAssocDataResourceViewTo" list-name="contentInfos"> <field-map field-name="contentIdStart" env-name="contentId"/> @@ -488,14 +489,16 @@ description="${contentId}" also-hidden="false"/> </field> </form> - <form name="CreateSimpleTextContentForAlternateLocale" type="single" target="createSimpleTextContentForAlternateLocale" title="${uiLabelMap.ProductCreateSimpleTextContentForAlternateLocale}"> + <form name="CreateSimpleTextContentForAlternateLocale" type="single" target="createSimpleTextContentForAlternateLocale" title="${uiLabelMap.ProductCreateSimpleTextContentForAlternateLocale}" + header-row-style="header-row" default-table-style="basic-table"> <field name="productId"><hidden/></field> <field name="mainContentId" entry-name="contentId"><hidden/></field> <field name="localeString"><text/></field> <field name="text"><text/></field> <field name="submitButton" title="${uiLabelMap.CommonCreate}"><submit button-type="button"/></field> </form> - <form name="EditProductContentEmail" type="single" target="updateEmailContentForProduct" title="${uiLabelMap.ProductUpdateEmailContentProduct}"> + <form name="EditProductContentEmail" type="single" target="updateEmailContentForProduct" title="${uiLabelMap.ProductUpdateEmailContentProduct}" + header-row-style="header-row" default-table-style="basic-table"> <alt-target use-when="contentId==null" target="createEmailContentForProduct"/> <auto-fields-entity entity-name="ProductContent" map-name="productContentData"/> <field name="fromDate" title="${uiLabelMap.CommonFromDate}" ></field> @@ -555,7 +558,8 @@ <field use-when="contentId == null" name="submitButton" title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit"><submit button-type="button"/></field> <field use-when="contentId != null" name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> - <form name="EditProductContentExternal" type="single" target="updateExternalContentForProduct" title="${uiLabelMap.ProductUpdateExternalContentProduct}"> + <form name="EditProductContentExternal" type="single" target="updateExternalContentForProduct" title="${uiLabelMap.ProductUpdateExternalContentProduct}" + header-row-style="header-row" default-table-style="basic-table"> <alt-target use-when="contentId==null" target="createExternalContentForProduct"/> <auto-fields-entity entity-name="ProductContent" map-name="productContentData"/> <field name="description" title="${uiLabelMap.ProductDescription}" map-name="content"><text size="40"/></field> @@ -569,7 +573,8 @@ <field use-when="contentId == null" name="submitButton" title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit"><submit button-type="button"/></field> <field use-when="contentId != null" name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> - <form name="EditProductContentSimpleText" type="single" target="updateSimpleTextContentForProduct" title="${uiLabelMap.ProductUpdateSimpleTextContentProduct}"> + <form name="EditProductContentSimpleText" type="single" target="updateSimpleTextContentForProduct" title="${uiLabelMap.ProductUpdateSimpleTextContentProduct}" + header-row-style="header-row" default-table-style="basic-table"> <alt-target use-when="contentId==null" target="createSimpleTextContentForProduct"/> <auto-fields-entity entity-name="ProductContent" map-name="productContentData"/> <field name="fromDate" use-when="contentId==null" title="${uiLabelMap.CommonFromDate}*" ><date-time/></field> @@ -706,7 +711,7 @@ <!-- ProductConfig --> <form name="AddProductConfig" type="single" target="createProductConfig" title="" - default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext"> + header-row-style="header-row" default-table-style="basic-table"> <auto-fields-service service-name="createProductConfig" map-name=""/> <field name="productId"><hidden value="${productId}"/></field> <field name="configTypeId"> @@ -725,7 +730,7 @@ <field name="submitButton" title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> <form name="UpdateProductConfig" type="list" target="updateProductConfig" title="" list-name="productConfigs" - default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext"> + odd-row-style="alternate-row" default-table-style="basic-table" paginate-target="ViewProductManufacturing"> <auto-fields-service service-name="updateProductConfig" map-name="productConfig"/> <field name="productId"><hidden/></field> <!-- TODO: get descriptions from IDs <display description="${roleType.description}"/> --> @@ -750,7 +755,7 @@ <!-- form for AssetUsage (rental) parameters --> <form name="EditProductAssetUsage" type="single" target="updateProductAssetUsage" title="" default-map-name="product" - default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext"> + header-row-style="header-row" default-table-style="basic-table"> <alt-target use-when="product==null" target="createProduct"/> <field name="productId"><hidden/></field> @@ -764,7 +769,7 @@ <!-- linked fixed assets --> <form name="ListProductFixedAssets" type="list" list-name="fixedAssetProducts" target="updateFixedAssetProduct" - default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext" > + odd-row-style="alternate-row" default-table-style="basic-table" paginate-target="ViewProductManufacturing"> <!-- <display-entity entity-name="FixedAsset" description="${fixedAssetName}[${fixedAssetId}]"/> --> @@ -774,18 +779,18 @@ <field name="del" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext" separate-column="false"> <hyperlink description="${uiLabelMap.CommonDelete}" target="removeFixedAssetProduct?fixedAssetId=${fixedAssetId}&productId=${productId}&fixedAssetProductTypeId=${fixedAssetProductTypeId}&fromDate=${fromDate}"/> </field> - <field name="fixedAssetId" title="${uiLabelMap.AccountingFixedAsset}[${uiLabelMap.AccountingFixedAssetId}]" widget-style="buttontext" > - <display-entity entity-name="FixedAsset" description="${fixedAssetName}[${fixedAssetId}]"/> + <field name="fixedAssetId" title="${uiLabelMap.AccountingFixedAsset} [${uiLabelMap.AccountingFixedAssetId}]" widget-style="buttontext" > + <display-entity entity-name="FixedAsset" description="${fixedAssetName} [${fixedAssetId}]"/> </field> - <field name="fixedAssetProductTypeId" title="${uiLabelMap.AccountingFixedAssetProductType}" widget-style="tabletext"><display-entity entity-name="FixedAssetProductType"/></field> - <field name="fromDate" title="${uiLabelMap.CommonFromDate}" widget-style="inputBox"> <display/> </field> - <field name="thruDate" title="${uiLabelMap.CommonThruDate}" widget-style="inputBox"> <display/></field> + <field name="fixedAssetProductTypeId" title="${uiLabelMap.AccountingFixedAssetProductType}"><display-entity entity-name="FixedAssetProductType"/></field> + <field name="fromDate" title="${uiLabelMap.CommonFromDate}"> <display/> </field> + <field name="thruDate" title="${uiLabelMap.CommonThruDate}"> <display/></field> <field name="productId"> <hidden/> </field> </form> <!-- create a fixed Asset link on a product --> <form name="addFixedAssetProduct" type="single" target="addFixedAssetProduct" title="" - default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext"> + header-row-style="header-row" default-table-style="basic-table"> <field name="productId"><hidden/></field> <field name="fixedAssetId" title="${uiLabelMap.AccountingFixedAssetId}" ><lookup target-form-name="LookupFixedAsset"/></field> @@ -817,7 +822,7 @@ </form> <form name="showFixedAssetProduct" type="single" default-map-name="fixedAssetProduct" target="updFixedAssetProduct" title="" - default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext"> + header-row-style="header-row" default-table-style="basic-table"> <alt-target use-when="fixedAssetId==null" target="addFixedAssetProduct"/> <field use-when="fixedAssetId!=null" name="fixedAssetId" title="${uiLabelMap.AccountingFixedAssetId}" > <display-entity entity-name="FixedAsset" description="${fixedAssetName}[${fixedAssetId}]"/></field> @@ -857,8 +862,7 @@ </form> <form name="ListProductAssocs" type="list" use-row-submit="true" title="" list-name="productAssocs" - default-title-style="tableheadtext" default-widget-style="tabletext" default-tooltip-style="tabletext" - paginate-target="EditProductAssoc"> + odd-row-style="alternate-row" default-table-style="basic-table" paginate-target="EditProductAssoc"> <auto-fields-entity entity-name="ProductAssoc" default-field-type="display"/> <field name="productId"><hidden/></field> <field name="productIdTo" title="${uiLabelMap.CommonEdit}" widget-style="buttontext"> @@ -867,8 +871,7 @@ </form> <form name="ListProductAssocsTo" type="list" use-row-submit="true" title="" list-name="productAssocsTo" - default-title-style="tableheadtext" default-widget-style="tabletext" default-tooltip-style="tabletext" - paginate-target="EditProductAssoc"> + odd-row-style="alternate-row" default-table-style="basic-table" paginate-target="EditProductAssoc"> <auto-fields-entity entity-name="ProductAssoc" default-field-type="display"/> <field name="productIdTo"><hidden/></field> <field name="productId" title="${uiLabelMap.CommonEdit}" widget-style="buttontext"> Modified: ofbiz/trunk/applications/product/widget/catalog/ProductScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/ProductScreens.xml?rev=607120&r1=607119&r2=607120&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/catalog/ProductScreens.xml (original) +++ ofbiz/trunk/applications/product/widget/catalog/ProductScreens.xml Thu Dec 27 12:55:12 2007 @@ -261,8 +261,34 @@ <widgets> <decorator-screen name="CommonProductDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <include-form name="UpdateProductConfig" location="component://product/webapp/catalog/product/ProductForms.xml"/> - <include-form name="AddProductConfig" location="component://product/webapp/catalog/product/ProductForms.xml"/> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.PageTitleEditProductConfigs}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="UpdateProductConfig" location="component://product/webapp/catalog/product/ProductForms.xml"/> + </widgets> + </section> + </container> + </container> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.PageTitleAddProductConfigs}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="AddProductConfig" location="component://product/webapp/catalog/product/ProductForms.xml"/> + </widgets> + </section> + </container> + </container> </decorator-section> </decorator-screen> </widgets> @@ -284,15 +310,37 @@ <widgets> <decorator-screen name="CommonProductDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <include-form name="EditProductAssetUsage" location="component://product/webapp/catalog/product/ProductForms.xml"/> - <container> - <label/> - <label style="head1">${uiLabelMap.AccountingFixedAssets}</label> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.PageTitleEditProductAssetUsage}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="EditProductAssetUsage" location="component://product/webapp/catalog/product/ProductForms.xml"/> + </widgets> + </section> + </container> </container> - <container> - <link target="newFixedAssetProduct?productId=${productId}" text="[${uiLabelMap.AccountingFixedAssetNew}]" style="buttontext"/> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.PageTitleEditProductAssetUsage}"/> + </container> + </container> + <container style="screenlet-body"> + <container> + <link target="newFixedAssetProduct?productId=${productId}" text="${uiLabelMap.PageTitleCreateProductAssetUsage}" style="buttontext"/> + </container> + <section> + <widgets> + <include-form name="ListProductFixedAssets" location="component://product/webapp/catalog/product/ProductForms.xml"/> + </widgets> + </section> + </container> </container> - <include-form name="ListProductFixedAssets" location="component://product/webapp/catalog/product/ProductForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -312,7 +360,23 @@ <widgets> <decorator-screen name="CommonProductDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <include-form name="showFixedAssetProduct" location="component://product/webapp/catalog/product/ProductForms.xml"/> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.PageTitleEditProductAssetUsage}"/> + </container> + </container> + <container style="screenlet-body"> + <container> + <link target="newFixedAssetProduct?productId=${productId}" text="${uiLabelMap.AccountingFixedAssetNew}" style="buttontext"/> + </container> + <section> + <widgets> + <include-form name="showFixedAssetProduct" location="component://product/webapp/catalog/product/ProductForms.xml"/> + </widgets> + </section> + </container> + </container> </decorator-section> </decorator-screen> </widgets> @@ -321,7 +385,7 @@ <screen name="newFixedAssetProduct"><!-- add a fixed asset --> <section> <actions> - <set field="titleProperty" value="PageTitleEditProductAssetUsage"/> + <set field="titleProperty" value="PageTitleAddProductAssetUsage"/> <set field="tabButtonItem" value="EditProductAssetUsage"/> <set field="labelTitleProperty" value="ProductAssetUsage"/> @@ -331,7 +395,20 @@ <widgets> <decorator-screen name="CommonProductDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <include-form name="addFixedAssetProduct" location="component://product/webapp/catalog/product/ProductForms.xml"/> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.PageTitleAddProductAssetUsage}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="addFixedAssetProduct" location="component://product/webapp/catalog/product/ProductForms.xml"/> + </widgets> + </section> + </container> + </container> </decorator-section> </decorator-screen> </widgets> @@ -1170,9 +1247,48 @@ <widgets> <decorator-screen name="CommonProductDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <include-form name="${contentFormName}" location="component://product/webapp/catalog/product/ProductForms.xml"/> - <include-form name="ListAssociatedContentInfos" location="component://product/webapp/catalog/product/ProductForms.xml"/> - <include-form name="CreateSimpleTextContentForAlternateLocale" location="component://product/webapp/catalog/product/ProductForms.xml"/> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.PageTitleEditProductContent}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="${contentFormName}" location="component://product/webapp/catalog/product/ProductForms.xml"/> + </widgets> + </section> + </container> + </container> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.PageTitleListAssociatedContentInfos}"/> + </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="head4"> + <label text="${uiLabelMap.PageTitleCreateSimpleTextContentForAlternateLocale}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="CreateSimpleTextContentForAlternateLocale" location="component://product/webapp/catalog/product/ProductForms.xml"/> + </widgets> + </section> + </container> + </container> </decorator-section> </decorator-screen> </widgets> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |