[or-cvs] [metrics-web/master] Add new country graphs and graph of all users.
karsten at torproject.org
karsten at torproject.org
Mon Aug 16 14:34:54 UTC 2010
Author: Karsten Loesing <karsten.loesing at gmx.net>
Date: Mon, 16 Aug 2010 16:34:16 +0200
Subject: Add new country graphs and graph of all users.
Commit: aba3bc88c677a8a1783e1d2bff6984e2f82a1355
---
war/WEB-INF/templates/graphs_bridge-users.tpl.jsp | 24 ++++++++++++++++---
war/WEB-INF/templates/graphs_new-users.tpl.jsp | 24 ++++++++++++++++---
.../templates/graphs_recurring-users.tpl.jsp | 24 ++++++++++++++++---
3 files changed, 60 insertions(+), 12 deletions(-)
diff --git a/war/WEB-INF/templates/graphs_bridge-users.tpl.jsp b/war/WEB-INF/templates/graphs_bridge-users.tpl.jsp
index 7511230..526160c 100644
--- a/war/WEB-INF/templates/graphs_bridge-users.tpl.jsp
+++ b/war/WEB-INF/templates/graphs_bridge-users.tpl.jsp
@@ -9,16 +9,30 @@
graphs display an estimate of Tor users via bridges based on the
unique IP addresses as seen by a few hundred bridges.</p>
<ul>
+ <li><a href="#total">All users</a></li>
+ <li><a href="#australia">Australia</a></li>
<li><a href="#bahrain">Bahrain</a></li>
+ <li><a href="#brazil">Brazil</a></li>
+ <li><a href="#burma">Burma</a></li>
+ <li><a href="#canada">Canada</a></li>
<li><a href="#china">China</a></li>
<li><a href="#cuba">Cuba</a></li>
<li><a href="#ethiopia">Ethiopia</a></li>
+ <li><a href="#france">France</a></li>
+ <li><a href="#germany">Germany</a></li>
<li><a href="#iran">Iran</a></li>
- <li><a href="#burma">Burma</a></li>
+ <li><a href="#italy">Italy</a></li>
+ <li><a href="#japan">Japan</a></li>
+ <li><a href="#poland">Poland</a></li>
+ <li><a href="#russia">Russia</a></li>
<li><a href="#saudi">Saudi</a></li>
+ <li><a href="#southkorea">South Korea</a></li>
+ <li><a href="#sweden">Sweden</a></li>
<li><a href="#syria">Syria</a></li>
<li><a href="#tunisia">Tunisia</a></li>
<li><a href="#turkmenistan">Turkmenistan</a></li>
+ <li><a href="#uk">U.K.</a></li>
+ <li><a href="#usa">U.S.A.</a></li>
<li><a href="#uzbekistan">Uzbekistan</a></li>
<li><a href="#vietnam">Vietnam</a></li>
<li><a href="#yemen">Yemen</a></li>
@@ -34,9 +48,11 @@
month by country.</li>
</ul>
<%
- List<String> countries = Arrays.asList((
- "bahrain,china,cuba,ethiopia,iran,burma,saudi,syria,tunisia,"
- + "turkmenistan,uzbekistan,vietnam,yemen").split(","));
+ List<String> countries = Arrays.asList(("total,australia,bahrain,"
+ + "brazil,burma,canada,china,cuba,ethiopia,france,germany,iran,"
+ + "italy,japan,poland,russia,saudi,southkorea,sweden,syria,"
+ + "tunisia,turkmenistan,uk,usa,uzbekistan,vietnam,yemen").
+ split(","));
List<String> suffixes = new ArrayList<String>(Arrays.asList(
"30d,90d,180d,all".split(",")));
Calendar now = Calendar.getInstance(TimeZone.getTimeZone("UTC"));
diff --git a/war/WEB-INF/templates/graphs_new-users.tpl.jsp b/war/WEB-INF/templates/graphs_new-users.tpl.jsp
index 4861d1c..e5c5f95 100644
--- a/war/WEB-INF/templates/graphs_new-users.tpl.jsp
+++ b/war/WEB-INF/templates/graphs_new-users.tpl.jsp
@@ -11,16 +11,30 @@
estimate of new or returning Tor users based on the requests as
seen by gabelmoo, one of the directory authorities.</p>
<ul>
+ <li><a href="#total">All users</a></li>
+ <li><a href="#australia">Australia</a></li>
<li><a href="#bahrain">Bahrain</a></li>
+ <li><a href="#brazil">Brazil</a></li>
+ <li><a href="#burma">Burma</a></li>
+ <li><a href="#canada">Canada</a></li>
<li><a href="#china">China</a></li>
<li><a href="#cuba">Cuba</a></li>
<li><a href="#ethiopia">Ethiopia</a></li>
+ <li><a href="#france">France</a></li>
+ <li><a href="#germany">Germany</a></li>
<li><a href="#iran">Iran</a></li>
- <li><a href="#burma">Burma</a></li>
+ <li><a href="#italy">Italy</a></li>
+ <li><a href="#japan">Japan</a></li>
+ <li><a href="#poland">Poland</a></li>
+ <li><a href="#russia">Russia</a></li>
<li><a href="#saudi">Saudi</a></li>
+ <li><a href="#southkorea">South Korea</a></li>
+ <li><a href="#sweden">Sweden</a></li>
<li><a href="#syria">Syria</a></li>
<li><a href="#tunisia">Tunisia</a></li>
<li><a href="#turkmenistan">Turkmenistan</a></li>
+ <li><a href="#uk">U.K.</a></li>
+ <li><a href="#usa">U.S.A.</a></li>
<li><a href="#uzbekistan">Uzbekistan</a></li>
<li><a href="#vietnam">Vietnam</a></li>
<li><a href="#yemen">Yemen</a></li>
@@ -30,9 +44,11 @@
data.</li>
</ul>
<%
- List<String> countries = Arrays.asList((
- "bahrain,china,cuba,ethiopia,iran,burma,saudi,syria,tunisia,"
- + "turkmenistan,uzbekistan,vietnam,yemen").split(","));
+ List<String> countries = Arrays.asList(("total,australia,bahrain,"
+ + "brazil,burma,canada,china,cuba,ethiopia,france,germany,iran,"
+ + "italy,japan,poland,russia,saudi,southkorea,sweden,syria,"
+ + "tunisia,turkmenistan,uk,usa,uzbekistan,vietnam,yemen").
+ split(","));
List<String> suffixes = new ArrayList<String>(Arrays.asList(
"30d,90d,180d,all".split(",")));
Calendar now = Calendar.getInstance(TimeZone.getTimeZone("UTC"));
diff --git a/war/WEB-INF/templates/graphs_recurring-users.tpl.jsp b/war/WEB-INF/templates/graphs_recurring-users.tpl.jsp
index d0e1b46..0235f02 100644
--- a/war/WEB-INF/templates/graphs_recurring-users.tpl.jsp
+++ b/war/WEB-INF/templates/graphs_recurring-users.tpl.jsp
@@ -10,16 +10,30 @@
an estimate of recurring Tor users based on the requests as seen
by trusted, a particularly fast directory mirror.</p>
<ul>
+ <li><a href="#total">All users</a></li>
+ <li><a href="#australia">Australia</a></li>
<li><a href="#bahrain">Bahrain</a></li>
+ <li><a href="#brazil">Brazil</a></li>
+ <li><a href="#burma">Burma</a></li>
+ <li><a href="#canada">Canada</a></li>
<li><a href="#china">China</a></li>
<li><a href="#cuba">Cuba</a></li>
<li><a href="#ethiopia">Ethiopia</a></li>
+ <li><a href="#france">France</a></li>
+ <li><a href="#germany">Germany</a></li>
<li><a href="#iran">Iran</a></li>
- <li><a href="#burma">Burma</a></li>
+ <li><a href="#italy">Italy</a></li>
+ <li><a href="#japan">Japan</a></li>
+ <li><a href="#poland">Poland</a></li>
+ <li><a href="#russia">Russia</a></li>
<li><a href="#saudi">Saudi</a></li>
+ <li><a href="#southkorea">South Korea</a></li>
+ <li><a href="#sweden">Sweden</a></li>
<li><a href="#syria">Syria</a></li>
<li><a href="#tunisia">Tunisia</a></li>
<li><a href="#turkmenistan">Turkmenistan</a></li>
+ <li><a href="#uk">U.K.</a></li>
+ <li><a href="#usa">U.S.A.</a></li>
<li><a href="#uzbekistan">Uzbekistan</a></li>
<li><a href="#vietnam">Vietnam</a></li>
<li><a href="#yemen">Yemen</a></li>
@@ -35,9 +49,11 @@
month by country.</li>
</ul>
<%
- List<String> countries = Arrays.asList((
- "bahrain,china,cuba,ethiopia,iran,burma,saudi,syria,tunisia,"
- + "turkmenistan,uzbekistan,vietnam,yemen").split(","));
+ List<String> countries = Arrays.asList(("total,australia,bahrain,"
+ + "brazil,burma,canada,china,cuba,ethiopia,france,germany,iran,"
+ + "italy,japan,poland,russia,saudi,southkorea,sweden,syria,"
+ + "tunisia,turkmenistan,uk,usa,uzbekistan,vietnam,yemen").
+ split(","));
List<String> suffixes = new ArrayList<String>(Arrays.asList(
"30d,90d,180d,all".split(",")));
Calendar now = Calendar.getInstance(TimeZone.getTimeZone("UTC"));
--
1.7.1
More information about the tor-commits
mailing list