Merge remote-tracking branch 'joar/exif-rebase'

5 files changed, 84 insertions, 0 deletions

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
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 <http://www.gnu.org/licenses/>.
+ */
+
 $(document).ready(function(){
   $('#form_comment').hide();
   $('#button_addcomment').click(function(){
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..35083d4f
--- /dev/null
+++ b/mediagoblin/static/js/geolocation-map.js
@@ -0,0 +1,46 @@
+/**
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+$(document).ready(function () {
+    var longitude = Number(
+	$('#tile-map #gps-longitude').val());
+    var latitude = Number(
+	$('#tile-map #gps-latitude').val());
+
+    // 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';
+    var mqtileAttrib = 'Map data &copy; '
+	+ String(new Date().getFullYear())
+	+ ' OpenStreetMap contributors, CC-BY-SA.'
+	+ ' Imaging &copy; '
+	+ String(new Date().getFullYear())
+	+ ' <a target="_blank" href="http://mapquest.com">MapQuest</a>.';
+    var mqtile = new L.TileLayer(
+	mqtileUrl,
+	{maxZoom: 18,
+	 attribution: mqtileAttrib,
+	 subdomains: '1234'});
+
+    var location = new L.LatLng(latitude, longitude); 
+    map.setView(location, 13).addLayer(mqtile);
+
+    var marker = new L.Marker(location);
+    map.addLayer(marker);
+});
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 <http://www.gnu.org/licenses/>.
+ */
+
 $(document).ready(function(){
   $("#password").after('<input type="text" value="" name="password_clear" id="password_clear" /><label><input type="checkbox" id="password_boolean" />Show password</label>');
   $('#password_clear').hide();