From 627f37e00485fc87b790418f7edba8fb0c7bfd28 Mon Sep 17 00:00:00 2001 From: David Fifield Date: Thu, 20 Dec 2018 17:22:36 -0700 Subject: [PATCH] Move the Yes/No buttons into index.html; redirect options.html to it. --- proxy/static/.htaccess | 1 + proxy/static/embed.html | 2 +- proxy/static/index.html | 106 ++++++++++++++++++++++++++++ proxy/static/options.html | 143 -------------------------------------- 4 files changed, 108 insertions(+), 144 deletions(-) delete mode 100644 proxy/static/options.html diff --git a/proxy/static/.htaccess b/proxy/static/.htaccess index f733194..3dd217d 100644 --- a/proxy/static/.htaccess +++ b/proxy/static/.htaccess @@ -1,3 +1,4 @@ Header always unset X-Frame-Options +Redirect permanent /options.html /index.html diff --git a/proxy/static/embed.html b/proxy/static/embed.html index 65303b5..9efe369 100644 --- a/proxy/static/embed.html +++ b/proxy/static/embed.html @@ -44,7 +44,7 @@ - +
Internet Freedom
diff --git a/proxy/static/index.html b/proxy/static/index.html index 74779e5..cfe8d89 100644 --- a/proxy/static/index.html +++ b/proxy/static/index.html @@ -17,6 +17,18 @@ textarea { resize: none; padding: 1em; } +#options { + background-color: rgba(0,0,0,0.8); + color: #fff; + resize: none; + position: relative; border: none; + width: 30rem; + padding: 3rem; margin: auto; margin-top: 1rem; + cursor: default; +} +#options .active { + color: #2F2 !important; +} @@ -29,6 +41,49 @@ textarea { is a WebRTC pluggable transport for Tor.

+

+This page enables you to use your web browser as a proxy to help other +Internet users in censored places. +When you click yes, your browser will act as a +censorship circumvention proxy +as long as you are viewing a page with the snowflake badge. +

+ +
+ + + + + + + +
+

Minimum functionality has been achieved, and it is possible to bootstrap a Tor client to 100% using Snowflake, and the @@ -74,5 +129,56 @@ gitweb.torproject.org/pluggable-transports/snowflake.git
Last update: + + diff --git a/proxy/static/options.html b/proxy/static/options.html deleted file mode 100644 index bdffd51..0000000 --- a/proxy/static/options.html +++ /dev/null @@ -1,143 +0,0 @@ - - - - - Snowflake - Options - - - -

-

Snowflake Options

-

- This page enables you to use your web browser as a proxy to help other - Internet users in censored places. - When you click yes, your browser will act as a - censorship circumvention proxy - as long as you are viewing a page with the snowflake badge. -

- -

- For more information on this system click - here. -

- - - - - - - - - -