svn commit: r989389 - in /ofbiz/trunk: applications/marketing/config/MarketingUiLabels.xml framework/common/config/CommonUiLabels.xml framework/common/widget/LookupScreens.xml

Author: jleroux
Date: Wed Aug 25 22:20:18 2010
New Revision: 989389

URL: http://svn.apache.org/viewvc?rev=989389&view=rev
Log:
Removes a framework dependency on Marketing component

Modified:
    ofbiz/trunk/applications/marketing/config/MarketingUiLabels.xml
    ofbiz/trunk/framework/common/config/CommonUiLabels.xml
    ofbiz/trunk/framework/common/widget/LookupScreens.xml

Modified: ofbiz/trunk/applications/marketing/config/MarketingUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/config/MarketingUiLabels.xml?rev=989389&r1=989388&r2=989389&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/config/MarketingUiLabels.xml (original)
+++ ofbiz/trunk/applications/marketing/config/MarketingUiLabels.xml Wed Aug 25 22:20:18 2010
@@ -1872,15 +1872,6 @@
         <value xml:lang="th">ค้นหาข้อมูลรายการติดต่อ</value>
         <value xml:lang="zh">查找联系列表</value>
     </property>
-    <property key="PageTitleLookupGeo">
-        <value xml:lang="en">Lookup Geo</value>
-        <value xml:lang="fr">Consulter la zone géographique</value>
-        <value xml:lang="it">Ricerca Geografia</value>
-        <value xml:lang="pt_BR">Buscar localização</value>
-        <value xml:lang="ro">Cauta Geografia</value>
-        <value xml:lang="th">ค้นหาข้อมูลโครงสร้าง</value>
-        <value xml:lang="zh">查找地理</value>
-    </property>
     <property key="PageTitleLookupSalesForecast">
         <value xml:lang="de">Verkaufsprognosen anschauen</value>
         <value xml:lang="en">Lookup Sales Forecast</value>

Modified: ofbiz/trunk/framework/common/config/CommonUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/config/CommonUiLabels.xml?rev=989389&r1=989388&r2=989389&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/config/CommonUiLabels.xml (original)
+++ ofbiz/trunk/framework/common/config/CommonUiLabels.xml Wed Aug 25 22:20:18 2010
@@ -9375,6 +9375,15 @@
         <value xml:lang="th">เข้าสู่ระบบ</value>
         <value xml:lang="zh">登录</value>
     </property>
+    <property key="PageTitleLookupGeo">
+        <value xml:lang="en">Lookup Geo</value>
+        <value xml:lang="fr">Consulter la zone géographique</value>
+        <value xml:lang="it">Ricerca Geografia</value>
+        <value xml:lang="pt_BR">Buscar localização</value>
+        <value xml:lang="ro">Cauta Geografia</value>
+        <value xml:lang="th">ค้นหาข้อมูลโครงสร้าง</value>
+        <value xml:lang="zh">查找地理</value>
+    </property>    
     <property key="PageTitleMain">
         <value xml:lang="cs">úvodní strana</value>
         <value xml:lang="de">Startseite</value>

Modified: ofbiz/trunk/framework/common/widget/LookupScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/widget/LookupScreens.xml?rev=989389&r1=989388&r2=989389&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/widget/LookupScreens.xml (original)
+++ ofbiz/trunk/framework/common/widget/LookupScreens.xml Wed Aug 25 22:20:18 2010
@@ -25,7 +25,6 @@ under the License.
     <screen name="LookupGeo">
         <section>
             <actions>
-                <property-map resource="MarketingUiLabels" map-name="uiLabelMap" global="true"/>
                 <set field="title" value="${uiLabelMap.PageTitleLookupGeo}"/>
                 <set field="queryString" from-field="result.queryString"/>
                 <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/>