Author: mbrohl
Date: Fri Sep 9 16:11:55 2016
New Revision: 1760059
URL: http://svn.apache.org/viewvc?rev=1760059&view=rev
Log:
Improved: Consistent menu names
(OFBIZ-8118)(OFBIZ-8122)(OFBIZ-8123)(OFBIZ-8124)(OFBIZ-8125)(OFBIZ-8126)(OFBIZ-8127)(OFBIZ-8128)(OFBIZ-8129)
Menu names should be in camel case to maintain consistency. I've slightly
modified the provided patch to eliminate names with "-" or all lower case also.
Thanks: Tanmay Muley for reporting and providing the patches.
Modified:
ofbiz/trunk/applications/accounting/widget/AccountingMenus.xml
ofbiz/trunk/applications/accounting/widget/GlSetupScreens.xml
ofbiz/trunk/applications/commonext/widget/ofbizsetup/Menus.xml
ofbiz/trunk/applications/order/widget/ordermgr/OrderMenus.xml
ofbiz/trunk/applications/order/widget/ordermgr/QuoteScreens.xml
ofbiz/trunk/applications/party/widget/partymgr/CommunicationEventScreens.xml
ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml
ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml
ofbiz/trunk/applications/party/widget/partymgr/ProfileScreens.xml
ofbiz/trunk/framework/webtools/widget/CommonScreens.xml
ofbiz/trunk/framework/webtools/widget/Menus.xml
ofbiz/trunk/specialpurpose/ecommerce/widget/blog/BlogMenus.xml
ofbiz/trunk/specialpurpose/ecommerce/widget/blog/BlogScreens.xml
ofbiz/trunk/specialpurpose/lucene/widget/LuceneMenus.xml
ofbiz/trunk/specialpurpose/lucene/widget/LuceneScreens.xml
ofbiz/trunk/specialpurpose/scrum/widget/scrumMenus.xml
ofbiz/trunk/specialpurpose/scrum/widget/scrumScreens.xml
Modified: ofbiz/trunk/applications/accounting/widget/AccountingMenus.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/AccountingMenus.xml?rev=1760059&r1=1760058&r2=1760059&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/AccountingMenus.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/AccountingMenus.xml Fri Sep 9
16:11:55 2016
@@ -1444,7 +1444,7 @@ under the License.
</link>
</menu-item>
</menu>
- <menu name="newAccountOrganization">
+ <menu name="NewAccountOrganization">
<menu-item name="addCompany"
title="${uiLabelMap.AccountingNewCompany}">
<condition>
<if-compare field="hasPrefPermission" operator="equals"
value="true" type="Boolean"/>
Modified: ofbiz/trunk/applications/accounting/widget/GlSetupScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/GlSetupScreens.xml?rev=1760059&r1=1760058&r2=1760059&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/GlSetupScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/GlSetupScreens.xml Fri Sep 9
16:11:55 2016
@@ -67,8 +67,8 @@ under the License.
<widgets>
<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"/>
+ <screenlet
title="${uiLabelMap.AccountingAvailableInternalOrganizations}"
navigation-menu-name="NewAccountOrganization">
+ <include-menu
location="component://accounting/widget/AccountingMenus.xml"
name="NewAccountOrganization"/>
<include-form name="ListCompanies"
location="component://accounting/widget/GlSetupForms.xml"/>
</screenlet>
</decorator-section>
Modified: ofbiz/trunk/applications/commonext/widget/ofbizsetup/Menus.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/commonext/widget/ofbizsetup/Menus.xml?rev=1760059&r1=1760058&r2=1760059&view=diff
==============================================================================
--- ofbiz/trunk/applications/commonext/widget/ofbizsetup/Menus.xml (original)
+++ ofbiz/trunk/applications/commonext/widget/ofbizsetup/Menus.xml Fri Sep 9
16:11:55 2016
@@ -96,7 +96,7 @@
</menu-item>
</menu>
- <menu name="personUpdate">
+ <menu name="PersonUpdate">
<menu-item name="update" title="${uiLabelMap.CommonUpdate}">
<link target="editperson">
<parameter param-name="customerPartyId"
from-field="customerPartyId"/>
@@ -105,7 +105,7 @@
</menu-item>
</menu>
- <menu name="groupUpdate">
+ <menu name="GroupUpdate">
<menu-item name="update" title="${uiLabelMap.CommonUpdate}">
<link target="editpartygroup">
<parameter param-name="partyId"
from-field="organizationPartyId"/>
Modified: ofbiz/trunk/applications/order/widget/ordermgr/OrderMenus.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/OrderMenus.xml?rev=1760059&r1=1760058&r2=1760059&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/OrderMenus.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/OrderMenus.xml Fri Sep 9
16:11:55 2016
@@ -353,7 +353,7 @@ under the License.
</menu-item>
</menu>
- <menu name="editrequestitemmenu" extends="CommonTabBarMenu"
extends-resource="component://common/widget/CommonMenus.xml">
+ <menu name="EditRequestItemMenu" extends="CommonTabBarMenu"
extends-resource="component://common/widget/CommonMenus.xml">
<menu-item name="requestitem" title="${uiLabelMap.OrderRequestItem}">
<link id="requestitem" target="requestitem">
<parameter param-name="custRequestId"
from-field="custRequest.custRequestId"/>
@@ -379,7 +379,7 @@ under the License.
</link>
</menu-item>
</menu>
- <menu name="quoteTermSubTabBar" extends="CommonTabBarMenu"
extends-resource="component://common/widget/CommonMenus.xml"
+ <menu name="QuoteTermSubTabBar" extends="CommonTabBarMenu"
extends-resource="component://common/widget/CommonMenus.xml"
menu-container-style="button-bar button-style-2">
<menu-item name="EditQuoteTerm"
title="${uiLabelMap.OrderCreateOrderQuoteTerm}" >
<condition>
@@ -405,7 +405,7 @@ under the License.
</link>
</menu-item>
</menu>
- <menu name="quoteItemSubTabBar" extends="CommonTabBarMenu"
extends-resource="component://common/widget/CommonMenus.xml"
+ <menu name="QuoteItemSubTabBar" extends="CommonTabBarMenu"
extends-resource="component://common/widget/CommonMenus.xml"
menu-container-style="button-bar button-style-2">
<menu-item name="EditQuoteTerm"
title="${uiLabelMap.OrderCreateOrderQuoteTerm}" >
<link target="EditQuoteItem"
text="${uiLabelMap.OrderCreateOrderQuoteItem}" style="buttontext">
Modified: ofbiz/trunk/applications/order/widget/ordermgr/QuoteScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/QuoteScreens.xml?rev=1760059&r1=1760058&r2=1760059&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/QuoteScreens.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/QuoteScreens.xml Fri Sep 9
16:11:55 2016
@@ -316,7 +316,7 @@ under the License.
<widgets>
<decorator-screen name="CommonQuoteDecorator"
location="${parameters.quoteDecoratorLocation}">
<decorator-section name="body">
- <include-menu name="quoteItemSubTabBar"
location="component://order/widget/ordermgr/OrderMenus.xml"/>
+ <include-menu name="QuoteItemSubTabBar"
location="component://order/widget/ordermgr/OrderMenus.xml"/>
<screenlet
title="${uiLabelMap.OrderOrderQuoteListItems}">
<include-form name="ListQuoteItems"
location="component://order/widget/ordermgr/QuoteForms.xml"/>
</screenlet>
@@ -345,7 +345,7 @@ under the License.
<decorator-screen name="CommonQuoteDecorator"
location="${parameters.quoteDecoratorLocation}">
<decorator-section name="body">
<container>
- <include-menu name="quoteTermSubTabBar"
location="component://order/widget/ordermgr/OrderMenus.xml"/>
+ <include-menu name="QuoteTermSubTabBar"
location="component://order/widget/ordermgr/OrderMenus.xml"/>
</container>
<container style="lefthalf">
<screenlet
title="${uiLabelMap.OrderOrderQuoteEditItems}" >
@@ -823,7 +823,7 @@ under the License.
<widgets>
<decorator-screen name="CommonQuoteDecorator"
location="${parameters.quoteDecoratorLocation}">
<decorator-section name="body">
- <include-menu name="quoteTermSubTabBar"
location="component://order/widget/ordermgr/OrderMenus.xml"/>
+ <include-menu name="QuoteTermSubTabBar"
location="component://order/widget/ordermgr/OrderMenus.xml"/>
<screenlet
title="${uiLabelMap.OrderOrderQuoteTermList}">
<include-form name="ListQuoteTerms"
location="component://order/widget/ordermgr/QuoteForms.xml"/>
</screenlet>
Modified:
ofbiz/trunk/applications/party/widget/partymgr/CommunicationEventScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/CommunicationEventScreens.xml?rev=1760059&r1=1760058&r2=1760059&view=diff
==============================================================================
---
ofbiz/trunk/applications/party/widget/partymgr/CommunicationEventScreens.xml
(original)
+++
ofbiz/trunk/applications/party/widget/partymgr/CommunicationEventScreens.xml
Fri Sep 9 16:11:55 2016
@@ -842,8 +842,8 @@ under the License.
</actions>
<widgets>
<screenlet title="${uiLabelMap.PartyCommunicationsOfParty}:
${partyName.firstName} ${partyName.middleName} ${partyName.lastName}
${partyName.groupName} [${partyId}] "
- navigation-menu-name="communicationsMenu"
navigation-form-name="ListPartyCommEvents" name="myComms">
- <include-menu name="communicationsMenu"
location="component://party/widget/partymgr/PartyMenus.xml"/>
+ navigation-menu-name="CommunicationsMenu"
navigation-form-name="ListPartyCommEvents" name="myComms">
+ <include-menu name="CommunicationsMenu"
location="component://party/widget/partymgr/PartyMenus.xml"/>
<section><!-- List my communication events -->
<condition>
<or>
Modified: ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml?rev=1760059&r1=1760058&r2=1760059&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml Fri Sep 9
16:11:55 2016
@@ -218,7 +218,7 @@
</link>
</menu-item>
</menu>
- <menu name="create-new-party" menu-container-style="basic-nav">
+ <menu name="CreateNewParty" menu-container-style="basic-nav">
<menu-item name="create-party-group"
title="${uiLabelMap.PartyCreateNewPartyGroup}">
<condition>
<if-has-permission permission="PARTYMGR" action="_CREATE"/>
@@ -273,7 +273,7 @@
</menu-item>
</menu>
- <menu name="personUpdate">
+ <menu name="PersonUpdate">
<menu-item name="update" title="${uiLabelMap.CommonUpdate}">
<link target="editperson">
<parameter param-name="partyId"
from-field="parameters.partyId"/>
@@ -317,7 +317,7 @@
</menu-item>
</menu>
- <menu name="groupUpdate">
+ <menu name="GroupUpdate">
<menu-item name="update" title="${uiLabelMap.CommonUpdate}">
<link target="editpartygroup">
<parameter param-name="partyId" from-field="party.partyId"/>
@@ -325,7 +325,7 @@
</menu-item>
</menu>
- <menu name="addShipper">
+ <menu name="AddShipper">
<menu-item name="new" title="${uiLabelMap.CommonCreateNew}">
<condition>
<if-has-permission permission="PARTYMGR" action="_CREATE"/>
@@ -335,7 +335,7 @@
</link>
</menu-item>
</menu>
- <menu name="communicationsMenu">
+ <menu name="CommunicationsMenu">
<menu-item name="newEmail" title="${uiLabelMap.PartyNewEmail}">
<condition>
<if-has-permission permission="PARTYMGR_CME-EMAIL_CREATE"/>
@@ -728,7 +728,7 @@
</menu-item>
</menu>
- <menu name="addRelContactAccounts">
+ <menu name="AddRelContactAccounts">
<menu-item name="add" title="${uiLabelMap.CommonCreateNew}">
<link target="${parameters._LAST_VIEW_NAME_}">
<parameter param-name="partyId"/>
@@ -738,7 +738,7 @@
</menu-item>
</menu>
- <menu name="newPartyIdentification">
+ <menu name="NewPartyIdentification">
<menu-item name="new" title="${uiLabelMap.CommonNew}">
<link target="viewidentifications">
<parameter param-name="partyId"
from-field="parameters.partyId"/>
Modified: ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml?rev=1760059&r1=1760058&r2=1760059&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml Fri Sep 9
16:11:55 2016
@@ -40,9 +40,9 @@ under the License.
<if-service-permission
service-name="partyBasePermissionCheck" main-action="VIEW"/>
</condition>
<widgets>
- <screenlet id="FindPartyPanel"
title="${uiLabelMap.PartyFindParty}" navigation-menu-name="create-new-party"
+ <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="create-new-party"/>
+ <include-menu
location="component://party/widget/partymgr/PartyMenus.xml"
name="CreateNewParty"/>
<include-form name="lookupparty"
location="component://party/widget/partymgr/PartyForms.xml"/>
</screenlet>
<screenlet
title="${uiLabelMap.CommonSearchResults}" navigation-form-name="ListParty">
@@ -1229,8 +1229,8 @@ under the License.
<screenlet
title="${uiLabelMap.PartyPartyIdentificationList}">
<include-form name="listPartyIdentification"
location="component://party/widget/partymgr/PartyForms.xml"/>
</screenlet>
- <screenlet
title="${uiLabelMap.PartyPartyIdentification}"
navigation-menu-name="newPartyIdentification"
id="PartyIdentificationCreationPanel">
- <include-menu name="newPartyIdentification"
location="component://party/widget/partymgr/PartyMenus.xml"/>
+ <screenlet
title="${uiLabelMap.PartyPartyIdentification}"
navigation-menu-name="NewPartyIdentification"
id="PartyIdentificationCreationPanel">
+ <include-menu name="NewPartyIdentification"
location="component://party/widget/partymgr/PartyMenus.xml"/>
<include-form name="editPartyIdentification"
location="component://party/widget/partymgr/PartyForms.xml"/>
</screenlet>
</decorator-section>
Modified: ofbiz/trunk/applications/party/widget/partymgr/ProfileScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/ProfileScreens.xml?rev=1760059&r1=1760058&r2=1760059&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/ProfileScreens.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/ProfileScreens.xml Fri Sep
9 16:11:55 2016
@@ -59,8 +59,8 @@
</or>
</condition>
<widgets>
- <screenlet
title="${uiLabelMap.PartyPersonalInformation}"
navigation-menu-name="personUpdate" id="PartyPersonalInformationPanel">
- <include-menu name="personUpdate"
location="component://party/widget/partymgr/PartyMenus.xml"/>
+ <screenlet
title="${uiLabelMap.PartyPersonalInformation}"
navigation-menu-name="PersonUpdate" id="PartyPersonalInformationPanel">
+ <include-menu name="PersonUpdate"
location="component://party/widget/partymgr/PartyMenus.xml"/>
<include-form name="ViewPartyPerson"
location="component://party/widget/partymgr/PartyForms.xml"/>
<section>
<condition>
@@ -98,8 +98,8 @@
<if-has-permission permission="PARTYMGR"
action="_GRP_UPDATE"/>
</condition>
<widgets>
- <screenlet
title="${uiLabelMap.PartyPartyGroupInformation}"
navigation-menu-name="groupUpdate" id="PartyGroupInformationPanel">
- <include-menu name="groupUpdate"
location="component://party/widget/partymgr/PartyMenus.xml"/>
+ <screenlet
title="${uiLabelMap.PartyPartyGroupInformation}"
navigation-menu-name="GroupUpdate" id="PartyGroupInformationPanel">
+ <include-menu name="GroupUpdate"
location="component://party/widget/partymgr/PartyMenus.xml"/>
<include-form name="ViewPartyGroup"
location="component://party/widget/partymgr/PartyForms.xml"/>
<section>
<condition>
@@ -489,8 +489,8 @@
<set field="partyId" from-field="parameters.partyId"/>
</actions>
<widgets>
- <screenlet title="${uiLabelMap.PartyShipperAccount}"
navigation-menu-name="addShipper">
- <include-menu name="addShipper"
location="component://party/widget/partymgr/PartyMenus.xml"/>
+ <screenlet title="${uiLabelMap.PartyShipperAccount}"
navigation-menu-name="AddShipper">
+ <include-menu name="AddShipper"
location="component://party/widget/partymgr/PartyMenus.xml"/>
<include-form name="ListCarrierAccounts"
location="component://party/widget/partymgr/PartyForms.xml"/>
</screenlet>
</widgets>
@@ -524,8 +524,8 @@
<if-compare field="party.partyTypeId"
operator="equals" value="PARTY_GROUP"/>
</condition>
<widgets>
- <screenlet
title="${uiLabelMap.PartyListRelatedContacts}"
navigation-menu-name="addRelContactAccounts">
- <include-menu name="addRelContactAccounts"
location="component://party/widget/partymgr/PartyMenus.xml"/>
+ <screenlet
title="${uiLabelMap.PartyListRelatedContacts}"
navigation-menu-name="AddRelContactAccounts">
+ <include-menu name="AddRelContactAccounts"
location="component://party/widget/partymgr/PartyMenus.xml"/>
<section>
<condition>
<not><if-empty
field="parameters.editPartyRel"/></not>
@@ -559,8 +559,8 @@
<if-compare field="party.partyTypeId"
operator="equals" value="PERSON"/>
</condition>
<widgets>
- <screenlet
title="${uiLabelMap.PartyListRelatedAccounts}"
navigation-menu-name="addRelContactAccounts">
- <include-menu name="addRelContactAccounts"
location="component://party/widget/partymgr/PartyMenus.xml"/>
+ <screenlet
title="${uiLabelMap.PartyListRelatedAccounts}"
navigation-menu-name="AddRelContactAccounts">
+ <include-menu name="AddRelContactAccounts"
location="component://party/widget/partymgr/PartyMenus.xml"/>
<section>
<condition>
<not><if-empty
field="parameters.editPartyRel"/></not>
Modified: ofbiz/trunk/framework/webtools/widget/CommonScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/CommonScreens.xml?rev=1760059&r1=1760058&r2=1760059&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/framework/webtools/widget/CommonScreens.xml Fri Sep 9 16:11:55
2016
@@ -156,7 +156,7 @@ under the License.
<if-has-permission permission="WEBTOOLS"
action="_VIEW"/>
</condition>
<widgets>
- <include-menu name="serviceTabBar"
location="component://webtools/widget/Menus.xml"/>
+ <include-menu name="ServiceTabBar"
location="component://webtools/widget/Menus.xml"/>
</widgets>
</section>
</decorator-section>
@@ -192,7 +192,7 @@ under the License.
<if-has-permission permission="ENTITY_MAINT"/>
</condition>
<widgets>
- <include-menu name="importExportTabBar"
location="component://webtools/widget/Menus.xml"/>
+ <include-menu name="ImportExportTabBar"
location="component://webtools/widget/Menus.xml"/>
</widgets>
</section>
</decorator-section>
@@ -228,7 +228,7 @@ under the License.
<if-has-permission permission="ENTITY_MAINT"/>
</condition>
<widgets>
- <include-menu name="artifactTabBar"
location="component://webtools/widget/Menus.xml"/>
+ <include-menu name="ArtifactTabBar"
location="component://webtools/widget/Menus.xml"/>
</widgets>
</section>
</decorator-section>
@@ -264,7 +264,7 @@ under the License.
<if-has-permission permission="ENTITY_MAINT"/>
</condition>
<widgets>
- <include-menu name="configurationTabBar"
location="component://webtools/widget/Menus.xml"/>
+ <include-menu name="ConfigurationTabBar"
location="component://webtools/widget/Menus.xml"/>
</widgets>
</section>
</decorator-section>
@@ -300,7 +300,7 @@ under the License.
<if-has-permission permission="WEBTOOLS"
action="_VIEW"/>
</condition>
<widgets>
- <include-menu name="geoManagement"
location="component://webtools/widget/Menus.xml"/>
+ <include-menu name="GeoManagement"
location="component://webtools/widget/Menus.xml"/>
</widgets>
</section>
</decorator-section>
Modified: ofbiz/trunk/framework/webtools/widget/Menus.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/Menus.xml?rev=1760059&r1=1760058&r2=1760059&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/widget/Menus.xml (original)
+++ ofbiz/trunk/framework/webtools/widget/Menus.xml Fri Sep 9 16:11:55 2016
@@ -59,7 +59,7 @@ under the License.
</menu-item>
</menu>
- <menu name="configurationTabBar" extends="CommonTabBarMenu"
extends-resource="component://common/widget/CommonMenus.xml"
+ <menu name="ConfigurationTabBar" extends="CommonTabBarMenu"
extends-resource="component://common/widget/CommonMenus.xml"
selected-menuitem-context-field-name="page.tabButtonItem">
<menu-item name="tempexpr"
title="${uiLabelMap.WebtoolsTemporalExpression}">
<link target="findTemporalExpression"/>
@@ -69,7 +69,7 @@ under the License.
</menu-item>
</menu>
- <menu name="importExportTabBar" extends="CommonTabBarMenu"
extends-resource="component://common/widget/CommonMenus.xml"
+ <menu name="ImportExportTabBar" extends="CommonTabBarMenu"
extends-resource="component://common/widget/CommonMenus.xml"
selected-menuitem-context-field-name="page.tabButtonItem">
<menu-item name="data" title="${uiLabelMap.WebtoolsDataFileTools}">
<link target="viewdatafile"/>
@@ -100,7 +100,7 @@ under the License.
</menu-item>
</menu>
- <menu name="serviceTabBar" extends="CommonTabBarMenu"
extends-resource="component://common/widget/CommonMenus.xml"
+ <menu name="ServiceTabBar" extends="CommonTabBarMenu"
extends-resource="component://common/widget/CommonMenus.xml"
selected-menuitem-context-field-name="page.tabButtonItem">
<menu-item name="serviceList"
title="${uiLabelMap.WebtoolsServiceReference}">
<link target="ServiceList"/>
@@ -162,7 +162,7 @@ under the License.
</menu-item>
</menu>
- <menu name="artifactTabBar" extends="CommonTabBarMenu"
extends-resource="component://common/widget/CommonMenus.xml"
+ <menu name="ArtifactTabBar" extends="CommonTabBarMenu"
extends-resource="component://common/widget/CommonMenus.xml"
selected-menuitem-context-field-name="tabButtonItem">
<menu-item name="viewents"
title="${uiLabelMap.WebtoolsViewComponents}">
<link target="ViewComponents"/>
@@ -307,7 +307,7 @@ under the License.
</menu-item>
</menu>
- <menu name="geoManagement" extends="CommonTabBarMenu"
extends-resource="component://common/widget/CommonMenus.xml">
+ <menu name="GeoManagement" extends="CommonTabBarMenu"
extends-resource="component://common/widget/CommonMenus.xml">
<!--menu-container-style="button-bar button-style-2 no-clear"-->
<menu-item name="FindGeo" title="${uiLabelMap.WebtoolsGeosFind}">
<link target="FindGeo"/>
Modified: ofbiz/trunk/specialpurpose/ecommerce/widget/blog/BlogMenus.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/widget/blog/BlogMenus.xml?rev=1760059&r1=1760058&r2=1760059&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/widget/blog/BlogMenus.xml (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/widget/blog/BlogMenus.xml Fri Sep 9
16:11:55 2016
@@ -19,7 +19,7 @@
-->
<menus xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns="http://ofbiz.apache.org/Widget-Menu";
xsi:schemaLocation="http://ofbiz.apache.org/Widget-Menu
http://ofbiz.apache.org/dtds/widget-menu.xsd";>
- <menu name="view_edit" default-title-style="tabButton"
default-selected-style="tabButtonSelected" default-menu-item-name="all"
orientation="horizontal" menu-width="100%" default-widget-style="tabButton"
menu-container-style="blogmenuwrapper" title="" type="simple">
+ <menu name="ViewEdit" default-title-style="tabButton"
default-selected-style="tabButtonSelected" default-menu-item-name="all"
orientation="horizontal" menu-width="100%" default-widget-style="tabButton"
menu-container-style="blogmenuwrapper" title="" type="simple">
<menu-item name="edit" title="${uiLabelMap.CommonEdit}">
<condition>
<or>
Modified: ofbiz/trunk/specialpurpose/ecommerce/widget/blog/BlogScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/widget/blog/BlogScreens.xml?rev=1760059&r1=1760058&r2=1760059&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/widget/blog/BlogScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/widget/blog/BlogScreens.xml Fri Sep 9
16:11:55 2016
@@ -115,7 +115,7 @@
</condition>
<widgets>
<container style="blogwrapper">
- <include-menu name="view_edit"
location="component://ecommerce/widget/blog/BlogMenus.xml"/>
+ <include-menu name="ViewEdit"
location="component://ecommerce/widget/blog/BlogMenus.xml"/>
<platform-specific><html><html-template
location="component://ecommerce/template/blog/BlogContentAltLink.ftl"/></html></platform-specific>
<!--<link text="${blog.contentName}
[${blog.contentId}]" target="ViewBlogArticle" style="blogheader">
<parameter param-name="contentId"
from-field="blog.contentId"/>
@@ -138,7 +138,7 @@
</condition>
<widgets>
<container style="blogwrapper">
- <include-menu name="view_edit"
location="component://ecommerce/widget/blog/BlogMenus.xml"/>
+ <include-menu name="ViewEdit"
location="component://ecommerce/widget/blog/BlogMenus.xml"/>
<!--<label text="${blog.contentName}
[${blog.contentId}]" style="blogheader"/>-->
<platform-specific><html><html-template
location="component://ecommerce/template/blog/BlogContentAltLink.ftl"/></html></platform-specific>
<!--<link text="${blog.contentName}
[${blog.contentId}]" target="ViewBlogArticle" style="blogheader">
Modified: ofbiz/trunk/specialpurpose/lucene/widget/LuceneMenus.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/lucene/widget/LuceneMenus.xml?rev=1760059&r1=1760058&r2=1760059&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/lucene/widget/LuceneMenus.xml (original)
+++ ofbiz/trunk/specialpurpose/lucene/widget/LuceneMenus.xml Fri Sep 9
16:11:55 2016
@@ -19,7 +19,7 @@ under the License.
-->
<menus xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns="http://ofbiz.apache.org/Widget-Menu";
xsi:schemaLocation="http://ofbiz.apache.org/Widget-Menu
http://ofbiz.apache.org/dtds/widget-menu.xsd";>
- <menu name="cms" default-menu-item-name="content"
default-permission-operation="HAS_AUTHOR_ROLE|CONTENT_ADMIN"
+ <menu name="Cms" default-menu-item-name="content"
default-permission-operation="HAS_AUTHOR_ROLE|CONTENT_ADMIN"
default-permission-entity-action="_ADMIN"
default-associated-content-id="${userLogin.userLoginId}"
selected-menuitem-context-field-name="currentCMSMenuItemName"
title="" type="simple"
menu-container-style="button-bar tab-bar"
default-selected-style="selected">
Modified: ofbiz/trunk/specialpurpose/lucene/widget/LuceneScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/lucene/widget/LuceneScreens.xml?rev=1760059&r1=1760058&r2=1760059&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/lucene/widget/LuceneScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/lucene/widget/LuceneScreens.xml Fri Sep 9
16:11:55 2016
@@ -34,7 +34,7 @@ under the License.
<if-has-permission permission="CONTENTMGR"
action="_VIEW"/>
</condition>
<widgets>
- <include-menu name="cms"
location="component://lucene/widget/LuceneMenus.xml"/>
+ <include-menu name="Cms"
location="component://lucene/widget/LuceneMenus.xml"/>
</widgets>
</section>
</decorator-section>
Modified: ofbiz/trunk/specialpurpose/scrum/widget/scrumMenus.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/scrum/widget/scrumMenus.xml?rev=1760059&r1=1760058&r2=1760059&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/scrum/widget/scrumMenus.xml (original)
+++ ofbiz/trunk/specialpurpose/scrum/widget/scrumMenus.xml Fri Sep 9 16:11:55
2016
@@ -1113,7 +1113,7 @@ under the License.
</link>
</menu-item>
</menu>
- <menu name="notCompleteBacklogItem">
+ <menu name="NotCompleteBacklogItem">
<menu-item name="notCompleteBacklogItem"
title="${uiLabelMap.ScrumBeingImplementBacklogItem}">
<link target="ViewSprint" link-type="auto">
<parameter param-name="sprintId"
value="${parameters.sprintId}"/>
Modified: ofbiz/trunk/specialpurpose/scrum/widget/scrumScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/scrum/widget/scrumScreens.xml?rev=1760059&r1=1760058&r2=1760059&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/scrum/widget/scrumScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/scrum/widget/scrumScreens.xml Fri Sep 9
16:11:55 2016
@@ -174,8 +174,8 @@ under the License.
</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"/>
+ <screenlet
id="sprintBacklogListItemsOnFail" title="${uiLabelMap.ScrumSprintBacklogList}"
navigation-menu-name="NotCompleteBacklogItem" collapsible="true">
+ <include-menu
location="component://scrum/widget/scrumMenus.xml"
name="NotCompleteBacklogItem"/>
<include-form
location="component://scrum/widget/scrumForms.xml"
name="ViewSprintBacklogListItemsNoAction"/>
</screenlet>
</fail-widgets>
@@ -203,8 +203,8 @@ under the License.
</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"/>
+ <screenlet
id="sprintBacklogListItemsOnFail" title="${uiLabelMap.ScrumSprintBacklogList}"
navigation-menu-name="NotCompleteBacklogItem" collapsible="true">
+ <include-menu
location="component://scrum/widget/scrumMenus.xml"
name="NotCompleteBacklogItem"/>
<include-form
location="component://scrum/widget/scrumForms.xml"
name="sprintBacklogListItems"/>
</screenlet>
</fail-widgets>
@@ -239,8 +239,8 @@ under the License.
</screenlet>
</widgets>
<fail-widgets>
-
<screenlet title="${uiLabelMap.ScrumSprintBacklogList}"
navigation-menu-name="notCompleteBacklogItem">
-
<include-menu location="component://scrum/widget/scrumMenus.xml"
name="notCompleteBacklogItem"/>
+
<screenlet title="${uiLabelMap.ScrumSprintBacklogList}"
navigation-menu-name="NotCompleteBacklogItem">
+
<include-menu location="component://scrum/widget/scrumMenus.xml"
name="NotCompleteBacklogItem"/>
<include-form location="component://scrum/widget/scrumForms.xml"
name="sprintBacklogListItemsHideDelete"/>
</screenlet>
</fail-widgets>
@@ -270,8 +270,8 @@ under the License.
</screenlet>
</widgets>
<fail-widgets>
-
<screenlet title="${uiLabelMap.ScrumSprintBacklogList}"
navigation-menu-name="notCompleteBacklogItem">
-
<include-menu location="component://scrum/widget/scrumMenus.xml"
name="notCompleteBacklogItem"/>
+
<screenlet title="${uiLabelMap.ScrumSprintBacklogList}"
navigation-menu-name="NotCompleteBacklogItem">
+
<include-menu location="component://scrum/widget/scrumMenus.xml"
name="NotCompleteBacklogItem"/>
<include-form location="component://scrum/widget/scrumForms.xml"
name="ViewSprintBacklogListItemsNoAction"/>
</screenlet>
</fail-widgets>
