April 2014 - tor-commits - lists.torproject.org

[bridgedb/master] Rewrite header/navigation bar for HTTPS distributor.
by isis＠torproject.org 19 Apr '14

19 Apr '14

commit 41bda9aa79b0a943fdacbcda27dab3887f5f3b70 Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Apr 11 11:46:10 2014 +0000 Rewrite header/navigation bar for HTTPS distributor. --- lib/bridgedb/templates/base.html | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/lib/bridgedb/templates/base.html b/lib/bridgedb/templates/base.html index fc8d03c..b5cfeed 100644 --- a/lib/bridgedb/templates/base.html +++ b/lib/bridgedb/templates/base.html @@ -21,30 +21,38 @@ span,p,h3,h4 { text-align: right; direction: rtl; } - span { float: right; } </style> -%endif +% endif </head> <body> <div class="container-narrow"> <div class="masthead"> - <ul class="nav nav-pills pull-right"> -  - <a href="https://bridges.torproject.org/"><img src="/assets/bridgedb.png" - height="100%" - width="100%" /></a> - </ul> - <a href="https://www.torproject.org"><img src="/assets/tor.svg" - height="10%" width="15%"/></a> + <div class="nav nav-tabs"> + <div class="nav navbar-header"> + <a class="navbar-brand" href="../">BridgeDB</a> + </div> + <ul class="nav navbar-nav pull-right"> + <li> + <a href="https://www.torproject.org">The Tor Project</a> + </li> + </ul> + </div> + <p style="float: left; text-align: left; + margin-left: -23%; margin-bottom: -30%;"> + <a href="https://www.torproject.org"> + <img src="/assets/tor-roots-blue.svg" + height="23%" width="23%"/></a> + </p> </div> -<hr> + ${self.body()} + <div class="faq"> <div class="row-fluid marketing">

1 0

[bridgedb/master] Rewrite bridges.html template.
by isis＠torproject.org 19 Apr '14

19 Apr '14

commit a8e593fe9f69acab3eff4f85c1f966f095a3d199 Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Apr 11 11:47:59 2014 +0000 Rewrite bridges.html template. --- lib/bridgedb/templates/bridges.html | 91 ++++++++++++++++++++++++++++++----- 1 file changed, 79 insertions(+), 12 deletions(-) diff --git a/lib/bridgedb/templates/bridges.html b/lib/bridgedb/templates/bridges.html index 7bb0a79..f99b3af 100644 --- a/lib/bridgedb/templates/bridges.html +++ b/lib/bridgedb/templates/bridges.html @@ -1,19 +1,86 @@ -## -*- coding: utf-8 -*- +## -*- coding: utf-8 -*- <%inherit file="base.html"/> -<h2> Bridges </h2> -<br /> +<div class="container-fluid" + style="width: 98%; align: center; margin: auto;"> + <div class="container-fluid" + style="padding: 2%"> + <h2>${_("Bridges")}</h2> + </div> +</div> + % if answer: -<pre> +<div class="container-fluid" style="width: 98%; align: center; margin: auto;"> +<div class="container-fluid" style="padding: 1px"> +<div class="well well-lg"> +<p style="font-family: Menlo,Monaco,Consolas,monospace; + font-size: 95%;"> ${answer} -</pre> -<br \> -<p> -<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> +</div> +</div> +</div> +<br \> + +<div class="container-fluid" + style="width: 100%; align: center; margin: auto;"> + <div class="panel panel-primary"> + <div class="panel-heading"> + <h3 class="panel-title">${_("""How to start using your bridges""")}</h3> + </div> + <br /> + + <div class="container-fluid" id="howto" style="align-content: left;"> + <p> +${_("""To use the above lines, follow the instructions on the""" \ + """ %s %s download page %s to start %s.""") % \ + ("""<a href="https://www.torproject.org/projects/torbrowser.html.en#downloads-beta" target="_blank">""", + """Tor Browser""", """</a>""", """Tor Browser""")} +${_("""When the "Tor Network Settings" dialogue pops up,""" \ + """ click "Configure" and follow the wizard until it asks:""")} + </p> + <br /> + <div class="bs-component"> + <blockquote> + <p> +${_(""" Does your Internet Service Provider (ISP) block or""" \ + """ otherwise censor connections to the Tor Network?""")} + </p> + </blockquote> + </div> + <p> +${_(""" Select "Yes" and click "Next" in order to configure your""" \ + """ new bridges. Select "Enter custom bridges", and copy and""" \ + """ paste the bridges lines shown above into the text input""" \ + """ box. Finally, click "Connect", and you should be good""" \ + """ to go! If you experience trouble, try clicking""" \ + """ the "Help" button in the "Tor Network Settings" wizard for""" \ + """ further assistance.""")} + </p> + </div> + </div> +</div> + % else: -<h3> ${_("No bridges currently available")} </h3> +<div class="bs-component" style="width: 80%; margin: auto;"> + <div class="alert alert-dismissable alert-danger"> + <p style="text-align: center; font-size: 115%;"> + <br /> + <strong> + <em class="primary">${_("""Uh oh, spaghettios!""")}</em> + </strong> + <br /> + </p> + <p style="text-align: center;"> + ${_("""There currently aren't any bridges available...""")} + ${_(""" Perhaps you should try %s going back %s and choosing a""" \ + """ different bridge type!""") % \ + ("""<a class="alert-link" href="options">""", """</a>""")} + </p> + </div> +</div> +<br /> + % endif + +<hr />

1 0

[bridgedb/master] Link to new stylesheets in base.html template.
by isis＠torproject.org 19 Apr '14

19 Apr '14

commit 3092a9d0a74acd095212e8cb4a4705091be84c5a Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Apr 11 11:19:25 2014 +0000 Link to new stylesheets in base.html template. --- lib/bridgedb/templates/base.html | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/bridgedb/templates/base.html b/lib/bridgedb/templates/base.html index 91d3341..fc8d03c 100644 --- a/lib/bridgedb/templates/base.html +++ b/lib/bridgedb/templates/base.html @@ -9,7 +9,11 @@ <meta name="author" content="The Tor Project">  -<link href="/assets/main.css" rel="stylesheet"> +<link rel="stylesheet" href="/assets/css/main.css"> +<link rel="stylesheet" href="/assets/css/font-awesome.min.css"> + % if rtl: <style>

1 0

[bridgedb/master] Rewrite captcha.html template.
by isis＠torproject.org 19 Apr '14

19 Apr '14

commit e4e9e62b1c2be979df39fc7c97aecc899341b9b5 Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Apr 11 11:48:40 2014 +0000 Rewrite captcha.html template. --- lib/bridgedb/templates/captcha.html | 79 +++++++++++++++++++++++++---------- 1 file changed, 58 insertions(+), 21 deletions(-) diff --git a/lib/bridgedb/templates/captcha.html b/lib/bridgedb/templates/captcha.html index 74866ce..23b9772 100644 --- a/lib/bridgedb/templates/captcha.html +++ b/lib/bridgedb/templates/captcha.html @@ -1,24 +1,61 @@ ## -*- coding: utf-8 -*- <%inherit file="base.html"/> -<div class="captcha"> - <form action="" method="POST"> - <input type="hidden" - name="captcha_challenge_field" - id="captcha_challenge_field" - value="${challenge_field}"> - <img width="300" - height="57" - alt=${_("Your browser is not displaying images properly.")} - src="${imgstr}"> - <div class="captcha_input_area"> - <label for="captcha_response_field">${_("Type the word")}</label></div> - <input name="captcha_response_field" - id="captcha_response_field" - type="text" - autocomplete="off"> - <input class="btn btn-primary" - type="submit" - name="submit" - value=${_("Submit")}> - </form> + +<div class="container-narrow" + id="captchaSubmissionContainer" + style="width: 90%; align: center; margin: auto;"> + <div class="container-fluid" + style="width: 100%; align: center; padding: 5%"> + <div class="box" style="padding: 5% 15% 5% 15%;"> + <p style="align: center;"> + <img width="400" height="125" + alt="${_('Your browser is not displaying images properly.')}" + src="${imgstr}" /> + </p> + + <div class="box" + style="align: center; width: 50% margin: auto;"> + <form class="bs-component" + id="captchaSubmission" + action="" + method="POST"> + <fieldset> + <div class="form-group"> +  + <div class="input-group" style="height: 60%;"> + <input type="hidden" + form="captchaSubmission" + name="captcha_challenge_field" + id="captcha_challenge_field" + value="${challenge_field}"></input> + <input class="form-control" + form="captchaSubmission" + name="captcha_response_field" + id="captcha_response_field" + value="" + autocomplete="off" + type="text" + placeholder="${_('Enter the characters from the image above...')}" + accesskey="t" autofocus ></input> + <span class="input-group-btn"> + <button class="btn btn-primary" + form="captchaSubmission" + type="submit" + name="submit" + value="submit" + accesskey="s"> + <i class="icon-level-down icon-rotate-90"></i> + </button></span> +  +  + </div> + </div> + </fieldset> + </form> + </div> + </div> + </div> </div> +<hr />

1 0

[bridgedb/master] Update TBB download link/text, add accesskey to improve accessibility.
by isis＠torproject.org 19 Apr '14

19 Apr '14

commit 8d8816210b974e2e2bb9ed463a2f44368174abd1 Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Apr 11 11:49:36 2014 +0000 Update TBB download link/text, add accesskey to improve accessibility. --- lib/bridgedb/templates/bridges.html | 3 ++- lib/bridgedb/templates/index.html | 13 ++++++++----- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/lib/bridgedb/templates/bridges.html b/lib/bridgedb/templates/bridges.html index f99b3af..4c57c91 100644 --- a/lib/bridgedb/templates/bridges.html +++ b/lib/bridgedb/templates/bridges.html @@ -34,7 +34,8 @@ ${answer} <p> ${_("""To use the above lines, follow the instructions on the""" \ """ %s %s download page %s to start %s.""") % \ - ("""<a href="https://www.torproject.org/projects/torbrowser.html.en#downloads-beta" target="_blank">""", + ("""Tor Browser""", + """<a href="https://www.torproject.org/projects/torbrowser.html.en#downloads-beta" target="_blank">""", """Tor Browser""", """</a>""", """Tor Browser""")} ${_("""When the "Tor Network Settings" dialogue pops up,""" \ """ click "Configure" and follow the wizard until it asks:""")} diff --git a/lib/bridgedb/templates/index.html b/lib/bridgedb/templates/index.html index 3819744..1f5ab34 100644 --- a/lib/bridgedb/templates/index.html +++ b/lib/bridgedb/templates/index.html @@ -6,11 +6,14 @@ <div class="bdb_span7 step-text"> <span class="lead"> <span class="step-title"> - ${_("Step 1")}</span> - <span style="margin-left: 20px;"> - ${_("Get the %s Tor Browser Bundle %s") % \ - ("""<a href="https://www.torproject.org/projects/torbrowser.html.en#downloads-beta">""", "</a>")}</span> - </span></div> + ${_("Step %s1%s") % ("""<u>""", """</u>""")}</span> + <span style="margin-left: 20px; margin-right: 20px;"> + ${_("Download the %s Tor Browser Bundle %s") % \ + ("""<a href="https://www.torproject.org/projects/torbrowser.html.en#downloads-beta" + target="_blank" accesskey="1">""", + """</a>""")}</span> + </span> + </div> </div> <div class="step row">

1 0

[bridgedb/master] Add accesskey to "get bridges" link.
by isis＠torproject.org 19 Apr '14

19 Apr '14

commit 2b75894680405f55342e09cb3944e4fda9fad608 Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Apr 11 11:51:04 2014 +0000 Add accesskey to "get bridges" link. --- lib/bridgedb/templates/index.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/bridgedb/templates/index.html b/lib/bridgedb/templates/index.html index 1f5ab34..da48ddd 100644 --- a/lib/bridgedb/templates/index.html +++ b/lib/bridgedb/templates/index.html @@ -20,9 +20,9 @@ <div class="bdb_span7 step-text"> <span class="lead"> <span class="step-title"> - ${_("Step 2")}</span> - <span style="margin-left: 20px;"> - ${_("Get %s bridges %s") % ("""<a href="/options">""", "</a>")}</span> + ${_("Step %s2%s") % ("""<u>""", """</u>""")}</span> + <span style="margin-left: 20px; margin-right: 20px;"> + ${_("Get %s bridges %s") % ("""<a href="/options" accesskey="2">""", "</a>")}</span> </span> </div> </div>

1 0

[bridgedb/master] Add explanation text for using bridges with TBB.
by isis＠torproject.org 19 Apr '14

19 Apr '14

commit 72fd54d4ab66008fe4bb1980f82bf921832a7a15 Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Apr 11 12:14:34 2014 +0000 Add explanation text for using bridges with TBB. * REMOVES all mention of Vidalia. * FIXES #10803 --- lib/bridgedb/HTTPServer.py | 26 +++++++++++++++++++ lib/bridgedb/templates/bridges.html | 2 +- lib/bridgedb/templates/howto.html | 47 +++++++++++++++++++++++++++++++++++ lib/bridgedb/templates/index.html | 14 ++++++----- 4 files changed, 82 insertions(+), 7 deletions(-) diff --git a/lib/bridgedb/HTTPServer.py b/lib/bridgedb/HTTPServer.py index 7a127d9..5e3ba37 100644 --- a/lib/bridgedb/HTTPServer.py +++ b/lib/bridgedb/HTTPServer.py @@ -553,6 +553,31 @@ class WebResourceOptions(resource.Resource): render_POST = render_GET +class WebResourceHowto(resource.Resource): + """A resource which explains how to use bridges.""" + + isLeaf = True + + def __init__(self): + """Create a new WebResource for the Options page""" + gettext.install("bridgedb", unicode=True) + resource.Resource.__init__(self) + + def render_GET(self, request): + rtl = False + langs = translations.getLocaleFromHTTPRequest(request) + + try: + rtl = translations.usingRTLLang(langs) + except Exception as err: # pragma: no cover + logging.exception(err) + + request.setHeader("Content-Type", "text/html; charset=utf-8") + return lookup.get_template('howto.html').render(rtl=rtl) + + render_POST = render_GET + + class WebResourceBridges(resource.Resource): """This resource displays bridge lines in response to a request.""" @@ -801,6 +826,7 @@ def addWebServer(cfg, dist, sched): httpdist.putChild('assets', static.File(os.path.join(template_root, 'assets/'))) httpdist.putChild('options', WebResourceOptions()) + httpdist.putChild('howto', WebResourceHowto()) bridgesResource = WebResourceBridges( dist, sched, cfg.HTTPS_N_BRIDGES_PER_ANSWER, diff --git a/lib/bridgedb/templates/bridges.html b/lib/bridgedb/templates/bridges.html index 4c57c91..f8e5a0e 100644 --- a/lib/bridgedb/templates/bridges.html +++ b/lib/bridgedb/templates/bridges.html @@ -32,7 +32,7 @@ ${answer} <div class="container-fluid" id="howto" style="align-content: left;"> <p> -${_("""To use the above lines, follow the instructions on the""" \ +${_("""To enter bridges into %s, follow the instructions on the""" \ """ %s %s download page %s to start %s.""") % \ ("""Tor Browser""", """<a href="https://www.torproject.org/projects/torbrowser.html.en#downloads-beta" target="_blank">""", diff --git a/lib/bridgedb/templates/howto.html b/lib/bridgedb/templates/howto.html new file mode 100644 index 0000000..42e14ca --- /dev/null +++ b/lib/bridgedb/templates/howto.html @@ -0,0 +1,47 @@ +## -*- coding: utf-8 -*- + +<%inherit file="base.html"/> + +<div class="container-fluid" + style="width: 98%; align: center; margin: auto;"> +<div class="container-fluid" + style="width: 95%; align: center; + padding-top: 10%; padding-left: 5%; padding-right: 5%;"> + <div class="panel panel-primary"> + <div class="panel-heading"> + <h3 class="panel-title">${_("""How to start using your bridges""")}</h3> + </div> + <br /> + + <div class="container-fluid" id="howto" style="align-content: left;"> + <p> +${_("""To enter bridges into %s, follow the instructions on the""" \ + """ %s %s download page %s to start %s.""") % \ + ("""Tor Browser""", + """<a href="https://www.torproject.org/projects/torbrowser.html.en#downloads-beta" target="_blank">""", + """Tor Browser""", """</a>""", """Tor Browser""")} +${_("""When the "Tor Network Settings" dialogue pops up,""" \ + """ click "Configure" and follow the wizard until it asks:""")} + </p> + <br /> + <div class="bs-component"> + <blockquote> + <p> +${_(""" Does your Internet Service Provider (ISP) block or""" \ + """ otherwise censor connections to the Tor Network?""")} + </p> + </blockquote> + </div> + <p> +${_(""" Select "Yes" and click "Next" in order to configure your""" \ + """ new bridges. Select "Enter custom bridges", and copy and""" \ + """ paste the bridges lines shown above into the text input""" \ + """ box. Finally, click "Connect", and you should be good""" \ + """ to go! If you experience trouble, try clicking""" \ + """ the "Help" button in the "Tor Network Settings" wizard for""" \ + """ further assistance.""")} + </p> + </div> + </div> +</div> +</div> diff --git a/lib/bridgedb/templates/index.html b/lib/bridgedb/templates/index.html index da48ddd..243ba10 100644 --- a/lib/bridgedb/templates/index.html +++ b/lib/bridgedb/templates/index.html @@ -31,10 +31,12 @@ <div class="bdb_span7 step-text"> <span class="lead"> <span class="step-title"> - ${_("Step 3")}</span> - <span style="margin-left: 20px;"> - ${_("Now %s add the bridges to Tor %s") % \ - ("""<a href="https://www.torproject.org/docs/bridges#UsingBridges">""", "</a>")}</span> -</span></div> + ${_("Step %s3%s") % ("""<u>""", """</u>""")}</span> + <span style="margin-left: 20px; margin-right: 20px;"> + ${_("""Now %s add the bridges to Tor %s""") % \ + ("""<a href="/howto" + target="_blank" accesskey="3">""", + """</a>""")}</span> + </span> + </div> </div> -

1 0

[bridgedb/master] Rewrite options.html template.
by isis＠torproject.org 19 Apr '14

19 Apr '14

commit e98a4319f3024f7d8bc7621d415562df641ab566 Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Apr 11 11:51:55 2014 +0000 Rewrite options.html template. --- lib/bridgedb/templates/options.html | 198 +++++++++++++++++++++++++++++------ 1 file changed, 164 insertions(+), 34 deletions(-) diff --git a/lib/bridgedb/templates/options.html b/lib/bridgedb/templates/options.html index 82d1213..d786ac1 100644 --- a/lib/bridgedb/templates/options.html +++ b/lib/bridgedb/templates/options.html @@ -1,39 +1,169 @@ -## -*- coding: utf-8 -*- +## -*- coding: utf-8 -*- <%inherit file="base.html"/> -<br /> -<br /> -<p><h2><a href="bridges">${_("""Just Give Me Bridges!""")}</a></h2> -</p> -<br /><br /><br /> -<hr /> -<p> -<h3> ${_("""Advanced Options""")}</h3> -<form action="bridges" method="GET"> -<div style="float: left;"> -<p>${_("""Do you need IPv6 addresses?""")} -</p> -## TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses" -<input type="checkbox" name="ipv6" value="yes">${_("""Yes!""")}</input> -<br /> -<br /> -</div><div style="float: right;"> -<p>${_("""Do you need a specific pluggable transport?""")}</p> -<select name="transport"> -<option name="none" value="0"> -## TRANSLATORS: Please do not translate the pluggable transport names -## (obfs2, obfs3, etc) - ${_("""No""")} -</option> -<option value="obfs2">${_("""Yes, obfs2""")}</option> -<option value="obfs3">${_("""Yes, obfs3""")}</option> - -</select> +<div class="container-fluid" + style="width: 96%; align: center; margin: 2%"> + <div class="container-fluid" style="padding: 2%"> + <p> + <h2>${_("""Get Bridges!""")}</h2> + </p> + </div> + <div class="container-fluid" + style="width: 100%; align: center; padding: 2%;"> + <p> + ${_(" BridgeDB can provide bridges with several %s types of %s, which can" + " help obfuscate your connections to the Tor Network, making it more" + " difficult for anyone watching your internet traffic to determine" + " that you are using Tor.") % \ + ("""<a href="https://www.torproject.org/docs/pluggable-transports.html">""", + """Pluggable Transports</a>""")} + </p> + <p> + ${_("Some bridges with IPv6 addresses are also available, though some" + " %s aren't IPv6 compatible.") % \ + ("""Pluggable Transports""")} + </p> + <p> + ${_(" Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s" + " without any %s %s which maybe doesn't sound as cool, but they can" + " still help to circumvent internet censorship in many cases.") % \ + ("""&#8212""", """Pluggable Transports""", """&#8212""")} + + </p> + <div class="container-fluid" style="align: center: margin: 2%;"> + <div style="align: center; padding: 5%;"> + <p class="bs-component"> + <a href="./bridges"> + <button class="btn btn-success btn-lg btn-block" + type="button" + accesskey="j"> +  + ${_("""%sJ%sust give me bridges!""") % ("""<u>""", """</u>""")} + </button> + </a> + </p> + </div> + </div> + </div> +</div> + + +<div class="container-fluid" + style="width: 96%; align: center; margin-left: 2%; margin-right: 2%;"> + <div class="panel panel-primary"> + <div class="panel-heading"> + <h3 class="panel-title">${_("""Advanced Options""")}</h3> + </div> + +  + <form class="form-horizontal" id="advancedOptions" action="bridges" method="GET"> + <fieldset> + <div class="container-fluid" id="instructions" style="align-content: left;"> + <legend style="font-size: 112%"> + <br /> + <p>${_("""Please select options for bridge type:""")}</p> + </legend> + </div> + + <div class="container-fluid"> +  + <div class="row" style="width: 98%; height: inherit; margin: auto;"> + +  + <div class="container-fluid col-lg-2" + style="float: left; width: 50%; height: inherit;"> + <div class="step" style="height: inherit;"> + <div class="form-group"> + <label class="control-label" + for="transport" + style="text-align: inherit;"> + ${_("""Do you need a %s?""") % ("""Pluggable <u>T</u>ransport""")} + </label> + <div class="container-fluid col-lg-4"> + <div class="btn-group" style="float: left; padding: 2%;"> + <select class="btn btn-primary btn-sm dropdown" + form="advancedOptions" + id="transport" + name="transport" + data-toggle="dropdown" + type="button" + accesskey="t"> + ${_("""No""")} +<option label="none" value="0" >${_("none")}</option> + +<option label="obfs2" value="obfs2" >obfs2</option> +<option label="obfs3" value="obfs3" selected >obfs3</option> +<option label="scramblesuit" value="scramblesuit">scramblesuit</option> + +<option label="fte" value="fte" disabled >fteproxy</option> +<option label="meek" value="meek" disabled >meek</option> + </select> + </div> + </div> + </div> + </div> + </div>  + +  + <div class="container-fluid col-lg-2" + style="float: right; width: 50%; height: inherit;"> + <div class="step" + style="height: inherit; margin-right: 1%;"> + <div class="form-group"> + <label class="control-label" + for="ipv6" + style="text-align: inherit;"> + ${_("""Do you need IPv6 addresses?""")} + </label> + <div class="container-fluid col-lg-4"> + <div class="checkbox" + style="float: left;"> + <div class="input-group" + style="float: left; padding: 2%;"> + <input name="ipv6" + id="ipv6" + form="advancedOptions" + type="checkbox" + value="yes" + accesskey="y" /> +  + ${_("""%sY%ses!""") % ("""<u>""", """</u>""")} + </div> + </div> + </div> + </div> + </div> + </div>  + </div> + + </div>  + </fieldset> + +  + <div class="row" + style="width: 98%; height: inherit; + margin-left: auto; margin-right: auto; padding: 2%;"> + <div class="container-fluid col-lg-2" + style="width: 50%; text-align: center;"> + <p> + <button class="btn btn-primary btn-lg btn-block" + accesskey="g"> + ${_("""%sG%set Bridges""") % ("""<u>""", """</u>""")} + </button> + </p> + </div> + </div> + </form>  + </div>  </div> <br /> -<br /> -<br /> -<br /> -<p><button>${_("""Get Bridges""")}</button></p> -</form> <hr>

1 0

[bridgedb/master] Fix unittest failures for test_HTTPServer due to template string changes.
by isis＠torproject.org 19 Apr '14

19 Apr '14

commit 6c5c358ffcee05ae9584aaa01b4a5b0e401a4ea2 Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Apr 11 12:44:03 2014 +0000 Fix unittest failures for test_HTTPServer due to template string changes. --- lib/bridgedb/test/test_HTTPServer.py | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/lib/bridgedb/test/test_HTTPServer.py b/lib/bridgedb/test/test_HTTPServer.py index c7308a3..111adc1 100644 --- a/lib/bridgedb/test/test_HTTPServer.py +++ b/lib/bridgedb/test/test_HTTPServer.py @@ -267,6 +267,7 @@ class ReCaptchaProtectedResourceTests(unittest.TestCase): """Create a :class:`HTTPServer.WebResourceBridges` and protect it with a :class:`ReCaptchaProtectedResource`. """ + self.timeout = 10.0 # Can't take longer than that, right? # Set up our resources to fake a minimal HTTP(S) server: self.pagename = b'captcha.html' self.root = Resource() @@ -327,7 +328,7 @@ class ReCaptchaProtectedResourceTests(unittest.TestCase): """Check the ``Request`` returned from ``_renderDeferred``.""" self.assertIsInstance(request, DummyRequest) html = b''.join(request.written) - self.assertSubstring('No bridges currently available', html) + self.assertSubstring('Uh oh, spaghettios!', html) d = task.deferLater(reactor, 0, lambda x: x, (True, self.request)) d.addCallback(self.captchaResource._renderDeferred) @@ -534,11 +535,11 @@ class WebResourceBridgesTests(unittest.TestCase): :rtype: list :returns: A list of the bridge lines contained on the **page**. """ - # The bridge lines are contained in a <pre> tag: - soup = BeautifulSoup(page).find('pre') - soup = str(soup).replace('<pre>', '').strip() - soup = str(soup).replace('</pre>', '').strip() - bridges = [b.strip() for b in soup.splitlines()] + # The bridge lines are contained in a <div class='well well-lg'> tag: + soup = BeautifulSoup(page) + well = soup.find('div', {'class': 'well well-lg'}).find('p') + content = well.renderContents().strip() + bridges = [b.strip() for b in content.splitlines()] return bridges def test_render_GET_vanilla(self): @@ -550,7 +551,7 @@ class WebResourceBridgesTests(unittest.TestCase): page = self.bridgesResource.render(request) # The response should explain how to use the bridge lines: - self.assertSubstring("To use the above lines", page) + self.assertTrue("To enter bridges into Tor Browser" in str(page)) for b in self.parseBridgesFromHTMLPage(page): # Check that each bridge line had the expected number of fields: @@ -579,7 +580,7 @@ class WebResourceBridgesTests(unittest.TestCase): page = self.bridgesResource.render(request) self.bridgesResource.useForwardedHeader = False # Reset it - self.assertSubstring("To use the above lines", page) + self.assertSubstring("To enter bridges into", page) def test_render_GET_RTLlang(self): """Test rendering a request for obfs3 bridges in Arabic.""" @@ -593,7 +594,8 @@ class WebResourceBridgesTests(unittest.TestCase): page = self.bridgesResource.render(request) self.assertSubstring("direction: rtl", page) - self.assertSubstring("لاستخدام الأسطر أعلاه", page) + self.assertSubstring( + "إذا لم يعمل تور بنجاح معك، يجب عليك ارسال بريد إلكتروني إلي", page) for bridgeLine in self.parseBridgesFromHTMLPage(page): # Check that each bridge line had the expected number of fields: @@ -631,7 +633,8 @@ class WebResourceBridgesTests(unittest.TestCase): """) #self.assertNotSubstring("html", page) - for bridgeLine in self.parseBridgesFromHTMLPage(page): + bridgeLines = self.parseBridgesFromHTMLPage(page) + for bridgeLine in bridgeLines: bridgeLine = bridgeLine.split(' ') self.assertEqual(len(bridgeLine), 2)

1 0

[bridgedb/master] Merge branch 'fix/10803-remove-vidalia-update-options' into develop
by isis＠torproject.org 19 Apr '14

19 Apr '14

commit 42e83f5843bf02fe971a7ca74f85eb49f5d50214 Merge: ebf301d 6c5c358 Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon Apr 14 19:36:40 2014 +0000 Merge branch 'fix/10803-remove-vidalia-update-options' into develop lib/bridgedb/HTTPServer.py | 26 ++ lib/bridgedb/templates/assets/bootstrap.min.css | 9 - .../templates/assets/css/bootstrap.min.css | 7 + lib/bridgedb/templates/assets/css/custom.css | 104 +++++ .../templates/assets/css/font-awesome-ie7.min.css | 384 +++++++++++++++++++ .../templates/assets/css/font-awesome.min.css | 403 ++++++++++++++++++++ lib/bridgedb/templates/assets/css/main.css | 24 ++ lib/bridgedb/templates/assets/custom.css | 104 ----- .../templates/assets/font/fontawesome-webfont.eot | Bin 0 -> 37405 bytes .../templates/assets/font/fontawesome-webfont.svg | 399 +++++++++++++++++++ .../templates/assets/font/fontawesome-webfont.ttf | Bin 0 -> 79076 bytes .../templates/assets/font/fontawesome-webfont.woff | Bin 0 -> 43572 bytes lib/bridgedb/templates/assets/font/lato-bold.woff | Bin 0 -> 46160 bytes .../templates/assets/font/lato-italic.woff | Bin 0 -> 47168 bytes .../templates/assets/font/lato-regular.woff | Bin 0 -> 46108 bytes lib/bridgedb/templates/assets/tor-roots-blue.svg | 95 +++++ lib/bridgedb/templates/base.html | 69 ++-- lib/bridgedb/templates/bridges.html | 92 ++++- lib/bridgedb/templates/captcha.html | 79 +++- lib/bridgedb/templates/howto.html | 47 +++ lib/bridgedb/templates/index.html | 33 +- lib/bridgedb/templates/options.html | 198 ++++++++-- lib/bridgedb/test/test_HTTPServer.py | 23 +- setup.py | 8 +- 24 files changed, 1855 insertions(+), 249 deletions(-)

1 0