[check/master] Add a donation button - tor-commits

9 Dec 2013

commit b2fbe9a099d01dab41fdba3d377715bea19f1ee3
Author: Arlo Breault arlolra@gmail.com
Date:   Sun Dec 8 22:40:52 2013 -0800
Add a donation button
---
 public/base.html  |   45 ++--------------------------------
 public/bulk.html  |    6 +++++
 public/index.html |   69 ++++++++++++++++++++++++++++++++++++++++++++++-------
 3 files changed, 69 insertions(+), 51 deletions(-)

diff --git a/public/base.html b/public/base.html
index 8414023..bd46b69 100644
--- a/public/base.html
+++ b/public/base.html
@@ -13,6 +13,7 @@
       font-family: Helvetica, sans-serif;
       margin: 0;
     }
+    h1 { font-size: 2.4em; }
     a { text-decoration: none; }
     a:hover { text-decoration: underline; }
     ul { margin: 0; padding: 0; }
@@ -22,35 +23,6 @@
       list-style-type: none;
       margin: 0;
     }
-    .on { color: green; }
-    .off { color: red; }
-    .mid { margin: 3em 0; }
-    .mid a {
-      text-decoration: underline;
-    }
-    .small { font-size: 0.8em; }
-    .security {
-      margin: 2em 0;
-      padding: 1em;
-      font-size: 1.4em;
-      color: goldenrod;
-      background-color: ghostwhite;
-      border-radius: 5px;
-    }
-    .security a {
-      color: goldenrod;
-      text-decoration: underline;
-    }
-    .onion {
-      width: 128px;
-      height: 128px;
-      border: 0;
-      text-decoration: none;
-    }
-    .form {
-      display: inline;
-      margin-right: 0.4em;
-    }
     .content {
       padding: 4em;
     }
@@ -67,20 +39,7 @@
       margin: 0;
       font-size: 0.8em;
     }
-    .other {
-      width: 50%;
-      float: left;
-    }
-    .other p {
-      margin: 1em 4em;
-    }
-    .other p a {
-      display: block;
-      margin-bottom: 0.4em;
-    }
-    #js {
-      font-size: 0.8em;
-    }
+    {{ template "css" . }}
   </style>
 </head>
 <body>
diff --git a/public/bulk.html b/public/bulk.html
index 2460f81..70f3f06 100644
--- a/public/bulk.html
+++ b/public/bulk.html
@@ -1,6 +1,12 @@
 {{ template "base.html" . }}
 {{ define "title" }}Bulk Tor Exit Exporter{{ end }}
 {{ define "head" }}{{ end }}
+{{ define "css" }}
+  .form {
+    display: inline;
+    margin-right: 0.4em;
+  }
+{{ end }}
 {{ define "body" }}
   <img src="/torcheck/img/tor-on.png" class="onion" />
   <h4>Welcome to the Tor Bulk Exit List exporting tool.</h4>
diff --git a/public/index.html b/public/index.html
index 763a6eb..eb81799 100644
--- a/public/index.html
+++ b/public/index.html
@@ -1,5 +1,56 @@
 {{ template "base.html" . }}
 {{ define "title" }}{{ GetText .Lang "Are you using Tor?" }}{{ end }}
+{{ define "css" }}
+  .on { color: green; }
+  .off { color: red; }
+  .mid { margin: 3em 0; }
+  .mid a {
+    text-decoration: underline;
+  }
+  .small { font-size: 0.8em; }
+  .security {
+    margin: 2em 0;
+    padding: 1em;
+    font-size: 1.4em;
+    color: goldenrod;
+    background-color: ghostwhite;
+    border-radius: 5px;
+  }
+  .security a {
+    color: goldenrod;
+    text-decoration: underline;
+  }
+  .onion {
+    width: 128px;
+    height: 128px;
+    border: 0;
+    text-decoration: none;
+  }
+  #js {
+    font-size: 0.8em;
+  }
+  #donate {
+    background-color: dodgerblue;
+    color: white;
+    text-decoration: none;
+    font-size: 1.4em;
+    font-weight: bold;
+    padding: 0.6em 2.4em;
+    border-radius: 0.2em;
+    display: inline-block;
+  }
+  #links {
+    margin-top: 0.6em;
+  }
+  #links li:after {
+    content: "|";
+    padding: 0 0.2em;
+  }
+  #links li:last-child:after {
+    content: "";
+    padding: 0;
+  }
+{{ end }}
 {{ define "head" }}
 <form action="/" method="get" id="lang">
   {{ if .Small }}<input type="hidden" name="small" value="1" />{{ end }}
@@ -39,14 +90,16 @@
       {{ GetText .Lang "If you are attempting to use a Tor client, please refer to the <a href="https://www.torproject.org/%5C%22%3ETor website</a> and specifically the <a href="https://www.torproject.org/docs/faq#DoesntWork%5C%22%3Einstructions for configuring your Tor client</a>." | UnEscaped }}
     {{ end }}
   </p>
-  <div class="other">
-    <p><a href="https://torproject.org/dist/manual/short-user-manual_{{ UserManual .Lang }}.xhtml">{{ GetText .Lang "Short User Manual" }}</a>
-    {{ GetText .Lang "The short user manual contains information about how to download Tor, how to use it, and what to do if Tor is unable to connect to the network." }}</p>
-  </div>
-  <div class="other">
-    <p><a href="https://tor.stackexchange.com/">{{ GetText .Lang "Tor Q&A Site" }}</a>
-    {{ GetText .Lang "Questions and answers site for researchers, developers, and users of Tor. Hosted on StackExchange. Currently only available in English." }}</p>
-  </div>
+  <a id="donate" href="https://www.torproject.org/donate/donate.html">Donate to Support Tor</a>
+  <ul id="links">
+    <li>
+      <a href="https://torproject.org/dist/manual/short-user-manual_{{ UserManual .Lang }}.xhtml">{{ GetText .Lang "Short User Manual" }}</a>
+    </li><li>
+      <a href="https://tor.stackexchange.com/">{{ GetText .Lang "Tor Q&A Site" }}</a>
+    </li><li>
+      <a href="https://www.torproject.org/getinvolved/volunteer.html">{{ GetText .Lang "Volunteer" }}</a>
+    </li>
+  </ul>
 {{ end }}
 {{ define "foot" }}
 <p id="js">

    