[tor-commits] [metrics-web/master] Update contents on Metrics page and subpages.

[karsten at torproject.org]

commit ae8400d88fc2f9670cb216618c5232fe987db398
Author: Karsten Loesing <karsten.loesing at gmx.net>
Date:   Wed Dec 14 19:46:02 2016 +0100

    Update contents on Metrics page and subpages.
---
 website/etc/categories.json                          | 20 +++++++++++++-------
 website/src/org/torproject/metrics/web/Category.java | 14 ++++++++++----
 .../src/org/torproject/metrics/web/IndexServlet.java |  2 +-
 website/web/WEB-INF/index.jsp                        |  5 +++--
 4 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/website/etc/categories.json b/website/etc/categories.json
index fe01905..103ac9d 100644
--- a/website/etc/categories.json
+++ b/website/etc/categories.json
@@ -2,7 +2,8 @@
   {
     "id": "clients",
     "header": "Users",
-    "description": "Where are Tor users from? How do they connect to Tor?",
+    "summary": "Where are Tor users from and how they connect to Tor.",
+    "description": "We estimate the number of users by analyzing the requests induced by Tor clients. These papers detail on how we count users and how we count bridge users.",
     "metrics": [
       "userstats-relay-country",
       "userstats-bridge-country",
@@ -17,7 +18,8 @@
   {
     "id": "servers",
     "header": "Relays and Bridges",
-    "description": "How many relays and bridges are online? What do we know about them?",
+    "summary": "How many relays and bridges are online and what we know about them.",
+    "description": "Country and ISP diversity are approximated by resolving IP addresses to a country code an an autonomous system. We process the capabilities and properties relays and bridges reported to directory authorities.",
     "metrics": [
       "networksize",
       "relayflags",
@@ -28,7 +30,8 @@
   {
     "id": "traffic",
     "header": "Traffic",
-    "description": "How much traffic can the Tor network handle? How much traffic is there?",
+    "summary": "How much traffic can the Tor network can handle and how much traffic there is.",
+"description": "We measure total available bandwidth and current capacity by aggregating what relays and bridges report to directory authorities.",
     "metrics": [
       "bandwidth",
       "bandwidth-flags",
@@ -41,7 +44,8 @@
   {
     "id": "performance",
     "header": "Performance",
-    "description": "How fast and reliable is the Tor network?",
+    "summary": "How fast and reliable the Tor network is.",
+description": "We use <a href=\"https://gitweb.torproject.org/torperf.git\">Torperf</a> to run performance measurements. It works by fetching files of different sizes over Tor and measuring how long that takes.",
     "metrics": [
       "torperf",
       "torperf-failures",
@@ -51,7 +55,8 @@
   {
     "id": "onion-services",
     "header": "Onion Services",
-    "description": "How many onion services are there? How much traffic do they pull?",
+    "summary": "How many onion services are there and how much traffic they pull.",
+    "description": "Onion services are services that are only accessible via the Tor network.",
     "metrics": [
       "hidserv-dir-onions-seen",
       "hidserv-rend-relayed-cells",
@@ -60,8 +65,9 @@
   },
   {
     "id": "downloads",
-    "header": "Downloads (coming soon)",
-    "description": "How many downloads of Tor applications are there? How many updates?",
+    "header": "Downloads",
+    "summary": "How many downloaded Tor application with respect to version updates.",
+    "description": "We measure how many people downloaded which versions of Tor by using a web stats.",
     "metrics": []
   }
 ]
diff --git a/website/src/org/torproject/metrics/web/Category.java b/website/src/org/torproject/metrics/web/Category.java
index 7f71b22..172929f 100644
--- a/website/src/org/torproject/metrics/web/Category.java
+++ b/website/src/org/torproject/metrics/web/Category.java
@@ -11,24 +11,30 @@ public class Category {
 
   private String header;
 
+  private String summary;
+
   private String description;
 
   private List<String> metrics;
 
   public String getId() {
-    return id;
+    return this.id;
   }
 
   public String getHeader() {
-    return header;
+    return this.header;
+  }
+
+  public String getSummary() {
+    return this.summary;
   }
 
   public String getDescription() {
-    return description;
+    return this.description;
   }
 
   public List<String> getMetrics() {
-    return metrics;
+    return this.metrics;
   }
 }
 
diff --git a/website/src/org/torproject/metrics/web/IndexServlet.java b/website/src/org/torproject/metrics/web/IndexServlet.java
index be4134b..b287102 100644
--- a/website/src/org/torproject/metrics/web/IndexServlet.java
+++ b/website/src/org/torproject/metrics/web/IndexServlet.java
@@ -25,7 +25,7 @@ public class IndexServlet extends HttpServlet {
         ContentProvider.getInstance().getCategoriesList()) {
       categories.add(new String[] {
           category.getMetrics().isEmpty() ? "" : category.getMetrics().get(0),
-          category.getHeader(), category.getDescription() });
+          category.getHeader(), category.getSummary() });
     }
     this.categories = categories;
   }
diff --git a/website/web/WEB-INF/index.jsp b/website/web/WEB-INF/index.jsp
index 2101f5f..3e0d03a 100644
--- a/website/web/WEB-INF/index.jsp
+++ b/website/web/WEB-INF/index.jsp
@@ -31,12 +31,13 @@ of data, rather than just dogma or perspective."
         <br>
         <!-- Navigation end -->
 
-        <p>Welcome! What would you like to know about the Tor network?</p>
+        <h1>Welcome!</h1>
+        <p>What would you like to know about the Tor network?</p>
 
 <div>
 
 <c:forEach var="category" items="${categories}">
-<c:if test="${fn:length(category[0]) > 0}"><a href="${category[0]}.html"></c:if><h3>${category[1]}</h3><c:if test="${fn:length(category[0]) > 0}"></a></c:if>
+<c:if test="${fn:length(category[0]) > 0}"><a href="${category[0]}.html"></c:if><h2>${category[1]}</h2><c:if test="${fn:length(category[0]) > 0}"></a></c:if>
 <p>${category[2]}</p>
 </c:forEach>
 <br>