Merge branch 'mkjs' into archweb-generic

13 files changed, 266 insertions, 113 deletions

diff --git a/Makefile b/Makefile
index 9c3fafea..6b633158 100644
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,100 @@
-subdirs = sitestatic visualize/static
+# The idea here is to be able to re-generate the exact Javascript
+# files as they exist in git.  This means munging whitespace in weird
+# ways, using specific versions of various JS minimizers...
 
-define newline =
+# Where are we?
+topdir := $(dir $(lastword $(MAKEFILE_LIST)))
+www = $(topdir)/../web-cache/www
 
+# Where are the Javascript minimizers?
+# Any of the 1.3.x or 2.2.x will produce the same output for these
+uglifyjs-1.3 = ~/Downloads/UglifyJS/bin/uglifyjs --no-copyright --ascii --max-line-len 0
+uglifyjs-2.2 = ~/Downloads/UglifyJS2/bin/uglifyjs --mangle --compress --
+closure-compiler = java -jar ~/Downloads/compiler-20121212/compiler.jar
 
-endef
+# What versions of 3rd party libraries are we using?
+jquery-ver=1.8.3
+bootstrap-ver=2.1.1
+tablesorter-ver=2.7
+d3-ver=3.0.6
+konami-ver=c0f686e647765860ff4d2fcb7b48122785432b75
 
-default: all ;
+targets = \
+	sitestatic/bootstrap-typeahead.js \
+	sitestatic/homepage.js \
+	sitestatic/jquery-$(jquery-ver).min.js \
+	sitestatic/jquery.tablesorter-$(tablesorter-ver).js \
+	sitestatic/jquery.tablesorter-$(tablesorter-ver).min.js \
+	sitestatic/konami.min.js \
+	visualize/static/d3-$(d3-ver).js \
+	visualize/static/d3-$(d3-ver).min.js
 
-%:
-	$(foreach subdir,$(subdirs),$(MAKE) -C $(subdir) $@$(newline))
+
+# The base rules
+
+all: $(targets)
+.PHONY: all
+
+basenames = $(sort $(patsubst %.min,%,$(patsubst %.js,%,$(targets))))
+generated = $(addsuffix .js,$(basenames)) $(addsuffix .min.js,$(basenames))
+clean:
+	rm -f -- $(generated)
+.PHONY: clean
+
+# Don't have non-minimized .js stick around unless we asked for them.
+.INTERMEDIATE: $(filter-out $(targets),$(generated))
+
+# Turn on sane error handling
+.DELETE_ON_ERROR:
+
+
+# How to download files
+
+$(www)/http/%:
+	mkdir -p '$(@D)'
+	wget 'http://$*' -O '$@'
+	touch '$@'
+
+$(www)/https/%:
+	mkdir -p '$(@D)'
+	wget 'https://$*' -O '$@'
+	touch '$@'
+
+
+# Non-minimized .js files
+sitestatic/bootstrap-typeahead.js: sitestatic/%: $(www)/https/raw.github.com/twitter/bootstrap/v$(bootstrap-ver)/js/% Makefile.d/%.patch
+	cp $< $@
+	patch -i Makefile.d/$*.patch $@
+sitestatic/jquery-$(jquery-ver).js: sitestatic/%: $(www)/http/code.jquery.com/%
+	cp $< $@
+sitestatic/jquery.tablesorter-$(tablesorter-ver).js: $(www)/https/raw.github.com/Mottie/tablesorter/v$(tablesorter-ver)/js/jquery.tablesorter.js
+	cp $< $@
+sitestatic/konami.js: sitestatic/%: $(www)/https/raw.github.com/snaptortoise/konami-js/$(konami-ver)/% Makefile.d/%.patch
+	cp $< $@
+	patch -i Makefile.d/$*.patch $@
+sitestatic/homepage.js: sitestatic/bootstrap-typeahead.min.js sitestatic/konami.min.js Makefile.d/homepage.js.in
+	{ \
+		cat sitestatic/bootstrap-typeahead.min.js && \
+		echo && \
+		sed -e 's,^\s*,,' -e 's,^return.*,&;,' sitestatic/konami.min.js && \
+		echo && \
+		cat Makefile.d/homepage.js.in ; \
+	} > $@
+visualize/static/d3-$(d3-ver).js: %: $(www)/https/raw.github.com/mbostock/d3/v$(d3-ver)/d3.js
+	cp $< $@
+
+
+# The crazy minimization processes
+
+sitestatic/bootstrap-typeahead.min.js: %.min.js: %.js
+	$(uglifyjs-1.3) $< > $@
+sitestatic/jquery-$(jquery-ver).min.js: sitestatic/%.min.js: sitestatic/%.js Makefile.d/%.min.js.preamble
+	{ cat Makefile.d/$*.min.js.preamble && echo && $(uglifyjs-1.3) $<; } > $@
+sitestatic/jquery.tablesorter-$(tablesorter-ver).min.js: sitestatic/%.min.js: sitestatic/%.js Makefile.d/%.min.js.preamble
+	@# The tr/sed is to turn all of the newlines except for the last one into spaces
+	{ cat Makefile.d/$*.min.js.preamble && echo && $(closure-compiler) $< | tr '\n' ' ' | sed 's, $$,\n,'; } > $@
+sitestatic/konami.min.js: %.min.js: %.js
+	@# The sed is to insert newlines and whitespace at the correct places; presumably to match Dan copy/pasting into an editor.
+	$(uglifyjs-2.2) $< | sed -r -e 's:e\.iphone\.stop_x|s=this\.tap===:\n\t&:g' -e 's,return"string",\n&,' | sed -e 's,;$$,,' -e '$$s,$$,\n,' > $@
+visualize/static/d3-$(d3-ver).min.js: %.min.js: %.js
+	$(uglifyjs-2.2) $< > $@
diff --git a/Makefile.d/bootstrap-typeahead.js.patch b/Makefile.d/bootstrap-typeahead.js.patch
new file mode 100644
index 00000000..dfbab80b
--- /dev/null
+++ b/Makefile.d/bootstrap-typeahead.js.patch
@@ -0,0 +1,38 @@
+commit f3e23371fa0473c82c28932e85570d94e5fc232a
+Author: Dan McGee <dan@archlinux.org>
+Date:   Mon Sep 24 20:21:15 2012 -0500
+
+    Don't auto-select the first item in typeahead
+    
+    This assumption was baked into the Twitter bootstrap JS; kill it so it
+    is still easy to do a freeform search if wanted.
+    
+    Signed-off-by: Dan McGee <dan@archlinux.org>
+
+diff --git a/sitestatic/bootstrap-typeahead.js b/sitestatic/bootstrap-typeahead.js
+index c2ccdea..3d355ae 100644
+--- a/sitestatic/bootstrap-typeahead.js
++++ b/sitestatic/bootstrap-typeahead.js
+@@ -45,9 +45,11 @@
+ 
+   , select: function () {
+       var val = this.$menu.find('.active').attr('data-value')
+-      this.$element
+-        .val(this.updater(val))
+-        .change()
++      if (val) {
++        this.$element
++          .val(this.updater(val))
++          .change()
++      }
+       return this.hide()
+     }
+ 
+@@ -141,7 +143,6 @@
+         return i[0]
+       })
+ 
+-      items.first().addClass('active')
+       this.$menu.html(items)
+       return this
+     }
diff --git a/Makefile.d/homepage.js.in b/Makefile.d/homepage.js.in
new file mode 100644
index 00000000..2d6f7910
--- /dev/null
+++ b/Makefile.d/homepage.js.in
@@ -0,0 +1,36 @@
+function setupTypeahead() {
+    $('#pkgsearch-field').typeahead({
+        source: function(query, callback) {
+            $.getJSON('/opensearch/packages/suggest', {q: query}, function(data) {
+                callback(data[1]);
+            });
+        },
+        matcher: function(item) { return true; },
+        sorter: function(items) { return items; },
+        menu: '<ul class="pkgsearch-typeahead"></ul>',
+        items: 10,
+        updater: function(item) {
+            $('#pkgsearch-field').val(item);
+            $('#pkgsearch-form').submit();
+            return item;
+        }
+    }).attr('autocomplete', 'off');
+    $('#pkgsearch-field').keyup(function(e) {
+        if (e.keyCode === 13 &&
+                $('ul.pkgsearch-typeahead li.active').size() === 0) {
+            $('#pkgsearch-form').submit();
+        }
+    });
+}
+
+function setupKonami(image_src) {
+    var konami = new Konami(function() {
+        $('#konami').html('<img src="' + image_src + '" alt=""/>');
+        setTimeout(function() {
+            $('#konami').fadeIn(500);
+        }, 500);
+        $('#konami').click(function() {
+            $('#konami').fadeOut(500);
+        });
+    });
+}
diff --git a/Makefile.d/jquery-1.8.3.min.js.preamble b/Makefile.d/jquery-1.8.3.min.js.preamble
new file mode 100644
index 00000000..ca451d71
--- /dev/null
+++ b/Makefile.d/jquery-1.8.3.min.js.preamble
@@ -0,0 +1 @@
+/*! jQuery v1.8.3 jquery.com | jquery.org/license */
\ No newline at end of file
diff --git a/Makefile.d/jquery.tablesorter-2.7.min.js.preamble b/Makefile.d/jquery.tablesorter-2.7.min.js.preamble
new file mode 100644
index 00000000..e57e2d88
--- /dev/null
+++ b/Makefile.d/jquery.tablesorter-2.7.min.js.preamble
@@ -0,0 +1,4 @@
+/*!
+* TableSorter 2.7 min - Client-side table sorting with ease!
+* Copyright (c) 2007 Christian Bach
+*/
\ No newline at end of file
diff --git a/Makefile.d/konami.js.patch b/Makefile.d/konami.js.patch
new file mode 100644
index 00000000..f6df91c4
--- /dev/null
+++ b/Makefile.d/konami.js.patch
@@ -0,0 +1,46 @@
+--- ..//web-cache/www/https/raw.github.com/snaptortoise/konami-js/c0f686e647765860ff4d2fcb7b48122785432b75/konami.js	2015-04-14 17:46:09.372597458 -0400
++++ sitestatic/konami.js	2015-04-14 22:39:28.549281737 -0400
+@@ -56,7 +56,7 @@
+ 	                load: function(link){
+ 									this.orig_keys = this.keys;
+ 	    							konami.addEvent(document,"touchmove",function(e){
+-	                          if(e.touches.length == 1 && konami.iphone.capture==true){ 
++	                          if(e.touches.length == 1 && konami.iphone.capture===true){ 
+ 	                            var touch = e.touches[0]; 
+ 	                                konami.iphone.stop_x = touch.pageX;
+ 	                                konami.iphone.stop_y = touch.pageY;
+@@ -66,7 +66,7 @@
+ 	                                }
+ 	                                });               
+ 	                        konami.addEvent(document,"touchend",function(evt){
+-	                                if (konami.iphone.tap==true) konami.iphone.check_direction(link);           
++	                                if (konami.iphone.tap===true) konami.iphone.check_direction(link);           
+ 	                                },false);
+ 	                        konami.addEvent(document,"touchstart", function(evt){
+ 	                                konami.iphone.start_x = evt.changedTouches[0].pageX
+@@ -76,12 +76,12 @@
+ 	                                });               
+ 	                                },
+ 	                check_direction: function(link){
+-	                        x_magnitude = Math.abs(this.start_x-this.stop_x)
+-	                        y_magnitude = Math.abs(this.start_y-this.stop_y)
+-	                        x = ((this.start_x-this.stop_x) < 0) ? "RIGHT" : "LEFT";
+-	                        y = ((this.start_y-this.stop_y) < 0) ? "DOWN" : "UP";
+-	                        result = (x_magnitude > y_magnitude) ? x : y;
+-	                        result = (this.tap==true) ? "TAP" : result;                     
++	                        var x_magnitude = Math.abs(this.start_x-this.stop_x)
++	                        var y_magnitude = Math.abs(this.start_y-this.stop_y)
++	                        var x = ((this.start_x-this.stop_x) < 0) ? "RIGHT" : "LEFT";
++	                        var y = ((this.start_y-this.stop_y) < 0) ? "DOWN" : "UP";
++	                        var result = (x_magnitude > y_magnitude) ? x : y;
++	                        result = (this.tap===true) ? "TAP" : result;                     
+ 
+ 	                        if (result==this.keys[0]) this.keys = this.keys.slice(1,this.keys.length)
+ 	                        if (this.keys.length==0) { 
+@@ -99,4 +99,4 @@
+ 	}
+ 
+ 	return konami;
+-}
+\ No newline at end of file
++}
diff --git a/common.mk b/common.mk
deleted file mode 100644
index a0db5d70..00000000
--- a/common.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-topdir := $(dir $(lastword $(MAKEFILE_LIST)))
-www = $(topdir)/../web-cache/www
-
-#JSMIN = cp $1 $2
-#JSMIN = compiler $1
-#JSMIN = uglify-js -nc $1 > $2
-JSMIN = { sed -n '1,/\*\//p' $1; closure-compiler --js $1; } > $2
-
-%.min.js: %.js
-	$(call JSMIN,$<,$@)
-
-$(www)/http/%:
-	mkdir -p '$(@D)'
-	wget 'http://$*' -O '$@'
-	touch '$@'
-
-$(www)/https/%:
-	mkdir -p '$(@D)'
-	wget 'http://$*' -O '$@'
-	touch '$@'
-
-.PHONY: PHONY
diff --git a/mirrors/utils.py b/mirrors/utils.py
index 51daf50e..930adb8d 100644
--- a/mirrors/utils.py
+++ b/mirrors/utils.py
@@ -141,6 +141,7 @@ def get_mirror_statuses(cutoff=DEFAULT_CUTOFF, mirror_id=None, show_all=False):
         else:
             check_frequency = None
     else:
+        urls = []
         last_check = None
         num_checks = 0
         check_frequency = None
diff --git a/mirrors/views.py b/mirrors/views.py
index c2736da8..cffafbf5 100644
--- a/mirrors/views.py
+++ b/mirrors/views.py
@@ -193,6 +193,8 @@ def mirror_details(request, name):
 def mirror_details_json(request, name):
     authorized = request.user.is_authenticated()
     mirror = get_object_or_404(Mirror, name=name)
+    if not authorized and (not mirror.public or not mirror.active):
+        raise Http404
     status_info = get_mirror_statuses(mirror_id=mirror.id,
             show_all=authorized)
     data = status_info.copy()
diff --git a/sitestatic/Makefile b/sitestatic/Makefile
deleted file mode 100644
index e99e3c96..00000000
--- a/sitestatic/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-include ../common.mk
-
-jquery-ver=1.8.3
-bootstrap-ver=2.1.1
-tablesorter-ver=2.7
-targets = \
-	bootstrap-typeahead \
-	jquery-$(jquery-ver) \
-	jquery.tablesorter-$(tablesorter-ver) \
-	konami
-
-target-files=$(addsuffix .js,$(targets)) $(addsuffix .min.js,$(targets))
-all: $(target-files)
-clean:
-	rm -f -- $(target-files)
-
-bootstrap-typeahead.js: %: $(www)/https/raw.github.com/twitter/bootstrap/v$(bootstrap-ver)/js/%
-	cp $< $@
-jquery-$(jquery-ver).js: %: $(www)/http/code.jquery.com/%
-	cp $< $@
-jquery.tablesorter-$(tablesorter-ver).js: $(www)/https/raw.github.com/Mottie/tablesorter/v$(tablesorter-ver)/js/jquery.tablesorter.js
-	cp $< $@
-konami.js: %: $(www)/https/raw.github.com/snaptortoise/konami-js/master/%
-	cp $< $@
diff --git a/sitestatic/bootstrap-typeahead.min.js b/sitestatic/homepage.js
index 7d555ed9..48dab93f 100644
--- a/sitestatic/bootstrap-typeahead.min.js
+++ b/sitestatic/homepage.js
@@ -1 +1,42 @@
-!function(e){"use strict";var t=function(t,n){this.$element=e(t),this.options=e.extend({},e.fn.typeahead.defaults,n),this.matcher=this.options.matcher||this.matcher,this.sorter=this.options.sorter||this.sorter,this.highlighter=this.options.highlighter||this.highlighter,this.updater=this.options.updater||this.updater,this.$menu=e(this.options.menu).appendTo("body"),this.source=this.options.source,this.shown=!1,this.listen()};t.prototype={constructor:t,select:function(){var e=this.$menu.find(".active").attr("data-value");return e&&this.$element.val(this.updater(e)).change(),this.hide()},updater:function(e){return e},show:function(){var t=e.extend({},this.$element.offset(),{height:this.$element[0].offsetHeight});return this.$menu.css({top:t.top+t.height,left:t.left}),this.$menu.show(),this.shown=!0,this},hide:function(){return this.$menu.hide(),this.shown=!1,this},lookup:function(t){var n;return this.query=this.$element.val(),!this.query||this.query.length<this.options.minLength?this.shown?this.hide():this:(n=e.isFunction(this.source)?this.source(this.query,e.proxy(this.process,this)):this.source,n?this.process(n):this)},process:function(t){var n=this;return t=e.grep(t,function(e){return n.matcher(e)}),t=this.sorter(t),t.length?this.render(t.slice(0,this.options.items)).show():this.shown?this.hide():this},matcher:function(e){return~e.toLowerCase().indexOf(this.query.toLowerCase())},sorter:function(e){var t=[],n=[],r=[],i;while(i=e.shift())i.toLowerCase().indexOf(this.query.toLowerCase())?~i.indexOf(this.query)?n.push(i):r.push(i):t.push(i);return t.concat(n,r)},highlighter:function(e){var t=this.query.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g,"\\$&");return e.replace(new RegExp("("+t+")","ig"),function(e,t){return"<strong>"+t+"</strong>"})},render:function(t){var n=this;return t=e(t).map(function(t,r){return t=e(n.options.item).attr("data-value",r),t.find("a").html(n.highlighter(r)),t[0]}),this.$menu.html(t),this},next:function(t){var n=this.$menu.find(".active").removeClass("active"),r=n.next();r.length||(r=e(this.$menu.find("li")[0])),r.addClass("active")},prev:function(e){var t=this.$menu.find(".active").removeClass("active"),n=t.prev();n.length||(n=this.$menu.find("li").last()),n.addClass("active")},listen:function(){this.$element.on("blur",e.proxy(this.blur,this)).on("keypress",e.proxy(this.keypress,this)).on("keyup",e.proxy(this.keyup,this)),(e.browser.chrome||e.browser.webkit||e.browser.msie)&&this.$element.on("keydown",e.proxy(this.keydown,this)),this.$menu.on("click",e.proxy(this.click,this)).on("mouseenter","li",e.proxy(this.mouseenter,this))},move:function(e){if(!this.shown)return;switch(e.keyCode){case 9:case 13:case 27:e.preventDefault();break;case 38:e.preventDefault(),this.prev();break;case 40:e.preventDefault(),this.next()}e.stopPropagation()},keydown:function(t){this.suppressKeyPressRepeat=!~e.inArray(t.keyCode,[40,38,9,13,27]),this.move(t)},keypress:function(e){if(this.suppressKeyPressRepeat)return;this.move(e)},keyup:function(e){switch(e.keyCode){case 40:case 38:break;case 9:case 13:if(!this.shown)return;this.select();break;case 27:if(!this.shown)return;this.hide();break;default:this.lookup()}e.stopPropagation(),e.preventDefault()},blur:function(e){var t=this;setTimeout(function(){t.hide()},150)},click:function(e){e.stopPropagation(),e.preventDefault(),this.select()},mouseenter:function(t){this.$menu.find(".active").removeClass("active"),e(t.currentTarget).addClass("active")}},e.fn.typeahead=function(n){return this.each(function(){var r=e(this),i=r.data("typeahead"),s=typeof n=="object"&&n;i||r.data("typeahead",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.typeahead.defaults={source:[],items:8,menu:'<ul class="typeahead dropdown-menu"></ul>',item:'<li><a href="#"></a></li>',minLength:1},e.fn.typeahead.Constructor=t,e(function(){e("body").on("focus.typeahead.data-api",'[data-provide="typeahead"]',function(t){var n=e(this);if(n.data("typeahead"))return;t.preventDefault(),n.typeahead(n.data())})})}(window.jQuery)
\ No newline at end of file
+!function(e){"use strict";var t=function(t,n){this.$element=e(t),this.options=e.extend({},e.fn.typeahead.defaults,n),this.matcher=this.options.matcher||this.matcher,this.sorter=this.options.sorter||this.sorter,this.highlighter=this.options.highlighter||this.highlighter,this.updater=this.options.updater||this.updater,this.$menu=e(this.options.menu).appendTo("body"),this.source=this.options.source,this.shown=!1,this.listen()};t.prototype={constructor:t,select:function(){var e=this.$menu.find(".active").attr("data-value");return e&&this.$element.val(this.updater(e)).change(),this.hide()},updater:function(e){return e},show:function(){var t=e.extend({},this.$element.offset(),{height:this.$element[0].offsetHeight});return this.$menu.css({top:t.top+t.height,left:t.left}),this.$menu.show(),this.shown=!0,this},hide:function(){return this.$menu.hide(),this.shown=!1,this},lookup:function(t){var n;return this.query=this.$element.val(),!this.query||this.query.length<this.options.minLength?this.shown?this.hide():this:(n=e.isFunction(this.source)?this.source(this.query,e.proxy(this.process,this)):this.source,n?this.process(n):this)},process:function(t){var n=this;return t=e.grep(t,function(e){return n.matcher(e)}),t=this.sorter(t),t.length?this.render(t.slice(0,this.options.items)).show():this.shown?this.hide():this},matcher:function(e){return~e.toLowerCase().indexOf(this.query.toLowerCase())},sorter:function(e){var t=[],n=[],r=[],i;while(i=e.shift())i.toLowerCase().indexOf(this.query.toLowerCase())?~i.indexOf(this.query)?n.push(i):r.push(i):t.push(i);return t.concat(n,r)},highlighter:function(e){var t=this.query.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g,"\\$&");return e.replace(new RegExp("("+t+")","ig"),function(e,t){return"<strong>"+t+"</strong>"})},render:function(t){var n=this;return t=e(t).map(function(t,r){return t=e(n.options.item).attr("data-value",r),t.find("a").html(n.highlighter(r)),t[0]}),this.$menu.html(t),this},next:function(t){var n=this.$menu.find(".active").removeClass("active"),r=n.next();r.length||(r=e(this.$menu.find("li")[0])),r.addClass("active")},prev:function(e){var t=this.$menu.find(".active").removeClass("active"),n=t.prev();n.length||(n=this.$menu.find("li").last()),n.addClass("active")},listen:function(){this.$element.on("blur",e.proxy(this.blur,this)).on("keypress",e.proxy(this.keypress,this)).on("keyup",e.proxy(this.keyup,this)),(e.browser.chrome||e.browser.webkit||e.browser.msie)&&this.$element.on("keydown",e.proxy(this.keydown,this)),this.$menu.on("click",e.proxy(this.click,this)).on("mouseenter","li",e.proxy(this.mouseenter,this))},move:function(e){if(!this.shown)return;switch(e.keyCode){case 9:case 13:case 27:e.preventDefault();break;case 38:e.preventDefault(),this.prev();break;case 40:e.preventDefault(),this.next()}e.stopPropagation()},keydown:function(t){this.suppressKeyPressRepeat=!~e.inArray(t.keyCode,[40,38,9,13,27]),this.move(t)},keypress:function(e){if(this.suppressKeyPressRepeat)return;this.move(e)},keyup:function(e){switch(e.keyCode){case 40:case 38:break;case 9:case 13:if(!this.shown)return;this.select();break;case 27:if(!this.shown)return;this.hide();break;default:this.lookup()}e.stopPropagation(),e.preventDefault()},blur:function(e){var t=this;setTimeout(function(){t.hide()},150)},click:function(e){e.stopPropagation(),e.preventDefault(),this.select()},mouseenter:function(t){this.$menu.find(".active").removeClass("active"),e(t.currentTarget).addClass("active")}},e.fn.typeahead=function(n){return this.each(function(){var r=e(this),i=r.data("typeahead"),s=typeof n=="object"&&n;i||r.data("typeahead",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.typeahead.defaults={source:[],items:8,menu:'<ul class="typeahead dropdown-menu"></ul>',item:'<li><a href="#"></a></li>',minLength:1},e.fn.typeahead.Constructor=t,e(function(){e("body").on("focus.typeahead.data-api",'[data-provide="typeahead"]',function(t){var n=e(this);if(n.data("typeahead"))return;t.preventDefault(),n.typeahead(n.data())})})}(window.jQuery);
+var Konami=function(t){var e={addEvent:function(t,e,n,i){t.addEventListener?t.addEventListener(e,n,!1):t.attachEvent&&(t["e"+e+n]=n,t[e+n]=function(){t["e"+e+n](window.event,i)},t.attachEvent("on"+e,t[e+n]))},input:"",pattern:"3838404037393739666513",load:function(t){this.addEvent(document,"keydown",function(n,i){return i&&(e=i),e.input+=n?n.keyCode:event.keyCode,e.input.length>e.pattern.length&&(e.input=e.input.substr(e.input.length-e.pattern.length)),e.input==e.pattern?(e.code(t),e.input="",void 0):void 0},this),this.iphone.load(t)},code:function(t){window.location=t},iphone:{start_x:0,start_y:0,stop_x:0,stop_y:0,tap:!1,capture:!1,orig_keys:"",keys:["UP","UP","DOWN","DOWN","LEFT","RIGHT","LEFT","RIGHT","TAP","TAP","TAP"],code:function(t){e.code(t)},load:function(t){this.orig_keys=this.keys,e.addEvent(document,"touchmove",function(t){if(1==t.touches.length&&e.iphone.capture===!0){var n=t.touches[0]
+e.iphone.stop_x=n.pageX,e.iphone.stop_y=n.pageY,e.iphone.tap=!1,e.iphone.capture=!1,e.iphone.check_direction()}}),e.addEvent(document,"touchend",function(){e.iphone.tap===!0&&e.iphone.check_direction(t)},!1),e.addEvent(document,"touchstart",function(t){e.iphone.start_x=t.changedTouches[0].pageX,e.iphone.start_y=t.changedTouches[0].pageY,e.iphone.tap=!0,e.iphone.capture=!0})},check_direction:function(t){var e=Math.abs(this.start_x-this.stop_x),n=Math.abs(this.start_y-this.stop_y),i=0>this.start_x-this.stop_x?"RIGHT":"LEFT",o=0>this.start_y-this.stop_y?"DOWN":"UP",s=e>n?i:o
+s=this.tap===!0?"TAP":s,s==this.keys[0]&&(this.keys=this.keys.slice(1,this.keys.length)),0==this.keys.length&&(this.keys=this.orig_keys,this.code(t))}}}
+return"string"==typeof t&&e.load(t),"function"==typeof t&&(e.code=t,e.load()),e};
+
+function setupTypeahead() {
+    $('#pkgsearch-field').typeahead({
+        source: function(query, callback) {
+            $.getJSON('/opensearch/packages/suggest', {q: query}, function(data) {
+                callback(data[1]);
+            });
+        },
+        matcher: function(item) { return true; },
+        sorter: function(items) { return items; },
+        menu: '<ul class="pkgsearch-typeahead"></ul>',
+        items: 10,
+        updater: function(item) {
+            $('#pkgsearch-field').val(item);
+            $('#pkgsearch-form').submit();
+            return item;
+        }
+    }).attr('autocomplete', 'off');
+    $('#pkgsearch-field').keyup(function(e) {
+        if (e.keyCode === 13 &&
+                $('ul.pkgsearch-typeahead li.active').size() === 0) {
+            $('#pkgsearch-form').submit();
+        }
+    });
+}
+
+function setupKonami(image_src) {
+    var konami = new Konami(function() {
+        $('#konami').html('<img src="' + image_src + '" alt=""/>');
+        setTimeout(function() {
+            $('#konami').fadeIn(500);
+        }, 500);
+        $('#konami').click(function() {
+            $('#konami').fadeOut(500);
+        });
+    });
+}
diff --git a/templates/public/index.html b/templates/public/index.html
index a6bd1fb1..a6ff7e9f 100644
--- a/templates/public/index.html
+++ b/templates/public/index.html
@@ -216,44 +216,8 @@
 
 {% load cdn %}{% jquery %}
 <script type="text/javascript">
-function setupTypeahead() {
-    $('#pkgsearch-field').typeahead({
-        source: function(query, callback) {
-            $.getJSON('/opensearch/packages/suggest', {q: query}, function(data) {
-                callback(data[1]);
-            });
-        },
-        matcher: function(item) { return true; },
-        sorter: function(items) { return items; },
-        menu: '<ul class="pkgsearch-typeahead"></ul>',
-        items: 10,
-        updater: function(item) {
-            $('#pkgsearch-field').val(item);
-            $('#pkgsearch-form').submit();
-            return item;
-        }
-    }).attr('autocomplete', 'off');
-    $('#pkgsearch-field').keyup(function(e) {
-        if (e.keyCode === 13 &&
-                $('ul.pkgsearch-typeahead li.active').size() === 0) {
-            $('#pkgsearch-form').submit();
-        }
-    });
-}
-function setupKonami() {
-    var konami = new Konami(function() {
-        $('#konami').html('<img src="{% static "vector_tux.png" %}" alt=""/>');
-        setTimeout(function() {
-            $('#konami').fadeIn(500);
-        }, 500);
-        $('#konami').click(function() {
-            $('#konami').fadeOut(500);
-        });
-    });
-}
 $(document).ready(function() {
-    $.ajax({ url: "{% static "bootstrap-typeahead.min.js" %}", cache: true, dataType: "script", success: setupTypeahead });
-    $.ajax({ url: "{% static "konami.min.js" %}", cache: true, dataType: "script", success: setupKonami });
+    $.ajax({ url: "{% static "homepage.js" %}", cache: true, dataType: "script", success: function() { setupTypeahead(); setupKonami("{% static "vector_tux.png" %}"); } });
 });
 </script>
 {% endblock %}
diff --git a/visualize/static/Makefile b/visualize/static/Makefile
deleted file mode 100644
index 9a7f9828..00000000
--- a/visualize/static/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-include ../../common.mk
-
-d3-ver=3.0.6
-targets = d3-$(d3-ver)
-
-target-files=$(addsuffix .js,$(targets)) $(addsuffix .min.js,$(targets))
-all: $(target-files)
-clean:
-	rm -f -- $(target-files)
-
-d3-$(d3-ver).js: %: \
-	$(www)/https/raw.github.com/mbostock/d3/v$(d3-ver)/d3.js \
-	$(www)/https/raw.github.com/mbostock/d3/v$(d3-ver)/LICENSE
-	{ \
-	  echo '/*! $@ - Data Driven Documents' && \
-	  echo ' * Version: $(d3-ver)' && \
-	  echo ' * Homepage: http://mbostock.github.com/d3/' && \
-	  echo ' * Copyright: 2012, Michael Bostock' && \
-	  echo ' * Licence: 3-Clause BSD' && \
-	  echo ' *' && \
-	  sed 's/.*/ * &/' $(<D)/LICENSE && \
-	  echo ' */' && \
-	  cat $< ;} > $@