From e72ad6bf1b0537acfea83c8c2d67b0f92725e581 Mon Sep 17 00:00:00 2001 From: Donncha O'Cearbhaill Date: Tue, 1 Mar 2016 18:04:44 +0100 Subject: [PATCH] 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 5885a70a..91f98b04 100644 --- a/download/en/download-easy.wml +++ b/download/en/download-easy.wml @@ -137,6 +137,19 @@

Not Using GNU/Linux? Download for Mac or Windows

+ +
+
+
+

Orbot - Tor for Android

+

Our software is available for Android-based phones, tablets, and computers from the Guardian Project in their F-Droid Repository or the Google Play Store.

+ Learn more »

+
+
+ DownloadOrbot +
+
+

Looking For Something Else? View All Downloads


@@ -313,6 +326,7 @@ the issues.

+ diff --git a/js/dlpage01.js b/js/dlpage01.js index a4bc89f6..2adc2bde 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 44ea629e..c24627d6 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