svn commit: r781851 - in /ofbiz/trunk: applications/accounting/config/ applications/accounting/webapp/accounting/fixedasset/ applications/accounting/widget/ framework/common/config/

[ad...@apache.org]

Author: adrianc
Date: Thu Jun  4 20:47:02 2009
New Revision: 781851

URL: http://svn.apache.org/viewvc?rev=781851&view=rev
Log:
Some trivial layout and UI label fixups for the Fixed Asset Geo Location feature. This is a really cool feature, btw. Kudos to whoever created it.

Modified:
    ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml
    ofbiz/trunk/applications/accounting/webapp/accounting/fixedasset/FixedAssetGeoLocation.ftl
    ofbiz/trunk/applications/accounting/widget/FixedAssetScreens.xml
    ofbiz/trunk/framework/common/config/CommonUiLabels.xml

Modified: ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml?rev=781851&r1=781850&r2=781851&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml (original)
+++ ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml Thu Jun  4 20:47:02 2009
@@ -10688,7 +10688,7 @@
         <value xml:lang="th">รายงานคำอธิบายทรัพย์สินไม่หมุนเวียน</value>
     </property>
     <property key="PageTitleFixedAssetGeoLocation">
-        <value xml:lang="en">Fixed Asset GeoLocation</value>
+        <value xml:lang="en">Fixed Asset Geo Location</value>
         <value xml:lang="fr">Géolocalisation de l'actif immobilisé</value>
     </property>
     <property key="PageTitleInventoryIssueSummary">

Modified: ofbiz/trunk/applications/accounting/webapp/accounting/fixedasset/FixedAssetGeoLocation.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/fixedasset/FixedAssetGeoLocation.ftl?rev=781851&r1=781850&r2=781851&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/fixedasset/FixedAssetGeoLocation.ftl (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/fixedasset/FixedAssetGeoLocation.ftl Thu Jun  4 20:47:02 2009
@@ -18,8 +18,8 @@
 -->
 <#if latestGeoPoint?has_content>
   <#if latestGeoPoint.latitude?has_content && latestGeoPoint.longitude?has_content>
-    ${uiLabelMap.CommonLatitude}${latestGeoPoint.latitude}<br>
-    ${uiLabelMap.CommonLongitude}${latestGeoPoint.longitude}
+    <br>${uiLabelMap.CommonLatitude}${latestGeoPoint.latitude}
+    <br>${uiLabelMap.CommonLongitude}${latestGeoPoint.longitude}
     <#if latestGeoPoint.elevation?has_content>
       <br>${uiLabelMap.CommonElevation}${latestGeoPoint.elevation} ${elevationUomAbbr}
     </#if>
@@ -37,7 +37,7 @@
           loadGoogleMap("${latestGeoPoint.latitude}",
                         "${latestGeoPoint.longitude}",
                         "<@o...@ofbizUrl>",
-                        "${uiLabelMap.AccountingFixedAsset} ${uiLabelMap.CommonOf} ${fixedAssetId}")
+                        "${uiLabelMap.AccountingFixedAsset} ${(fixedAsset.fixedAssetName)?if_exists}")
         </script>
       <#elseif  latestGeoPoint.dataSourceId == "GEOPT_YAHOO">
       <#elseif  latestGeoPoint.dataSourceId == "GEOPT_MICROSOFT">

Modified: ofbiz/trunk/applications/accounting/widget/FixedAssetScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/FixedAssetScreens.xml?rev=781851&r1=781850&r2=781851&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/FixedAssetScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/FixedAssetScreens.xml Thu Jun  4 20:47:02 2009
@@ -569,6 +569,8 @@
         <section>
             <actions>
                 <set field="titleProperty" value="PageTitleFixedAssetGeoLocation"/>
+                <set field="tabButtonItem" value="FixedAssetGeoLocation"/>
+                <entity-one value-field="fixedAsset" entity-name="FixedAsset"/>
                 <script location="component://accounting/webapp/accounting/WEB-INF/actions/fixedasset/FixedAssetGeoLocation.groovy"/>
             </actions>
             <widgets>

Modified: ofbiz/trunk/framework/common/config/CommonUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/config/CommonUiLabels.xml?rev=781851&r1=781850&r2=781851&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/config/CommonUiLabels.xml (original)
+++ ofbiz/trunk/framework/common/config/CommonUiLabels.xml Thu Jun  4 20:47:02 2009
@@ -2754,7 +2754,7 @@
         <value xml:lang="th">Geo</value>
     </property>
     <property key="CommonGeoLocation">
-        <value xml:lang="en">Geolocation</value>
+        <value xml:lang="en">Geo Location</value>
         <value xml:lang="fr">Géolocalisation</value>
     </property>
     <property key="CommonGeos">
@@ -8374,7 +8374,7 @@
         <value xml:lang="zh_CN">增加新数据源类型</value>
     </property>
     <property key="PageTitleCommonGeoLocation">
-        <value xml:lang="en">GeoLocation of requested element</value>
+        <value xml:lang="en">Geo Location of requested element</value>
         <value xml:lang="fr">Géolocalisation de l'élément demandé</value>
     </property>
     <property key="PageTitleEditDataSource">