nils/gluon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gluon-config-mode-geo-location-with-map: add copyright link and use SSL links

Browse Source
This commit is contained in:
Jan-Tarek Butt 2018-08-04 21:53:19 +02:00
parent 3066c0c7ad
commit 1b0734382a
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/package/gluon-config-mode-geo-location.rst
View File

@ -55,7 +55,7 @@ config_mode.geo_location.map.zoom \: optional
config_mode.geo_location.map.openlayers_js_url \: optional config_mode.geo_location.map.openlayers_js_url \: optional
- ``url`` set an URL for OpenStreetMap layers. - ``url`` set an URL for OpenStreetMap layers.
- defaults to ``http://dev.openlayers.org/OpenLayers.js`` - defaults to ``https://openlayers.org/api/OpenLayers.js``
Example:: Example::

8
package/gluon-config-mode-geo-location/src/0400-geo-location.lua.in
View File

@ -32,7 +32,7 @@ return function(form, uci)
end end
local function show_olurl() local function show_olurl()
return site.config_mode.geo_location.map.openlayers_js_url('http://dev.openlayers.org/OpenLayers.js') return site.config_mode.geo_location.map.openlayers_js_url('https://openlayers.org/api/OpenLayers.js')
end end
#endif #endif
@ -63,7 +63,11 @@ return function(form, uci)
text = text .. [[ text = text .. [[
</div> </div>
<div id="locationPickerMap" style="width:100%; height:400px; margin-bottom:20px !important; display: none;"></div> <div id="locationPickerMap" style="position:relative; width:100%; height:400px; margin-bottom:20px !important; display:none;">
<div target="_blank" style="position:absolute; left:5px; bottom:5px; z-index:1000; color:#aaa; outline: 0">
© <a href="https://openstreetmap.org/copyright">OpenStreetMap</a> contributors
</div>
</div>
<script type="text/javascript" src="/static/osm.js"></script> <script type="text/javascript" src="/static/osm.js"></script>
<script type="text/javascript"> <script type="text/javascript">
var latitude=]] .. show_lon() .. ",longitude=" .. show_lat() .. ",zoom=" .. site_zoom() .. [[; var latitude=]] .. show_lon() .. ",longitude=" .. show_lat() .. ",zoom=" .. site_zoom() .. [[;