svn commit: r1026901 - in /ofbiz/trunk/applications: accounting/widget/ product/webapp/facility/group/ product/widget/facility/
Locked
 
|
Author: buscob
Date: Sun Oct 24 21:43:50 2010 New Revision: 1026901 URL: http://svn.apache.org/viewvc?rev=1026901&view=rev Log: - Replaced FacilityGroupTabBar.ftl with a TabBar menu widget. - Added proper class style to several menu items. - Fixed a wrong headerItem setting in ShipmentGatewayConfigScreens.xml Removed: ofbiz/trunk/applications/product/webapp/facility/group/ Modified: ofbiz/trunk/applications/accounting/widget/AccountingMenus.xml ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml ofbiz/trunk/applications/product/widget/facility/FacilityGroupScreens.xml ofbiz/trunk/applications/product/widget/facility/FacilityMenus.xml ofbiz/trunk/applications/product/widget/facility/InventoryItemLabelScreens.xml ofbiz/trunk/applications/product/widget/facility/ShipmentGatewayConfigScreens.xml Modified: ofbiz/trunk/applications/accounting/widget/AccountingMenus.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/AccountingMenus.xml?rev=1026901&r1=1026900&r2=1026901&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/AccountingMenus.xml (original) +++ ofbiz/trunk/applications/accounting/widget/AccountingMenus.xml Sun Oct 24 21:43:50 2010 @@ -152,7 +152,7 @@ under the License. </menu> <menu name="InvoiceSubTabBar" menu-container-style="button-bar button-style-2" default-selected-style="selected"> - <menu-item name="createNew" title="${uiLabelMap.CommonCreateNew}" widget-style="buttontext create"> + <menu-item name="createNew" title="${uiLabelMap.AccountingCreateNewInvoice}" widget-style="buttontext create"> <link target="newInvoice"/> </menu-item> <menu-item name="copyInvoice" title="${uiLabelMap.CommonCopy}"> Modified: ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml?rev=1026901&r1=1026900&r2=1026901&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml (original) +++ ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml Sun Oct 24 21:43:50 2010 @@ -76,8 +76,8 @@ under the License. <decorator-section name="menu-bar"> <container style="button-bar"> <link target="newPayment" text="${uiLabelMap.CommonCreateNew} ${uiLabelMap.AccountingPayment}" style="buttontext create"/> - <link target="FindSalesInvoicesByDueDate" text="${uiLabelMap.AccountingFindSalesInvoicesByDueDate}" style="buttontext"/> - <link target="FindPurchaseInvoicesByDueDate" text="${uiLabelMap.AccountingFindPurchaseInvoicesByDueDate}" style="buttontext"/> + <link target="FindSalesInvoicesByDueDate" text="${uiLabelMap.AccountingFindSalesInvoicesByDueDate}" style="buttontext search"/> + <link target="FindPurchaseInvoicesByDueDate" text="${uiLabelMap.AccountingFindPurchaseInvoicesByDueDate}" style="buttontext search"/> </container> </decorator-section> <decorator-section name="search-options"> Modified: ofbiz/trunk/applications/product/widget/facility/FacilityGroupScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/facility/FacilityGroupScreens.xml?rev=1026901&r1=1026900&r2=1026901&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/facility/FacilityGroupScreens.xml (original) +++ ofbiz/trunk/applications/product/widget/facility/FacilityGroupScreens.xml Sun Oct 24 21:43:50 2010 @@ -31,8 +31,8 @@ under the License. <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> <screenlet title="${uiLabelMap.PageTitleFindFacilityGroup}"> - <container> - <link target="EditFacilityGroup" text="${uiLabelMap.ProductNewGroup}" style="buttontext"/> + <container style="button-bar"> + <link target="EditFacilityGroup" text="${uiLabelMap.ProductNewGroup}" style="buttontext create"/> </container> <include-form name="FindFacilityGroup" location="component://product/widget/facility/FacilityGroupForms.xml"/> </screenlet> @@ -50,16 +50,22 @@ under the License. </actions> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> + <decorator-section name="pre-body"> + <section> + <condition> + <if-has-permission permission="FACILITY" action="_VIEW"/> + </condition> + <widgets> + <include-menu name="FacilityGroupTabBar" location="component://product/widget/facility/FacilityMenus.xml"/> + </widgets> + </section> + </decorator-section> <decorator-section name="body"> <section> <condition> <if-has-permission permission="FACILITY" action="_VIEW"/> </condition> <widgets> - <platform-specific> - <html><html-template location="component://product/webapp/facility/group/FacilityGroupTabBar.ftl"/></html> - </platform-specific> - <decorator-section-include name="body"/> </widgets> <fail-widgets> @@ -83,8 +89,8 @@ under the License. <decorator-screen name="CommonFacilityGroupDecorator"> <decorator-section name="body"> <screenlet title="${uiLabelMap.PageTitleEditFacilityGroup}"> - <container> - <link target="EditFacilityGroup" text="${uiLabelMap.CommonNew}" style="buttontext"/> + <container style="button-bar"> + <link target="EditFacilityGroup" text="${uiLabelMap.CommonNew}" style="buttontext create"/> </container> <include-form name="EditFacilityGroup" location="component://product/widget/facility/FacilityGroupForms.xml"/> </screenlet> @@ -110,7 +116,9 @@ under the License. <label style="h1">${uiLabelMap.ProductFacilities} ${uiLabelMap.CommonFor} ${facilityGroup.facilityGroupName} [${facilityGroup.facilityGroupId}]</label> </container> <screenlet id="AddFacilityGroupMemberPanel" title="${uiLabelMap.ProductAddFacilityGroupMember}" collapsible="true"> - <link target="EditFacilityGroup" text="${uiLabelMap.ProductNewGroup}" style="buttontext"/> + <container style="button-bar"> + <link target="EditFacilityGroup" text="${uiLabelMap.ProductNewGroup}" style="buttontext create"/> + </container> <include-form name="AddFacilityGroupMember" location="component://product/widget/facility/FacilityGroupForms.xml"/> </screenlet> <include-form name="UpdateFacilityGroupMembers" location="component://product/widget/facility/FacilityGroupForms.xml"/> @@ -133,7 +141,9 @@ under the License. <decorator-section name="body"> <label style="h1">${uiLabelMap.PartyRoles} ${uiLabelMap.CommonFor} ${facilityGroup.facilityGroupName} [${facilityGroup.facilityGroupId}]</label> <screenlet id="AddFacilityGroupRolePanel" title="${uiLabelMap.ProductAddFacilityGroupPartyRole}" collapsible="true"> - <link target="EditFacilityGroup" text="${uiLabelMap.ProductNewGroup}" style="buttontext"/> + <container style="button-bar"> + <link target="EditFacilityGroup" text="${uiLabelMap.ProductNewGroup}" style="buttontext create"/> + </container> <include-form name="AddFacilityGroupRole" location="component://product/widget/facility/FacilityGroupForms.xml"/> </screenlet> <include-form name="UpdateFacilityGroupRoles" location="component://product/widget/facility/FacilityGroupForms.xml"/> @@ -160,7 +170,9 @@ under the License. <decorator-section name="body"> <container><label style="h1">${uiLabelMap.ProductRollups} ${uiLabelMap.CommonFor} ${facilityGroup.facilityGroupName} [${facilityGroup.facilityGroupId}]</label></container> <screenlet id="AddFacilityGroupRollupFromPanel" title="${uiLabelMap.PageTitleAddFacilityGroupRollup}" collapsible="true"> - <link target="EditFacilityGroup" text="${uiLabelMap.ProductNewGroup}" style="buttontext"/> + <container style="button-bar"> + <link target="EditFacilityGroup" text="${uiLabelMap.ProductNewGroup}" style="buttontext create"/> + </container> <include-form name="AddFacilityGroupRollupFrom" location="component://product/widget/facility/FacilityGroupForms.xml"/> </screenlet> <include-form name="UpdateFacilityGroupRollupTo" location="component://product/widget/facility/FacilityGroupForms.xml"/> Modified: ofbiz/trunk/applications/product/widget/facility/FacilityMenus.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/facility/FacilityMenus.xml?rev=1026901&r1=1026900&r2=1026901&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/facility/FacilityMenus.xml (original) +++ ofbiz/trunk/applications/product/widget/facility/FacilityMenus.xml Sun Oct 24 21:43:50 2010 @@ -252,4 +252,27 @@ under the License. </link> </menu-item> </menu> + + <menu name="FacilityGroupTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"> + <menu-item name="EditFacilityGroup" title="${uiLabelMap.ProductFacilityGroup}"> + <link target="EditFacilityGroup"> + <parameter param-name="facilityGroupId" from-field="facilityGroupId"/> + </link> + </menu-item> + <menu-item name="EditFacilityGroupRollup" title="${uiLabelMap.ProductRollups}"> + <link target="EditFacilityGroupRollup"> + <parameter param-name="facilityGroupId" from-field="facilityGroupId"/> + </link> + </menu-item> + <menu-item name="EditFacilityGroupMembers" title="${uiLabelMap.ProductFacilities}"> + <link target="EditFacilityGroupMembers"> + <parameter param-name="facilityGroupId" from-field="facilityGroupId"/> + </link> + </menu-item> + <menu-item name="EditFacilityGroupRoles" title="${uiLabelMap.PartyRoles}"> + <link target="EditFacilityGroupRoles"> + <parameter param-name="facilityGroupId" from-field="facilityGroupId"/> + </link> + </menu-item> + </menu> </menus> Modified: ofbiz/trunk/applications/product/widget/facility/InventoryItemLabelScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/facility/InventoryItemLabelScreens.xml?rev=1026901&r1=1026900&r2=1026901&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/facility/InventoryItemLabelScreens.xml (original) +++ ofbiz/trunk/applications/product/widget/facility/InventoryItemLabelScreens.xml Sun Oct 24 21:43:50 2010 @@ -32,8 +32,8 @@ under the License. <widgets> <decorator-screen name="CommonInventoryItemLabelsDecorator" location="${parameters.commonFacilityDecoratorLocation}"> <decorator-section name="body"> - <container> - <link target="EditInventoryItemLabel" text="${uiLabelMap.CommonNew}" style="buttontext"/> + <container style="button-bar"> + <link target="EditInventoryItemLabel" text="${uiLabelMap.CommonNew}" style="buttontext create"/> </container> <screenlet title="${uiLabelMap.PageTitleFindInventoryItemLabels}"> <include-form name="ListInventoryItemLabels" location="component://product/widget/facility/InventoryItemLabelForms.xml"/> Modified: ofbiz/trunk/applications/product/widget/facility/ShipmentGatewayConfigScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/facility/ShipmentGatewayConfigScreens.xml?rev=1026901&r1=1026900&r2=1026901&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/facility/ShipmentGatewayConfigScreens.xml (original) +++ ofbiz/trunk/applications/product/widget/facility/ShipmentGatewayConfigScreens.xml Sun Oct 24 21:43:50 2010 @@ -24,7 +24,7 @@ under the License. <screen name="GenericShipmentGatewayConfigDecorator"> <section> <actions> - <set field="headerItem" value="shipmentGatewayConfig"/> + <set field="headerItem" value="ShipmentGatewayConfig"/> </actions> <widgets> <!-- main defines the regions of the HTML page --> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |