[tor-commits] [bridgedb/master] Parametize captcha and bridges templates

[aagbsn at torproject.org]

commit 5beb96ba85064500fccd405f72666710222e2184
Author: aagbsn <aagbsn at extc.org>
Date:   Mon Mar 25 01:10:13 2013 +0000

    Parametize captcha and bridges templates
---
 lib/bridgedb/templates/bridges.html |   11 +++++++----
 lib/bridgedb/templates/captcha.html |    7 ++++---
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/lib/bridgedb/templates/bridges.html b/lib/bridgedb/templates/bridges.html
index df5c4c6..bf6f7d6 100644
--- a/lib/bridgedb/templates/bridges.html
+++ b/lib/bridgedb/templates/bridges.html
@@ -1,13 +1,16 @@
 <%inherit file="base.html"/>
 
-<h2> Bridges </h3>
+<h2> Bridges </h2>
 <br />
+% if answer:
 <pre>
-  bridge 0.1.2.3:2222
-  bridge 0.1.2.3:9001
-  bridge 0.1.2.3:9003
+${answer}
 </pre>
 <br />
 <p >To use the above lines, go to Vidalia's Network settings page, and click "My ISP blocks connections to the Tor network". Then add each bridge address one at a time.
 </p>
+</pre>
+% else:
+<h3> No bridges currently available </h3>
+% endif
 <hr>
diff --git a/lib/bridgedb/templates/captcha.html b/lib/bridgedb/templates/captcha.html
index 984f02c..b037eed 100644
--- a/lib/bridgedb/templates/captcha.html
+++ b/lib/bridgedb/templates/captcha.html
@@ -1,9 +1,10 @@
 <%inherit file="base.html"/>
 
 <div class="captcha">
+<form action="" method="POST">
   <input type="hidden" name="recaptcha_challenge_field"
-    id="recaptcha_challenge_field" value="03AHJ_VuuEc-3bxAV4t4czoovajwas7ZxKMTAf8QumwzO6pjV_19gnLT-WIhfhgWaR_APT9K5aqaV-F2z9wja-1JrmHSVsWPzj8QHJTU0T2PHr-f3zY409BgWLp1cvpnHu36i_aArc6WpZ0Lw3hI8SEY6MybG9YyKmpZm2jcVobV3oA8iqNkkOsMw">
-  <img width="300" height="57" alt="Upgrade your browser to Firefox" src="data:image/jpeg;base64,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">
+    id="recaptcha_challenge_field" value="${challenge_field}">
+  <img width="300" height="57" alt="Upgrade your browser to Firefox" src="${imgstr}">
   <div class="recaptcha_input_area">
     <label for="recaptcha_response_field">Type the two words</label>
   </div>
@@ -11,6 +12,6 @@
     <input name="recaptcha_response_field" id="recaptcha_response_field"
     type="text" autocomplete="off">
     <input class="btn btn-success" type="submit" name="submit" value="I am human">
-
 </div>
+</form>
 <hr>