Merge remote-tracking branch 'cweb/master'

12 files changed, 464 insertions, 0 deletions

diff --git a/mediagoblin/static/js/audio.js b/mediagoblin/static/js/audio.js
new file mode 100644
index 00000000..50d58cd9
--- /dev/null
+++ b/mediagoblin/static/js/audio.js
@@ -0,0 +1,229 @@
+/**
+ * GNU MediaGoblin -- federated, autonomous media hosting
+ * Copyright (C) 2011, 2012 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/>.
+ */
+
+var audioPlayer = new Object();
+
+(function (audioPlayer) {
+    audioPlayer.init = function (audioElement) {
+        audioPlayer.audioElement = audioElement;
+
+        console.log(audioElement);
+
+        attachEvents();
+
+        $(audioElement).hide();
+    };
+
+    function attachEvents () {
+        audioPlayer.audioElement.addEventListener(
+            'durationchange', audioPlayer.durationChange, true);
+        audioPlayer.audioElement.addEventListener(
+            'timeupdate', audioPlayer.timeUpdate, true);
+        audioPlayer.audioElement.addEventListener(
+            'progress', audioPlayer.onProgress, true);
+        audioPlayer.audioElement.addEventListener(
+            'ended', audioPlayer.onEnded, true);
+
+        $(document).ready( function () {
+            $('.audio-spectrogram').delegate(
+                '.seekbar', 'click', audioPlayer.onSeek);
+            $('.audio-spectrogram').delegate(
+                '.audio-control-play-pause', 'click', audioPlayer.playPause);
+            $('.audio-spectrogram').delegate(
+                '.audio-volume', 'change', audioPlayer.onVolumeChange);
+            $('.audio-media').delegate(
+                '.audio-spectrogram', 'attachedControls',
+                audioPlayer.onControlsAttached);
+        });
+    }
+
+    audioPlayer.onVolumeChange = function(e) {
+        console.log('volume change', e);
+        audioPlayer.audioElement.volume = e.target.value;
+    }
+
+    audioPlayer.onControlsAttached = function(e) {
+        console.log('Controls attached', e);
+        $('.audio-spectrogram .audio-volume').val(
+                Math.round(audioPlayer.audioElement.volume, 2));
+    }
+
+    audioPlayer.onProgress = function(e) {
+        /**
+         * Handler for file download progress
+         */
+        console.log(e);
+
+        var buffered = audioPlayer.audioElement.buffered;
+
+        ranges = new Array(); 
+
+        var indicators = $('.audio-spectrogram .buffered-indicators div');
+
+        for (var i = 0; i < buffered.length; i++) {
+            if (!(i in indicators)) {
+                $('<div style="display: none;"></div>')
+                    .appendTo($('.audio-spectrogram .buffered-indicators'))
+                    .fadeIn(500);
+                indicators = $('.audio-spectrogram .buffered-indicators div');
+            }
+            var posStart = ((buffered.start(i) / audioPlayer.audioElement.duration)
+                    * audioPlayer.imageElement.width());
+            var posStop = ((buffered.end(i) / audioPlayer.audioElement.duration)
+                    * audioPlayer.imageElement.width());
+            console.log('indicators', indicators);
+
+            var indicator = $(indicators[i]);
+
+            indicator.css('left', posStart);
+            indicator.css('width', posStop - posStart);
+        }
+
+        /*
+         * Clean up unused indicators
+         */
+        if (indicators.length > buffered.length) {
+            for (var i = buffered.length; i < indicators.length; i++) {
+                $(indicators[i]).fadeOut(500, function () {
+                    this.remove();
+                });
+            }
+        }
+    };
+
+    audioPlayer.onSeek = function (e) {
+        /**
+         * Callback handler for seek event, which is a .click() event on the
+         * .seekbar element
+         */
+        console.log('onSeek', e);
+
+        var im = audioPlayer.imageElement;
+        var pos = (e.offsetX || e.originalEvent.layerX) / im.width();
+
+        audioPlayer.audioElement.currentTime = pos * audioPlayer.audioElement.duration;
+        audioPlayer.audioElement.play();
+        audioPlayer.setState(audioPlayer.PLAYING);
+    };
+
+    audioPlayer.onEnded = function (e) {
+        audioPlayer.setState(audioPlayer.PAUSED);
+    }
+
+    audioPlayer.playPause = function (e) {
+        console.log('playPause', e);
+        if (audioPlayer.audioElement.paused) {
+            audioPlayer.audioElement.play();
+            audioPlayer.setState(audioPlayer.PLAYING);
+        } else {
+            audioPlayer.audioElement.pause();
+            audioPlayer.setState(audioPlayer.PAUSED);
+        }
+    };
+
+    audioPlayer.NULL = null;
+    audioPlayer.PLAYING = 2;
+    audioPlayer.PAUSED = 4;
+
+    audioPlayer.state = audioPlayer.NULL;
+
+    audioPlayer.setState = function (state) {
+        if (state == audioPlayer.state) {
+            return;
+        } else {
+            audioPlayer.state = state;
+        }
+
+        switch (state) {
+            case audioPlayer.PLAYING:
+                $('.audio-spectrogram .audio-control-play-pause')
+                    .removeClass('paused').addClass('playing')
+                    .text('▮▮');
+                break;
+            case audioPlayer.PAUSED:
+                $('.audio-spectrogram .audio-control-play-pause')
+                    .removeClass('playing').addClass('paused')
+                    .text('▶');
+                break;
+        }
+    };
+
+    audioPlayer.durationChange = function () {
+        // ???
+    };
+
+    audioPlayer.timeUpdate = function () {
+        /**
+         * Callback handler for the timeupdate event, responsible for
+         * updating the playhead
+         */
+        var currentTime = audioPlayer.audioElement.currentTime;
+        var playhead = audioPlayer.imageElement.parent().find('.playhead');
+        playhead.css('width', (currentTime / audioPlayer.audioElement.duration)
+                * audioPlayer.imageElement.width());
+        var time = formatTime(currentTime);
+        var duration = formatTime(audioPlayer.audioElement.duration);
+        audioPlayer.imageElement.parent()
+            .find('.audio-currentTime')
+            .text(time + '/' + duration);
+    };
+
+    function formatTime(seconds) {
+        /**
+         * Format a time duration in (hh:)?mm:ss manner
+         */
+        var h = Math.floor(seconds / (60 * 60));
+        var m = Math.floor((seconds - h * 60 * 60) / 60);
+        var s = Math.round(seconds - h * 60 * 60 - m * 60);
+        return '' + (h ? (h < 10 ? '0' + h : h) + ':' : '') + (m < 10 ? '0' + m : m) + ':' + (s < 10 ? '0' + s : s);
+    }
+
+    audioPlayer.formatTime = formatTime;
+
+    audioPlayer.attachToImage = function (imageElement) {
+        /**
+         * Attach the player to an image element
+         */
+        console.log(imageElement);
+
+        var im = $(imageElement);
+
+        audioPlayer.imageElement = im;
+
+        $('<div class="playhead"></div>').appendTo(im.parent());
+        $('<div class="buffered-indicators"></div>').appendTo(im.parent());
+        $('<div class="seekbar"></div>').appendTo(im.parent());
+        $('<div class="audio-control-play-pause paused">▶</div>').appendTo(im.parent());
+        $('<div class="audio-currentTime">00:00</div>').appendTo(im.parent());
+        $('<input type="range" class="audio-volume"'
+                +'value="1" min="0" max="1" step="0.001" />').appendTo(im.parent());
+        $('.audio-spectrogram').trigger('attachedControls');
+    };
+})(audioPlayer);
+
+$(document).ready(function () {
+    if (!$('.audio-media').length) {
+        return;
+    }
+
+    console.log('Initializing audio player');
+
+    audioElements = $('.audio-media .audio-player');
+    audioPlayer.init(audioElements[0]);
+    audioPlayer.attachToImage($('.audio-spectrogram img')[0]);
+});
diff --git a/mediagoblin/static/js/autofilledin_password.js b/mediagoblin/static/js/autofilledin_password.js
new file mode 100644
index 00000000..45e867fe
--- /dev/null
+++ b/mediagoblin/static/js/autofilledin_password.js
@@ -0,0 +1,25 @@
+/**
+ * GNU MediaGoblin -- federated, autonomous media hosting
+ * Copyright (C) 2012 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(){
+  $('#forgot_password').click(function(event){
+    event.preventDefault();
+    window.location.pathname = $(this).attr('href') + '?username=' +
+                               $('#username').val();
+  });
+});
diff --git a/mediagoblin/static/js/collection_form_show.js b/mediagoblin/static/js/collection_form_show.js
new file mode 100644
index 00000000..03a4906b
--- /dev/null
+++ b/mediagoblin/static/js/collection_form_show.js
@@ -0,0 +1,26 @@
+/**
+ * GNU MediaGoblin -- federated, autonomous media hosting
+ * Copyright (C) 2011, 2012 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(){
+  $('#new_collection').hide();
+  $('#button_addcollection').click(function(){
+    $('#new_collection').slideToggle('fast', function(){
+        $('#collection_title').focus();
+    });
+  });
+});
diff --git a/mediagoblin/static/js/comment_show.js b/mediagoblin/static/js/comment_show.js
new file mode 100644
index 00000000..c5ccee66
--- /dev/null
+++ b/mediagoblin/static/js/comment_show.js
@@ -0,0 +1,27 @@
+/**
+ * GNU MediaGoblin -- federated, autonomous media hosting
+ * Copyright (C) 2011, 2012 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(){
+    $(this).fadeOut('fast');
+    $('#form_comment').slideDown(function(){
+        $('#comment_content').focus();
+    });
+  });
+});
diff --git a/mediagoblin/static/js/extlib/html5slider.js b/mediagoblin/static/js/extlib/html5slider.js
new file mode 120000
index 00000000..feae2cb8
--- /dev/null
+++ b/mediagoblin/static/js/extlib/html5slider.js
@@ -0,0 +1 @@
+../../../../extlib/html5slider/html5slider.js
\ No newline at end of file
diff --git a/mediagoblin/static/js/extlib/jquery.js b/mediagoblin/static/js/extlib/jquery.js
new file mode 120000
index 00000000..d78f5cc3
--- /dev/null
+++ b/mediagoblin/static/js/extlib/jquery.js
@@ -0,0 +1 @@
+../../../../extlib/jquery/jquery.js
\ No newline at end of file
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/extlib/thingiview.js b/mediagoblin/static/js/extlib/thingiview.js
new file mode 120000
index 00000000..b7c842ba
--- /dev/null
+++ b/mediagoblin/static/js/extlib/thingiview.js
@@ -0,0 +1 @@
+../../../../extlib/thingiview.js/
\ 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..26d94c5d
--- /dev/null
+++ b/mediagoblin/static/js/geolocation-map.js
@@ -0,0 +1,47 @@
+/**
+ * GNU MediaGoblin -- federated, autonomous media hosting
+ * Copyright (C) 2011, 2012 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 () {
+    if (!$('#tile-map').length) {
+        return;
+    }
+    console.log('Initializing map');
+
+    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 = '<a id="osm_license_link">see map license</a>';
+    var mqtile = new L.TileLayer(
+	mqtileUrl,
+	{maxZoom: 18,
+	 attribution: mqtileAttrib,
+	 subdomains: '1234'});
+
+    map.attributionControl.setPrefix('');
+    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/header_dropdown.js b/mediagoblin/static/js/header_dropdown.js
new file mode 100644
index 00000000..1b2fb00f
--- /dev/null
+++ b/mediagoblin/static/js/header_dropdown.js
@@ -0,0 +1,27 @@
+/**
+ * GNU MediaGoblin -- federated, autonomous media hosting
+ * Copyright (C) 2011, 2012 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(){
+  $(".header_dropdown").hide();
+  $(".header_dropdown_up").hide();
+  $(".header_dropdown_down,.header_dropdown_up").click(function() {
+    $(".header_dropdown_down").toggle();
+    $(".header_dropdown_up").toggle();
+    $(".header_dropdown").slideToggle();
+  });
+});
diff --git a/mediagoblin/static/js/keyboard_navigation.js b/mediagoblin/static/js/keyboard_navigation.js
new file mode 100644
index 00000000..7401e4d8
--- /dev/null
+++ b/mediagoblin/static/js/keyboard_navigation.js
@@ -0,0 +1,41 @@
+/**
+ * GNU MediaGoblin -- federated, autonomous media hosting
+ * Copyright (C) 2011, 2012 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/>.
+ */
+
+/* It must be wrapped into a function and you also cannot use
+ * $(':not(textarea, input)') because of some reason. */
+
+$(document).ready(function(){
+  $('textarea, input').keydown(function(event){
+    event.stopPropagation();
+  });
+});
+
+$(document).keydown(function(event){
+  switch(event.which){
+    case 37:
+      if($('a.navigation_left').length) {
+        window.location = $('a.navigation_left').attr('href');
+      }
+      break;
+    case 39:
+      if($('a.navigation_right').length) {
+      window.location = $('a.navigation_right').attr('href');
+      }
+      break;
+  }
+});
diff --git a/mediagoblin/static/js/show_password.js b/mediagoblin/static/js/show_password.js
new file mode 100644
index 00000000..b3fbc862
--- /dev/null
+++ b/mediagoblin/static/js/show_password.js
@@ -0,0 +1,38 @@
+/**
+ * GNU MediaGoblin -- federated, autonomous media hosting
+ * Copyright (C) 2011, 2012 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(){
+  //Create a duplicate password field. We could change the input type dynamically, but this angers the IE gods (not just IE6).
+  $("#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();
+  $('#password_boolean').click(function(){
+    if($('#password_boolean').prop("checked")) {
+      $('#password_clear').val($('#password').val());
+      $('#password').hide();
+      $('#password_clear').show();
+    } else {
+      $('#password').val($('#password_clear').val());
+      $('#password_clear').hide();
+      $('#password').show();
+    };
+  });
+  $('#password,#password_clear').keyup(function(){
+    $('#password').val($(this).val());
+    $('#password_clear').val($(this).val());
+  });
+});