commit dce9da5121b6e998e9281171978ff9dae15e2ae3 Author: ilv <ilv@users.noreply.github.com> Date: Tue Feb 23 19:03:11 2016 -0300 Improved templates for readme and landing --- upload/landing_gh.tpl | 133 +++++++++++++++++++++++++++++++++----------------- upload/readme_gh.tpl | 2 +- 2 files changed, 88 insertions(+), 47 deletions(-) diff --git a/upload/landing_gh.tpl b/upload/landing_gh.tpl index c10c15b..771756a 100644 --- a/upload/landing_gh.tpl +++ b/upload/landing_gh.tpl @@ -17,7 +17,7 @@ <div class="container"> <div class="navbar-header"> <span class="navbar-brand"> - <span id="head-title">GetTor</span> + <span id="head-title">GetTor - Github mirror</span> </span> </div> <div class="navbar-right"> @@ -30,55 +30,96 @@ <div id="main"> <div class="container text-justify"> - <div id="description"> - <p> - <h1>Download Tor Browser</h1> - <hr /> - Below you will find links to download the latest version of Tor Browser (%VERSION%). - </p> - </div> + <!-- <div class="row lang well"> + Supported languages: <strong>English</strong>, <a href="fa/index.html">Farsi</a>, <a href="zh/index.html">Chinese</a>, <a href="tr/index.html">Turkish</a>. + </div>--> <br /> - <h2>Direct downloads</h2> - <!-- - <div class="row well"> - <div class="col-lg-2"> - <img src="img/android-logo.png" class="pad-big-right"> - </div> - <div class="col-lg-10"> - <a href="%ANDROID%" class="big-link">Tor Browser for Android</a><br />(<a href="%ANDROID_SIG%">signature file</a>) - </div> - </div> - --> - <div class="row well"> + <div class="row"> <div class="col-lg-2"> - <img src="img/windows-logo.png" class="pad-big-right"> + <img src="img/gettor-logo.png"> </div> - <div class="col-lg-10"> - <a href="%WINDOWS%" class="big-link">Tor Browser for Windows</a><br />(<a href="%WINDOWS_SIG%">signature file</a>) + <div class="col-lg-10" id="description"> + <p> + <h1>Download Tor Browser</h1> + <hr /> + Below you will find links to download the latest version of Tor Browser (%TB_VERSION%)<!-- and Orbot (%ORBOT_VERSION%) -->. + </p> </div> </div> - <div class="row well"> - <div class="col-lg-2"> - <img src="img/osx-logo.png" class="pad-big-right"> - </div> - <div class="col-lg-10"> - <a href="%OSX%" class="big-link">Tor Browser for OS X</a><br />(<a href="%OSX_SIG%">signature file</a>) - </div> - </div> - <div class="row well"> - <div class="col-lg-2"> - <img src="img/linux-logo.png" class="pad-big-right"> - </div> - <div class="col-lg-10"> - <a href="%LINUX32%" class="big-link">Tor Browser for Linux 32-bit</a><br />(<a href="%LINUX32_SIG%">signature file</a>) - </div> - </div> - <div class="row well"> - <div class="col-lg-2"> - <img src="img/linux-logo.png" class="pad-big-right"> + <br /> + <div class="row"> + <div class="col-lg-5"> + <h2>Direct downloads</h2> + <!-- + <div class="row well"> + + <div class="col-lg-2"> + <img src="img/android-logo.png" class="pad-big-right"> + </div> + <div class="col-lg-10"> + <a href="#" class="big-link">Tor Browser for Android</a><br />(<a href="#">signature file</a>) + </div> + </div> --> + <div class="row well"> + <div class="col-lg-2"> + <img src="img/windows-logo.png" class="pad-big-right"> + </div> + <div class="col-lg-10"> + <span class="big-link">Tor Browser for Windows</span><br /> + <a href="%WINDOWS_EN%">English</a>, <a href="%WINDOWS_FA%">Farsi</a>, <a href="%WINDOWS_ZH%">Chinese</a>, <a href="%WINDOWS_TR%">Turkish</a> + </div> + </div> + <div class="row well"> + <div class="col-lg-2"> + <img src="img/osx-logo.png" class="pad-big-right"> + </div> + <div class="col-lg-10"> + <span class="big-link">Tor Browser for OS X</span><br /> + <a href="%OSX_EN%">English</a>, <a href="%OSX_FA%">Farsi</a>, <a href="%OSX_ZH%">Chinese</a>, <a href="%OSX_TR%">Turkish</a> + </div> + </div> + <div class="row well"> + <div class="col-lg-2"> + <img src="img/linux-logo.png" class="pad-big-right"> + </div> + <div class="col-lg-10"> + <span class="big-link">Tor Browser for Linux 32-bit</span><br /> + <a href="%LINUX32_EN%">English</a>, <a href="%LINUX32_FA%">Farsi</a>, <a href="%LINUX32_ZH%">Chinese</a>, <a href="%LINUX32_TR%">Turkish</a> + </div> + </div> + <div class="row well"> + <div class="col-lg-2"> + <img src="img/linux-logo.png" class="pad-big-right"> + </div> + <div class="col-lg-10"> + <span class="big-link">Tor Browser for Linux 64-bit</span><br /> + <a href="%LINUX64_EN%">English</a>, <a href="%LINUX64_FA%">Farsi</a>, <a href="%LINUX64_ZH%">Chinese</a>, <a href="%LINUX64_TR%">Turkish</a> + </div> + </div> </div> - <div class="col-lg-10"> - <a href="%LINUX64%" class="big-link">Tor Browser for Linux 64-bit</a><br />(<a href="%LINUX64_SIG%">signature file</a>) + <div class="col-lg-5 col-lg-offset-2"> + <h2>Alternative downloads</h2> + <div class="row well"> + <span class="mid-title">Get links via Email</span>: You can send an email to <a href="mailto:gettor@torproject.org">gettor@torproject.org</a>. + Send the word <strong>help</strong> in the body of the message to learn how to interact with it. + </div> + <div class="row well"> + <span class="mid-title">Get links via XMPP</span>: You can send a message to <a href="#">get_tor@riseup.net</a> using your favorite XMPP client. Simply + enter <strong>help</strong> in an XMPP message to learn how to interact with it. + </div> + <div class="row well"> + <span class="mid-title">Get links via Twitter</span>: You can send a direct message to <a href="https://twitter.com/get_tor">@get_tor</a> account + (you don't need to follow). Send the word <strong>help</strong> in a direct message to learn + how to interact with it. + </div> + <h2>Get bridges</h2> + <div class="row well"> + Bridges are Tor relays that help you circumvent censorship. If you suspect your access to the + Tor network is being blocked, you may want to use bridges. You can get bridges from + the <a href="https://bridges.torproject.org">HTTP distributor</a>. You can also send + an email to <a href="mailto:bridges@torproject.org">bridges@torproject.org</a> <span class="note"> + (please note that you must send the email using an address from one of the following email providers: riseup, gmail or yahoo).</span> + </div> </div> </div> </div> @@ -86,8 +127,8 @@ <hr /> - <footer class="pad-big-left"> - <p>© The Tor Project</p> + <footer class="container"> + <p>© The Tor Project 2016</p> </footer> </div> diff --git a/upload/readme_gh.tpl b/upload/readme_gh.tpl index 80952f3..63ed23a 100644 --- a/upload/readme_gh.tpl +++ b/upload/readme_gh.tpl @@ -1,7 +1,7 @@ # Download Tor Browser In this repository you will find links to download the latest version of -Tor Browser, which currently is %VERSION%. Please select one of the links below: +Tor Browser, which currently is %TB_VERSION%. Please select one of the links below: ## Windows [Download Tor Browser](%WINDOWS_EN%) (English) ([signature file](%WINDOWS_EN_SIG%)).