[tor-commits] [bridgedb/master] Fix newlines in bridge lines distributed by HTTPServer.

[isis@xxxxxxxxxxxxxx]

commit dd018316a01533ef614d8180daa8aec180cf0ac8
Author: Isis Lovecruft <isis@xxxxxxxxxxxxxx>
Date:   Thu Jan 15 20:48:41 2015 +0000

    Fix newlines in bridge lines distributed by HTTPServer.
    
     * CHANGES bridge.html template to inline replace '\n' with '<br />' in
       the bridge lines.
     * FIXES #12664 https://bugs.torproject.org/12664
---
 lib/bridgedb/templates/bridges.html |   39 +++++++++++++++++++++++------------
 1 file changed, 26 insertions(+), 13 deletions(-)

diff --git a/lib/bridgedb/templates/bridges.html b/lib/bridgedb/templates/bridges.html
index 7e44513..7ac77dd 100644
--- a/lib/bridgedb/templates/bridges.html
+++ b/lib/bridgedb/templates/bridges.html
@@ -3,23 +3,36 @@
 <%inherit file="base.html"/>
 <%page args="strings, rtl=False, lang='en', answer=0, **kwargs"/>
 
-<div class="container-fluid"
-     style="width: 98%; align: center; margin: auto;">
-  <div class="container-fluid"
-       style="padding: 2%">
-    <h2>${_(strings.BRIDGES[0])}</h2>
   </div>
 </div>
 
+<div class="container-narrow">
+  <div class="container-fluid">
+
 % if answer:
-<div class="container-fluid" style="width: 98%; align: center; margin: auto;">
-<div class="container-fluid" style="padding: 1px">
-<div class="bridge-lines">
-${answer}
-</div>
-</div>
-</div>
-<br \>
+    <div class="container-fluid"
+         style="width: 98%; align: center; margin: auto;">
+      <div class="container-fluid"
+           style="padding: 2%">
+        <h2>${_(strings.BRIDGES[0])}</h2>
+      </div>
+    </div>
+
+    <div class="container-fluid"
+         style="width: auto; align: center; margin: auto;
+                position: relative; left: 0%;"
+         onclick="selectText('bridgelines')">
+      <div class="row" id="bridgesrow1">
+        <div class="col col-lg-12">
+          <div class="bridge-lines" id="bridgelines">
+${answer.replace("\n", "<br />")}
+          </div>
+        </div>
+      </div>
+    </div>
+
+    <br />
+    <br />
 
 <div class="container-fluid"
      style="width: 100%; align: center; margin: auto;">



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits