svn commit: r1128860 - in /ofbiz/trunk/applications/prod
Locked
 
|
Author: hansbak
Date: Sun May 29 10:46:29 2011 New Revision: 1128860 URL: http://svn.apache.org/viewvc?rev=1128860&view=rev Log: changed also the other options in catelog to make everything consistent again. The subscription option was not in a good state, cleaned up some stuff but not all Modified: ofbiz/trunk/applications/product/config/ProductUiLabels.xml ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml ofbiz/trunk/applications/product/widget/catalog/ConfigScreens.xml ofbiz/trunk/applications/product/widget/catalog/PromoScreens.xml ofbiz/trunk/applications/product/widget/catalog/SubscriptionForms.xml ofbiz/trunk/applications/product/widget/catalog/SubscriptionScreens.xml Modified: ofbiz/trunk/applications/product/config/ProductUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/config/ProductUiLabels.xml?rev=1128860&r1=1128859&r2=1128860&view=diff ============================================================================== --- ofbiz/trunk/applications/product/config/ProductUiLabels.xml (original) +++ ofbiz/trunk/applications/product/config/ProductUiLabels.xml Sun May 29 10:46:29 2011 @@ -1951,6 +1951,9 @@ <value xml:lang="zh">èªå¨æ¹åè¯ä»·</value> <value xml:lang="zh_TW">èªåæ ¸åè©è«</value> </property> + <property key="FormFieldTitle_automaticExtend"> + <value xml:lang="en">Automatic Extend</value> + </property> <property key="FormFieldTitle_autoInvoiceDigitalItems"> <value xml:lang="de">Automatische Rechnungsstellung Digitaler Produkte</value> <value xml:lang="en">Auto Invoice Digital Items</value> Modified: ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml?rev=1128860&r1=1128859&r2=1128860&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml (original) +++ ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml Sun May 29 10:46:29 2011 @@ -109,19 +109,6 @@ under the License. <section> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> - <decorator-section name="pre-body"> - <section> - <condition> - <and> - <if-has-permission permission="CATALOG" action="_VIEW"/> - <not><if-empty field="productStoreId"/></not> - </and> - </condition> - <widgets> - <include-menu name="ProductStoreTabBar" location="component://product/widget/catalog/CatalogMenus.xml"/> - </widgets> - </section> - </decorator-section> <decorator-section name="left-column"> <include-screen name="leftbar"/> </decorator-section> @@ -136,6 +123,7 @@ under the License. <condition><not><if-empty field="productStoreId"/></not></condition> <widgets> <container> + <include-menu name="ProductStoreTabBar" location="component://product/widget/catalog/CatalogMenus.xml"/> <label style="h1">${uiLabelMap[labelTitleProperty]} ${uiLabelMap.CommonFor}: ${productStore.storeName} [${uiLabelMap.CommonId}:${productStoreId}] ${${extraFunctionName}}</label> </container> <section> @@ -175,16 +163,6 @@ under the License. <section> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> - <decorator-section name="pre-body"> - <section> - <condition> - <if-has-permission permission="CATALOG" action="_VIEW"/> - </condition> - <widgets> - <include-menu name="ShippingTabBar" location="component://product/widget/catalog/CatalogMenus.xml"/> - </widgets> - </section> - </decorator-section> <decorator-section name="left-column"> <include-screen name="leftbar"/> </decorator-section> @@ -195,7 +173,7 @@ under the License. <if-has-permission permission="CATALOG" action="_VIEW"/> </condition> <widgets> - <!--<include-menu name="EditSubscriptionResource" location="component://product/widget/catalog/SubscriptionMenus.xml"/>--> + <include-menu name="ShippingTabBar" location="component://product/widget/catalog/CatalogMenus.xml"/> <container> <label style="h1">${uiLabelMap[labelTitleProperty]}</label> </container> @@ -221,22 +199,16 @@ under the License. </actions> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> - <decorator-section name="pre-body"> - <section> - <condition> - <if-has-permission permission="CATALOG" action="_VIEW"/> - </condition> - <widgets> - <include-menu name="WebAnalyticsTabBar" location="component://product/widget/catalog/CatalogMenus.xml"/> - </widgets> - </section> - </decorator-section> + <decorator-section name="left-column"> + <include-screen name="leftbar"/> + </decorator-section> <decorator-section name="body"> <section> <condition> <if-has-permission permission="CATALOG" action="_VIEW"/> </condition> <widgets> + <include-menu name="WebAnalyticsTabBar" location="component://product/widget/catalog/CatalogMenus.xml"/> <container style="no-clear"> <decorator-section-include name="body"/> </container> @@ -399,22 +371,16 @@ under the License. </actions> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> - <decorator-section name="pre-body"> - <section> - <condition> - <if-has-permission permission="CATALOG" action="_VIEW"/> - </condition> - <widgets> - <include-menu name="ImageManagementTabBar" location="component://product/widget/catalog/CatalogMenus.xml"/> - </widgets> - </section> - </decorator-section> + <decorator-section name="left-column"> + <include-screen name="leftbar"/> + </decorator-section> <decorator-section name="body"> <section> <condition> <if-has-permission permission="CATALOG" action="_VIEW"/> </condition> <widgets> + <include-menu name="ImageManagementTabBar" location="component://product/widget/catalog/CatalogMenus.xml"/> <decorator-section-include name="body"/> </widgets> <fail-widgets> Modified: ofbiz/trunk/applications/product/widget/catalog/ConfigScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/ConfigScreens.xml?rev=1128860&r1=1128859&r2=1128860&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/catalog/ConfigScreens.xml (original) +++ ofbiz/trunk/applications/product/widget/catalog/ConfigScreens.xml Sun May 29 10:46:29 2011 @@ -24,19 +24,6 @@ under the License. <section> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> - <decorator-section name="pre-body"> - <section> - <condition> - <and> - <if-has-permission permission="CATALOG" action="_VIEW"/> - <not><if-empty field="configItemId"/></not> - </and> - </condition> - <widgets> - <include-menu name="ConfigItemTabBar" location="component://product/widget/catalog/CatalogMenus.xml"/> - </widgets> - </section> - </decorator-section> <decorator-section name="left-column"> <include-screen name="leftbar" location="component://product/widget/catalog/CommonScreens.xml"/> </decorator-section> @@ -51,6 +38,7 @@ under the License. <condition><not><if-empty field="configItemId"/></not></condition> <widgets> <container> + <include-menu name="ConfigItemTabBar" location="component://product/widget/catalog/CatalogMenus.xml"/> <label style="h1">${uiLabelMap[labelTitleProperty]} ${uiLabelMap.CommonFor}: ${configItem.configItemName} [${uiLabelMap.CommonId}:${configItemId}] ${${extraFunctionName}}</label> </container> <container style="button-bar"> Modified: ofbiz/trunk/applications/product/widget/catalog/PromoScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/PromoScreens.xml?rev=1128860&r1=1128859&r2=1128860&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/catalog/PromoScreens.xml (original) +++ ofbiz/trunk/applications/product/widget/catalog/PromoScreens.xml Sun May 29 10:46:29 2011 @@ -27,19 +27,6 @@ under the License. <decorator-section name="left-column"> <include-screen name="leftbar" location="component://product/widget/catalog/CommonScreens.xml"/> </decorator-section> - <decorator-section name="pre-body"> - <section> - <condition> - <and> - <if-has-permission permission="CATALOG" action="_VIEW"/> - <not><if-empty field="productPromoId"/></not> - </and> - </condition> - <widgets> - <include-menu name="PromoTabBar" location="component://product/widget/catalog/CatalogMenus.xml"/> - </widgets> - </section> - </decorator-section> <decorator-section name="body"> <section> <!-- do check for CATALOG, _VIEW permission --> @@ -50,6 +37,7 @@ under the License. <section> <condition><not><if-empty field="productPromoId"/></not></condition> <widgets> + <include-menu name="PromoTabBar" location="component://product/widget/catalog/CatalogMenus.xml"/> <container> <label style="h1">${uiLabelMap[labelTitleProperty]} ${uiLabelMap.CommonFor}: ${productPromo.promoName} [${uiLabelMap.CommonId}:${productPromoId}] ${${extraFunctionName}}</label> </container> Modified: ofbiz/trunk/applications/product/widget/catalog/SubscriptionForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/SubscriptionForms.xml?rev=1128860&r1=1128859&r2=1128860&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/catalog/SubscriptionForms.xml (original) +++ ofbiz/trunk/applications/product/widget/catalog/SubscriptionForms.xml Sun May 29 10:46:29 2011 @@ -62,7 +62,7 @@ under the License. <field name="orderId"><lookup target-form-name="LookupOrderHeader"/></field> <field name="productId"><lookup target-form-name="LookupProduct"/></field> <field name="productCategoryId"><lookup target-form-name="LookupProductCategory"/></field> - <field name="automaticExtend"> + <field name="automaticExtend" title="Automatic Extend" ><!-- TODO: ${uiLabelMap.FormFieldTitle_automaticExtend} get overwritten with the description of the field from the entitymodel--> <drop-down allow-empty="true"> <option key="Y" description="${uiLabelMap.CommonYes}"/> <option key="N" description="${uiLabelMap.CommonNo}"/> @@ -281,13 +281,14 @@ under the License. </entity-options> </drop-down> </field> - <field name="automaticExtend"> + <field name="automaticExtend" title="Automatic Extend" ><!-- TODO: ${uiLabelMap.FormFieldTitle_automaticExtend} get overwritten with the description of the field from the entitymodel--> <drop-down allow-empty="true"> <option key="Y" description="${uiLabelMap.CommonYes}"/> <option key="N" description="${uiLabelMap.CommonNo}"/> </drop-down> </field> - <field name="canclAutmExtTimeUomId"> + <field name="canclAutmExtTime" title="Cancel time"></field> + <field name="canclAutmExtTimeUomId" title="Cancel UOM time"> <drop-down allow-empty="true"> <entity-options entity-name="Uom" key-field-name="uomId" description="${description}"> <entity-constraint name="uomTypeId" value="TIME_FREQ_MEASURE"/> Modified: ofbiz/trunk/applications/product/widget/catalog/SubscriptionScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/SubscriptionScreens.xml?rev=1128860&r1=1128859&r2=1128860&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/catalog/SubscriptionScreens.xml (original) +++ ofbiz/trunk/applications/product/widget/catalog/SubscriptionScreens.xml Sun May 29 10:46:29 2011 @@ -77,19 +77,6 @@ under the License. <decorator-section name="left-column"> <include-screen name="leftbar" location="component://product/widget/catalog/CommonScreens.xml"/> </decorator-section> - <decorator-section name="pre-body"> - <section> - <condition> - <and> - <if-service-permission service-name="subscriptionPermissionCheck" main-action="VIEW"/> - <not><if-empty field="subscription"/></not> - </and> - </condition> - <widgets> - <include-menu name="EditSubscription" location="component://product/widget/catalog/SubscriptionMenus.xml"/> - </widgets> - </section> - </decorator-section> <decorator-section name="body"> <section> <condition> @@ -101,11 +88,19 @@ under the License. <not><if-empty field="subscription"/></not> </condition> <widgets> - <container style="h1"><label>${uiLabelMap[titleProperty]} ${uiLabelMap.CommonFor} ${subscription.description} [${subscriptionId}]</label></container> + <include-menu name="EditSubscription" location="component://product/widget/catalog/SubscriptionMenus.xml"/> <container style="button-bar"><link target="EditSubscription" text="${uiLabelMap.ProductNewSubscription}" style="buttontext"/></container> + <container style="h1"><label>${uiLabelMap[titleProperty]} ${uiLabelMap.CommonFor} ${subscription.description} [${subscriptionId}]</label></container> </widgets> <fail-widgets> - <container style="h1"><label>${uiLabelMap[titleProperty]}</label></container> + <section> + <condition> + <if-compare operator="not-equals" value="EditSubscription" field="tabButtonItem"/> + </condition> + <widgets> + <container style="button-bar"><link target="EditSubscription" text="${uiLabelMap.ProductNewSubscription}" style="buttontext"/></container> + </widgets> + </section> </fail-widgets> </section> <decorator-section-include name="body"/> @@ -137,7 +132,9 @@ under the License. </section> <decorator-screen name="CommonSubscriptionDecorator" location="${parameters.subscriptionDecoratorLocation}"> <decorator-section name="body"> - <include-form name="EditSubscription" location="component://product/widget/catalog/SubscriptionForms.xml"/> + <screenlet id="editSubscription" title="${uiLabelMap.PageTitleEditSubscription}" collapsible="true"> + <include-form name="EditSubscription" location="component://product/widget/catalog/SubscriptionForms.xml"/> + </screenlet> </decorator-section> </decorator-screen> </widgets> @@ -177,7 +174,7 @@ under the License. <set field="titleProperty" value="PageTitleFindSubscriptionResource"/> </actions> <widgets> - <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> + <decorator-screen name="CommonSubscriptionResourceDecorator"> <decorator-section name="body"> <section> <condition> @@ -211,6 +208,9 @@ under the License. </actions> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> + <decorator-section name="left-column"> + <include-screen name="leftbar" location="component://product/widget/catalog/CommonScreens.xml"/> + </decorator-section> <decorator-section name="body"> <section> <condition> @@ -223,13 +223,13 @@ under the License. </condition> <widgets> <include-menu name="EditSubscriptionResource" location="component://product/widget/catalog/SubscriptionMenus.xml"/> - <container style="h1"><label>${uiLabelMap[titleProperty]} ${uiLabelMap.CommonFor} "${subscriptionResource.description}" [${subscriptionResourceId}]</label></container> <container style="button-bar"> <link target="EditSubscriptionResource" text="${uiLabelMap.ProductNewSubscriptionResource}" style="buttontext"/> <link target="FindSubscription" text="${uiLabelMap.ProductFindResourceSubscriptions}" style="buttontext"> <parameter param-name="subscriptionResourceId"/> </link> </container> + <container style="h1"><label>${uiLabelMap[titleProperty]} ${uiLabelMap.CommonFor} "${subscriptionResource.description}" [${subscriptionResourceId}]</label></container> </widgets> <fail-widgets> <container style="h1"><label>${uiLabelMap[titleProperty]}</label></container> @@ -264,7 +264,9 @@ under the License. </section> <decorator-screen name="CommonSubscriptionResourceDecorator" location="${parameters.subscriptionResourceDecoratorLocation}"> <decorator-section name="body"> - <include-form name="EditSubscriptionResource" location="component://product/widget/catalog/SubscriptionForms.xml"/> + <screenlet id="EditSubscriptionResource" title="${uiLabelMap.PageTitleEditSubscriptionResource}" collapsible="true"> + <include-form name="EditSubscriptionResource" location="component://product/widget/catalog/SubscriptionForms.xml"/> + </screenlet> </decorator-section> </decorator-screen> </widgets> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |