From d7e8024970aed218c6e114b806209939a5f8ec56 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robin=20Lind=C3=A9n?= Date: Fri, 2 Dec 2016 23:02:28 +0100 Subject: [PATCH 1/3] Start redesign of download page. --- themes/website/templates/download.html | 161 ++++++++++++++++++------- 1 file changed, 118 insertions(+), 43 deletions(-) diff --git a/themes/website/templates/download.html b/themes/website/templates/download.html index d3ae83a..2d72612 100644 --- a/themes/website/templates/download.html +++ b/themes/website/templates/download.html @@ -4,81 +4,74 @@
-
+
Tox icon
-

Thanks for downloading!

+

Thank you for choosing Tox!

- After you've installed, try adding GroupBot, and then invite some friends! Want to know more about the different clients? See our clients list. + After you've installed your client of choice, try adding GroupBot, and then invite some friends! Want to know more about the different clients? See our clients list.

Note: Tox is still under heavy development — expect to run into some bugs.
- - - -  Download - - - - - - -
-

All Platforms:

+

Tox Clients:


- -

Windows

-

qTox stable: 32 bit / 64 bit

-

qTox nightly: 32 bit / 64 bit

-

uTox stable: 32 bit / 64 bit

+

qTox

+

+ Windows | + OS X | + Linux | + FreeBSD +

- -

OS X

-

qTox

-

uTox 64 bit (OS X 10.7+)

+

uTox

+

+ Windows | + OS X | + Linux | + FreeBSD +

- -

Linux

-

Ricin, Toxic, Toxygen and uTox Debian/Ubuntu repo

-

qTox repo (Arch, CentOS, Debian, Fedora, openSUSE, Ubuntu)

-

Arch and Gentoo repos (not maintained)

-

uTox static: 32 bit / 64 bit

-

Toxic static: 32 bit / 64 bit

- +

Ricin

+

+ Windows | + Linux +

- -

FreeBSD

-

qTox on Freshports

-

uTox on Freshports

-

Toxic on Freshports

+

Toxic

+

+ Linux | + FreeBSD +

- -

iOS

-

Antidote (iOS 8+)

+

Antidote

+

+ iOS +

- -

Android

-

Antox: F-Droid / Google Play / APK

+

Antox

+

+ Android +

@@ -275,6 +268,88 @@

TokTok/c-toxcore

TokTok/c-toxcore is a fork of the original irungentoo/toxcore. Toxcore developer, irungentoo, has been very busy lately and unable to find time to work on Toxcore. Because any change to Toxcore should be first reviewed and approved by irungentoo, as he is the only one who can merge changes, Toxcore development has been stalled for some time now. To get around this, a non-hostile Toxcore fork was created where the development is currently ongoing.

+ +
+
+ +   + +

qTox for Windows

+ +

Text goes here.

+
+
+
+
+ +   + +

qTox for Linux

+ +

Text goes here.

+
+
+
+
+ +   + +

qTox for OS X

+ +

Text goes here.

+
+
+
+
+ +   + +

qTox for FreeBSD

+ +

Text goes here.

+
+
+ +
+
+ +   + +

uTox for Windows

+ +

Text goes here.

+
+
+
+
+ +   + +

uTox for Linux

+ +

Text goes here.

+
+
+
+
+ +   + +

uTox for OS X

+ +

Text goes here.

+
+
+
+
+ +   + +

uTox for FreeBSD

+ +

Text goes here.

+
+
From 6d119237dc2514c5c3f5adbe079503ac0c418feb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robin=20Lind=C3=A9n?= Date: Fri, 2 Dec 2016 23:04:25 +0100 Subject: [PATCH 2/3] Remove osdetect.js --- themes/website/static/js/osdetect.js | 216 ------------------------- themes/website/templates/download.html | 2 - 2 files changed, 218 deletions(-) delete mode 100644 themes/website/static/js/osdetect.js diff --git a/themes/website/static/js/osdetect.js b/themes/website/static/js/osdetect.js deleted file mode 100644 index 6e7bf4a..0000000 --- a/themes/website/static/js/osdetect.js +++ /dev/null @@ -1,216 +0,0 @@ -/* - Globals -*/ - -var arch = 0; -var OSName = "Unknown"; - -var defClient = { - title: "Wiki Downloads", - name: "", - icon: "external-link", - desc: false, - dlLink: "http://wiki.tox.chat/binaries", -}; - -var clients = [defClient]; - -/* - Arch detection -*/ - -// If 64 is declared -if (window.navigator.userAgent.indexOf("WOW64") != -1 || window.navigator.userAgent.indexOf("x86_64") != -1 || window.navigator.userAgent.indexOf("x64;") != -1 || window.navigator.userAgent.indexOf("Win64") != -1 || window.navigator.userAgent.indexOf("AMD64") != -1) { - arch = 64; -} - -// If 32 is declared -if (window.navigator.userAgent.indexOf("i386") != -1 || window.navigator.userAgent.indexOf("i686") != -1) { - arch = 32; -} - -// If the OS is Windows and neither is declared we know it's 32 -if (window.navigator.userAgent.indexOf("Windows") != -1 && arch == 0) { - arch = 32; -} - -/* - OS detection (order matters) -*/ - -if (window.navigator.userAgent.indexOf("Mac") != -1) { - OSName = "Mac"; - - clients = [{ - title: "qTox", - name: "qtox", - icon: "download", - desc: true, - dlLink: "https://github.com/qTox/qTox/releases/download/v1.5.1/qTox.dmg", - }, { - title: "uTox 64-bit", - name: "utox", - icon: "download", - desc: true, - dlLink: "https://github.com/uTox/uTox/releases/download/v0.9.8/uTox-0.9.8.dmg", - }]; -} - -if (window.navigator.userAgent.indexOf("iPad") != -1) { - OSName = "iOS"; - - clients = [{ - title: "Antidote", - name: "antidote", - icon: "external-link", - desc: true, - dlLink: "https://itunes.apple.com/app/antidote-for-tox/id933117605", - }]; -} - -if (window.navigator.userAgent.indexOf("iPhone") != -1) { - OSName = "iOS"; - - clients = [{ - title: "Antidote", - name: "antidote", - icon: "external-link", - desc: true, - dlLink: "https://itunes.apple.com/app/antidote-for-tox/id933117605", - }]; -} - -if (window.navigator.userAgent.indexOf("Linux") != -1) { - OSName = "Linux"; - - clients = [{ - title: "Our repository", - name: "repo", - icon: "list-ul", - desc: false, - dlLink: "#gnulinux", - }, { - title: "qTox repository", - name: "qtox", - icon: "external-link", - desc: true, - dlLink: "https://software.opensuse.org/download.html?project=home%3Aantonbatenev%3Atox&package=qtox", - }]; -} - -if (window.navigator.userAgent.indexOf("FreeBSD") != -1) { - OSName = "FreeBSD"; - - clients = [{ - title: "Install qTox", - name: "qtox", - icon: "external-link", - desc: true, - dlLink: "https://www.freshports.org/net-im/qTox", - }, { - title: "Install uTox", - name: "utox", - icon: "external-link", - desc: true, - dlLink: "https://freshports.org/net-im/uTox/", - }, { - title: "Install Toxic", - name: "toxic", - icon: "external-link", - desc: true, - dlLink: "https://freshports.org/net-im/toxic/", - }]; -} - -if (window.navigator.userAgent.indexOf("Android") != -1) { - OSName = "Android"; - - clients = [{ - title: "Antox F-Droid", - name: "antox", - icon: "external-link", - desc: true, - dlLink: "#fdroid", - }, { - title: "Antox Google Play", - name: "antox", - icon: "external-link", - desc: true, - dlLink: "https://play.google.com/store/apps/details?id=chat.tox.antox", - }, { - title: "Antox APK", - name: "antox", - icon: "download", - desc: true, - dlLink: "https://pkg.tox.chat/fdroid/repo/antox.apk", - }]; -} - -if (window.navigator.userAgent.indexOf("Windows") != -1) { - OSName = "Windows"; - - if (arch == 64) { - clients = [{ - title: "qTox 64-bit", - name: "qtox", - icon: "download", - desc: true, - dlLink: "https://build.tox.chat/view/qtox/job/qTox_pkg_windows_x86-64_stable_release/lastSuccessfulBuild/artifact/setup-qtox.exe", - }, { - title: "uTox 64-bit", - name: "utox", - icon: "download", - desc: true, - dlLink: "https://build.tox.chat/job/uTox_build_windows_x86-64_release/lastSuccessfulBuild/artifact/utox_windows_x86-64.zip", - }]; - } else { - clients = [{ - title: "qTox 32-bit", - name: "qtox", - icon: "download", - desc: true, - dlLink: "https://build.tox.chat/view/qtox/job/qTox_pkg_windows_x86_stable_release/lastSuccessfulBuild/artifact/setup-qtox.exe", - }, { - title: "uTox 32-bit", - name: "utox", - icon: "download", - desc: true, - dlLink: "https://build.tox.chat/job/uTox_build_windows_x86_release/lastSuccessfulBuild/artifact/utox_windows_x86.zip" - }]; - } -} - -if (window.navigator.userAgent.indexOf("Windows Phone") != -1) { - // We don't have a windows phone client?!?? - clients = [defClient]; -} - -/* - All the magic stuff the makes the buttons change and stuff -*/ - -// Set platform toxlock -document.getElementById("platImg").src = "theme/img/plat/" + OSName.toLowerCase() + ".svg"; - -// Remove normal button -document.getElementById("defaultButton").innerHTML = ""; - -// Loop through all links and make buttons and info modals -for (var i = 0; i < clients.length; i++) { - var client = clients[i]; - - var button = "\ - \ -  " + client.title + "\ - "; - - var infoButton = ""; - if (client.desc) { - infoButton = "\ - \ - \ - "; - } - - document.getElementById("buttonArea").innerHTML = document.getElementById("buttonArea").innerHTML + button + infoButton + "
"; -} diff --git a/themes/website/templates/download.html b/themes/website/templates/download.html index 2d72612..5f9ead4 100644 --- a/themes/website/templates/download.html +++ b/themes/website/templates/download.html @@ -351,6 +351,4 @@

uTox for FreeBSD

- - {% endblock %} From 0f95b1a20f0f12f5ba7b16b72004f5e12ebd661d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robin=20Lind=C3=A9n?= Date: Wed, 7 Dec 2016 03:22:38 +0100 Subject: [PATCH 3/3] Add list of all clients. --- pelicanconf.py | 157 +++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 153 insertions(+), 4 deletions(-) diff --git a/pelicanconf.py b/pelicanconf.py index 29b58aa..aade684 100644 --- a/pelicanconf.py +++ b/pelicanconf.py @@ -34,7 +34,156 @@ templates_dir = THEME + '/templates' for root, dirnames, filenames in os.walk(templates_dir): - for filename in fnmatch.filter(filenames, '*.html'): - if not filename.startswith("_"): - template = os.path.join(root, filename)[len(templates_dir)+1:] - TEMPLATE_PAGES[template] = template + for filename in fnmatch.filter(filenames, '*.html'): + if not filename.startswith("_"): + template = os.path.join(root, filename)[len(templates_dir)+1:] + TEMPLATE_PAGES[template] = template + +clients = [{ + 'name': 'qTox', + 'platforms': { + 'Windows': { + 'stable': { + 'x86': 'https://build.tox.chat/view/qtox/job/qTox-stable_build_windows_x86_release/lastSuccessfulBuild/artifact/qTox-stable_build_windows_x86_release.zip', + 'x86-64': 'https://build.tox.chat/view/qtox/job/qTox-stable_build_windows_x86-64_release/lastSuccessfulBuild/artifact/qTox-stable_build_windows_x86-64_release.zip' + }, + 'nightly': { + 'x86': 'https://build.tox.chat/view/qtox/job/qTox_pkg_windows_x86_stable_release/lastSuccessfulBuild/artifact/setup-qtox.exe', + 'x86-64': 'https://build.tox.chat/view/qtox/job/qTox_pkg_windows_x86-64_stable_release/lastSuccessfulBuild/artifact/setup-qtox.exe' + } + }, + 'Linux': { + 'packages': { + 'OBS': 'https://software.opensuse.org/download.html?project=home%3Aantonbatenev%3Atox&package=qtox' + } + }, + 'macOS': { + 'stable': { + 'x86-64': 'https://github.com/qTox/qTox/releases/download/v1.5.1/qTox.dmg' + } + }, + 'FreeBSD': { + 'FreshPorts': { + 'Experimental': 'https://www.freshports.org/net-im/qTox' + } + } + } + + }, + { + 'name': 'uTox', + 'platforms': { + 'Windows': { + 'stable': { + 'x86': 'https://build.tox.chat/job/uTox_build_windows_x86_release/lastSuccessfulBuild/artifact/utox_windows_x86.zip', + 'x86-64': 'https://build.tox.chat/job/uTox_build_windows_x86-64_release/lastSuccessfulBuild/artifact/utox_windows_x86-64.zip' + }, + 'nightly': { + 'x86-64': 'https://build.tox.chat/view/uTox/job/uTox-nightly_build_windows_x86-64_debug/lastSuccessfulBuild/artifact/utox_nightly.zip' + } + }, + 'Linux': { + 'stable': { + 'x86': 'https://build.tox.chat/job/uTox_build_linux_x86_release/lastSuccessfulBuild/artifact/utox_linux_x86.tar.xz', + 'x86-64': 'https://build.tox.chat/job/uTox_build_linux_x86-64_release/lastSuccessfulBuild/artifact/utox_linux_x86-64.tar.xz' + }, + 'packages': { + 'tox.chat': { + 'name': 'utox', + 'stable': { + 'Debian': ['Jessie', 'Stretch', 'Sid'], + 'Ubuntu': ['Willy', 'Xenial'] + }, + 'nightly': { + 'Debian': ['Jessie', 'Stretch', 'Sid'], + 'Ubuntu': ['Willy', 'Xenial'] + } + } + } + }, + 'macOS': { + 'stable': { + 'x86-64': 'https://github.com/uTox/uTox/releases/download/v0.9.8/uTox-0.9.8.dmg' + } + }, + 'FreeBSD': { + 'FreshPorts': { + 'Experimental': 'https://www.freshports.org/net-im/uTox' + } + } + } + }, + { + 'name': 'Toxygen', + 'platforms': { + 'Windows': { + 'stable': { + 'x86': 'https://github.com/toxygen-project/toxygen/releases/download/v0.2.5/toxygen_windows.zip' + } + }, + 'Linux': { + 'stable': { + 'x86': 'https://github.com/toxygen-project/toxygen/releases/download/v0.2.5/toxygen_linux.tar.gz' + }, + 'packages': { + 'tox.chat': { + 'name': 'toxygen', + 'stable': { + 'Debian': ['Jessie' 'Stretch', 'Sid'], + 'Ubuntu': ['Willy', 'Xenial'] + }, + 'nightly': { + 'Debian': ['Jessie' 'Stretch', 'Sid'], + 'Ubuntu': ['Willy', 'Xenial'] + } + } + } + } + } + }, + { + 'name': 'Ricin', + 'platforms': { + 'Linux': { + 'stable': { + 'x86': 'https://cdn.ricin.im/linux/ricin-0.2.1.app' + }, + 'packages': { + 'tox.chat': { + 'name': 'ricin', + 'stable': { + 'Debian': ['Jessie', 'Stretch', 'Sid'], + 'Ubuntu': ['Willy', 'Xenial'] + }, + 'nightly': { + 'Debian': ['Jessie', 'Stretch', 'Sid'], + 'Ubuntu': ['Willy', 'Xenial'] + } + } + } + } + } + }, + { + 'name': 'Antidote', + 'platforms': { + 'iOS': { + 'links': { + 'iTunes': 'https://itunes.apple.com/app/antidote-for-tox/id933117605' + } + } + } + }, + { + 'name': 'Antox', + 'platforms': { + 'Android': { + 'links': { + 'Google Play': 'https://play.google.com/store/apps/details?id=chat.tox.antox', + 'APK': 'https://pkg.tox.chat/fdroid/repo/antox.apk', + 'F-droid': '#antox-fdroid' + } + } + } + } +] \ No newline at end of file