Author: mbrohl
Date: Fri Sep 16 22:10:04 2016 New Revision: 1761103 URL: http://svn.apache.org/viewvc?rev=1761103&view=rev Log: Improved: Common: Consistent form name. (OFBIZ-8099) Change all form names to upper camel case for consistency. Thanks: Tanmay Muley for reporting and providing the patch. Modified: ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml ofbiz/trunk/framework/common/widget/LookupForms.xml ofbiz/trunk/framework/common/widget/LookupScreens.xml ofbiz/trunk/framework/common/widget/SecurityForms.xml ofbiz/trunk/framework/common/widget/SecurityScreens.xml ofbiz/trunk/framework/webtools/widget/GeoManagementForms.xml Modified: ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml?rev=1761103&r1=1761102&r2=1761103&view=diff ============================================================================== --- ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml (original) +++ ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml Fri Sep 16 22:10:04 2016 @@ -537,9 +537,9 @@ under the License. <container style="page-title"> <label text="${uiLabelMap.UserLoginUpdateSecuritySettings} - ${userLoginId}"/> </container> - <include-form name="updateUserLoginSecurity" location="component://common/widget/SecurityForms.xml"/> + <include-form name="UpdateUserLoginSecurity" location="component://common/widget/SecurityForms.xml"/> <screenlet title="${uiLabelMap.UserLoginChangePassword}"> - <include-form name="updatePassword" location="component://common/widget/SecurityForms.xml"/> + <include-form name="UpdatePassword" location="component://common/widget/SecurityForms.xml"/> </screenlet> </decorator-section> </decorator-screen> Modified: ofbiz/trunk/framework/common/widget/LookupForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/widget/LookupForms.xml?rev=1761103&r1=1761102&r2=1761103&view=diff ============================================================================== --- ofbiz/trunk/framework/common/widget/LookupForms.xml (original) +++ ofbiz/trunk/framework/common/widget/LookupForms.xml Fri Sep 16 22:10:04 2016 @@ -37,7 +37,7 @@ under the License. <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field> <field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> - <form name="listLookupGeo" list-name="listIt" target="" title="" type="list" paginate-target="LookupGeo"> + <form name="ListLookupGeo" list-name="listIt" target="" title="" type="list" paginate-target="LookupGeo"> <actions> <service service-name="performFind" result-map="result" result-map-list="listIt"> <field-map field-name="inputFields" from-field="parameters"/> @@ -61,7 +61,7 @@ under the License. </form> <form name="LookupGeoName" extends="LookupGeo" target="LookupGeoName"/> - <form name="listLookupGeoName" extends="listLookupGeo" paginate-target="LookupGeoName"> + <form name="ListLookupGeoName" extends="ListLookupGeo" paginate-target="LookupGeoName"> <field name="geoId" widget-style="buttontext" title="${uiLabelMap.CommonGeoId}"> <hyperlink also-hidden="false" target-type="plain" description="${geoId}" target="javascript:set_values('${geoName}', '${geoId}')"/> </field> Modified: ofbiz/trunk/framework/common/widget/LookupScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/widget/LookupScreens.xml?rev=1761103&r1=1761102&r2=1761103&view=diff ============================================================================== --- ofbiz/trunk/framework/common/widget/LookupScreens.xml (original) +++ ofbiz/trunk/framework/common/widget/LookupScreens.xml Fri Sep 16 22:10:04 2016 @@ -52,7 +52,7 @@ under the License. <include-form name="LookupGeo" location="component://common/widget/LookupForms.xml"/> </decorator-section> <decorator-section name="search-results"> - <include-form name="listLookupGeo" location="component://common/widget/LookupForms.xml"/> + <include-form name="ListLookupGeo" location="component://common/widget/LookupForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -90,7 +90,7 @@ under the License. <include-form name="LookupGeoName" location="component://common/widget/LookupForms.xml"/> </decorator-section> <decorator-section name="search-results"> - <include-form name="listLookupGeoName" location="component://common/widget/LookupForms.xml"/> + <include-form name="ListLookupGeoName" location="component://common/widget/LookupForms.xml"/> </decorator-section> </decorator-screen> </widgets> Modified: ofbiz/trunk/framework/common/widget/SecurityForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/widget/SecurityForms.xml?rev=1761103&r1=1761102&r2=1761103&view=diff ============================================================================== --- ofbiz/trunk/framework/common/widget/SecurityForms.xml (original) +++ ofbiz/trunk/framework/common/widget/SecurityForms.xml Fri Sep 16 22:10:04 2016 @@ -292,7 +292,7 @@ under the License. <field name="disabledDateTime"><display/></field> </form> - <form name="updatePassword" type="single" target="${updatePasswordURI}" + <form name="UpdatePassword" type="single" target="${updatePasswordURI}" focus-field-name="currentPassword" header-row-style="header-row" default-table-style="basic-table"> <actions> <set field="passwordHint" from-field="editUserLogin.passwordHint"/> @@ -312,7 +312,7 @@ under the License. </field> </form> - <form name="updateUserLoginSecurity" type="single" target="${updateUserLoginSecurityURI}" default-map-name="editUserLogin" + <form name="UpdateUserLoginSecurity" type="single" target="${updateUserLoginSecurityURI}" default-map-name="editUserLogin" header-row-style="header-row" default-table-style="basic-table"> <actions> <property-to-field field="ldapEnabled" resource="security" property="security.ldap.enable"/> Modified: ofbiz/trunk/framework/common/widget/SecurityScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/widget/SecurityScreens.xml?rev=1761103&r1=1761102&r2=1761103&view=diff ============================================================================== --- ofbiz/trunk/framework/common/widget/SecurityScreens.xml (original) +++ ofbiz/trunk/framework/common/widget/SecurityScreens.xml Fri Sep 16 22:10:04 2016 @@ -179,9 +179,9 @@ under the License. <container style="page-title"> <label text="${uiLabelMap.UserLoginUpdateSecuritySettings} - ${userLoginId}"/> </container> - <include-form name="updateUserLoginSecurity" location="component://common/widget/SecurityForms.xml"/> + <include-form name="UpdateUserLoginSecurity" location="component://common/widget/SecurityForms.xml"/> <screenlet title="${uiLabelMap.UserLoginChangePassword}"> - <include-form name="updatePassword" location="component://common/widget/SecurityForms.xml"/> + <include-form name="UpdatePassword" location="component://common/widget/SecurityForms.xml"/> </screenlet> </decorator-section> </decorator-screen> Modified: ofbiz/trunk/framework/webtools/widget/GeoManagementForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/GeoManagementForms.xml?rev=1761103&r1=1761102&r2=1761103&view=diff ============================================================================== --- ofbiz/trunk/framework/webtools/widget/GeoManagementForms.xml (original) +++ ofbiz/trunk/framework/webtools/widget/GeoManagementForms.xml Fri Sep 16 22:10:04 2016 @@ -51,7 +51,7 @@ </field> <field name="information"><display/></field> </form> - <form name="ListGeos" extends-resource="component://common/widget/LookupForms.xml" extends="listLookupGeo" paginate-target="${currentUrl}" + <form name="ListGeos" extends-resource="component://common/widget/LookupForms.xml" extends="ListLookupGeo" paginate-target="${currentUrl}" odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar" separate-columns="true" > <field name="geoId" widget-style="buttontext" title="${uiLabelMap.CommonGeoId}"> <hyperlink also-hidden="false" target-type="plain" description="${geoId}" target="EditGeo"> |
Free forum by Nabble | Edit this page |