[tor-commits] [webwml/staging] Display Orbot on Tor download page
arma at torproject.org
arma at torproject.org
Wed Mar 9 19:23:16 UTC 2016
commit e72ad6bf1b0537acfea83c8c2d67b0f92725e581
Author: Donncha O'Cearbhaill <donncha at donncha.is>
Date: Tue Mar 1 18:04:44 2016 +0100
Display Orbot on Tor download page
This commit adds a box on the download-easy.html.en webpage which
includes links to install Orbot.
The jquery.client.min.js script is from 2009 and does not detect
Android. I've added JS Android detection.
---
download/en/download-easy.wml | 14 ++++++++++++++
js/dlpage01.js | 6 +++++-
js/jquery.client.min.js | 2 +-
3 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/download/en/download-easy.wml b/download/en/download-easy.wml
index 5885a70..91f98b0 100644
--- a/download/en/download-easy.wml
+++ b/download/en/download-easy.wml
@@ -137,6 +137,19 @@
<p class="alt-dl">Not Using GNU/Linux? Download for <a href="#mac">Mac</a> or <a href="#windows">Windows</a></p>
</div>
</div>
+<!-- START Orbot -->
+ <div id="android" class="easy android">
+ <div class="package" style="padding-top: 13px; border-top: 0px;">
+ <div class="desc">
+ <h2>Orbot - Tor for Android</h2>
+ <p>Our software is available for Android-based phones, tablets, and computers from the <a href="https://guardianproject.info/">Guardian Project</a> in their <a href= "https://guardianproject.info/2012/03/15/our-new-f-droid-app-repository/">F-Droid Repository</a> or the <a href="https://play.google.com/store/apps/details?id=org.torproject.android">Google Play Store</a>.</p>
+ <a href="https://www.torproject.org/docs/android.html.en">Learn more »</a></p>
+ </div>
+ <form class="downloads">
+ <a class="button lin-orbot" href="https://guardianproject.info/apps/orbot/?src=tbb_download"><span class="strong">Download</span><span class="normal">Orbot</span></a>
+ </form>
+ </div>
+ </div>
<p class="all-dl">Looking For Something Else? <a href="<page download/download>">View All Downloads</a></p>
<!-- END DOWNLOADS --><br>
</div> <!-- END dow-don-left -->
@@ -313,6 +326,7 @@ the issues</a>.</p>
<li class="dropdown"><a href="#windows">Microsoft Windows</a></li>
<li class="dropdown"><a href="#mac">Apple OS X</a></li>
<li class="dropdown"><a href="#linux">Linux/Unix</a></li>
+<li class="dropdown"><a href="#android">Android</a></li>
<li class="dropdown"><a href="<page download/download>">All Downloads</a></li>
</ul>
</div>
diff --git a/js/dlpage01.js b/js/dlpage01.js
index a4bc89f..2adc2bd 100644
--- a/js/dlpage01.js
+++ b/js/dlpage01.js
@@ -17,6 +17,8 @@ function OScheck() {
$('.easy.windows').css('display', 'block');
}else if(clientos == "Mac"){
$('.easy.mac').css('display', 'block');
+ }else if(clientos == "Android"){
+ $('.easy.android').css('display', 'block');
}else{
$('.easy').css('display', 'block');
}
@@ -63,7 +65,7 @@ $(document).ready(function () {
var url = $.param.fragment();
// Toggle the '.easy' divs to off
- if(url == 'windows'|url == 'mac'|url == 'linux'){
+ if(url == 'windows'|url == 'mac'|url == 'linux'|url == 'android'){
$('.easy').css('display', 'none');
}
@@ -74,6 +76,8 @@ $(document).ready(function () {
$('.easy.mac').css('display', 'block');
} else if(url == 'linux'){
$('.easy.linux').css('display', 'block');
+ } else if(url == 'android'){
+ $('.easy.android').css('display', 'block');
} else {
$('.easy').css('display', 'none');
$(function(){OScheck();});
diff --git a/js/jquery.client.min.js b/js/jquery.client.min.js
index 44ea629..c24627d 100644
--- a/js/jquery.client.min.js
+++ b/js/jquery.client.min.js
@@ -1,4 +1,4 @@
(function(){var BrowserDetect={init:function(){this.browser=this.searchString(this.dataBrowser)||"An unknown browser";this.version=this.searchVersion(navigator.userAgent)||this.searchVersion(navigator.appVersion)||"an unknown version";this.OS=this.searchString(this.dataOS)||"an unknown OS";},searchString:function(data){for(var i=0;i<data.length;i++){var dataString=data[i].string;var dataProp=data[i].prop;this.versionSearchString=data[i].versionSearch||data[i].identity;if(dataString){if(dataString.indexOf(data[i].subString)!=-1)
return data[i].identity;}
else if(dataProp)
-return data[i].identity;}},searchVersion:function(dataString){var index=dataString.indexOf(this.versionSearchString);if(index==-1)return;return parseFloat(dataString.substring(index+this.versionSearchString.length+1));},dataBrowser:[{string:navigator.userAgent,subString:"Chrome",identity:"Chrome"},{string:navigator.userAgent,subString:"OmniWeb",versionSearch:"OmniWeb/",identity:"OmniWeb"},{string:navigator.vendor,subString:"Apple",identity:"Safari",versionSearch:"Version"},{prop:window.opera,identity:"Opera"},{string:navigator.vendor,subString:"iCab",identity:"iCab"},{string:navigator.vendor,subString:"KDE",identity:"Konqueror"},{string:navigator.userAgent,subString:"Firefox",identity:"Firefox"},{string:navigator.vendor,subString:"Camino",identity:"Camino"},{string:navigator.userAgent,subString:"Netscape",identity:"Netscape"},{string:navigator.userAgent,subString:"MSIE",identity:"Explorer",versionSearch:"MSIE"},{string:navigator.userAgent,subString:"Gecko",identity:"Mozilla",version
Search:"rv"},{string:navigator.userAgent,subString:"Mozilla",identity:"Netscape",versionSearch:"Mozilla"}],dataOS:[{string:navigator.platform,subString:"Win",identity:"Windows"},{string:navigator.platform,subString:"Mac",identity:"Mac"},{string:navigator.userAgent,subString:"iPhone",identity:"iPhone/iPod"},{string:navigator.platform,subString:"Linux",identity:"Linux"}]};BrowserDetect.init();window.$.client={os:BrowserDetect.OS,browser:BrowserDetect.browser};})();
\ No newline at end of file
+return data[i].identity;}},searchVersion:function(dataString){var index=dataString.indexOf(this.versionSearchString);if(index==-1)return;return parseFloat(dataString.substring(index+this.versionSearchString.length+1));},dataBrowser:[{string:navigator.userAgent,subString:"Chrome",identity:"Chrome"},{string:navigator.userAgent,subString:"OmniWeb",versionSearch:"OmniWeb/",identity:"OmniWeb"},{string:navigator.vendor,subString:"Apple",identity:"Safari",versionSearch:"Version"},{prop:window.opera,identity:"Opera"},{string:navigator.vendor,subString:"iCab",identity:"iCab"},{string:navigator.vendor,subString:"KDE",identity:"Konqueror"},{string:navigator.userAgent,subString:"Firefox",identity:"Firefox"},{string:navigator.vendor,subString:"Camino",identity:"Camino"},{string:navigator.userAgent,subString:"Netscape",identity:"Netscape"},{string:navigator.userAgent,subString:"MSIE",identity:"Explorer",versionSearch:"MSIE"},{string:navigator.userAgent,subString:"Gecko",identity:"Mozilla",version
Search:"rv"},{string:navigator.userAgent,subString:"Mozilla",identity:"Netscape",versionSearch:"Mozilla"}],dataOS:[{string:navigator.platform,subString:"Win",identity:"Windows"},{string:navigator.platform,subString:"Mac",identity:"Mac"},{string:navigator.userAgent,subString:"iPhone",identity:"iPhone/iPod"},{string:navigator.platform,subString:"Linux",identity:"Linux"},{string:navigator.userAgent,subString:"Android",identity:"Android"}]};BrowserDetect.init();window.$.client={os:BrowserDetect.OS,browser:BrowserDetect.browser};})();
More information about the tor-commits
mailing list