Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add download links to os text #97

Merged
merged 2 commits into from
Dec 3, 2018
Merged

Add download links to os text #97

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cd7e617
Remove trailing slash from root url
Dec 3, 2018
88fe6b6
Link to download from "download for os" text
Dec 3, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion _config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
title: Bisq
url: "https://bisq.network/"
url: "https://bisq.network"
markdown: kramdown
permalink: /blog/:title/
livereload: true
Expand Down
14 changes: 1 addition & 13 deletions _includes/homepage_content.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,17 +19,6 @@ <h1 class="intro text-monospace display-1" style="margin-left: -.3rem;"><span cl

<button class="btn btn-outline-secondary btn-lg selected-os-download btn-icon shadow-btn" type="button">

<div class="id-win32 hidden">
<div class="float-left">
<img src="{{ site.url }}/images/icon-windows-g.svg" class="os-icon os-icon-g">
<img src="{{ site.url }}/images/icon-windows-w.svg" class="os-icon os-icon-w">
Download for Windows
</div>
<div class="float-right">
<a href="https://github.com/bisq-network/bisq/releases/download/v{{ site.client_version }}/Bisq-32bit-{{ site.client_version }}.exe">32bits</a>
</div>
</div>

<div class="id-win64 hidden">
<div class="float-left">
<img src="{{ site.url }}/images/icon-windows-g.svg" class="os-icon os-icon-g">
Expand Down Expand Up @@ -178,8 +167,7 @@ <h1 class="intro text-monospace display-1" style="margin-left: -.3rem;"><span cl


<p class="text-muted mb-0 mt-1 small" style="opacity: 0.5">
v{{ site.client_version }} — <span class="id-win32 hidden">You appear to be running Windows 32 bit.</span>
<span class="id-win64 hidden">You appear to be running Windows 64 bit.</span>
v{{ site.client_version }} — <span class="id-win64 hidden">You appear to be running Windows 64 bit.</span>
<span class="id-mac hidden">You appear to be using a Mac.</span>
<span class="id-deb32 hidden">You appear to be using Debian/Ubuntu 32 bit.</span>
<span class="id-deb64 hidden">You appear to be using Debian/Ubuntu 64 bit.</span>
Expand Down
7 changes: 3 additions & 4 deletions _includes/os_selector_options.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,16 @@

<div class="dropdown-item btn-icon">
<img src="{{ site.url }}/images/icon-windows-g.svg" class="os-icon os-icon-g" />
<img src="{{ site.url }}/images/icon-windows-w.svg" class="os-icon os-icon-w" /> Download for Windows
<img src="{{ site.url }}/images/icon-windows-w.svg" class="os-icon os-icon-w" /> <a class="dl-win64" href="https://github.com/bisq-network/bisq/releases/download/v{{ site.client_version }}/Bisq-64bit-{{ site.client_version }}.exe" onclick="ga('send', 'event', 'Jumbotron actions', 'Download', 'Download v0.9.0');">Download for Windows</a>
<div class="float-right">
<a class="dl-win32" href="https://github.com/bisq-network/bisq/releases/download/v{{ site.client_version }}/Bisq-32bit-{{ site.client_version }}.exe" onclick="ga('send', 'event', 'Jumbotron actions', 'Download', 'Download v0.9.0');">32 Bit</a> |
<a class="dl-win64" href="https://github.com/bisq-network/bisq/releases/download/v{{ site.client_version }}/Bisq-64bit-{{ site.client_version }}.exe" onclick="ga('send', 'event', 'Jumbotron actions', 'Download', 'Download v0.9.0');">64 Bit</a>
</div>
</div>


<div class="dropdown-item btn-icon">
<img src="{{ site.url }}/images/icon-apple-g.svg" class="os-icon os-icon-g" />
<img src="{{ site.url }}/images/icon-apple-w.svg" class="os-icon os-icon-w" /> Download for Mac
<img src="{{ site.url }}/images/icon-apple-w.svg" class="os-icon os-icon-w" /> <a class="dl-mac" href="https://github.com/bisq-network/bisq/releases/download/v{{ site.client_version }}/Bisq-{{ site.client_version }}.dmg" onclick="ga('send', 'event', 'Jumbotron actions', 'Download', 'Download v0.9.0');">Download for Mac</a>
<div class="float-right">
<a class="dl-mac" href="https://github.com/bisq-network/bisq/releases/download/v{{ site.client_version }}/Bisq-{{ site.client_version }}.dmg" onclick="ga('send', 'event', 'Jumbotron actions', 'Download', 'Download v0.9.0');">.dmg</a>
</div>
Expand All @@ -37,7 +36,7 @@

<div class="dropdown-item btn-icon">
<img src="{{ site.url }}/images/icon-linux-g.svg" class="os-icon os-icon-g" />
<img src="{{ site.url }}/images/icon-linux-w.svg" class="os-icon os-icon-w" /> Download for Arch Linux
<img src="{{ site.url }}/images/icon-linux-w.svg" class="os-icon os-icon-w" /> <a href="https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=bisq-git" onclick="ga('send', 'event', 'Jumbotron actions', 'Download', 'Download v0.9.0');">Download for Arch Linux</a>
<div class="float-right">
<a href="https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=bisq-git" onclick="ga('send', 'event', 'Jumbotron actions', 'Download', 'Download v0.9.0');">Arch User Repo</a></div>
</div>
Expand Down
6 changes: 1 addition & 5 deletions js/scripts.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,9 @@ $(document).ready(function() {
$('.id-all').removeClass('shown').addClass('hidden');
break;
case "Windows":
// if 64-bit
if (navigator.userAgent.indexOf("WOW64") != -1 || navigator.userAgent.indexOf("Win64") != -1) {
$('.dl-win64').addClass('selected');
$('.id-win64').removeClass('hidden').addClass('shown');
} else {
$('.dl-win32').addClass('selected');
$('.id-win32').removeClass('hidden').addClass('shown');
}
$('.id-all').removeClass('shown').addClass('hidden');
break;
Expand Down Expand Up @@ -59,7 +55,7 @@ $(document).ready(function() {
//console.log(OSName);

// add virtual pageview and event tracking for download attempts
$('.dl-win32, .dl-win64, .dl-mac, .dl-deb32, .dl-deb64').click(function() {
$('.dl-win64, .dl-mac, .dl-deb32, .dl-deb64').click(function() {
ga('send', 'pageview', location.pathname + 'release');
ga('send', 'event', 'Release Build', 'download', $(this).attr('class').split('-').pop());
});
Expand Down