svn commit: r933318 - in /ofbiz/trunk/applications/marketing/widget/sfa/forms: AccountForms.xml LeadForms.xml

[erwan]

Author: erwan
Date: Mon Apr 12 16:44:14 2010
New Revision: 933318

URL: http://svn.apache.org/viewvc?rev=933318&view=rev
Log:
Some refactoring, using FormFieldTitles when possible

Modified:
    ofbiz/trunk/applications/marketing/widget/sfa/forms/AccountForms.xml
    ofbiz/trunk/applications/marketing/widget/sfa/forms/LeadForms.xml

Modified: ofbiz/trunk/applications/marketing/widget/sfa/forms/AccountForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/forms/AccountForms.xml?rev=933318&r1=933317&r2=933318&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/sfa/forms/AccountForms.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/sfa/forms/AccountForms.xml Mon Apr 12 16:44:14 2010
@@ -35,7 +35,7 @@ under the License.
             <text size="50" maxlength="60"/>
         </field>
         <field name="address2" title="${uiLabelMap.CommonAddress2}"><text size="50" maxlength="60"/></field>
-        <field name="city" title="${uiLabelMap.CommonCity}" tooltip="${uiLabelMap.CommonRequired}" widget-style="required">
+        <field name="city" tooltip="${uiLabelMap.CommonRequired}" widget-style="required">
             <text size="30" maxlength="60"/>
         </field>
         <field name="state" title="${uiLabelMap.CommonState}" tooltip="${uiLabelMap.CommonRequired}" widget-style="required">
@@ -49,7 +49,7 @@ under the License.
         <field name="postalCode" title="${uiLabelMap.CommonZipPostalCode}" tooltip="${uiLabelMap.CommonRequired}" widget-style="required">
             <text size="10" maxlength="30"/>
         </field>
-        <field name="country" title="${uiLabelMap.CommonCountry}" tooltip="${uiLabelMap.CommonRequired}" widget-style="required">
+        <field name="country" tooltip="${uiLabelMap.CommonRequired}" widget-style="required">
             <drop-down allow-empty="false" no-current-selected-key="${defaultCountryGeoId}">
                 <entity-options entity-name="Geo" key-field-name="geoId" description="${geoName} - ${geoId}">
                     <entity-constraint name="geoTypeId" value="COUNTRY"/>
@@ -147,10 +147,10 @@ under the License.
             </hyperlink>
         </field>
         <field name="emailAddress" title="${uiLabelMap.FormFieldTitle_emailAddress}"><display description="${emailAddresses[0].infoString}"/></field>
-        <field name="telecomNumber">
-            <display description="${telecomNumber.tnContryCode} ${telecomNumber.tnAreaCode} ${telecomNumber.tnContactNumber} ${telecomNumber.tnAskForName}"/>
+        <field name="telecomNumber" title="${uiLabelMap.PartyPhoneNumber}">
+            <display description="${telecomNumber.tnCountryCode} ${telecomNumber.tnAreaCode} ${telecomNumber.tnContactNumber} ${telecomNumber.tnAskForName}"/>
         </field>
-        <field name="city" title="${uiLabelMap.FormFieldTitle_city}"><display description="${postalAddress.paCity}"/></field>
+        <field name="city"><display description="${postalAddress.paCity}"/></field>
         <field name="countryGeoId" title="${uiLabelMap.FormFieldTitle_country}">
             <display-entity entity-name="Geo" description="${geoName}" key-field-name="geoId"/>
         </field>
@@ -159,7 +159,7 @@ under the License.
                 <parameter param-name="partyId" from-field="relatedCompanyPartyId"/>
             </hyperlink>
         </field>
-        <field name="relatedCompany" use-when="relatedCompanyPartyId==null"><display/></field>
+        <field name="relatedCompany" use-when="relatedCompanyPartyId==null" title="${uiLabelMap.PartyRelatedCompany}"><display/></field>
     </form>
     <form name="ListAccounts" extends="listAccounts">
         <field name="assignToMe" use-when="existRelationship==null&amp;&amp;!&quot;false&quot;.equals(parameters.get(&quot;all&quot;))"
@@ -211,7 +211,7 @@ under the License.
         <field name="paAttnName" title="${uiLabelMap.PartyAddrAttnName}"><text-find/></field>
         <field name="paAddress1" title="${uiLabelMap.FormFieldTitle_paAddress1}"><text-find/></field>
         <field name="paAddress2" title="${uiLabelMap.FormFieldTitle_paAddress2}"><text-find/></field>
-        <field name="paCity" title="${uiLabelMap.PartyCity}"><text-find/></field>
+        <field name="paCity" title="${uiLabelMap.FormFieldTitle_city}"><text-find/></field>
         <field name="paStateProvinceGeoId" title="${uiLabelMap.FormFieldTitle_stateProvince}">
             <drop-down allow-empty="true">
                 <list-options key-name="geoId" description="${geoName}" list-name="states"/>

Modified: ofbiz/trunk/applications/marketing/widget/sfa/forms/LeadForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/forms/LeadForms.xml?rev=933318&r1=933317&r2=933318&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/sfa/forms/LeadForms.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/sfa/forms/LeadForms.xml Mon Apr 12 16:44:14 2010
@@ -28,11 +28,11 @@ under the License.
         <field name="groupName"><text/></field>
         <field name="title"><text/></field>
         <field name="numEmployees" title="${uiLabelMap.MarketingNoOfEmployees}"><text size="30"/></field>
-        <field name="officeSiteName" title="${uiLabelMap.FormFieldTitle_officeSiteName}"><text size="30" maxlength="60"/></field>
+        <field name="officeSiteName"><text size="30" maxlength="60"/></field>
         <field name="postalAddressTitle" title="${uiLabelMap.PartyGeneralCorrespondenceAddress}" title-area-style="group-label"><display description=" " also-hidden="false"/></field>
         <field name="address1" title="${uiLabelMap.CommonAddress1}"><text size="50" maxlength="60"/></field>
         <field name="address2" title="${uiLabelMap.CommonAddress2}"><text size="50" maxlength="60"/></field>
-        <field name="city" title="${uiLabelMap.CommonCity}"><text size="30" maxlength="60"/></field>
+        <field name="city"><text size="30" maxlength="60"/></field>
         <field name="stateProvinceGeoId" title="${uiLabelMap.CommonState}">
             <drop-down allow-empty="true">
                 <entity-options entity-name="Geo" key-field-name="geoId" description="${geoId} - ${geoName}">
@@ -42,7 +42,7 @@ under the License.
             </drop-down>
         </field>
         <field name="postalCode" title="${uiLabelMap.CommonZipPostalCode}"><text size="10" maxlength="30"/></field>
-        <field name="countryGeoId" title="${uiLabelMap.CommonCountry}">
+        <field name="countryGeoId" title="${uiLabelMap.FormFieldTitle_country}">
             <drop-down allow-empty="false" no-current-selected-key="${defaultCountryGeoId}">
                 <entity-options entity-name="Geo" key-field-name="geoId" description="${geoId}: ${geoName}">
                     <entity-constraint name="geoTypeId" value="COUNTRY"/>
@@ -151,7 +151,7 @@ under the License.
         <field name="dataSourceId" title="${uiLabelMap.SfaLeadSource}">
             <display-entity entity-name="DataSource"/>
         </field>
-        <field name="fromDate"><display></display> </field>
+        <field name="fromDate"><display/></field>
         
     </form>