[tor-commits] [check/master] Update favicon / title with check result

[arlo at torproject.org]

commit 4f2b003dfe56bf524ed71ed318c332af7aa7954b
Author: Arlo Breault <arlolra at gmail.com>
Date:   Mon May 4 12:23:53 2015 -0700

    Update favicon / title with check result
    
     * trac 15820
---
 public/base.html       |    2 +-
 public/bulk.html       |    1 +
 public/img/tor-not.ico |  Bin 0 -> 4286 bytes
 public/img/tor-off.ico |  Bin 0 -> 4286 bytes
 public/img/tor-on.ico  |  Bin 0 -> 4286 bytes
 public/index.html      |    9 ++++++++-
 6 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/public/base.html b/public/base.html
index 5673de9..2f9facc 100644
--- a/public/base.html
+++ b/public/base.html
@@ -4,7 +4,7 @@
   <meta charset="utf-8" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
   <title>{{ template "title" . }}</title>
-  <link rel="icon" type="image/x-icon" href="/torcheck/favicon.ico" />
+  <link rel="icon" type="image/x-icon" href="/torcheck/img/{{ template "favicon" . }}" />
   <style>
     html { height: 100%; }
     body {
diff --git a/public/bulk.html b/public/bulk.html
index 9f62854..15ec668 100644
--- a/public/bulk.html
+++ b/public/bulk.html
@@ -1,5 +1,6 @@
 {{ template "base.html" . }}
 {{ define "title" }}Bulk Tor Exit Exporter{{ end }}
+{{ define "favicon" }}favicon.ico{{ end }}
 {{ define "head" }}{{ end }}
 {{ define "css" }}
   .form {
diff --git a/public/img/tor-not.ico b/public/img/tor-not.ico
new file mode 100644
index 0000000..b925b97
Binary files /dev/null and b/public/img/tor-not.ico differ
diff --git a/public/img/tor-off.ico b/public/img/tor-off.ico
new file mode 100644
index 0000000..6682396
Binary files /dev/null and b/public/img/tor-off.ico differ
diff --git a/public/img/tor-on.ico b/public/img/tor-on.ico
new file mode 100644
index 0000000..24b3bac
Binary files /dev/null and b/public/img/tor-on.ico differ
diff --git a/public/index.html b/public/index.html
index 05c2e56..eb1195e 100644
--- a/public/index.html
+++ b/public/index.html
@@ -1,5 +1,12 @@
 {{ template "base.html" . }}
-{{ define "title" }}{{ GetText .Lang "Are you using Tor?" }}{{ end }}
+{{ define "title" }}
+    {{ if .IsTor }}
+      {{ GetText .Lang "Congratulations. This browser is configured to use Tor." }}
+    {{ else }}
+      {{ GetText .Lang "Sorry. You are not using Tor." }}
+    {{ end }}
+{{ end }}
+{{ define "favicon" }}tor-{{ .OnOff }}.png{{ end }}
 {{ define "css" }}
   .on { color: green; }
   .off { color: red; }