svn commit: r1845090 - in /ofbiz/ofbiz-plugins/trunk: ebaystore/widget/ projectmgr/widget/ scrum/widget/

Mon, 29 Oct 2018 01:32:15 -0700 

Author: surajk
Date: Mon Oct 29 08:31:17 2018
New Revision: 1845090

URL: http://svn.apache.org/viewvc?rev=1845090&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-plugins/trunk/ebaystore/widget/CommonScreens.xml
    ofbiz/ofbiz-plugins/trunk/ebaystore/widget/EbayAccountScreens.xml
    ofbiz/ofbiz-plugins/trunk/ebaystore/widget/EbaySellingManagerScreens.xml
    ofbiz/ofbiz-plugins/trunk/projectmgr/widget/CommonScreens.xml
    ofbiz/ofbiz-plugins/trunk/scrum/widget/CommonScreens.xml
    ofbiz/ofbiz-plugins/trunk/scrum/widget/scrumScreens.xml

Modified: ofbiz/ofbiz-plugins/trunk/ebaystore/widget/CommonScreens.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ebaystore/widget/CommonScreens.xml?rev=1845090&r1=1845089&r2=1845090&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/ebaystore/widget/CommonScreens.xml (original)
+++ ofbiz/ofbiz-plugins/trunk/ebaystore/widget/CommonScreens.xml Mon Oct 29 
08:31:17 2018
@@ -130,7 +130,7 @@
                     <decorator-section name="body">
                         <section>
                             <widgets>
-                                <include-menu 
location="component://ebaystore/widget/EbayStoreMenus.xml" 
name="EbaySellingManagerTabBar"/>
+                                <include-menu name="EbaySellingManagerTabBar" 
location="component://ebaystore/widget/EbayStoreMenus.xml"/>
                                 <decorator-section-include name="body"/>
                             </widgets>
                         </section>
@@ -149,7 +149,7 @@
                     <decorator-section name="body">
                         <section>
                             <widgets>
-                                <include-menu 
location="component://ebaystore/widget/EbayStoreMenus.xml" 
name="EbayAccountTabBar"/>
+                                <include-menu name="EbayAccountTabBar" 
location="component://ebaystore/widget/EbayStoreMenus.xml"/>
                                 <decorator-section-include name="body"/>
                             </widgets>
                         </section>

Modified: ofbiz/ofbiz-plugins/trunk/ebaystore/widget/EbayAccountScreens.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ebaystore/widget/EbayAccountScreens.xml?rev=1845090&r1=1845089&r2=1845090&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/ebaystore/widget/EbayAccountScreens.xml (original)
+++ ofbiz/ofbiz-plugins/trunk/ebaystore/widget/EbayAccountScreens.xml Mon Oct 
29 08:31:17 2018
@@ -56,7 +56,7 @@
                             </condition>
                             <widgets>
                                 <screenlet title="${uiLabelMap.EbayFeedback}">
-                                    <include-menu 
location="component://ebaystore/widget/EbayStoreMenus.xml" 
name="EbayFeedbackTabBar"/>
+                                    <include-menu name="EbayFeedbackTabBar" 
location="component://ebaystore/widget/EbayStoreMenus.xml"/>
                                     <decorator-section-include name="body"/>
                                 </screenlet>
                             </widgets>
@@ -116,7 +116,7 @@
                     <decorator-section name="body">
                         <screenlet>
                             <screenlet title="${uiLabelMap.EbayLeaveFeedback}">
-                                <include-menu 
location="component://ebaystore/widget/EbayStoreMenus.xml" 
name="EbayFeedbackSubTabBar"/>
+                                <include-menu name="EbayFeedbackSubTabBar" 
location="component://ebaystore/widget/EbayStoreMenus.xml"/>
                                 <platform-specific>
                                     <html><html-template 
location="component://ebaystore/template/feedback/LeaveFeedback.ftl"/></html>
                                 </platform-specific>
@@ -144,7 +144,7 @@
                             </condition>
                             <widgets>
                                 <screenlet title="${uiLabelMap.EbayFeedback}">
-                                    <include-menu 
location="component://ebaystore/widget/EbayStoreMenus.xml" 
name="EbayFeedbackTabBar"/>
+                                    <include-menu name="EbayFeedbackTabBar" 
location="component://ebaystore/widget/EbayStoreMenus.xml"/>
                                     <decorator-section-include name="body"/>
                                 </screenlet>
                             </widgets>
@@ -204,7 +204,7 @@
                     <decorator-section name="body">
                         <screenlet>
                             <screenlet title="${uiLabelMap.EbayLeaveFeedback}">
-                                <include-menu 
location="component://ebaystore/widget/EbayStoreMenus.xml" 
name="EbayFeedbackSubTabBar"/>
+                                <include-menu name="EbayFeedbackSubTabBar" 
location="component://ebaystore/widget/EbayStoreMenus.xml"/>
                                 <platform-specific>
                                     <html><html-template 
location="component://ebaystore/template/feedback/LeaveFeedback.ftl"/></html>
                                 </platform-specific>

Modified: 
ofbiz/ofbiz-plugins/trunk/ebaystore/widget/EbaySellingManagerScreens.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ebaystore/widget/EbaySellingManagerScreens.xml?rev=1845090&r1=1845089&r2=1845090&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/ebaystore/widget/EbaySellingManagerScreens.xml 
(original)
+++ ofbiz/ofbiz-plugins/trunk/ebaystore/widget/EbaySellingManagerScreens.xml 
Mon Oct 29 08:31:17 2018
@@ -714,7 +714,7 @@
                                     <widgets/>
                                 </section>
                                     <screenlet title="Order Listings (Import 
single Transactions)">
-                                        <include-menu 
location="component://ebaystore/widget/EbayStoreMenus.xml" 
name="EbayOrderSubBar"/>
+                                        <include-menu name="EbayOrderSubBar" 
location="component://ebaystore/widget/EbayStoreMenus.xml"/>
                                         <include-form 
name="FindEbayStoreOrders" 
location="component://ebaystore/widget/EbaySellingManagerForms.xml"/>
                                         <include-form name="TransactionList" 
location="component://ebaystore/widget/EbaySellingManagerForms.xml"/>
                                     </screenlet>
@@ -745,7 +745,7 @@
                                     <widgets/>
                                 </section>
                                     <screenlet title="Order Listings (Import 
many transactions)">
-                                        <include-menu 
location="component://ebaystore/widget/EbayStoreMenus.xml" 
name="EbayOrderSubBar"/>
+                                        <include-menu name="EbayOrderSubBar" 
location="component://ebaystore/widget/EbayStoreMenus.xml"/>
                                         <include-form 
name="FindEbayStoreOrders" 
location="component://ebaystore/widget/EbaySellingManagerForms.xml"/>
                                         <include-form name="OrderList" 
location="component://ebaystore/widget/EbaySellingManagerForms.xml"/>
                                     </screenlet>

Modified: ofbiz/ofbiz-plugins/trunk/projectmgr/widget/CommonScreens.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/projectmgr/widget/CommonScreens.xml?rev=1845090&r1=1845089&r2=1845090&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/projectmgr/widget/CommonScreens.xml (original)
+++ ofbiz/ofbiz-plugins/trunk/projectmgr/widget/CommonScreens.xml Mon Oct 29 
08:31:17 2018
@@ -352,7 +352,7 @@ under the License.
                                 <section>
                                     <condition><not><if-empty 
field="partyId"/></not></condition>
                                     <widgets>
-                                        <include-menu 
location="component://projectmgr/widget/ProjectMenus.xml" 
name="ResourceTabBar"/>
+                                        <include-menu name="ResourceTabBar" 
location="component://projectmgr/widget/ProjectMenus.xml"/>
                                         <container>
                                             <section>
                                                 <widgets>

Modified: ofbiz/ofbiz-plugins/trunk/scrum/widget/CommonScreens.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/scrum/widget/CommonScreens.xml?rev=1845090&r1=1845089&r2=1845090&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/scrum/widget/CommonScreens.xml (original)
+++ ofbiz/ofbiz-plugins/trunk/scrum/widget/CommonScreens.xml Mon Oct 29 
08:31:17 2018
@@ -383,7 +383,7 @@ under the License.
                                 <section>
                                     <condition><not><if-empty 
field="partyId"/></not></condition>
                                     <widgets>
-                                        <include-menu 
location="component://scrum/widget/scrumMenus.xml" name="ResourceTabBar"/>
+                                        <include-menu name="ResourceTabBar" 
location="component://scrum/widget/scrumMenus.xml"/>
                                         <container>
                                             <section>
                                                 <widgets>

Modified: ofbiz/ofbiz-plugins/trunk/scrum/widget/scrumScreens.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/scrum/widget/scrumScreens.xml?rev=1845090&r1=1845089&r2=1845090&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/scrum/widget/scrumScreens.xml (original)
+++ ofbiz/ofbiz-plugins/trunk/scrum/widget/scrumScreens.xml Mon Oct 29 08:31:17 
2018
@@ -169,13 +169,13 @@ under the License.
                                             </condition>
                                             <widgets>
                                                 <screenlet 
id="sprintBacklogListItems" title="${uiLabelMap.ScrumSprintBacklogList}" 
navigation-menu-name="AllBacklogItem" collapsible="true">
-                                                    <include-menu 
location="component://scrum/widget/scrumMenus.xml" name="AllBacklogItem"/>
+                                                    <include-menu 
name="AllBacklogItem" location="component://scrum/widget/scrumMenus.xml"/>
                                                     <include-form 
name="ViewSprintBacklogListItemsNoAction" 
location="component://scrum/widget/scrumForms.xml"/>
                                                 </screenlet>
                                             </widgets>
                                             <fail-widgets>
                                                 <screenlet 
id="sprintBacklogListItemsOnFail" title="${uiLabelMap.ScrumSprintBacklogList}" 
navigation-menu-name="NotCompleteBacklogItem" collapsible="true">
-                                                    <include-menu 
location="component://scrum/widget/scrumMenus.xml" 
name="NotCompleteBacklogItem"/>
+                                                    <include-menu 
name="NotCompleteBacklogItem" 
location="component://scrum/widget/scrumMenus.xml"/>
                                                     <include-form 
name="ViewSprintBacklogListItemsNoAction" 
location="component://scrum/widget/scrumForms.xml"/>
                                                 </screenlet>
                                             </fail-widgets>
@@ -198,13 +198,13 @@ under the License.
                                                     </condition>
                                                     <widgets>
                                                         <screenlet 
id="sprintBacklogListItems" title="${uiLabelMap.ScrumSprintBacklogList}" 
navigation-menu-name="AllBacklogItem" collapsible="true">
-                                                            <include-menu 
location="component://scrum/widget/scrumMenus.xml" name="AllBacklogItem"/>
+                                                            <include-menu 
name="AllBacklogItem" location="component://scrum/widget/scrumMenus.xml"/>
                                                             <include-form 
name="SprintBacklogListItems" 
location="component://scrum/widget/scrumForms.xml"/>
                                                         </screenlet>
                                                     </widgets>
                                                     <fail-widgets>
                                                         <screenlet 
id="sprintBacklogListItemsOnFail" title="${uiLabelMap.ScrumSprintBacklogList}" 
navigation-menu-name="NotCompleteBacklogItem" collapsible="true">
-                                                            <include-menu 
location="component://scrum/widget/scrumMenus.xml" 
name="NotCompleteBacklogItem"/>
+                                                            <include-menu 
name="NotCompleteBacklogItem" 
location="component://scrum/widget/scrumMenus.xml"/>
                                                             <include-form 
name="SprintBacklogListItems" 
location="component://scrum/widget/scrumForms.xml"/>
                                                         </screenlet>
                                                     </fail-widgets>
@@ -234,13 +234,13 @@ under the License.
                                                                         
</condition>
                                                                         
<widgets>
                                                                             
<screenlet title="${uiLabelMap.ScrumSprintBacklogList}" 
navigation-menu-name="AllBacklogItem">
-                                                                               
 <include-menu location="component://scrum/widget/scrumMenus.xml" 
name="AllBacklogItem"/>
+                                                                               
 <include-menu name="AllBacklogItem" 
location="component://scrum/widget/scrumMenus.xml"/>
                                                                                
 <include-form name="SprintBacklogListItemsHideDelete" 
location="component://scrum/widget/scrumForms.xml"/>
                                                                             
</screenlet>
                                                                         
</widgets>
                                                                         
<fail-widgets>
                                                                             
<screenlet title="${uiLabelMap.ScrumSprintBacklogList}" 
navigation-menu-name="NotCompleteBacklogItem">
-                                                                               
 <include-menu location="component://scrum/widget/scrumMenus.xml" 
name="NotCompleteBacklogItem"/>
+                                                                               
 <include-menu name="NotCompleteBacklogItem" 
location="component://scrum/widget/scrumMenus.xml"/>
                                                                                
 <include-form name="SprintBacklogListItemsHideDelete" 
location="component://scrum/widget/scrumForms.xml"/>
                                                                             
</screenlet>
                                                                         
</fail-widgets>
@@ -265,13 +265,13 @@ under the License.
                                                                         
</condition>
                                                                         
<widgets>
                                                                             
<screenlet title="${uiLabelMap.ScrumSprintBacklogList}" 
navigation-menu-name="AllBacklogItem">
-                                                                               
 <include-menu location="component://scrum/widget/scrumMenus.xml" 
name="AllBacklogItem"/>
+                                                                               
 <include-menu name="AllBacklogItem" 
location="component://scrum/widget/scrumMenus.xml"/>
                                                                                
 <include-form name="ViewSprintBacklogListItemsNoAction" 
location="component://scrum/widget/scrumForms.xml"/>
                                                                             
</screenlet>
                                                                         
</widgets>
                                                                         
<fail-widgets>
                                                                             
<screenlet title="${uiLabelMap.ScrumSprintBacklogList}" 
navigation-menu-name="NotCompleteBacklogItem">
-                                                                               
 <include-menu location="component://scrum/widget/scrumMenus.xml" 
name="NotCompleteBacklogItem"/>
+                                                                               
 <include-menu name="NotCompleteBacklogItem" 
location="component://scrum/widget/scrumMenus.xml"/>
                                                                                
 <include-form name="ViewSprintBacklogListItemsNoAction" 
location="component://scrum/widget/scrumForms.xml"/>
                                                                             
</screenlet>
                                                                         
</fail-widgets>
@@ -2866,13 +2866,13 @@ under the License.
                                         </condition>
                                         <widgets>
                                             <screenlet 
id="unplanBacklogListItems" title="${uiLabelMap.ScrumUnplanBacklogList}" 
navigation-menu-name="AllUnplanBacklogItem" collapsible="true">
-                                                <include-menu 
location="component://scrum/widget/scrumMenus.xml" name="AllUnplanBacklogItem"/>
+                                                <include-menu 
name="AllUnplanBacklogItem" location="component://scrum/widget/scrumMenus.xml"/>
                                                 <include-form 
name="UnplanBacklogListItems" 
location="component://scrum/widget/scrumForms.xml"/>
                                             </screenlet>
                                         </widgets>
                                         <fail-widgets>
                                             <screenlet 
id="unplanBacklogListItemsOnFail" title="${uiLabelMap.ScrumUnplanBacklogList}" 
navigation-menu-name="notCompleteUnplanBacklogItem" collapsible="true">
-                                                <include-menu 
location="component://scrum/widget/scrumMenus.xml" 
name="notCompleteUnplanBacklogItem"/>
+                                                <include-menu 
name="notCompleteUnplanBacklogItem" 
location="component://scrum/widget/scrumMenus.xml"/>
                                                 <include-form 
name="UnplanBacklogListItems" 
location="component://scrum/widget/scrumForms.xml"/>
                                             </screenlet>
                                         </fail-widgets>
@@ -2893,13 +2893,13 @@ under the License.
                                                             </condition>
                                                             <widgets>
                                                                 <screenlet 
id="unplanBacklogListItemsHideDelete" 
title="${uiLabelMap.ScrumUnplanBacklogList}" 
navigation-menu-name="AllUnplanBacklogItem">
-                                                                    
<include-menu location="component://scrum/widget/scrumMenus.xml" 
name="AllUnplanBacklogItem"/>
+                                                                    
<include-menu name="AllUnplanBacklogItem" 
location="component://scrum/widget/scrumMenus.xml"/>
                                                                     
<include-form name="UnplanBacklogListItemsForOwner" 
location="component://scrum/widget/scrumForms.xml"/>
                                                                 </screenlet>
                                                             </widgets>
                                                             <fail-widgets>
                                                                 <screenlet 
id="unplanBacklogListItemsHideDeleteOnFail" 
title="${uiLabelMap.ScrumUnplanBacklogList}" 
navigation-menu-name="notCompleteUnplanBacklogItem">
-                                                                    
<include-menu location="component://scrum/widget/scrumMenus.xml" 
name="notCompleteUnplanBacklogItem"/>
+                                                                    
<include-menu name="notCompleteUnplanBacklogItem" 
location="component://scrum/widget/scrumMenus.xml"/>
                                                                     
<include-form name="UnplanBacklogListItemsForOwner" 
location="component://scrum/widget/scrumForms.xml"/>
                                                                 </screenlet>
                                                             </fail-widgets>
@@ -2912,13 +2912,13 @@ under the License.
                                                             </condition>
                                                             <widgets>
                                                                 <screenlet 
id="unplanBacklogListItemsHideDelete" 
title="${uiLabelMap.ScrumUnplanBacklogList}" 
navigation-menu-name="AllUnplanBacklogItem">
-                                                                    
<include-menu location="component://scrum/widget/scrumMenus.xml" 
name="AllUnplanBacklogItem"/>
+                                                                    
<include-menu name="AllUnplanBacklogItem" 
location="component://scrum/widget/scrumMenus.xml"/>
                                                                     
<include-form name="UnplanBacklogListItemsHideDelete" 
location="component://scrum/widget/scrumForms.xml"/>
                                                                 </screenlet>
                                                             </widgets>
                                                             <fail-widgets>
                                                                 <screenlet 
id="unplanBacklogListItemsHideDeleteOnFail" 
title="${uiLabelMap.ScrumUnplanBacklogList}" 
navigation-menu-name="notCompleteUnplanBacklogItem">
-                                                                    
<include-menu location="component://scrum/widget/scrumMenus.xml" 
name="notCompleteUnplanBacklogItem"/>
+                                                                    
<include-menu name="notCompleteUnplanBacklogItem" 
location="component://scrum/widget/scrumMenus.xml"/>
                                                                     
<include-form name="UnplanBacklogListItemsHideDelete" 
location="component://scrum/widget/scrumForms.xml"/>
                                                                 </screenlet>
                                                             </fail-widgets>

Reply via email to