[or-cvs] [metrics-web/master] Remember drop down list values.

karsten at torproject.org karsten at torproject.org
Mon Jan 31 11:36:59 UTC 2011


commit 0a79de4e7f2bdc16230bc1c377a060340438e233
Author: Karsten Loesing <karsten.loesing at gmx.net>
Date:   Mon Jan 31 12:05:07 2011 +0100

    Remember drop down list values.
---
 web/WEB-INF/users.jsp |  184 ++++++++++++++++++++++++------------------------
 1 files changed, 92 insertions(+), 92 deletions(-)

diff --git a/web/WEB-INF/users.jsp b/web/WEB-INF/users.jsp
index bc98e9c..9d88e96 100644
--- a/web/WEB-INF/users.jsp
+++ b/web/WEB-INF/users.jsp
@@ -36,55 +36,55 @@ based on the requests seen by a few dozen directory mirrors.</p>
              value="${direct_users_end[0]}">
     </p><p>
       Source: <select name="country">
-        <option value="all" selected>All users</option>
-        <option value="dz">Algeria</option>
-        <option value="au">Australia</option>
-        <option value="bh">Bahrain</option>
-        <option value="br">Brazil</option>
-        <option value="mm">Burma</option>
-        <option value="ca">Canada</option>
-        <option value="cn">China</option>
-        <option value="cu">Cuba</option>
-        <option value="dj">Djibouti</option>
-        <option value="eg">Egypt</option>
-        <option value="et">Ethiopia</option>
-        <option value="fr">France</option>
-        <option value="de">Germany</option>
-        <option value="ir">Iran</option>
-        <option value="iq">Iraq</option>
-        <option value="il">Israel</option>
-        <option value="it">Italy</option>
-        <option value="jp">Japan</option>
-        <option value="jo">Jordan</option>
-        <option value="kw">Kuwait</option>
-        <option value="lb">Lebanon</option>
-        <option value="ly">Libya</option>
-        <option value="ma">Morocco</option>
-        <option value="kp">North Korea</option>
-        <option value="om">Oman</option>
-        <option value="ps">Palestinian territories</option>
-        <option value="pl">Poland</option>
-        <option value="qa">Qatar</option>
-        <option value="ru">Russia</option>
-        <option value="sa">Saudi Arabia</option>
-        <option value="kr">South Korea</option>
-        <option value="sd">Sudan</option>
-        <option value="se">Sweden</option>
-        <option value="sy">Syria</option>
-        <option value="tn">Tunisia</option>
-        <option value="tm">Turkmenistan</option>
-        <option value="ae">U.A.E.</option>
-        <option value="gb">U.K.</option>
-        <option value="us">U.S.A.</option>
-        <option value="uz">Uzbekistan</option>
-        <option value="vn">Vietnam</option>
-        <option value="ye">Yemen</option>
+        <option value="all"<c:if test="${direct_users_country[0] eq 'all'}"> selected</c:if>>All users</option>
+        <option value="dz"<c:if test="${direct_users_country[0] eq 'dz'}"> selected</c:if>>Algeria</option>
+        <option value="au"<c:if test="${direct_users_country[0] eq 'au'}"> selected</c:if>>Australia</option>
+        <option value="bh"<c:if test="${direct_users_country[0] eq 'bh'}"> selected</c:if>>Bahrain</option>
+        <option value="br"<c:if test="${direct_users_country[0] eq 'br'}"> selected</c:if>>Brazil</option>
+        <option value="mm"<c:if test="${direct_users_country[0] eq 'mm'}"> selected</c:if>>Burma</option>
+        <option value="ca"<c:if test="${direct_users_country[0] eq 'ca'}"> selected</c:if>>Canada</option>
+        <option value="cn"<c:if test="${direct_users_country[0] eq 'cn'}"> selected</c:if>>China</option>
+        <option value="cu"<c:if test="${direct_users_country[0] eq 'cu'}"> selected</c:if>>Cuba</option>
+        <option value="dj"<c:if test="${direct_users_country[0] eq 'dj'}"> selected</c:if>>Djibouti</option>
+        <option value="eg"<c:if test="${direct_users_country[0] eq 'eg'}"> selected</c:if>>Egypt</option>
+        <option value="et"<c:if test="${direct_users_country[0] eq 'et'}"> selected</c:if>>Ethiopia</option>
+        <option value="fr"<c:if test="${direct_users_country[0] eq 'fr'}"> selected</c:if>>France</option>
+        <option value="de"<c:if test="${direct_users_country[0] eq 'de'}"> selected</c:if>>Germany</option>
+        <option value="ir"<c:if test="${direct_users_country[0] eq 'ir'}"> selected</c:if>>Iran</option>
+        <option value="iq"<c:if test="${direct_users_country[0] eq 'iq'}"> selected</c:if>>Iraq</option>
+        <option value="il"<c:if test="${direct_users_country[0] eq 'il'}"> selected</c:if>>Israel</option>
+        <option value="it"<c:if test="${direct_users_country[0] eq 'it'}"> selected</c:if>>Italy</option>
+        <option value="jp"<c:if test="${direct_users_country[0] eq 'jp'}"> selected</c:if>>Japan</option>
+        <option value="jo"<c:if test="${direct_users_country[0] eq 'jo'}"> selected</c:if>>Jordan</option>
+        <option value="kw"<c:if test="${direct_users_country[0] eq 'kw'}"> selected</c:if>>Kuwait</option>
+        <option value="lb"<c:if test="${direct_users_country[0] eq 'lb'}"> selected</c:if>>Lebanon</option>
+        <option value="ly"<c:if test="${direct_users_country[0] eq 'ly'}"> selected</c:if>>Libya</option>
+        <option value="ma"<c:if test="${direct_users_country[0] eq 'ma'}"> selected</c:if>>Morocco</option>
+        <option value="kp"<c:if test="${direct_users_country[0] eq 'kp'}"> selected</c:if>>North Korea</option>
+        <option value="om"<c:if test="${direct_users_country[0] eq 'om'}"> selected</c:if>>Oman</option>
+        <option value="ps"<c:if test="${direct_users_country[0] eq 'ps'}"> selected</c:if>>Palestinian territories</option>
+        <option value="pl"<c:if test="${direct_users_country[0] eq 'pl'}"> selected</c:if>>Poland</option>
+        <option value="qa"<c:if test="${direct_users_country[0] eq 'qa'}"> selected</c:if>>Qatar</option>
+        <option value="ru"<c:if test="${direct_users_country[0] eq 'ru'}"> selected</c:if>>Russia</option>
+        <option value="sa"<c:if test="${direct_users_country[0] eq 'sa'}"> selected</c:if>>Saudi Arabia</option>
+        <option value="kr"<c:if test="${direct_users_country[0] eq 'kr'}"> selected</c:if>>South Korea</option>
+        <option value="sd"<c:if test="${direct_users_country[0] eq 'sd'}"> selected</c:if>>Sudan</option>
+        <option value="se"<c:if test="${direct_users_country[0] eq 'se'}"> selected</c:if>>Sweden</option>
+        <option value="sy"<c:if test="${direct_users_country[0] eq 'sy'}"> selected</c:if>>Syria</option>
+        <option value="tn"<c:if test="${direct_users_country[0] eq 'tn'}"> selected</c:if>>Tunisia</option>
+        <option value="tm"<c:if test="${direct_users_country[0] eq 'tm'}"> selected</c:if>>Turkmenistan</option>
+        <option value="ae"<c:if test="${direct_users_country[0] eq 'ae'}"> selected</c:if>>U.A.E.</option>
+        <option value="gb"<c:if test="${direct_users_country[0] eq 'gb'}"> selected</c:if>>U.K.</option>
+        <option value="us"<c:if test="${direct_users_country[0] eq 'us'}"> selected</c:if>>U.S.A.</option>
+        <option value="uz"<c:if test="${direct_users_country[0] eq 'uz'}"> selected</c:if>>Uzbekistan</option>
+        <option value="vn"<c:if test="${direct_users_country[0] eq 'vn'}"> selected</c:if>>Vietnam</option>
+        <option value="ye"<c:if test="${direct_users_country[0] eq 'ye'}"> selected</c:if>>Yemen</option>
       </select>
     </p><p>
       Resolution: <select name="dpi">
-        <option value="72" selected>Screen - 576x360</option>
-        <option value="150">Print low - 1200x750</option>
-        <option value="300">Print high - 2400x1500</option>
+        <option value="72"<c:if test="${direct_users_dpi[0] eq '72'}"> selected</c:if>>Screen - 576x360</option>
+        <option value="150"<c:if test="${direct_users_dpi[0] eq '150'}"> selected</c:if>>Print low - 1200x750</option>
+        <option value="300"<c:if test="${direct_users_dpi[0] eq '300'}"> selected</c:if>>Print high - 2400x1500</option>
       </select>
     </p><p>
     <input class="submit" type="submit" value="Update graph">
@@ -119,55 +119,55 @@ by a few hundred bridges.</p>
              value="${bridge_users_end[0]}">
     </p><p>
       Source: <select name="country">
-        <option value="all" selected>All users</option>
-        <option value="dz">Algeria</option>
-        <option value="au">Australia</option>
-        <option value="bh">Bahrain</option>
-        <option value="br">Brazil</option>
-        <option value="mm">Burma</option>
-        <option value="ca">Canada</option>
-        <option value="cn">China</option>
-        <option value="cu">Cuba</option>
-        <option value="dj">Djibouti</option>
-        <option value="eg">Egypt</option>
-        <option value="et">Ethiopia</option>
-        <option value="fr">France</option>
-        <option value="de">Germany</option>
-        <option value="ir">Iran</option>
-        <option value="iq">Iraq</option>
-        <option value="il">Israel</option>
-        <option value="it">Italy</option>
-        <option value="jp">Japan</option>
-        <option value="jo">Jordan</option>
-        <option value="kw">Kuwait</option>
-        <option value="lb">Lebanon</option>
-        <option value="ly">Libya</option>
-        <option value="ma">Morocco</option>
-        <option value="kp">North Korea</option>
-        <option value="om">Oman</option>
-        <option value="ps">Palestinian territories</option>
-        <option value="pl">Poland</option>
-        <option value="qa">Qatar</option>
-        <option value="ru">Russia</option>
-        <option value="sa">Saudi Arabia</option>
-        <option value="kr">South Korea</option>
-        <option value="sd">Sudan</option>
-        <option value="se">Sweden</option>
-        <option value="sy">Syria</option>
-        <option value="tn">Tunisia</option>
-        <option value="tm">Turkmenistan</option>
-        <option value="ae">U.A.E.</option>
-        <option value="gb">U.K.</option>
-        <option value="us">U.S.A.</option>
-        <option value="uz">Uzbekistan</option>
-        <option value="vn">Vietnam</option>
-        <option value="ye">Yemen</option>
+        <option value="all"<c:if test="${bridge_users_country[0] eq 'all'}"> selected</c:if>>All users</option>
+        <option value="dz"<c:if test="${bridge_users_country[0] eq 'dz'}"> selected</c:if>>Algeria</option>
+        <option value="au"<c:if test="${bridge_users_country[0] eq 'au'}"> selected</c:if>>Australia</option>
+        <option value="bh"<c:if test="${bridge_users_country[0] eq 'bh'}"> selected</c:if>>Bahrain</option>
+        <option value="br"<c:if test="${bridge_users_country[0] eq 'br'}"> selected</c:if>>Brazil</option>
+        <option value="mm"<c:if test="${bridge_users_country[0] eq 'mm'}"> selected</c:if>>Burma</option>
+        <option value="ca"<c:if test="${bridge_users_country[0] eq 'ca'}"> selected</c:if>>Canada</option>
+        <option value="cn"<c:if test="${bridge_users_country[0] eq 'cn'}"> selected</c:if>>China</option>
+        <option value="cu"<c:if test="${bridge_users_country[0] eq 'cu'}"> selected</c:if>>Cuba</option>
+        <option value="dj"<c:if test="${bridge_users_country[0] eq 'dj'}"> selected</c:if>>Djibouti</option>
+        <option value="eg"<c:if test="${bridge_users_country[0] eq 'eg'}"> selected</c:if>>Egypt</option>
+        <option value="et"<c:if test="${bridge_users_country[0] eq 'et'}"> selected</c:if>>Ethiopia</option>
+        <option value="fr"<c:if test="${bridge_users_country[0] eq 'fr'}"> selected</c:if>>France</option>
+        <option value="de"<c:if test="${bridge_users_country[0] eq 'de'}"> selected</c:if>>Germany</option>
+        <option value="ir"<c:if test="${bridge_users_country[0] eq 'ir'}"> selected</c:if>>Iran</option>
+        <option value="iq"<c:if test="${bridge_users_country[0] eq 'iq'}"> selected</c:if>>Iraq</option>
+        <option value="il"<c:if test="${bridge_users_country[0] eq 'il'}"> selected</c:if>>Israel</option>
+        <option value="it"<c:if test="${bridge_users_country[0] eq 'it'}"> selected</c:if>>Italy</option>
+        <option value="jp"<c:if test="${bridge_users_country[0] eq 'jp'}"> selected</c:if>>Japan</option>
+        <option value="jo"<c:if test="${bridge_users_country[0] eq 'jo'}"> selected</c:if>>Jordan</option>
+        <option value="kw"<c:if test="${bridge_users_country[0] eq 'kw'}"> selected</c:if>>Kuwait</option>
+        <option value="lb"<c:if test="${bridge_users_country[0] eq 'lb'}"> selected</c:if>>Lebanon</option>
+        <option value="ly"<c:if test="${bridge_users_country[0] eq 'ly'}"> selected</c:if>>Libya</option>
+        <option value="ma"<c:if test="${bridge_users_country[0] eq 'ma'}"> selected</c:if>>Morocco</option>
+        <option value="kp"<c:if test="${bridge_users_country[0] eq 'kp'}"> selected</c:if>>North Korea</option>
+        <option value="om"<c:if test="${bridge_users_country[0] eq 'om'}"> selected</c:if>>Oman</option>
+        <option value="ps"<c:if test="${bridge_users_country[0] eq 'ps'}"> selected</c:if>>Palestinian territories</option>
+        <option value="pl"<c:if test="${bridge_users_country[0] eq 'pl'}"> selected</c:if>>Poland</option>
+        <option value="qa"<c:if test="${bridge_users_country[0] eq 'qa'}"> selected</c:if>>Qatar</option>
+        <option value="ru"<c:if test="${bridge_users_country[0] eq 'ru'}"> selected</c:if>>Russia</option>
+        <option value="sa"<c:if test="${bridge_users_country[0] eq 'sa'}"> selected</c:if>>Saudi Arabia</option>
+        <option value="kr"<c:if test="${bridge_users_country[0] eq 'kr'}"> selected</c:if>>South Korea</option>
+        <option value="sd"<c:if test="${bridge_users_country[0] eq 'sd'}"> selected</c:if>>Sudan</option>
+        <option value="se"<c:if test="${bridge_users_country[0] eq 'se'}"> selected</c:if>>Sweden</option>
+        <option value="sy"<c:if test="${bridge_users_country[0] eq 'sy'}"> selected</c:if>>Syria</option>
+        <option value="tn"<c:if test="${bridge_users_country[0] eq 'tn'}"> selected</c:if>>Tunisia</option>
+        <option value="tm"<c:if test="${bridge_users_country[0] eq 'tm'}"> selected</c:if>>Turkmenistan</option>
+        <option value="ae"<c:if test="${bridge_users_country[0] eq 'ae'}"> selected</c:if>>U.A.E.</option>
+        <option value="gb"<c:if test="${bridge_users_country[0] eq 'gb'}"> selected</c:if>>U.K.</option>
+        <option value="us"<c:if test="${bridge_users_country[0] eq 'us'}"> selected</c:if>>U.S.A.</option>
+        <option value="uz"<c:if test="${bridge_users_country[0] eq 'uz'}"> selected</c:if>>Uzbekistan</option>
+        <option value="vn"<c:if test="${bridge_users_country[0] eq 'vn'}"> selected</c:if>>Vietnam</option>
+        <option value="ye"<c:if test="${bridge_users_country[0] eq 'ye'}"> selected</c:if>>Yemen</option>
       </select>
     </p><p>
       Resolution: <select name="dpi">
-        <option value="72" selected>Screen - 576x360</option>
-        <option value="150">Print low - 1200x750</option>
-        <option value="300">Print high - 2400x1500</option>
+        <option value="72"<c:if test="${bridge_users_dpi[0] eq '72'}"> selected</c:if>>Screen - 576x360</option>
+        <option value="150"<c:if test="${bridge_users_dpi[0] eq '150'}"> selected</c:if>>Print low - 1200x750</option>
+        <option value="300"<c:if test="${bridge_users_dpi[0] eq '300'}"> selected</c:if>>Print high - 2400x1500</option>
       </select>
     </p><p>
     <input class="submit" type="submit" value="Update graph">





More information about the tor-commits mailing list