Author: surajk
Date: Mon Oct 29 08:29:43 2018
New Revision: 1845088
URL: http://svn.apache.org/viewvc?rev=1845088&view=rev
Log:
Improved: Consistency and Readability improvements for include-menu tag.
(OFBIZ-8972)
Thanks Ankush Upadhyay for reporting and Devanshu Vyas for providing the
updated patch.
Modified:
ofbiz/ofbiz-framework/trunk/applications/accounting/widget/GlScreens.xml
ofbiz/ofbiz-framework/trunk/applications/accounting/widget/GlSetupScreens.xml
ofbiz/ofbiz-framework/trunk/applications/accounting/widget/ap/CommonScreens.xml
ofbiz/ofbiz-framework/trunk/applications/commonext/widget/ofbizsetup/CommonScreens.xml
ofbiz/ofbiz-framework/trunk/applications/humanres/widget/GlobalHRSettingScreens.xml
ofbiz/ofbiz-framework/trunk/applications/marketing/widget/ContactListScreens.xml
ofbiz/ofbiz-framework/trunk/applications/marketing/widget/SegmentScreens.xml
ofbiz/ofbiz-framework/trunk/applications/marketing/widget/sfa/OpportunityScreens.xml
ofbiz/ofbiz-framework/trunk/applications/party/widget/partymgr/CommonScreens.xml
ofbiz/ofbiz-framework/trunk/applications/party/widget/partymgr/CommunicationEventScreens.xml
ofbiz/ofbiz-framework/trunk/applications/party/widget/partymgr/PartyClassificationScreens.xml
ofbiz/ofbiz-framework/trunk/applications/party/widget/partymgr/PartyScreens.xml
ofbiz/ofbiz-framework/trunk/framework/webtools/widget/LogScreens.xml
Modified:
ofbiz/ofbiz-framework/trunk/applications/accounting/widget/GlScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/widget/GlScreens.xml?rev=1845088&r1=1845087&r2=1845088&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/accounting/widget/GlScreens.xml
(original)
+++ ofbiz/ofbiz-framework/trunk/applications/accounting/widget/GlScreens.xml
Mon Oct 29 08:29:43 2018
@@ -57,7 +57,7 @@ under the License.
<section>
<widgets>
<screenlet
title="${uiLabelMap.AccountingPartyAccountsSummary}">
- <include-menu
location="component://accounting/widget/AccountingMenus.xml"
name="PartyGlShortCuts"/>
+ <include-menu name="PartyGlShortCuts"
location="component://accounting/widget/AccountingMenus.xml"/>
</screenlet>
</widgets>
</section>
@@ -311,7 +311,7 @@ under the License.
<not><if-empty field="acctgTransId"/></not>
</condition>
<widgets>
- <include-menu
location="component://accounting/widget/AccountingMenus.xml"
name="EditGlAcctgTransSubTabBar"/>
+ <include-menu name="EditGlAcctgTransSubTabBar"
location="component://accounting/widget/AccountingMenus.xml"/>
<section>
<condition>
<if-compare
field="acctgTrans.isPosted" operator="equals" value="Y"/>
Modified:
ofbiz/ofbiz-framework/trunk/applications/accounting/widget/GlSetupScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/widget/GlSetupScreens.xml?rev=1845088&r1=1845087&r2=1845088&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/applications/accounting/widget/GlSetupScreens.xml
(original)
+++
ofbiz/ofbiz-framework/trunk/applications/accounting/widget/GlSetupScreens.xml
Mon Oct 29 08:29:43 2018
@@ -69,7 +69,7 @@ under the License.
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<screenlet
title="${uiLabelMap.AccountingAvailableInternalOrganizations}"
navigation-menu-name="NewAccountOrganization">
- <include-menu
location="component://accounting/widget/AccountingMenus.xml"
name="NewAccountOrganization"/>
+ <include-menu name="NewAccountOrganization"
location="component://accounting/widget/AccountingMenus.xml"/>
<include-form name="ListCompanies"
location="component://accounting/widget/GlSetupForms.xml"/>
</screenlet>
</decorator-section>
Modified:
ofbiz/ofbiz-framework/trunk/applications/accounting/widget/ap/CommonScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/widget/ap/CommonScreens.xml?rev=1845088&r1=1845087&r2=1845088&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/applications/accounting/widget/ap/CommonScreens.xml
(original)
+++
ofbiz/ofbiz-framework/trunk/applications/accounting/widget/ap/CommonScreens.xml
Mon Oct 29 08:29:43 2018
@@ -151,7 +151,7 @@ under the License.
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="pre-body">
- <include-menu
location="component://accounting/widget/ap/ApMenus.xml" name="ApInvoiceTabBar"/>
+ <include-menu name="ApInvoiceTabBar"
location="component://accounting/widget/ap/ApMenus.xml"/>
</decorator-section>
<decorator-section name="body">
<decorator-section-include name="body"/>
Modified:
ofbiz/ofbiz-framework/trunk/applications/commonext/widget/ofbizsetup/CommonScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/commonext/widget/ofbizsetup/CommonScreens.xml?rev=1845088&r1=1845087&r2=1845088&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/applications/commonext/widget/ofbizsetup/CommonScreens.xml
(original)
+++
ofbiz/ofbiz-framework/trunk/applications/commonext/widget/ofbizsetup/CommonScreens.xml
Mon Oct 29 08:29:43 2018
@@ -77,7 +77,7 @@
</and>
</condition>
<widgets>
- <include-menu
location="component://commonext/widget/ofbizsetup/Menus.xml"
name="SetupSubTabBar"/>
+ <include-menu name="SetupSubTabBar"
location="component://commonext/widget/ofbizsetup/Menus.xml"/>
</widgets>
</section>
<section>
Modified:
ofbiz/ofbiz-framework/trunk/applications/humanres/widget/GlobalHRSettingScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/humanres/widget/GlobalHRSettingScreens.xml?rev=1845088&r1=1845087&r2=1845088&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/applications/humanres/widget/GlobalHRSettingScreens.xml
(original)
+++
ofbiz/ofbiz-framework/trunk/applications/humanres/widget/GlobalHRSettingScreens.xml
Mon Oct 29 08:29:43 2018
@@ -130,7 +130,7 @@
</not>
</condition>
<widgets>
- <include-menu
location="component://humanres/widget/HumanresMenus.xml"
name="EmplPositionTypeTabBar"/>
+ <include-menu name="EmplPositionTypeTabBar"
location="component://humanres/widget/HumanresMenus.xml"/>
</widgets>
</section>
<screenlet
title="${uiLabelMap.HumanResEditEmplPositionType}">
@@ -158,7 +158,7 @@
<widgets>
<decorator-screen name="GlobalHRSettingsDecorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <include-menu
location="component://humanres/widget/HumanresMenus.xml"
name="EmplPositionTypeTabBar"/>
+ <include-menu name="EmplPositionTypeTabBar"
location="component://humanres/widget/HumanresMenus.xml"/>
<screenlet id="AddEmplPositionTypeRatePanel"
title="${uiLabelMap.CommonAdd} ${uiLabelMap.HumanResEmplPositionType}
${uiLabelMap.CommonRate}" collapsible="true">
<include-form name="AddEmplPositionTypeRate"
location="component://humanres/widget/forms/GlobalHRSettingForms.xml"/>
</screenlet>
Modified:
ofbiz/ofbiz-framework/trunk/applications/marketing/widget/ContactListScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/marketing/widget/ContactListScreens.xml?rev=1845088&r1=1845087&r2=1845088&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/applications/marketing/widget/ContactListScreens.xml
(original)
+++
ofbiz/ofbiz-framework/trunk/applications/marketing/widget/ContactListScreens.xml
Mon Oct 29 08:29:43 2018
@@ -264,7 +264,7 @@ under the License.
<decorator-screen name="CommonContactListDecorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<screenlet
title="${uiLabelMap.PageTitleEditContactList}">
- <include-menu
location="component://marketing/widget/ContactListMenus.xml"
name="ContactListCommBar"/>
+ <include-menu name="ContactListCommBar"
location="component://marketing/widget/ContactListMenus.xml"/>
<container style="button-bar">
<link
text="${uiLabelMap.MarketingContactListCommEventCreate}"
target="EditContactListCommEvent" style="buttontext create">
<parameter param-name="contactListId"/>
Modified:
ofbiz/ofbiz-framework/trunk/applications/marketing/widget/SegmentScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/marketing/widget/SegmentScreens.xml?rev=1845088&r1=1845087&r2=1845088&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/applications/marketing/widget/SegmentScreens.xml
(original)
+++
ofbiz/ofbiz-framework/trunk/applications/marketing/widget/SegmentScreens.xml
Mon Oct 29 08:29:43 2018
@@ -87,7 +87,7 @@ under the License.
</and>
</condition>
<widgets>
- <include-menu
location="component://marketing/widget/SegmentMenus.xml"
name="SegmentGroupTabBar"/>
+ <include-menu name="SegmentGroupTabBar"
location="component://marketing/widget/SegmentMenus.xml"/>
</widgets>
</section>
</decorator-section>
Modified:
ofbiz/ofbiz-framework/trunk/applications/marketing/widget/sfa/OpportunityScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/marketing/widget/sfa/OpportunityScreens.xml?rev=1845088&r1=1845087&r2=1845088&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/applications/marketing/widget/sfa/OpportunityScreens.xml
(original)
+++
ofbiz/ofbiz-framework/trunk/applications/marketing/widget/sfa/OpportunityScreens.xml
Mon Oct 29 08:29:43 2018
@@ -148,8 +148,8 @@ under the License.
<widgets>
<decorator-screen name="CommonOpportunityDecorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <include-menu
location="component://party/widget/partymgr/PartyMenus.xml"
name="CommEventTabBar"/>
- <include-menu
location="component://party/widget/partymgr/PartyMenus.xml"
name="CommSubTabBar"/>
+ <include-menu name="CommEventTabBar"
location="component://party/widget/partymgr/PartyMenus.xml"/>
+ <include-menu name="CommSubTabBar"
location="component://party/widget/partymgr/PartyMenus.xml"/>
<screenlet
title="${uiLabelMap.PageTitleListCommunications} ${partyId}">
<include-form name="ListCommEvents"
location="component://party/widget/partymgr/CommunicationEventForms.xml"/>
</screenlet>
Modified:
ofbiz/ofbiz-framework/trunk/applications/party/widget/partymgr/CommonScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/party/widget/partymgr/CommonScreens.xml?rev=1845088&r1=1845087&r2=1845088&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/applications/party/widget/partymgr/CommonScreens.xml
(original)
+++
ofbiz/ofbiz-framework/trunk/applications/party/widget/partymgr/CommonScreens.xml
Mon Oct 29 08:29:43 2018
@@ -75,7 +75,7 @@ under the License.
</and>
</condition>
<widgets>
- <include-menu
location="component://party/widget/partymgr/PartyMenus.xml"
name="ProfileTabBar"/>
+ <include-menu name="ProfileTabBar"
location="component://party/widget/partymgr/PartyMenus.xml"/>
</widgets>
</section>
</decorator-section>
@@ -89,7 +89,7 @@ under the License.
<section>
<condition><not><if-empty
field="partyId"/></not></condition>
<widgets>
- <include-menu
location="component://party/widget/partymgr/PartyMenus.xml"
name="ProfileSubTabBar"/>
+ <include-menu name="ProfileSubTabBar"
location="component://party/widget/partymgr/PartyMenus.xml"/>
<container style="clear"/>
<container style="page-title">
<section>
Modified:
ofbiz/ofbiz-framework/trunk/applications/party/widget/partymgr/CommunicationEventScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/party/widget/partymgr/CommunicationEventScreens.xml?rev=1845088&r1=1845087&r2=1845088&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/applications/party/widget/partymgr/CommunicationEventScreens.xml
(original)
+++
ofbiz/ofbiz-framework/trunk/applications/party/widget/partymgr/CommunicationEventScreens.xml
Mon Oct 29 08:29:43 2018
@@ -34,8 +34,8 @@ under the License.
<if-has-permission permission="PARTYMGR"
action="_VIEW"/>
</condition>
<widgets>
- <include-menu
location="component://party/widget/partymgr/PartyMenus.xml"
name="CommEventTabBar"/>
- <include-menu
location="component://party/widget/partymgr/PartyMenus.xml"
name="CommSubTabBar"/>
+ <include-menu name="CommEventTabBar"
location="component://party/widget/partymgr/PartyMenus.xml"/>
+ <include-menu name="CommSubTabBar"
location="component://party/widget/partymgr/PartyMenus.xml"/>
</widgets>
</section>
</decorator-section>
@@ -65,8 +65,8 @@ under the License.
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="pre-body">
- <include-menu
location="component://party/widget/partymgr/PartyMenus.xml"
name="CommEventTabBar"/>
- <include-menu
location="component://party/widget/partymgr/PartyMenus.xml"
name="CommSubTabBar"/>
+ <include-menu name="CommEventTabBar"
location="component://party/widget/partymgr/PartyMenus.xml"/>
+ <include-menu name="CommSubTabBar"
location="component://party/widget/partymgr/PartyMenus.xml"/>
</decorator-section>
<decorator-section name="body">
<section>
@@ -110,10 +110,10 @@ under the License.
<not><if-empty field="partyId"/></not>
</condition>
<widgets>
- <include-menu
location="component://party/widget/partymgr/PartyMenus.xml"
name="ProfileTabBar"/>
+ <include-menu name="ProfileTabBar"
location="component://party/widget/partymgr/PartyMenus.xml"/>
</widgets>
</section>
- <include-menu
location="component://party/widget/partymgr/PartyMenus.xml"
name="CommFindTabBar"/>
+ <include-menu name="CommFindTabBar"
location="component://party/widget/partymgr/PartyMenus.xml"/>
<container><label style="h1"
text="${uiLabelMap.PartyPendingCommunicationEvents}"/></container>
<container>
<link style="smallSubmit"
target="ViewCommunicationEvent" text="${uiLabelMap.PartyNewCommunication}">
@@ -801,7 +801,7 @@ under the License.
<not><if-empty field="partyId"/></not>
</condition>
<widgets>
- <include-menu
location="component://party/widget/partymgr/PartyMenus.xml"
name="ProfileTabBar"/>
+ <include-menu name="ProfileTabBar"
location="component://party/widget/partymgr/PartyMenus.xml"/>
</widgets>
</section>
<container style="h1"><label
text="${uiLabelMap.PageTitleEditCommContent}"/></container>
@@ -899,7 +899,7 @@ under the License.
<set field="partyIdFrom"
from-field="parameters.partyId" default-value="${userLogin.partyId}"/>
</actions>
<widgets>
- <include-menu
location="component://party/widget/partymgr/PartyMenus.xml"
name="MyCommSubTabBar"/>
+ <include-menu name="MyCommSubTabBar"
location="component://party/widget/partymgr/PartyMenus.xml"/>
<include-screen name="commOverview"/>
</widgets>
</section>
Modified:
ofbiz/ofbiz-framework/trunk/applications/party/widget/partymgr/PartyClassificationScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/party/widget/partymgr/PartyClassificationScreens.xml?rev=1845088&r1=1845087&r2=1845088&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/applications/party/widget/partymgr/PartyClassificationScreens.xml
(original)
+++
ofbiz/ofbiz-framework/trunk/applications/party/widget/partymgr/PartyClassificationScreens.xml
Mon Oct 29 08:29:43 2018
@@ -65,7 +65,7 @@ under the License.
<if-service-permission
service-name="partyBasePermissionCheck" main-action="VIEW"/>
</condition>
<widgets>
- <include-menu
location="component://party/widget/partymgr/PartyMenus.xml"
name="PartyClassificationTabBar"/>
+ <include-menu name="PartyClassificationTabBar"
location="component://party/widget/partymgr/PartyMenus.xml"/>
</widgets>
</section>
</decorator-section>
@@ -136,7 +136,7 @@ under the License.
<if-service-permission
service-name="partyBasePermissionCheck" main-action="VIEW"/>
</condition>
<widgets>
- <include-menu
location="component://party/widget/partymgr/PartyMenus.xml"
name="PartyClassificationTabBar"/>
+ <include-menu name="PartyClassificationTabBar"
location="component://party/widget/partymgr/PartyMenus.xml"/>
</widgets>
</section>
</decorator-section>
Modified:
ofbiz/ofbiz-framework/trunk/applications/party/widget/partymgr/PartyScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/party/widget/partymgr/PartyScreens.xml?rev=1845088&r1=1845087&r2=1845088&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/applications/party/widget/partymgr/PartyScreens.xml
(original)
+++
ofbiz/ofbiz-framework/trunk/applications/party/widget/partymgr/PartyScreens.xml
Mon Oct 29 08:29:43 2018
@@ -50,7 +50,7 @@ under the License.
<widgets>
<screenlet id="FindPartyPanel"
title="${uiLabelMap.PartyFindParty}" navigation-menu-name="CreateNewParty"
navigation-form-name="LookupParty"
save-collapsed="false" collapsible="true"
initially-collapsed="${initialyCollapsed}">
- <include-menu
location="component://party/widget/partymgr/PartyMenus.xml"
name="CreateNewParty"/>
+ <include-menu name="CreateNewParty"
location="component://party/widget/partymgr/PartyMenus.xml"/>
<include-form name="LookupParty"
location="component://party/widget/partymgr/PartyForms.xml"/>
</screenlet>
<screenlet
title="${uiLabelMap.CommonSearchResults}" navigation-form-name="ListParty">
Modified: ofbiz/ofbiz-framework/trunk/framework/webtools/widget/LogScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webtools/widget/LogScreens.xml?rev=1845088&r1=1845087&r2=1845088&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/webtools/widget/LogScreens.xml
(original)
+++ ofbiz/ofbiz-framework/trunk/framework/webtools/widget/LogScreens.xml Mon
Oct 29 08:29:43 2018
@@ -33,7 +33,7 @@ under the License.
<if-has-permission permission="WEBTOOLS"
action="_VIEW"/>
</condition>
<widgets>
- <include-menu
location="component://webtools/widget/Menus.xml" name="LoggingTabBar"/>
+ <include-menu name="LoggingTabBar"
location="component://webtools/widget/Menus.xml"/>
</widgets>
</section>
</decorator-section>
