[tor-commits] [exonerator/master] Apply style changes based on suggestions by Joshua Lee Tucker.

[karsten at torproject.org]

commit 6337bdaa110b6a5e8b10b2dbf1f3d997d7010e3a
Author: Karsten Loesing <karsten.loesing at gmx.net>
Date:   Fri Jul 17 17:25:42 2015 +0200

    Apply style changes based on suggestions by Joshua Lee Tucker.
---
 res/ExoneraTor.properties                          |    1 +
 res/ExoneraTor_de.properties                       |    1 +
 .../torproject/exonerator/ExoneraTorServlet.java   |   11 +++++++++-
 web/css/exonerator.css                             |   21 ++++++++++++++++++++
 4 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/res/ExoneraTor.properties b/res/ExoneraTor.properties
index 8174e5e..aea0367 100644
--- a/res/ExoneraTor.properties
+++ b/res/ExoneraTor.properties
@@ -1,3 +1,4 @@
+form.explanation=Enter an IP address and date to find out whether that address was used by a Tor relay:
 form.ip.label=IP address
 form.timestamp.label=Date
 form.search.label=Search
diff --git a/res/ExoneraTor_de.properties b/res/ExoneraTor_de.properties
index 4247ddd..8715666 100644
--- a/res/ExoneraTor_de.properties
+++ b/res/ExoneraTor_de.properties
@@ -1,3 +1,4 @@
+form.explanation=Geben Sie eine IP-Adresse und ein Datum ein um herauszufinden, ob diese IP-Adresse von einem Tor-Relay verwendet wurde:
 form.ip.label=IP-Adresse
 form.timestamp.label=Datum
 form.search.label=Suchen
diff --git a/src/org/torproject/exonerator/ExoneraTorServlet.java b/src/org/torproject/exonerator/ExoneraTorServlet.java
index 7d87fd6..47947c7 100644
--- a/src/org/torproject/exonerator/ExoneraTorServlet.java
+++ b/src/org/torproject/exonerator/ExoneraTorServlet.java
@@ -519,6 +519,7 @@ public class ExoneraTorServlet extends HttpServlet {
           + "initial-scale=1\">\n"
         + "<title>ExoneraTor</title>\n"
         + "<link rel=\"stylesheet\" href=\"css/bootstrap.min.css\">\n"
+        + "<link rel=\"stylesheet\" href=\"css/exonerator.css\">\n"
         + "<link href=\"images/favicon.ico\" type=\"image/x-icon\" "
           + "rel=\"icon\">\n"
         + "</head>\n"
@@ -547,6 +548,9 @@ public class ExoneraTorServlet extends HttpServlet {
     out.printf("<div class=\"row\">\n"
         + "<div class=\"col-xs-12\">\n"
         + "<div class=\"text-center\">\n"
+        + "<div class=\"row vbottom15\">\n"
+        + "<h4>%s</h4>\n"
+        + "</div> <!-- row -->\n"
         + "<form class=\"form-inline\">\n"
         + "<div class=\"form-group%s\">\n"
         + "<label for=\"inputIp\" class=\"control-label\">%s</label>\n"
@@ -566,6 +570,7 @@ public class ExoneraTorServlet extends HttpServlet {
         + "</div><!-- text-center -->\n"
         + "</div><!-- col -->\n"
         + "</div><!-- row -->\n",
+        rb.getString("form.explanation"),
         relayIPHasError ? " has-error" : "",
         rb.getString("form.ip.label"),
         ipValue,
@@ -812,7 +817,10 @@ public class ExoneraTorServlet extends HttpServlet {
 
   private void writeFooter(PrintWriter out, ResourceBundle rb)
       throws IOException {
-    out.printf("<div class=\"row\">\n"
+    out.printf("</div><!-- container -->\n"
+        + "<div class=\"footer\">\n"
+        + "<div class=\"container\">\n"
+        + "<div class=\"row\">\n"
         + "<div class=\"col-xs-6\">\n"
         + "<h3>%s</h3>\n"
         + "<p class=\"small\">\n"
@@ -843,6 +851,7 @@ public class ExoneraTorServlet extends HttpServlet {
         + "</div><!-- col -->\n"
         + "</div><!-- row -->\n"
         + "</div><!-- container -->\n"
+        + "</div><!-- footer -->\n"
         + "</body>\n"
         + "</html>\n",
         String.format(rb.getString("footer.trademark.text"),
diff --git a/web/css/exonerator.css b/web/css/exonerator.css
new file mode 100644
index 0000000..dfa4767
--- /dev/null
+++ b/web/css/exonerator.css
@@ -0,0 +1,21 @@
+html {
+  position: relative;
+  min-height: 100%;
+}
+
+body {
+  margin: 0 0 200px; /* bottom = footer height */
+}
+
+.footer {
+  position: absolute;
+  left: 0;
+  bottom: 0;
+  height: 200px;
+  width: 100%;
+}
+
+.vbottom15 {
+  margin-bottom: 15px;
+}
+