svn commit: r928733 - in /ofbiz/trunk: applications/accounting/webapp/accounting/WEB-INF/actions/fixedasset/ applications/party/webapp/partymgr/WEB-INF/actions/party/ applications/product/webapp/facility/WEB-INF/actions/facility/ framework/common/webco...

[bibryam]

Author: bibryam
Date: Mon Mar 29 11:51:49 2010
New Revision: 928733

URL: http://svn.apache.org/viewvc?rev=928733&view=rev
Log:
Removed hardcoded width and height pixels from google map template, which now allows setting them also in percentages.

Modified:
    ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/fixedasset/FixedAssetGeoLocation.groovy
    ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyGeoLocation.groovy
    ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/facility/FacilityLocationGeoLocation.groovy
    ofbiz/trunk/framework/common/webcommon/includes/geolocation.ftl
    ofbiz/trunk/framework/example/widget/example/CommonScreens.xml
    ofbiz/trunk/framework/example/widget/example/ExampleScreens.xml

Modified: ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/fixedasset/FixedAssetGeoLocation.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/fixedasset/FixedAssetGeoLocation.groovy?rev=928733&r1=928732&r2=928733&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/fixedasset/FixedAssetGeoLocation.groovy (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/fixedasset/FixedAssetGeoLocation.groovy Mon Mar 29 11:51:49 2010
@@ -34,7 +34,7 @@ if (fixedAsset) {
             List geoPoints = UtilMisc.toList(UtilMisc.toMap("lat", latestGeoPoint.latitude, "lon", latestGeoPoint.longitude, "fixedAssetId", fixedAssetId,
                             "link", UtilMisc.toMap("url", "EditFixedAsset?fixedAssetId="+ fixedAssetId, "label", uiLabelMap.AccountingFixedAsset + " " + fixedAsset.fixedAssetName)));
             
-            Map geoChart = UtilMisc.toMap("width", "500", "height", "450", "controlUI" , "small", "dataSourceId", latestGeoPoint.dataSourceId, "points", geoPoints);
+            Map geoChart = UtilMisc.toMap("width", "500px", "height", "450px", "controlUI" , "small", "dataSourceId", latestGeoPoint.dataSourceId, "points", geoPoints);
             context.geoChart = geoChart;
         }
         if (latestGeoPoint.elevationUomId) {

Modified: ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyGeoLocation.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyGeoLocation.groovy?rev=928733&r1=928732&r2=928733&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyGeoLocation.groovy (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyGeoLocation.groovy Mon Mar 29 11:51:49 2010
@@ -49,7 +49,7 @@ if (latestGeoPoint) {
         List geoPoints = UtilMisc.toList(UtilMisc.toMap("lat", latestGeoPoint.latitude, "lon", latestGeoPoint.longitude, "partyId", partyId,
               "link", UtilMisc.toMap("url", "viewprofile?partyId="+ partyId, "label", uiLabelMap.PartyProfile + " " + uiLabelMap.CommonOf + " " + partyId)));
 
-        Map geoChart = UtilMisc.toMap("width", "500", "height", "450", "controlUI" , "small", "dataSourceId", latestGeoPoint.dataSourceId, "points", geoPoints);
+        Map geoChart = UtilMisc.toMap("width", "500px", "height", "450px", "controlUI" , "small", "dataSourceId", latestGeoPoint.dataSourceId, "points", geoPoints);
         context.geoChart = geoChart;
     }
     if (latestGeoPoint && latestGeoPoint.elevationUomId) {

Modified: ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/facility/FacilityLocationGeoLocation.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/facility/FacilityLocationGeoLocation.groovy?rev=928733&r1=928732&r2=928733&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/facility/FacilityLocationGeoLocation.groovy (original)
+++ ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/facility/FacilityLocationGeoLocation.groovy Mon Mar 29 11:51:49 2010
@@ -38,7 +38,7 @@ if (facilityId && locationSeqId) {
                 "link", UtilMisc.toMap("url", "EditFacilityLocation?facilityId="+ facilityId + "&locationSeqId=" + locationSeqId,
                 "label", uiLabelMap.ProductFacilityLocation  + " " + uiLabelMap.CommonOf + " " + facilityId + "/" + locationSeqId)));
 
-        Map geoChart = UtilMisc.toMap("width", "500", "height", "450", "controlUI" , "small", "dataSourceId", latestGeoPoint.dataSourceId, "points", geoPoints);
+        Map geoChart = UtilMisc.toMap("width", "500px", "height", "450px", "controlUI" , "small", "dataSourceId", latestGeoPoint.dataSourceId, "points", geoPoints);
         context.geoChart = geoChart;
     }
     if (latestGeoPoint && latestGeoPoint.elevationUomId) {

Modified: ofbiz/trunk/framework/common/webcommon/includes/geolocation.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/includes/geolocation.ftl?rev=928733&r1=928732&r2=928733&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/webcommon/includes/geolocation.ftl (original)
+++ ofbiz/trunk/framework/common/webcommon/includes/geolocation.ftl Mon Mar 29 11:51:49 2010
@@ -19,7 +19,7 @@ under the License.
 <#if geoChart?has_content>
     <#if geoChart.dataSourceId?has_content>
       <#if geoChart.dataSourceId == "GEOPT_GOOGLE">
-        <div id="<#if geoChart.id?has_content>${geoChart.id}<#else>map_canvas</#if>" style="border:1px solid #979797; background-color:#e5e3df; width:${geoChart.width}px; height:${geoChart.height}px; margin:2em auto;">
+        <div id="<#if geoChart.id?has_content>${geoChart.id}<#else>map_canvas</#if>" style="border:1px solid #979797; background-color:#e5e3df; width:${geoChart.width}; height:${geoChart.height}; margin:2em auto;">
           <div style="padding:1em; color:gray;">${uiLabelMap.CommonLoading}</div>
         </div>
         <#assign defaultUrl = "https." + request.getServerName()>

Modified: ofbiz/trunk/framework/example/widget/example/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/example/widget/example/CommonScreens.xml?rev=928733&r1=928732&r2=928733&view=diff
==============================================================================
--- ofbiz/trunk/framework/example/widget/example/CommonScreens.xml (original)
+++ ofbiz/trunk/framework/example/widget/example/CommonScreens.xml Mon Mar 29 11:51:49 2010
@@ -196,8 +196,8 @@ under the License.
             <actions>
                 <set field="headerItem" value="ExampleGeoLocation"/>
                 <set field="geoChart.dataSourceId" value="GEOPT_GOOGLE"/>
-                <set field="geoChart.width" value="600"/>
-                <set field="geoChart.height" value="500"/>                
+                <set field="geoChart.width" value="600px"/>
+                <set field="geoChart.height" value="500px"/>                
                 <set field="geoChart.points" from-field="geoPoints"/>
                 <set field="geoChart.center" from-field="geoCenter"/>
             </actions>

Modified: ofbiz/trunk/framework/example/widget/example/ExampleScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/example/widget/example/ExampleScreens.xml?rev=928733&r1=928732&r2=928733&view=diff
==============================================================================
--- ofbiz/trunk/framework/example/widget/example/ExampleScreens.xml (original)
+++ ofbiz/trunk/framework/example/widget/example/ExampleScreens.xml Mon Mar 29 11:51:49 2010
@@ -212,8 +212,8 @@ under the License.
                 <set field="headerItem" value="ExampleGeoLocation"/>
                 <set field="tabButtonItem" value="ExampleGeoLocationPointSet4"/>
                 <set field="geoChart.dataSourceId" value="GEOPT_GOOGLE"/>
-                <set field="geoChart.width" value="600"/>
-                <set field="geoChart.height" value="500"/>
+                <set field="geoChart.width" value="600px"/>
+                <set field="geoChart.height" value="500px"/>
                 <set field="geoChart.points" from-field="geoPoints"/>
                 <set field="geoChart.center" from-field="geoCenter"/>
             </actions>
@@ -238,8 +238,8 @@ under the License.
                                         <set field="geoCenter.zoom" value="12"/>
                                         <set field="geoChart.id" value="chart1"/>
                                         <set field="geoChart.dataSourceId" value="GEOPT_GOOGLE"/>
-                                        <set field="geoChart.width" value="600"/>
-                                        <set field="geoChart.height" value="500"/>
+                                        <set field="geoChart.width" value="600px"/>
+                                        <set field="geoChart.height" value="500px"/>
                                         <set field="geoChart.points" from-field="geoPoints"/>
                                         <set field="geoChart.center" from-field="geoCenter"/>
                                     </actions>
@@ -262,8 +262,8 @@ under the License.
                                         <set field="geoCenter.zoom" value="11"/>
                                         <set field="geoChart.id" value="chart2"/>
                                         <set field="geoChart.dataSourceId" value="GEOPT_GOOGLE"/>
-                                        <set field="geoChart.width" value="800"/>
-                                        <set field="geoChart.height" value="500"/>
+                                        <set field="geoChart.width" value="800px"/>
+                                        <set field="geoChart.height" value="500px"/>
                                         <set field="geoChart.points" from-field="geoPoints"/>
                                         <set field="geoChart.center" from-field="geoCenter"/>
                                     </actions>
@@ -284,8 +284,8 @@ under the License.
                 <set field="headerItem" value="ExampleGeoLocation"/>
                 <set field="tabButtonItem" value="ExampleGeoLocationAddress"/>
                 <set field="geoChart.dataSourceId" value="GEOPT_ADDRESS_GOOGLE"/>
-                <set field="geoChart.width" value="800"/>
-                <set field="geoChart.height" value="500"/>
+                <set field="geoChart.width" value="800px"/>
+                <set field="geoChart.height" value="500px"/>
 
                 <set field="contactMechId" value="9015"/>
                 <entity-one entity-name="PostalAddress" value-field="address"/>