[tor-commits] [metrics-web/master] Re-order tables and form fields to customize tables.

[karsten at torproject.org]

commit 0ffae78626e37932019e425ea14f9505865b4bfa
Author: Karsten Loesing <karsten.loesing at gmx.net>
Date:   Tue Mar 20 15:53:29 2012 +0100

    Re-order tables and form fields to customize tables.
    
    Having the table caption, then the table data, and then the form to
    customize the table might have been confusing, in particular with table
    data depending on default values in the form.  Maybe people are more used
    to reading text above tables than below tables?  Let's try that.
    
    Fixes #3873.
---
 web/WEB-INF/users.jsp |   48 ++++++++++++++++++++++++------------------------
 1 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/web/WEB-INF/users.jsp b/web/WEB-INF/users.jsp
index b3dfa31..b9b0914 100644
--- a/web/WEB-INF/users.jsp
+++ b/web/WEB-INF/users.jsp
@@ -65,19 +65,6 @@ based on the requests seen by a few dozen directory mirrors.</p>
 <hr>
 <a name="direct-users-table"></a>
 <p><b>Top-10 countries by directly connecting users:</b></p>
-<table>
-  <tr>
-    <th>Country</th>
-    <th>Mean daily users</th>
-  </tr>
-  <c:forEach var="row" items="${direct_users_tabledata}">
-    <tr>
-      <td><a href="users.html?graph=direct-users&country=${row['cc']}#direct-users">${row['country']}</a> </td>
-      <td>${row['abs']} (<fmt:formatNumber type="number" minFractionDigits="2" value="${row['rel']}" /> %)</td>
-    </tr>
-  </c:forEach>
-</table>
-<br>
 <form action="users.html#direct-users-table">
   <div class="formrow">
     <input type="hidden" name="table" value="direct-users">
@@ -93,25 +80,23 @@ based on the requests seen by a few dozen directory mirrors.</p>
     </p>
   </div>
 </form>
-<hr>
-<a name="censorship-events"></a>
-<p><b>Top-10 countries by possible censorship events (<a
-      href="papers/detector-2011-09-09.pdf">BETA</a>):</b></p>
+<br>
 <table>
   <tr>
     <th>Country</th>
-    <th>Downturns</th>
-    <th>Upturns</th>
+    <th>Mean daily users</th>
   </tr>
-  <c:forEach var="row" items="${censorship_events_tabledata}">
+  <c:forEach var="row" items="${direct_users_tabledata}">
     <tr>
-      <td><a href="users.html?graph=direct-users&country=${row['cc']}&events=on#direct-users">${row['country']}</a> </td>
-      <td>${row['downturns']}</td>
-      <td>${row['upturns']}</td>
+      <td><a href="users.html?graph=direct-users&country=${row['cc']}#direct-users">${row['country']}</a> </td>
+      <td>${row['abs']} (<fmt:formatNumber type="number" minFractionDigits="2" value="${row['rel']}" /> %)</td>
     </tr>
   </c:forEach>
 </table>
-<br>
+<hr>
+<a name="censorship-events"></a>
+<p><b>Top-10 countries by possible censorship events (<a
+      href="papers/detector-2011-09-09.pdf">BETA</a>):</b></p>
 <form action="users.html#censorship-events">
   <div class="formrow">
     <input type="hidden" name="table" value="censorship-events">
@@ -127,6 +112,21 @@ based on the requests seen by a few dozen directory mirrors.</p>
     </p>
   </div>
 </form>
+<br>
+<table>
+  <tr>
+    <th>Country</th>
+    <th>Downturns</th>
+    <th>Upturns</th>
+  </tr>
+  <c:forEach var="row" items="${censorship_events_tabledata}">
+    <tr>
+      <td><a href="users.html?graph=direct-users&country=${row['cc']}&events=on#direct-users">${row['country']}</a> </td>
+      <td>${row['downturns']}</td>
+      <td>${row['upturns']}</td>
+    </tr>
+  </c:forEach>
+</table>
 <hr>
 <p><a href="csv/direct-users.csv">CSV</a> file containing daily directly
 connecting users by country.</p>