From 331ea452fa1186e096e3a905b2b729a599d07b42 Mon Sep 17 00:00:00 2001
From: Aslak Knutsen <aslak@redhat.com>
Date: Tue, 5 Mar 2013 02:09:16 +0100
Subject: Change Activity Graph from Protovis to d3 (#43)

Fixes failing javascipt in Opera and Chrome resulting
in no graph and no other javascript features.

Changed to precalculate all days in the begin_date...end_date
date range before matching email counts to ensure we have data
points for all days in the range.
---
 hyperkitty/templates/base.html              |  2 +-
 hyperkitty/templates/recent_activities.html | 24 +++++++++++++++---------
 2 files changed, 16 insertions(+), 10 deletions(-)

(limited to 'hyperkitty/templates')

diff --git a/hyperkitty/templates/base.html b/hyperkitty/templates/base.html
index c564468..1c5f544 100644
--- a/hyperkitty/templates/base.html
+++ b/hyperkitty/templates/base.html
@@ -73,7 +73,7 @@
 	<script src="//ajax.googleapis.com/ajax/libs/jquery/1.8.3/jquery.min.js"></script>
 	<script>window.jQuery || document.write('<script src="{{ STATIC_URL }}libs/jquery/jquery-1.8.3.min.js"><\/script>')</script>
 	<script src="{{ STATIC_URL }}libs/jquery/jquery-ui-1.10.0.custom.min.js"></script>
-	{% assets filters="rjsmin", output="gen/hyperkitty.js", "libs/bootstrap/bootstrap.min.js", "libs/jquery.expander.js", "libs/protovis-d3.1.js", "js/hyperkitty.js" %}
+	{% assets filters="rjsmin", output="gen/hyperkitty.js", "libs/bootstrap/bootstrap.min.js", "libs/jquery.expander.js", "libs/d3.v2.min.js", "js/hyperkitty.js" %}
 	<script src="{{ ASSET_URL }}"></script>
 	{% endassets %}
 	{% block additionaljs %} {% endblock %}
diff --git a/hyperkitty/templates/recent_activities.html b/hyperkitty/templates/recent_activities.html
index 172b992..233067c 100644
--- a/hyperkitty/templates/recent_activities.html
+++ b/hyperkitty/templates/recent_activities.html
@@ -19,15 +19,7 @@
 
 		<section id="graph">
 			<h2>Activities on the list over the last 30 days</h2>
-			<div id="fig">
-				<script type="text/javascript+protovis" >
-					activity_graph(
-							["{{days|join:'","'}}"],
-							{{evolution}},
-							"{{ archives_baseurl }}"
-						);
-				</script>
-			</div>
+			<div id="fig" />
 		</section>
 
 		<div class="row-fluid">
@@ -112,5 +104,19 @@
 
 {% endblock %}
 
+{% block additionaljs %}
+
+<script type="text/javascript" >
+	$(function() {
+		activity_graph(
+			"#fig",
+			["{{days|join:'","'}}"],
+			{{evolution}},
+			"{{ archives_baseurl }}"
+		)
+	});
+</script>
+
+{% endblock %}
 
 {# vim: set noet: #}
-- 
cgit