You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2015/11/10 13:32:01 UTC
svn commit: r1713627 - in /ofbiz/trunk:
applications/party/webapp/partymgr/party/ framework/base/config/
framework/common/config/ framework/common/webcommon/includes/
framework/webtools/webapp/webtools/WEB-INF/
framework/webtools/webapp/webtools/WEB-IN...
Author: jleroux
Date: Tue Nov 10 12:32:01 2015
New Revision: 1713627
URL: http://svn.apache.org/viewvc?rev=1713627&view=rev
Log:
A modified patch from Pierre Smits for "Display GeoPoint with map in WebTools" https://issues.apache.org/jira/browse/OFBIZ-6527
Currently only a list of geoPoints is shown. The user experience will improve when we not only show that, but a map as well.
jleroux:
I refactored the js scripts in party editGeoLocation.ftl and added webtools GeoLocation.ftl into a new common GoogleGeoLocation.ftl template now included in both party editGeoLocation.ftl and webtools GeoLocation.ftl
I also removed trailing blanks in common GeoLocation.ftl template.
I also added a French label
Added:
ofbiz/trunk/framework/base/config/owasp.properties (with props)
ofbiz/trunk/framework/common/webcommon/includes/GoogleGeoLocation.ftl (with props)
ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/geo/
ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/geo/GetGeoLocation.groovy (with props)
ofbiz/trunk/framework/webtools/webapp/webtools/geo/
ofbiz/trunk/framework/webtools/webapp/webtools/geo/GeoLocation.ftl (with props)
Modified:
ofbiz/trunk/applications/party/webapp/partymgr/party/editGeoLocation.ftl
ofbiz/trunk/framework/common/config/CommonUiLabels.xml
ofbiz/trunk/framework/common/webcommon/includes/geolocation.ftl
ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/controller.xml
ofbiz/trunk/framework/webtools/widget/GeoManagementForms.xml
ofbiz/trunk/framework/webtools/widget/GeoManagementScreens.xml
Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/editGeoLocation.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/editGeoLocation.ftl?rev=1713627&r1=1713626&r2=1713627&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/party/editGeoLocation.ftl (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/party/editGeoLocation.ftl Tue Nov 10 12:32:01 2015
@@ -17,104 +17,7 @@ specific language governing permissions
under the License.
-->
-<script src="https://maps.googleapis.com/maps/api/js?sensor=false" type="text/javascript"></script>
-<script type="text/javascript">
- function load() {
- var geocoder = new google.maps.Geocoder();
- var center = new google.maps.LatLng(${latitude!38}, ${longitude!15});
- var map = new google.maps.Map(document.getElementById("map"),
- { center: center,
- zoom: 15, // 0=World, 19=max zoom in
- mapTypeId: google.maps.MapTypeId.ROADMAP
- });
-
- var marker = new google.maps.Marker({
- position: center,
- map: map,
- draggable: true
- });
-
- document.getElementById("lat").value = center.lat().toFixed(5);
- document.getElementById("lng").value = center.lng().toFixed(5);
-
- google.maps.event.addListener(marker, "dragend", function() {
- var point = marker.getPosition();
- map.panTo(point);
- document.getElementById("lat").value = point.lat().toFixed(5);
- document.getElementById("lng").value = point.lng().toFixed(5);
- });
-
-
- google.maps.event.addListener(map, "moveend", function() {
- map.clearOverlays();
- var center = map.getCenter();
- var marker = new GMarker(center, {draggable: true});
- map.addOverlay(marker);
- document.getElementById("lat").value = center.lat().toFixed(5);
- document.getElementById("lng").value = center.lng().toFixed(5);
- });
-
- google.maps.event.addListener(marker, "dragend", function() {
- var point = marker.getPoint();
- map.panTo(point);
- document.getElementById("lat").value = point.lat().toFixed(5);
- document.getElementById("lng").value = point.lng().toFixed(5);
- });
- }
-
- function showAddress(address) {
- var map = new google.maps.Map(document.getElementById("map"),
- { center: new google.maps.LatLng(${latitude!38}, ${longitude!15}),
- zoom: 15, // 0=World, 19=max zoom in
- mapTypeId: google.maps.MapTypeId.ROADMAP
- });
- var geocoder = new google.maps.Geocoder();
- if (geocoder) {
- geocoder.geocode({'address': address}, function(result, status) {
- if (status != google.maps.GeocoderStatus.OK) {
- showErrorAlert("${uiLabelMap.CommonErrorMessage2}","${uiLabelMap.CommonAddressNotFound}");
- } else {
- var point = result[0].geometry.location;
- var lat = point.lat().toFixed(5);
- var lng = point.lng().toFixed(5);
- document.getElementById("lat").value = lat;
- document.getElementById("lng").value = lng;
- //map.clearOverlays()
- map.setCenter(point, 14);
-
- var marker = new google.maps.Marker({
- position: new google.maps.LatLng(lat, lng),
- map: map,
- draggable: true
- });
-
- google.maps.event.addListener(marker, "dragend", function() {
- var point = marker.getPosition();
- map.panTo(point);
- document.getElementById("lat").value = point.lat().toFixed(5);
- document.getElementById("lng").value = point.lng().toFixed(5);
- });
-
- google.maps.event.addListener(map, "moveend", function() {
- //map.clearOverlays();
- var center = map.getCenter();
- var marker = new google.maps.Marker(center, {draggable: true});
- map.addOverlay(marker);
- document.getElementById("lat").value = center.lat().toFixed(5);
- document.getElementById("lng").value = center.lng().toFixed(5);
- });
-
- google.maps.event.addListener(marker, "dragend", function() {
- var pt = marker.getPoint();
- map.panTo(pt);
- document.getElementById("lat").value = pt.lat().toFixed(5);
- document.getElementById("lng").value = pt.lng().toFixed(5);
- });
- }
- });
- }
- }
-</script>
+<#include "component://common/webcommon/includes/GoogleGeoLocation.ftl"/>
<body onload="load()">
<center>
Added: ofbiz/trunk/framework/base/config/owasp.properties
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/config/owasp.properties?rev=1713627&view=auto
==============================================================================
--- ofbiz/trunk/framework/base/config/owasp.properties (added)
+++ ofbiz/trunk/framework/base/config/owasp.properties Tue Nov 10 12:32:01 2015
@@ -0,0 +1,27 @@
+###############################################################################
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+###############################################################################
+
+####
+# OFBiz OWASP properties File https://www.owasp.org/index.php/Main_Page
+####
+
+# Should we use a permissive sanitizer policy?
+# This has a slightly impact on the code rendered, see OFBIZ-6669. False By default!
+
+sanitizer.permissive.policy=true
Propchange: ofbiz/trunk/framework/base/config/owasp.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/framework/base/config/owasp.properties
------------------------------------------------------------------------------
svn:keywords = Date Rev Author URL Id
Propchange: ofbiz/trunk/framework/base/config/owasp.properties
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: ofbiz/trunk/framework/common/config/CommonUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/config/CommonUiLabels.xml?rev=1713627&r1=1713626&r2=1713627&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/config/CommonUiLabels.xml (original)
+++ ofbiz/trunk/framework/common/config/CommonUiLabels.xml Tue Nov 10 12:32:01 2015
@@ -6313,6 +6313,11 @@
<value xml:lang="zh-CN">å¤</value>
<value xml:lang="zh-TW">許å¤</value>
</property>
+ <property key="CommonMap">
+ <value xml:lang="en">Map</value>
+ <value xml:lang="fr">Carte</value>
+ <value xml:lang="nl">Kaart</value>
+ </property>
<property key="CommonMarch">
<value xml:lang="ar">Ù
ارس</value>
<value xml:lang="cs">BÅezen</value>
@@ -12111,7 +12116,7 @@
<value xml:lang="de">aktualisieren</value>
<value xml:lang="en">Update</value>
<value xml:lang="es">Actualizar</value>
- <value xml:lang="fr">MÃ j</value>
+ <value xml:lang="fr">Actualiser</value>
<value xml:lang="hi-IN">à¤
दà¥à¤¯à¤¤à¤¨ à¤à¤°à¥</value>
<value xml:lang="it">Aggiorna</value>
<value xml:lang="ja">æ´æ°</value>
Added: ofbiz/trunk/framework/common/webcommon/includes/GoogleGeoLocation.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/includes/GoogleGeoLocation.ftl?rev=1713627&view=auto
==============================================================================
--- ofbiz/trunk/framework/common/webcommon/includes/GoogleGeoLocation.ftl (added)
+++ ofbiz/trunk/framework/common/webcommon/includes/GoogleGeoLocation.ftl Tue Nov 10 12:32:01 2015
@@ -0,0 +1,117 @@
+<#--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<script src="https://maps.googleapis.com/maps/api/js?sensor=false" type="text/javascript"></script>
+<script type="text/javascript">
+ function load() {
+ var geocoder = new google.maps.Geocoder();
+ var center = new google.maps.LatLng(${latitude!38}, ${longitude!15});
+ var map = new google.maps.Map(document.getElementById("map"),
+ { center: center,
+ zoom: 15, // 0=World, 19=max zoom in
+ mapTypeId: google.maps.MapTypeId.ROADMAP
+ });
+
+ var marker = new google.maps.Marker({
+ position: center,
+ map: map,
+ draggable: true
+ });
+
+ document.getElementById("lat").value = center.lat().toFixed(5);
+ document.getElementById("lng").value = center.lng().toFixed(5);
+
+ google.maps.event.addListener(marker, "dragend", function() {
+ var point = marker.getPosition();
+ map.panTo(point);
+ document.getElementById("lat").value = point.lat().toFixed(5);
+ document.getElementById("lng").value = point.lng().toFixed(5);
+ });
+
+
+ google.maps.event.addListener(map, "moveend", function() {
+ map.clearOverlays();
+ var center = map.getCenter();
+ var marker = new GMarker(center, {draggable: true});
+ map.addOverlay(marker);
+ document.getElementById("lat").value = center.lat().toFixed(5);
+ document.getElementById("lng").value = center.lng().toFixed(5);
+ });
+
+ google.maps.event.addListener(marker, "dragend", function() {
+ var point = marker.getPoint();
+ map.panTo(point);
+ document.getElementById("lat").value = point.lat().toFixed(5);
+ document.getElementById("lng").value = point.lng().toFixed(5);
+ });
+ }
+
+ function showAddress(address) {
+ var map = new google.maps.Map(document.getElementById("map"),
+ { center: new google.maps.LatLng(${latitude!38}, ${longitude!15}),
+ zoom: 15, // 0=World, 19=max zoom in
+ mapTypeId: google.maps.MapTypeId.ROADMAP
+ });
+ var geocoder = new google.maps.Geocoder();
+ if (geocoder) {
+ geocoder.geocode({'address': address}, function(result, status) {
+ if (status != google.maps.GeocoderStatus.OK) {
+ showErrorAlert("${uiLabelMap.CommonErrorMessage2}","${uiLabelMap.CommonAddressNotFound}");
+ } else {
+ var point = result[0].geometry.location;
+ var lat = point.lat().toFixed(5);
+ var lng = point.lng().toFixed(5);
+ document.getElementById("lat").value = lat;
+ document.getElementById("lng").value = lng;
+ //map.clearOverlays()
+ map.setCenter(point, 14);
+
+ var marker = new google.maps.Marker({
+ position: new google.maps.LatLng(lat, lng),
+ map: map,
+ draggable: true
+ });
+
+ google.maps.event.addListener(marker, "dragend", function() {
+ var point = marker.getPosition();
+ map.panTo(point);
+ document.getElementById("lat").value = point.lat().toFixed(5);
+ document.getElementById("lng").value = point.lng().toFixed(5);
+ });
+
+ google.maps.event.addListener(map, "moveend", function() {
+ //map.clearOverlays();
+ var center = map.getCenter();
+ var marker = new google.maps.Marker(center, {draggable: true});
+ map.addOverlay(marker);
+ document.getElementById("lat").value = center.lat().toFixed(5);
+ document.getElementById("lng").value = center.lng().toFixed(5);
+ });
+
+ google.maps.event.addListener(marker, "dragend", function() {
+ var pt = marker.getPoint();
+ map.panTo(pt);
+ document.getElementById("lat").value = pt.lat().toFixed(5);
+ document.getElementById("lng").value = pt.lng().toFixed(5);
+ });
+ }
+ });
+ }
+ }
+</script>
Propchange: ofbiz/trunk/framework/common/webcommon/includes/GoogleGeoLocation.ftl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/framework/common/webcommon/includes/GoogleGeoLocation.ftl
------------------------------------------------------------------------------
svn:keywords = Date Rev Author URL Id
Propchange: ofbiz/trunk/framework/common/webcommon/includes/GoogleGeoLocation.ftl
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: ofbiz/trunk/framework/common/webcommon/includes/geolocation.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/includes/geolocation.ftl?rev=1713627&r1=1713626&r2=1713627&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/webcommon/includes/geolocation.ftl (original)
+++ ofbiz/trunk/framework/common/webcommon/includes/geolocation.ftl Tue Nov 10 12:32:01 2015
@@ -114,7 +114,7 @@ under the License.
<#-- due to https://github.com/openlayers/openlayers/issues/1025 rather use a local version loaded by framework/common/widget/CommonScreens.xml -->
<#-- script src="//www.openlayers.org/api/OpenLayers.js"></script-->
<script type="text/javascript">
- map = new OpenLayers.Map("${id}");
+ map = new OpenLayers.Map("${id}");
map.addLayer(new OpenLayers.Layer.OSM());
var zoom = ${zoom};
var center= new OpenLayers.LonLat(${center.lon},${center.lat})
Added: ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/geo/GetGeoLocation.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/geo/GetGeoLocation.groovy?rev=1713627&view=auto
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/geo/GetGeoLocation.groovy (added)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/geo/GetGeoLocation.groovy Tue Nov 10 12:32:01 2015
@@ -0,0 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+context.geoPointId = geoPoint.geoPointId;
+context.latitude = geoPoint.latitude;
+context.longitude = geoPoint.longitude;
\ No newline at end of file
Propchange: ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/geo/GetGeoLocation.groovy
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/geo/GetGeoLocation.groovy
------------------------------------------------------------------------------
svn:keywords = Date Rev Author URL Id
Propchange: ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/geo/GetGeoLocation.groovy
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/controller.xml?rev=1713627&r1=1713626&r2=1713627&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/controller.xml Tue Nov 10 12:32:01 2015
@@ -543,6 +543,7 @@ under the License.
<!-- Geo Management -->
<request-map uri="FindGeo"><security https="true" auth="true"/><response name="success" type="view" value="FindGeo" save-home-view="true"/></request-map>
+ <request-map uri="geoPoint"><security https="true" auth="true"/><response name="success" type="view" value="geoPoint" save-home-view="true"/></request-map>
<request-map uri="geoPoints"><security https="true" auth="true"/><response name="success" type="view" value="geoPoints" save-home-view="true"/></request-map>
<request-map uri="EditGeo"><security https="true" auth="true"/><response name="success" type="view" value="EditGeo"/></request-map>
<request-map uri="LinkGeos"><security https="true" auth="true"/><response name="success" type="view" value="LinkGeos"/></request-map>
@@ -680,6 +681,7 @@ under the License.
<!-- Geo Management -->
<view-map name="FindGeo" type="screen" page="component://webtools/widget/GeoManagementScreens.xml#FindGeo"/>
+ <view-map name="geoPoint" type="screen" page="component://webtools/widget/GeoManagementScreens.xml#GeoPoint"/>
<view-map name="geoPoints" type="screen" page="component://webtools/widget/GeoManagementScreens.xml#GeoPoints"/>
<view-map name="EditGeo" type="screen" page="component://webtools/widget/GeoManagementScreens.xml#EditGeo"/>
<view-map name="LinkGeos" type="screen" page="component://webtools/widget/GeoManagementScreens.xml#LinkGeos"/>
Added: ofbiz/trunk/framework/webtools/webapp/webtools/geo/GeoLocation.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/geo/GeoLocation.ftl?rev=1713627&view=auto
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/geo/GeoLocation.ftl (added)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/geo/GeoLocation.ftl Tue Nov 10 12:32:01 2015
@@ -0,0 +1,25 @@
+<#--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<#include "component://common/webcommon/includes/GoogleGeoLocation.ftl"/>
+
+<body onload="load()">
+ <center>
+ <div id="map" style="border:1px solid #979797; background-color:#e5e3df; width:500px; height:450px; margin:2em auto;"></div>
+ </center>
+</body>
Propchange: ofbiz/trunk/framework/webtools/webapp/webtools/geo/GeoLocation.ftl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/framework/webtools/webapp/webtools/geo/GeoLocation.ftl
------------------------------------------------------------------------------
svn:keywords = Date Rev Author URL Id
Propchange: ofbiz/trunk/framework/webtools/webapp/webtools/geo/GeoLocation.ftl
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: ofbiz/trunk/framework/webtools/widget/GeoManagementForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/GeoManagementForms.xml?rev=1713627&r1=1713626&r2=1713627&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/widget/GeoManagementForms.xml (original)
+++ ofbiz/trunk/framework/webtools/widget/GeoManagementForms.xml Tue Nov 10 12:32:01 2015
@@ -39,6 +39,18 @@
<field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
+ <form name="GeoPoint" type="single" title="" default-map-name="geoPoint"
+ header-row-style="header-row" default-table-style="basic-table">
+ <field name="geoPointId" title="${uiLabelMap.CommonId}"><display/></field>
+ <field name="dataSourceId" title="${uiLabelMap.Source}"><display/></field>
+ <field name="latitude" title="${uiLabelMap.CommonLatitude}"><display/></field>
+ <field name="longitude" title="${uiLabelMap.CommonLongitude}"><display/></field>
+ <field name="elevation" title="${uiLabelMap.Elevation}"><display/></field>
+ <field name="elevationUomId" title="${uiLabelMap.CommonUom}">
+ <display-entity entity-name="Uom" key-field-name="uomId" description="${abbreviation}"/>
+ </field>
+ <field name="information"><display/></field>
+ </form>
<form name="ListGeos" extends-resource="component://common/widget/LookupForms.xml" extends="listLookupGeo" paginate-target="${currentUrl}"
odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar" separate-columns="true" >
<field name="geoId" widget-style="buttontext" title="${uiLabelMap.CommonGeoId}">
@@ -65,7 +77,10 @@
<field-map field-name="viewSize" from-field="viewSize"/>
</service>
</actions>
- <field name="geoPointId" widget-style="buttontext" title="${uiLabelMap.CommonId}"><display/>
+ <field name="geoPointId" title="${uiLabelMap.CommonId}">
+ <hyperlink also-hidden="false" target-type="plain" description="${geoPointId}" target="geoPoint">
+ <parameter param-name="geoPointId"/>
+ </hyperlink>
</field>
<field name="dataSourceId" title="${uiLabelMap.Source}"><display/></field>
<field name="latitude" title="${uiLabelMap.CommonLatitude}"><display/></field>
Modified: ofbiz/trunk/framework/webtools/widget/GeoManagementScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/GeoManagementScreens.xml?rev=1713627&r1=1713626&r2=1713627&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/widget/GeoManagementScreens.xml (original)
+++ ofbiz/trunk/framework/webtools/widget/GeoManagementScreens.xml Tue Nov 10 12:32:01 2015
@@ -46,6 +46,32 @@
</widgets>
</section>
</screen>
+ <screen name="GeoPoint">
+ <section>
+ <actions>
+ <set field="titleProperty" value="WebtoolsGeoPoints"/>
+ <set field="currentUrl" value="geoPoints"/>
+ <set field="headerItem" value="Geos"/>
+ <set field="tabButtonItem" value="GeoPoints"/>
+ <entity-one value-field="geoPoint" entity-name="GeoPoint"/>
+ <script location="component://webtools/webapp/webtools/WEB-INF/actions/geo/GetGeoLocation.groovy"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="CommonGeoManagementDecorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="body">
+ <screenlet title="${uiLabelMap.CommonSummary}">
+ <include-form location="component://webtools/widget/GeoManagementForms.xml" name="GeoPoint"/>
+ </screenlet>
+ <screenlet title="${uiLabelMap.CommonMap}">
+ <platform-specific>
+ <html><html-template location="component://webtools/webapp/webtools/geo/GeoLocation.ftl"/></html>
+ </platform-specific>
+ </screenlet>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
<screen name="GeoPoints">
<section>
<actions>