Author: mbrohl
Date: Fri Sep 16 20:37:43 2016
New Revision: 1761079
URL: http://svn.apache.org/viewvc?rev=1761079&view=rev
Log:
Improved: Content: Consistent form name.
(OFBIZ-8046)
Change all form names to upper camel case for consistency.
Thanks: Tanmay Muley for reporting and providing the patch.
Modified:
ofbiz/trunk/applications/content/widget/LookupForms.xml
ofbiz/trunk/applications/content/widget/LookupScreens.xml
ofbiz/trunk/applications/content/widget/SurveyScreens.xml
ofbiz/trunk/applications/content/widget/cms/CMSForms.xml
ofbiz/trunk/applications/content/widget/cms/CMSScreens.xml
ofbiz/trunk/applications/content/widget/content/ContentForms.xml
ofbiz/trunk/applications/content/widget/content/DataResourceForms.xml
ofbiz/trunk/applications/content/widget/layout/LayoutForms.xml
ofbiz/trunk/applications/content/widget/layout/LayoutScreens.xml
ofbiz/trunk/applications/content/widget/survey/SurveyForms.xml
Modified: ofbiz/trunk/applications/content/widget/LookupForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/LookupForms.xml?rev=1761079&r1=1761078&r2=1761079&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/LookupForms.xml (original)
+++ ofbiz/trunk/applications/content/widget/LookupForms.xml Fri Sep 16 20:37:43
2016
@@ -21,7 +21,7 @@ under the License.
<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns="http://ofbiz.apache.org/Widget-Form";
xsi:schemaLocation="http://ofbiz.apache.org/Widget-Form
http://ofbiz.apache.org/dtds/widget-form.xsd";>
- <form name="lookupListLayout"
default-entity-name="ContentAssocDataResourceViewFrom" list-name="entityList"
target="" title="" type="list"
+ <form name="LookupListLayout"
default-entity-name="ContentAssocDataResourceViewFrom" list-name="entityList"
target="" title="" type="list"
paginate-target="LookupListLayout" odd-row-style="alternate-row"
default-table-style="basic-table hover-bar">
<actions>
<entity-condition entity-name="ContentAssocDataResourceViewFrom"
list="entityList" >
@@ -36,7 +36,7 @@ under the License.
<field name="drObjectInfo"><display/></field>
</form>
- <form name="lookupDataResourceContent"
default-entity-name="DataResourceContentView" target="LookupSubContent"
title="" type="single"
+ <form name="LookupDataResourceContent"
default-entity-name="DataResourceContentView" target="LookupSubContent"
title="" type="single"
header-row-style="header-row" default-table-style="basic-table">
<field name="dataResourceId"
title="${uiLabelMap.ContentDataResourceId}">
<text-find/>
@@ -73,7 +73,7 @@ under the License.
</field>
</form>
- <form name="listLookupDataResourceContent"
default-entity-name="DataResourceContentView" list-name="listIt" target=""
title="" type="list"
+ <form name="ListLookupDataResourceContent"
default-entity-name="DataResourceContentView" list-name="listIt" target=""
title="" type="list"
paginate-target="LookupSubContent" odd-row-style="alternate-row"
default-table-style="basic-table hover-bar">
<actions>
<service service-name="performFind" result-map="result"
result-map-list="listIt">
Modified: ofbiz/trunk/applications/content/widget/LookupScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/LookupScreens.xml?rev=1761079&r1=1761078&r2=1761079&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/LookupScreens.xml (original)
+++ ofbiz/trunk/applications/content/widget/LookupScreens.xml Fri Sep 16
20:37:43 2016
@@ -36,7 +36,7 @@ under the License.
<widgets>
<decorator-screen name="LookupDecorator"
location="component://common/widget/CommonScreens.xml">
<decorator-section name="search-results">
- <include-form name="lookupListLayout"
location="component://content/widget/LookupForms.xml"/>
+ <include-form name="LookupListLayout"
location="component://content/widget/LookupForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
@@ -58,10 +58,10 @@ under the License.
<widgets>
<decorator-screen name="LookupDecorator"
location="component://common/widget/CommonScreens.xml">
<decorator-section name="search-options">
- <include-form name="lookupDataResourceContent"
location="component://content/widget/LookupForms.xml"/>
+ <include-form name="LookupDataResourceContent"
location="component://content/widget/LookupForms.xml"/>
</decorator-section>
<decorator-section name="search-results">
- <include-form name="listLookupDataResourceContent"
location="component://content/widget/LookupForms.xml"/>
+ <include-form name="ListLookupDataResourceContent"
location="component://content/widget/LookupForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
Modified: ofbiz/trunk/applications/content/widget/SurveyScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/SurveyScreens.xml?rev=1761079&r1=1761078&r2=1761079&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/SurveyScreens.xml (original)
+++ ofbiz/trunk/applications/content/widget/SurveyScreens.xml Fri Sep 16
20:37:43 2016
@@ -398,10 +398,10 @@ under the License.
<widgets>
<decorator-screen name="LookupDecorator"
location="component://common/widget/CommonScreens.xml">
<decorator-section name="search-options">
- <include-form name="lookupSurvey"
location="component://content/widget/survey/SurveyForms.xml"/>
+ <include-form name="LookupSurvey"
location="component://content/widget/survey/SurveyForms.xml"/>
</decorator-section>
<decorator-section name="search-results">
- <include-form name="listLookupSurvey"
location="component://content/widget/survey/SurveyForms.xml"/>
+ <include-form name="ListLookupSurvey"
location="component://content/widget/survey/SurveyForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
@@ -423,10 +423,10 @@ under the License.
<widgets>
<decorator-screen name="LookupDecorator"
location="component://common/widget/CommonScreens.xml">
<decorator-section name="search-options">
- <include-form name="lookupSurveyResponse"
location="component://content/widget/survey/SurveyForms.xml"/>
+ <include-form name="LookupSurveyResponse"
location="component://content/widget/survey/SurveyForms.xml"/>
</decorator-section>
<decorator-section name="search-results">
- <include-form name="listLookupSurveyResponse"
location="component://content/widget/survey/SurveyForms.xml"/>
+ <include-form name="ListLookupSurveyResponse"
location="component://content/widget/survey/SurveyForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
Modified: ofbiz/trunk/applications/content/widget/cms/CMSForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/cms/CMSForms.xml?rev=1761079&r1=1761078&r2=1761079&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/cms/CMSForms.xml (original)
+++ ofbiz/trunk/applications/content/widget/cms/CMSForms.xml Fri Sep 16
20:37:43 2016
@@ -20,7 +20,7 @@ under the License.
<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns="http://ofbiz.apache.org/Widget-Form";
xsi:schemaLocation="http://ofbiz.apache.org/Widget-Form
http://ofbiz.apache.org/dtds/widget-form.xsd";>
- <form name="findContent"
default-entity-name="ContentAssocDataResourceViewFrom" target="CMSContentFind"
title="" type="single"
+ <form name="FindContent"
default-entity-name="ContentAssocDataResourceViewFrom" target="CMSContentFind"
title="" type="single"
header-row-style="header-row" default-table-style="basic-table">
<field name="caContentIdTo"><text-find/></field>
<field name="caMapKey"><text-find/></field>
@@ -32,7 +32,7 @@ under the License.
<field name="submitButton" title="${uiLabelMap.CommonFind}"
widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
- <form name="listFindContent" type="list" list-name="listIt" target=""
paginate-target="/CMSContentFind" view-size="20"
+ <form name="ListFindContent" type="list" list-name="listIt" target=""
paginate-target="/CMSContentFind" view-size="20"
odd-row-style="alternate-row" default-table-style="basic-table
hover-bar">
<actions>
<service service-name="performFind" result-map-list="listIt">
Modified: ofbiz/trunk/applications/content/widget/cms/CMSScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/cms/CMSScreens.xml?rev=1761079&r1=1761078&r2=1761079&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/cms/CMSScreens.xml (original)
+++ ofbiz/trunk/applications/content/widget/cms/CMSScreens.xml Fri Sep 16
20:37:43 2016
@@ -43,10 +43,10 @@ under the License.
<container style="button-bar"><link
target="EditAddContent" text="${uiLabelMap.CommonCreateNew}" style="buttontext
create"/></container>
</decorator-section>
<decorator-section name="search-options">
- <include-form name="findContent"
location="component://content/widget/cms/CMSForms.xml"/>
+ <include-form name="FindContent"
location="component://content/widget/cms/CMSForms.xml"/>
</decorator-section>
<decorator-section name="search-results">
- <include-form name="listFindContent"
location="component://content/widget/cms/CMSForms.xml"/>
+ <include-form name="ListFindContent"
location="component://content/widget/cms/CMSForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
Modified: ofbiz/trunk/applications/content/widget/content/ContentForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/content/ContentForms.xml?rev=1761079&r1=1761078&r2=1761079&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/content/ContentForms.xml (original)
+++ ofbiz/trunk/applications/content/widget/content/ContentForms.xml Fri Sep 16
20:37:43 2016
@@ -219,7 +219,7 @@ under the License.
</form>
<!-- Content Lookup forms -->
- <form name="mruLookupContent" default-entity-name="Content"
list-name="mruList" target="" title="" type="list"
+ <form name="MruLookupContent" default-entity-name="Content"
list-name="mruList" target="" title="" type="list"
odd-row-style="alternate-row" default-table-style="basic-table
hover-bar">
<field name="contentId" widget-style="buttontext">
@@ -490,7 +490,7 @@ under the License.
</form>
<!-- Person Lookup forms -->
- <form name="mruLookupPerson" list-name="mruList" target="" title=""
type="list"
+ <form name="MruLookupPerson" list-name="mruList" target="" title=""
type="list"
odd-row-style="alternate-row" default-table-style="basic-table
hover-bar">
<field name="partyId" title=" " widget-style="buttontext">
<hyperlink also-hidden="false" target-type="plain"
description="${partyId}" target="javascript:set_value('${partyId}')"/>
@@ -498,7 +498,7 @@ under the License.
<field name="firstName" title=" "
widget-style="buttontext"><display/></field>
<field name="lastName" title=" "
widget-style="buttontext"><display/></field>
</form>
- <form name="mruLookupPartyAndUserLoginAndPerson" list-name="mruList"
target="" title="" type="list"
+ <form name="MruLookupPartyAndUserLoginAndPerson" list-name="mruList"
target="" title="" type="list"
odd-row-style="alternate-row" default-table-style="basic-table
hover-bar">
<field name="partyId" title=" " widget-style="buttontext">
<hyperlink also-hidden="false" target-type="plain"
description="${partyId}" target="javascript:set_value('${partyId}',
'${userLoginId}')"/>
Modified: ofbiz/trunk/applications/content/widget/content/DataResourceForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/content/DataResourceForms.xml?rev=1761079&r1=1761078&r2=1761079&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/content/DataResourceForms.xml
(original)
+++ ofbiz/trunk/applications/content/widget/content/DataResourceForms.xml Fri
Sep 16 20:37:43 2016
@@ -145,7 +145,7 @@ under the License.
</field>
<field name="dataResourceName"><display/></field>
</form>
- <form name="mruLookupDataResource" default-entity-name="DataResource"
list-name="mruList" target="" title="" type="list"
default-widget-style="display"
+ <form name="MruLookupDataResource" default-entity-name="DataResource"
list-name="mruList" target="" title="" type="list"
default-widget-style="display"
odd-row-style="alternate-row" default-table-style="basic-table
hover-bar">
<field name="contentId" widget-style="buttontext">
<hyperlink also-hidden="false" target-type="plain"
description="${dataResourceId}"
target="javascript:set_value('${dataResourceId}')"/>
@@ -444,7 +444,7 @@ under the License.
</hyperlink>
</field>
</form>
- <form name="lookupProductFeature" target="LookupProductFeature" title=""
type="single"
+ <form name="LookupProductFeature" target="LookupProductFeature" title=""
type="single"
header-row-style="header-row" default-table-style="basic-table">
<auto-fields-entity entity-name="ProductFeature"
default-field-type="find"/>
<field name="productFeatureTypeId">
@@ -463,14 +463,14 @@ under the License.
</field>
<field name="submitButton" title="${uiLabelMap.CommonFind}"
widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
- <form name="listLookupProductFeature" list-name="entityList" title=""
type="list" paginate-target="LookupProductFeature"
+ <form name="ListLookupProductFeature" list-name="entityList" title=""
type="list" paginate-target="LookupProductFeature"
odd-row-style="alternate-row" default-table-style="basic-table
hover-bar">
<auto-fields-entity entity-name="ProductFeature"
default-field-type="display"/>
<field name="productFeatureId" title=" " widget-style="buttontext">
<hyperlink also-hidden="false" target-type="plain"
description="${productFeatureId}"
target="javascript:set_value('${productFeatureId}')"/>
</field>
</form>
- <form name="mruLookupProductFeature" default-entity-name="ProductFeature"
list-name="mruList" target="" title="" type="list"
+ <form name="MruLookupProductFeature" default-entity-name="ProductFeature"
list-name="mruList" target="" title="" type="list"
odd-row-style="alternate-row" default-table-style="basic-table
hover-bar">
<field name="contentId" widget-style="buttontext">
<hyperlink also-hidden="false" target-type="plain"
description="${productFeatureId}"
target="javascript:set_value('${productFeatureId}')"/>
Modified: ofbiz/trunk/applications/content/widget/layout/LayoutForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/layout/LayoutForms.xml?rev=1761079&r1=1761078&r2=1761079&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/layout/LayoutForms.xml (original)
+++ ofbiz/trunk/applications/content/widget/layout/LayoutForms.xml Fri Sep 16
20:37:43 2016
@@ -21,7 +21,7 @@ under the License.
<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns="http://ofbiz.apache.org/Widget-Form";
xsi:schemaLocation="http://ofbiz.apache.org/Widget-Form
http://ofbiz.apache.org/dtds/widget-form.xsd";>
<!-- LayoutFind forms -->
- <form name="findLayout" default-entity-name="Content" target="FindLayout"
title="" type="single"
+ <form name="FindLayout" default-entity-name="Content" target="FindLayout"
title="" type="single"
header-row-style="header-row" default-table-style="basic-table">
<!--<auto-fields-entity entity-name="Content"
default-field-type="find"/>-->
<field name="contentTypeId">
@@ -142,7 +142,7 @@ under the License.
</field>
</form>
- <form name="listFindLayout" default-entity-name="ContentDataResourceView"
title="" type="list" list-name="listIt" target="" paginate-target="FindLayout"
+ <form name="ListFindLayout" default-entity-name="ContentDataResourceView"
title="" type="list" list-name="listIt" target="" paginate-target="FindLayout"
odd-row-style="alternate-row" default-table-style="basic-table
hover-bar">
<actions>
<set field="requestParameters.contentTypeId" value="DOCUMENT"/>
@@ -183,7 +183,7 @@ under the License.
-->
</form>
- <form name="listListLayout"
default-entity-name="ContentAssocDataResourceViewFrom" list-name="layoutList"
target="" title="" type="list" paginate-target="FindLayout"
+ <form name="ListListLayout"
default-entity-name="ContentAssocDataResourceViewFrom" list-name="layoutList"
target="" title="" type="list" paginate-target="FindLayout"
odd-row-style="alternate-row" default-table-style="basic-table
hover-bar">
<field name="contentId" widget-style="buttontext">
<hyperlink also-hidden="false" description="${contentId}"
target="EditLayout">
Modified: ofbiz/trunk/applications/content/widget/layout/LayoutScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/layout/LayoutScreens.xml?rev=1761079&r1=1761078&r2=1761079&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/layout/LayoutScreens.xml (original)
+++ ofbiz/trunk/applications/content/widget/layout/LayoutScreens.xml Fri Sep 16
20:37:43 2016
@@ -45,10 +45,10 @@ under the License.
</container>
</decorator-section>
<decorator-section name="search-options">
- <include-form name="findLayout"
location="component://content/widget/layout/LayoutForms.xml"/>
+ <include-form name="FindLayout"
location="component://content/widget/layout/LayoutForms.xml"/>
</decorator-section>
<decorator-section name="search-results">
- <include-form name="listFindLayout"
location="component://content/widget/layout/LayoutForms.xml"/>
+ <include-form name="ListFindLayout"
location="component://content/widget/layout/LayoutForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
@@ -81,7 +81,7 @@ under the License.
<parameter param-name="contentIdTo"
value="TEMPLATE_MASTER"/>
</link>
</container>
- <include-form name="listListLayout"
location="component://content/widget/layout/LayoutForms.xml"/>
+ <include-form name="ListListLayout"
location="component://content/widget/layout/LayoutForms.xml"/>
</screenlet>
</decorator-section>
</decorator-screen>
Modified: ofbiz/trunk/applications/content/widget/survey/SurveyForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/survey/SurveyForms.xml?rev=1761079&r1=1761078&r2=1761079&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/survey/SurveyForms.xml (original)
+++ ofbiz/trunk/applications/content/widget/survey/SurveyForms.xml Fri Sep 16
20:37:43 2016
@@ -276,7 +276,7 @@ under the License.
</field>
</form>
- <form name="lookupSurvey" target="LookupSurvey" title="" type="single"
+ <form name="LookupSurvey" target="LookupSurvey" title="" type="single"
header-row-style="header-row" default-table-style="basic-table">
<auto-fields-entity entity-name="Survey" default-field-type="find"/>
<field name="surveyId"
title="${uiLabelMap.ContentSurveySurveyId}"><text-find/></field>
@@ -287,7 +287,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="listLookupSurvey" list-name="listIt" title="" type="list"
paginate-target="LookupSurvey"
+ <form name="ListLookupSurvey" list-name="listIt" title="" type="list"
paginate-target="LookupSurvey"
odd-row-style="alternate-row" default-table-style="basic-table
hover-bar">
<actions>
<service service-name="performFind" result-map="result"
result-map-list="listIt">
@@ -303,14 +303,14 @@ under the License.
</field>
</form>
- <form name="lookupSurveyResponse" target="LookupSurveyResponse" title=""
type="single"
+ <form name="LookupSurveyResponse" target="LookupSurveyResponse" title=""
type="single"
header-row-style="header-row" default-table-style="basic-table">
<auto-fields-entity entity-name="SurveyResponse"
default-field-type="find"/>
<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="listLookupSurveyResponse" list-name="listIt" title=""
type="list" paginate-target="LookupSurveyResponse"
+ <form name="ListLookupSurveyResponse" list-name="listIt" title=""
type="list" paginate-target="LookupSurveyResponse"
odd-row-style="alternate-row" default-table-style="basic-table
hover-bar">
<actions>
<service service-name="performFind" result-map="result"
result-map-list="listIt">
