From c5ba5b0456a711d157e317f220e9c739226e7f50 Mon Sep 17 00:00:00 2001 From: Joar Wandborg Date: Tue, 10 Jan 2012 01:54:37 +0100 Subject: Installed leaflet in extlib --- mediagoblin/static/extlib/leaflet | 1 + 1 file changed, 1 insertion(+) create mode 120000 mediagoblin/static/extlib/leaflet (limited to 'mediagoblin/static') diff --git a/mediagoblin/static/extlib/leaflet b/mediagoblin/static/extlib/leaflet new file mode 120000 index 00000000..b47e2b1b --- /dev/null +++ b/mediagoblin/static/extlib/leaflet @@ -0,0 +1 @@ +../../../extlib/leaflet/dist/ \ No newline at end of file -- cgit v1.2.3 From 836df45dbecbaa5c8156dbbdb93c1c23bee44be4 Mon Sep 17 00:00:00 2001 From: Joar Wandborg Date: Tue, 10 Jan 2012 02:53:46 +0100 Subject: Added code for leaflet geolocation map --- mediagoblin/static/js/extlib/leaflet | 1 + mediagoblin/static/js/geolocation-map.js | 29 +++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+) create mode 120000 mediagoblin/static/js/extlib/leaflet create mode 100644 mediagoblin/static/js/geolocation-map.js (limited to 'mediagoblin/static') diff --git a/mediagoblin/static/js/extlib/leaflet b/mediagoblin/static/js/extlib/leaflet new file mode 120000 index 00000000..2fc302d7 --- /dev/null +++ b/mediagoblin/static/js/extlib/leaflet @@ -0,0 +1 @@ +../../../../extlib/leaflet/dist/ \ No newline at end of file diff --git a/mediagoblin/static/js/geolocation-map.js b/mediagoblin/static/js/geolocation-map.js new file mode 100644 index 00000000..22cbe2f3 --- /dev/null +++ b/mediagoblin/static/js/geolocation-map.js @@ -0,0 +1,29 @@ +$(document).ready(function () { + var longitude = Number( + $('#tile-map #gps-longitude').val()); + var latitude = Number( + $('#tile-map #gps-latitude').val()); + + console.log(longitude, latitude); + + var map = new L.Map('tile-map'); + + var mqtileUrl = 'http://otile{s}.mqcdn.com/tiles/1.0.0/osm/{z}/{x}/{y}.jpg'; + var mqtileAttrib = 'Map data © ' + + String(new Date().getFullYear()) + + ' OpenStreetMap contributors, CC-BY-SA.' + + ' Imaging © ' + + String(new Date().getFullYear()) + + ' MapQuest.'; + var mqtile = new L.TileLayer( + mqtileUrl, + {maxZoom: 18, + attribution: mqtileAttrib, + subdomains: '1234'}); + + var location = new L.LatLng(latitude, longitude); // geographical point (longitude and latitude) + map.setView(location, 13).addLayer(mqtile); + + var marker = new L.Marker(location); + map.addLayer(marker); +}); -- cgit v1.2.3 From 9542a2ba076b7e00e79d7adb1a4e90a095427645 Mon Sep 17 00:00:00 2001 From: Joar Wandborg Date: Sat, 28 Jan 2012 01:31:56 +0100 Subject: JavaScript fixes - AGPL headers, etc - Added AGPL header to comment_show.js, show_password.js and geolocation-map.js - Removed console.log from geolocation-map.js --- mediagoblin/static/js/comment_show.js | 18 ++++++++++++++++++ mediagoblin/static/js/geolocation-map.js | 23 ++++++++++++++++++++--- mediagoblin/static/js/show_password.js | 18 ++++++++++++++++++ 3 files changed, 56 insertions(+), 3 deletions(-) (limited to 'mediagoblin/static') diff --git a/mediagoblin/static/js/comment_show.js b/mediagoblin/static/js/comment_show.js index 2212b9ad..71466a8d 100644 --- a/mediagoblin/static/js/comment_show.js +++ b/mediagoblin/static/js/comment_show.js @@ -1,3 +1,21 @@ +/** + * GNU MediaGoblin -- federated, autonomous media hosting + * Copyright (C) 2011 MediaGoblin contributors. See AUTHORS. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + $(document).ready(function(){ $('#form_comment').hide(); $('#button_addcomment').click(function(){ diff --git a/mediagoblin/static/js/geolocation-map.js b/mediagoblin/static/js/geolocation-map.js index 22cbe2f3..35083d4f 100644 --- a/mediagoblin/static/js/geolocation-map.js +++ b/mediagoblin/static/js/geolocation-map.js @@ -1,11 +1,28 @@ +/** + * GNU MediaGoblin -- federated, autonomous media hosting + * Copyright (C) 2011 MediaGoblin contributors. See AUTHORS. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + $(document).ready(function () { var longitude = Number( $('#tile-map #gps-longitude').val()); var latitude = Number( $('#tile-map #gps-latitude').val()); - console.log(longitude, latitude); - + // Get a new map instance attached and element with id="tile-map" var map = new L.Map('tile-map'); var mqtileUrl = 'http://otile{s}.mqcdn.com/tiles/1.0.0/osm/{z}/{x}/{y}.jpg'; @@ -21,7 +38,7 @@ $(document).ready(function () { attribution: mqtileAttrib, subdomains: '1234'}); - var location = new L.LatLng(latitude, longitude); // geographical point (longitude and latitude) + var location = new L.LatLng(latitude, longitude); map.setView(location, 13).addLayer(mqtile); var marker = new L.Marker(location); diff --git a/mediagoblin/static/js/show_password.js b/mediagoblin/static/js/show_password.js index 519b29c1..513fe327 100644 --- a/mediagoblin/static/js/show_password.js +++ b/mediagoblin/static/js/show_password.js @@ -1,3 +1,21 @@ +/** + * GNU MediaGoblin -- federated, autonomous media hosting + * Copyright (C) 2011 MediaGoblin contributors. See AUTHORS. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + $(document).ready(function(){ $("#password").after(''); $('#password_clear').hide(); -- cgit v1.2.3