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

Rework download links #102

Merged
merged 12 commits into from
Dec 5, 2018
+232 −276
Merged

Rework download links #102

Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
6fe6636
Revert 88fe6b67d10a937e5068a5493dfa016504b4c619
Dec 4, 2018
906d45e
Remove 32-bit links from download page & menu
Dec 4, 2018
0f0ad29
Rename '64 bit' links to '.exe' and '.deb'
Dec 4, 2018
72760b0
Add download links to os text
Dec 4, 2018
af16da7
Add fallback download link for non-deb/rpm linux
Dec 4, 2018
cb16240
Refactor os detection in scripts.js
Dec 4, 2018
e8a7261
Remove rpm download text/links
Dec 4, 2018
636adf3
Refactor os detection for downloads
Dec 4, 2018
0ab7fe4
Re-enable analytics
Dec 5, 2018
7ebab4b
Remove comma causing syntax error on chrome
Dec 5, 2018
9006f89
Remove console.log() statements
Dec 5, 2018
f6425c3
Merge branch 'master' into link-download-text
Dec 5, 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
188 changes: 68 additions & 120 deletions _includes/homepage_content.html
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@


<div class="container fadeIn">

<main class="bd-masthead" id="content" role="main">
@@ -17,134 +15,87 @@ <h1 class="intro text-monospace display-1" style="margin-left: -.3rem;"><span cl

<div class="downloads-desktop btn-group os-selector-home col-sm-12 col-md-12 col-lg-5 px-0">

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

<div class="id-win64 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-64bit-{{ site.client_version }}.exe">64 Bit</a>
</div>
</div>

<div class="id-mac hidden">
<div class="float-left">
<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
</div>
<div class="float-right">
<a href="https://github.com/bisq-network/bisq/releases/download/v{{ site.client_version }}/Bisq-{{ site.client_version }}.dmg">.dmg</a>
</div>
<!-- This what displays on the dropdown in collapsed state -->
<button class="btn btn-outline-secondary btn-lg selected-os-download btn-icon shadow-btn" type="button" data-bisq-version="{{ site.client_version }}" data-site-url="{{ site.url }}">
<div class="id-win64 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 class="dl-win64" href="https://github.com/bisq-network/bisq/releases/download/v{{ site.client_version }}/Bisq-64bit-{{ site.client_version }}.exe">.exe</a>
</div>
</div>

<div class="id-mac hidden">
<div class="float-left">
<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
</div>
<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">.dmg</a>
</div>
</div>

<div class="id-deb64 hidden">
<div class="float-left">
<img src="{{ site.url }}/images/icon-ubuntu-g.svg" class="os-icon os-icon-g">
<img src="{{ site.url }}/images/icon-ubuntu-w.svg" class="os-icon os-icon-w">
Download for Debian/Ubuntu
</div>
<div class="float-right">
<a class="dl-deb64" href="https://github.com/bisq-network/bisq/releases/download/v{{ site.client_version }}/Bisq-64bit-{{ site.client_version }}.deb">.deb</a>
</div>
</div>

<div class="id-all hidden">
<div class="float-left">
<img src="{{ site.url }}/images/icon-download-g.svg" class="os-icon os-icon-g">
<img src="{{ site.url }}/images/icon-download-w.svg" class="os-icon os-icon-w">
Downloads
</div>
<div class="float-right">
<a href="{{ site.url }}/downloads">Get Bisq</a>
</div>
</div>
</button>

<button type="button" class="btn btn-lg btn-secondary dropdown-toggle dropdown-toggle-split hero-btn shadow-btn " data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<span class="sr-only">Toggle Dropdown</span>
</button>

<div class="dropdown-menu dropdown-menu-right shadow-lg">
{% include os_selector_options.html %}
</div>



<div class="id-deb32 hidden">
<div class="float-left">
<img src="{{ site.url }}/images/icon-ubuntu-g.svg" class="os-icon os-icon-g">
<img src="{{ site.url }}/images/icon-ubuntu-w.svg" class="os-icon os-icon-w">
Download for Debian/Ubuntu
</div>
<div class="float-right">
<a class="dl-deb32" href="https://github.com/bisq-network/bisq/releases/download/v{{ site.client_version }}/Bisq-32bit-{{ site.client_version }}.deb" onclick="ga('send', 'event', 'Jumbotron actions', 'Download', 'Download v0.9.0');">32 Bit</a>
</div>
</div>


<div class="id-deb64 hidden">
<div class="float-left">
<img src="{{ site.url }}/images/icon-ubuntu-g.svg" class="os-icon os-icon-g">
<img src="{{ site.url }}/images/icon-ubuntu-w.svg" class="os-icon os-icon-w">
Download for Debian/Ubuntu
</div>
<div class="float-right">
<a class="dl-deb64" href="https://github.com/bisq-network/bisq/releases/download/v{{ site.client_version }}/Bisq-64bit-{{ site.client_version }}.deb" onclick="ga('send', 'event', 'Jumbotron actions', 'Download', 'Download v0.9.0');">64 Bit</a>
</div>
</div>





<div class="id-all hidden">
<div class="float-left">
<img src="{{ site.url }}/images/icon-download-g.svg" class="os-icon os-icon-g">
<img src="{{ site.url }}/images/icon-download-w.svg" class="os-icon os-icon-w">
Downloads
</div>
<div class="float-right">
<a href="{{ site.url }}/downloads" target="_blank">Get Bisq</a>
</div>
</div>










</button>








<button type="button" class="btn btn-lg btn-secondary dropdown-toggle dropdown-toggle-split hero-btn shadow-btn " data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<span class="sr-only">Toggle Dropdown</span>
</button>

<div class="dropdown-menu dropdown-menu-right shadow-lg">
{% include os_selector_options.html %}
</div>



</div>








<a href="{{ site.url }}/downloads" class="downloads-mobile btn btn-lg btn-outline-secondary btn-icon hero-btn col-sm-12 col-md-12 col-lg-3 px-0 shadow-btn ">
<img src="{{ site.url }}/images/icon-download-g.svg" class="os-icon os-icon-g">
<img src="{{ site.url }}/images/icon-download-w.svg" class="os-icon os-icon-w">
Downloads
<img src="{{ site.url }}/images/icon-download-g.svg" class="os-icon os-icon-g">
<img src="{{ site.url }}/images/icon-download-w.svg" class="os-icon os-icon-w">
Downloads
</a>


<a href="https://play.google.com/store/apps/details?id=com.joachimneumann.bisq" target="_blank" class="downloads-android hidden btn btn-lg btn-outline-secondary btn-icon hero-btn col-sm-12 col-md-12 col-lg-3 px-0 shadow-btn " onclick="ga('send', 'event', 'Jumbotron actions', 'Download', 'Download Android App');">
<img src="{{ site.url }}/images/icon-android-g.svg" class="os-icon os-icon-g">
<img src="{{ site.url }}/images/icon-android-w.svg" class="os-icon os-icon-w">
Get Android Notifications App
<a href="https://play.google.com/store/apps/details?id=com.joachimneumann.bisq" target="_blank" class="downloads-android hidden btn btn-lg btn-outline-secondary btn-icon hero-btn col-sm-12 col-md-12 col-lg-3 px-0 shadow-btn" onclick="ga('send', 'event', 'Jumbotron actions', 'download', 'android-notifications');">
<img src="{{ site.url }}/images/icon-android-g.svg" class="os-icon os-icon-g">
<img src="{{ site.url }}/images/icon-android-w.svg" class="os-icon os-icon-w">
Get Android Notifications App
</a>


<a href="https://play.google.com/store/apps/details?id=com.joachimneumann.bisq" target="_blank" class="downloads-ios hidden btn btn-lg btn-outline-secondary btn-icon hero-btn col-sm-12 col-md-12 col-lg-3 px-0 shadow-btn " onclick="ga('send', 'event', 'Jumbotron actions', 'Download', 'Download iOS App');">
<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">
Get iOS Notifications App
<a href="https://play.google.com/store/apps/details?id=com.joachimneumann.bisq" target="_blank" class="downloads-ios hidden btn btn-lg btn-outline-secondary btn-icon hero-btn col-sm-12 col-md-12 col-lg-3 px-0 shadow-btn" onclick="ga('send', 'event', 'Jumbotron actions', 'download', 'ios-notifications');">
<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">
Get iOS Notifications App
</a>





<a href="https://docs.bisq.network/getting-started.html" target="_blank" class="btn btn-lg btn-outline-secondary btn-icon hero-btn col-sm-12 col-md-12 col-lg-3 px-0 shadow-btn " onclick="ga('send', 'event', 'Jumbotron actions', 'Download', 'Download Whitepaper');">

Get Started »
<a href="https://docs.bisq.network/getting-started.html" target="_blank" class="btn btn-lg btn-outline-secondary btn-icon hero-btn col-sm-12 col-md-12 col-lg-3 px-0 shadow-btn">
Get Started »
</a>

{% comment %}
@@ -167,12 +118,9 @@ <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-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.</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>
<span class="id-rpm32 hidden">You appear to be using Redhat/Fedora/CentOS 32 bit.</span>
<span class="id-rpm64 hidden">You appear to be using Redhat/Fedora/CentOS 64 bit.</span>
<span class="id-deb64 hidden">You appear to be using Debian/Ubuntu.</span>
<span class="id-all hidden">Current Version</span> <!-- fallback text if no desktop os recognized -->
</p>

27 changes: 13 additions & 14 deletions _includes/os_selector_options.html
View file
Original file line number Diff line number Diff line change
@@ -2,24 +2,24 @@
<img src="{{ site.url }}/images/icon-download-g.svg" class="os-icon os-icon-g" />
<img src="{{ site.url }}/images/icon-download-w.svg" class="os-icon os-icon-w" />All Downloads
<div class="float-right">
<a href="{{ site.url }}/downloads/" onclick="ga('send', 'event', 'Jumbotron actions', 'Download', 'Download v0.9.0');">Go to Downloads Page</a>
<a href="{{ site.url }}/downloads/">Go to Downloads Page</a>
</div>
</div>

<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" /> <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>
<img src="{{ site.url }}/images/icon-windows-w.svg" class="os-icon os-icon-w" /> Download for Windows
<div class="float-right">
<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>
<a class="dl-win64" href="https://github.com/bisq-network/bisq/releases/download/v{{ site.client_version }}/Bisq-64bit-{{ site.client_version }}.exe">.exe</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" /> <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>
<img src="{{ site.url }}/images/icon-apple-w.svg" class="os-icon os-icon-w" /> Download for Mac
<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>
<a class="dl-mac" href="https://github.com/bisq-network/bisq/releases/download/v{{ site.client_version }}/Bisq-{{ site.client_version }}.dmg">.dmg</a>
</div>
</div>

@@ -28,39 +28,38 @@
<img src="{{ site.url }}/images/icon-ubuntu-g.svg" class="os-icon os-icon-g" />
<img src="{{ site.url }}/images/icon-ubuntu-w.svg" class="os-icon os-icon-w" /> Download for Debian/Ubuntu
<div class="float-right">
<a class="dl-deb32" href="https://github.com/bisq-network/bisq/releases/download/v{{ site.client_version }}/Bisq-32bit-{{ site.client_version }}.deb" onclick="ga('send', 'event', 'Jumbotron actions', 'Download', 'Download v0.9.0');">32 Bit</a> |
<a class="dl-deb64" href="https://github.com/bisq-network/bisq/releases/download/v{{ site.client_version }}/Bisq-64bit-{{ site.client_version }}.deb" onclick="ga('send', 'event', 'Jumbotron actions', 'Download', 'Download v0.9.0');">64 Bit</a>
<a class="dl-deb64" href="https://github.com/bisq-network/bisq/releases/download/v{{ site.client_version }}/Bisq-64bit-{{ site.client_version }}.deb">.deb</a>
</div>
</div>


<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" /> <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>
<img src="{{ site.url }}/images/icon-linux-w.svg" class="os-icon os-icon-w" /> Download for Arch Linux
<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>
<a href="https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=bisq-git">Arch User Repo</a></div>
</div>

<div class="dropdown-item btn-icon">
<img src="{{ site.url }}/images/icon-opensource-g.svg" class="os-icon os-icon-g" />
<img src="{{ site.url }}/images/icon-opensource-w.svg" class="os-icon os-icon-w" /> Source Code
<div class="float-right">
<a href="https://github.com/bisq-network/bisq/archive/v{{ site.client_version }}.zip" onclick="ga('send', 'event', 'Jumbotron actions', 'Download', 'Download v0.9.0');">zip</a> |
<a href="https://github.com/bisq-network/bisq/archive/v{{ site.client_version }}.tar.gz" onclick="ga('send', 'event', 'Jumbotron actions', 'Download', 'Download v0.9.0');">tar.gz</a></div>
<a href="https://github.com/bisq-network/bisq/archive/v{{ site.client_version }}.zip">zip</a> |
<a href="https://github.com/bisq-network/bisq/archive/v{{ site.client_version }}.tar.gz">tar.gz</a></div>
</div>

<div class="dropdown-item btn-icon">
<img src="{{ site.url }}/images/icon-notes-g.svg" class="os-icon os-icon-g" />
<img src="{{ site.url }}/images/icon-notes-w.svg" class="os-icon os-icon-w" /> Release Notes
<div class="float-right">
<a href="https://github.com/bisq-network/bisq/releases/tag/v{{ site.client_version }}" onclick="ga('send', 'event', 'Jumbotron actions', 'Download', 'Download v0.9.0');">v0.9.0</a>
<a href="https://github.com/bisq-network/bisq/releases/tag/v{{ site.client_version }}">v0.9.0</a>
</div>
</div>

<div class="dropdown-item btn-icon">
<img src="{{ site.url }}/images/icon-verification-g.svg" class="os-icon os-icon-g" />
<img src="{{ site.url }}/images/icon-verification-w.svg" class="os-icon os-icon-w" /> Verification
<div class="float-right">
<a href="https://github.com/bisq-network/bisq/releases/tag/v{{ site.client_version }}" onclick="ga('send', 'event', 'Jumbotron actions', 'Download', 'Download v0.9.0');">PGP signatures</a> |
<a href="https://github.com/bisq-network/bisq/releases/download/v{{ site.client_version }}/29CDFD3B.asc" onclick="ga('send', 'event', 'Jumbotron actions', 'Download', 'Download v0.9.0');">PGP Public Key</a></div>
<a href="https://github.com/bisq-network/bisq/releases/tag/v{{ site.client_version }}">PGP signatures</a> |
<a href="https://github.com/bisq-network/bisq/releases/download/v{{ site.client_version }}/29CDFD3B.asc">PGP Public Key</a></div>
</div>
122 changes: 62 additions & 60 deletions _layouts/default.html
View file
Original file line number Diff line number Diff line change
@@ -1,85 +1,87 @@
<!doctype html>
<html lang="en">

<head>
<meta charset="UTF-8"/>
<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0">
<head>

<meta name="author" content="Bisq">
<meta charset="UTF-8"/>
<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0">

<meta name="description" content="{{ site.description }}">
<meta name="image" content="{{ site.url }}/images/bisq-og.jpg">
<meta itemprop="name" content="Bisq">
<meta itemprop="description" content="{{ site.description }}">
<meta itemprop="image" content="{{ site.url }}/images/bisq-og.jpg">
<meta name="og:title" content="{{ page.title }}">
<meta name="og:description" content="{{ site.description }}">
<meta name="og:image" content="{{ site.url }}/images/bisq-og.jpg">
<meta name="og:site_name" content="Bisq - The decentralized Bitcoin exchange">
<meta name="og:type" content="website">
<meta property="twitter:title" content="{{ page.title }}">
<meta property="twitter:card" content="summary_large_image">
<meta property="twitter:site" content="Bisq - The decentralized Bitcoin exchange">
<meta name="twitter:creator" content="@bisq_network">
<link rel="canonical" href="{{ site.url }}">
<meta name="author" content="Bisq">

<meta name="description" content="{{ site.description }}">
<meta name="image" content="{{ site.url }}/images/bisq-og.jpg">
<meta itemprop="name" content="Bisq">
<meta itemprop="description" content="{{ site.description }}">
<meta itemprop="image" content="{{ site.url }}/images/bisq-og.jpg">
<meta name="og:title" content="{{ page.title }}">
<meta name="og:description" content="{{ site.description }}">
<meta name="og:image" content="{{ site.url }}/images/bisq-og.jpg">
<meta name="og:site_name" content="Bisq - The decentralized Bitcoin exchange">
<meta name="og:type" content="website">
<meta property="twitter:title" content="{{ page.title }}">
<meta property="twitter:card" content="summary_large_image">
<meta property="twitter:site" content="Bisq - The decentralized Bitcoin exchange">
<meta name="twitter:creator" content="@bisq_network">
<link rel="canonical" href="{{ site.url }}">

<link href="https://fonts.googleapis.com/css?family=IBM+Plex+Sans:100,100i,200,200i,300,300i,400,400i,500,500i,600,600i,700,700i" rel="stylesheet">
<link href="https://fonts.googleapis.com/css?family=IBM+Plex+Mono:100,100i,200,200i,300,300i,400,400i,500,500i,600,600i,700,700i" rel="stylesheet">
<link href="{{ site.url }}/css/bootstrap.css" rel="stylesheet">
<link href="{{ site.url }}/css/styles.css" rel="stylesheet">

<link rel="apple-touch-icon" sizes="180x180" href="{{ site.url }}/images/apple-touch-icon.png">
<link rel="icon" type="image/png" sizes="32x32" href="{{ site.url }}/images/bisq-fav.png">
<link rel="icon" type="image/png" sizes="16x16" href="{{ site.url }}/images/bisq-fav.png">
<link rel="icon" type="image/x-icon" href="{{ site.url }}/favicon.ico" />
<link rel="manifest" href="/site.webmanifest">
<link rel="mask-icon" href="/safari-pinned-tab.svg" color="#404040">
<meta name="msapplication-TileColor" content="#ffffff">
<meta name="theme-color" content="#ffffff">

<title>{{ page.title }}</title>

<script src="{{ site.url }}/js/jquery-3.3.1.min.js"></script>
<script src="{{ site.url }}/js/popper.min.js"></script>
<script src="{{ site.url }}/js/bootstrap.min.js"></script>
<script src="{{ site.url }}/js/scripts.js"></script>

<link href="https://fonts.googleapis.com/css?family=IBM+Plex+Sans:100,100i,200,200i,300,300i,400,400i,500,500i,600,600i,700,700i" rel="stylesheet">
<link href="https://fonts.googleapis.com/css?family=IBM+Plex+Mono:100,100i,200,200i,300,300i,400,400i,500,500i,600,600i,700,700i" rel="stylesheet">
<link href="{{ site.url }}/css/bootstrap.css" rel="stylesheet">
<link href="{{ site.url }}/css/styles.css" rel="stylesheet">
</head>

<link rel="apple-touch-icon" sizes="180x180" href="{{ site.url }}/images/apple-touch-icon.png">
<link rel="icon" type="image/png" sizes="32x32" href="{{ site.url }}/images/bisq-fav.png">
<link rel="icon" type="image/png" sizes="16x16" href="{{ site.url }}/images/bisq-fav.png">
<link rel="icon" type="image/x-icon" href="{{ site.url }}/favicon.ico" />
<link rel="manifest" href="/site.webmanifest">
<link rel="mask-icon" href="/safari-pinned-tab.svg" color="#404040">
<meta name="msapplication-TileColor" content="#ffffff">
<meta name="theme-color" content="#ffffff">
<body class="home page-template-default page page-id-6 custom-background">

<title>{{ page.title }}</title>

{% include main_nav.html %}

<script src="{{ site.url }}/js/jquery-3.3.1.min.js"></script>
<script src="{{ site.url }}/js/popper.min.js"></script>
<script src="{{ site.url }}/js/bootstrap.min.js"></script>
<script src="{{ site.url }}/js/scripts.js"></script>
{% if page.url == '/' %}

<div class="outter">
{% include homepage_content.html %}
</div>

{% else %}

<div class="outter">
{{ content }}
</div>

</head>
{% endif %}


<body class="home page-template-default page page-id-6 custom-background">
{% include footer.html %}


{% include main_nav.html %}

{% if page.url == '/' %}

<div class="outter">
{% include homepage_content.html %}
</div>

{% else %}

<div class="outter">
{{ content }}
</div>

{% endif %}


{% include footer.html %}


</body>

<script>
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
ga('create', 'UA-104074395-1', 'auto');
{% if page.url == '/404.html' %}
ga('send', 'pageview', '/404error/?url=' + document.location.pathname + document.location.search + '&ref=' + document.referrer );
{% else %}
ga('send', 'pageview');
{% endif %}
</script>

</body>
</html>
13 changes: 4 additions & 9 deletions downloads.html
View file
Original file line number Diff line number Diff line change
@@ -8,19 +8,15 @@ <h1>Bisq Downloads</h1>


<div class="mt-5 mb-2">
<div class="id-win32 hidden">You appear to be running Windows 32 bit.</div>
<div class="id-win64 hidden">You appear to be running Windows 64 bit.</div>
<div class="id-win64 hidden">You appear to be running Windows.</div>
<div class="id-mac hidden">You appear to be using a Mac.</div>
<div class="id-deb32 hidden">You appear to be using Debian/Ubuntu 32 bit.</div>
<div class="id-deb64 hidden">You appear to be using Debian/Ubuntu 64 bit.</div>
<div class="id-rpm32 hidden">You appear to be using Redhat/Fedora/CentOS 32 bit.</div>
<div class="id-rpm64 hidden">You appear to be using Redhat/Fedora/CentOS 64 bit.</div>
<div class="id-deb64 hidden">You appear to be using Debian/Ubuntu.</div>

<table class="all-downloads mt-5">
<tr class="border-bottom">
<td>Windows</td>
<td>
<a class="dl-win64" href="https://github.com/bisq-network/bisq/releases/download/v{{ site.client_version }}/Bisq-64bit-{{ site.client_version }}.exe">64 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">.exe</a>
</td>
</tr>
<tr class="border-bottom">
@@ -31,8 +27,7 @@ <h1>Bisq Downloads</h1>
<tr class="border-bottom">
<td>Debian/Ubuntu</td>
<td>
<a class="dl-deb32" href="https://github.com/bisq-network/bisq/releases/download/v{{ site.client_version }}/Bisq-32bit-{{ site.client_version }}.deb">32 Bit</a> |
<a class="dl-deb64" href="https://github.com/bisq-network/bisq/releases/download/v{{ site.client_version }}/Bisq-64bit-{{ site.client_version }}.deb">64 Bit</a>
<a class="dl-deb64" href="https://github.com/bisq-network/bisq/releases/download/v{{ site.client_version }}/Bisq-64bit-{{ site.client_version }}.deb">.deb</a>
</td>
</tr>
<tr class="border-bottom">
12 changes: 2 additions & 10 deletions js/markets.js
View file
Original file line number Diff line number Diff line change
@@ -55,8 +55,6 @@ function getTrades(pair){
jsonUrl = 'https://markets.bisq.network/api/trades?market=all&format=jsonpretty';
//jsonUrl = baseUrl+'/js/sample_data/trades_all.json';

console.log(jsonUrl);

$.get( jsonUrl, function( data ) {


@@ -116,7 +114,7 @@ function getTrades(pair){
$('<th>').text('Action'),
$('<th>').text('Price ('+buildTKR(pair)+')'),
$('<th>').text('Trade Size (BTC)'),
$('<th>').text('Trade Size ('+buildTKR(pair)+')'),
$('<th>').text('Trade Size ('+buildTKR(pair)+')')
).appendTo('#trade-history-header');

}else{
@@ -253,7 +251,7 @@ function buildData(jsonUrl){
pair = 'btc';

jsonUrl = "https://markets.bisq.network/api/volumes?basecurrency=btc&milliseconds=true&timestamp=no&format=jscallback&fillgaps=&callback=?&interval=day";
console.log("chart volumes: " + pair);
//console.log("chart volumes: " + pair);
getTrades('all');

}else{
@@ -263,12 +261,6 @@ function buildData(jsonUrl){
getOffers(pair);
}




console.log(jsonUrl);


$.getJSON(jsonUrl, function (data) {


146 changes: 83 additions & 63 deletions js/scripts.js
View file
Original file line number Diff line number Diff line change
@@ -1,66 +1,86 @@
$(document).ready(function() {




//OS detection
var OSName = "Unknown OS";
if (navigator.userAgent.indexOf("Win") != -1) OSName = "Windows";
else if (navigator.userAgent.indexOf("Mac") != -1) OSName = "MacOS";
else if (navigator.userAgent.indexOf("Linux") != -1) OSName = "Linux";
else if (navigator.userAgent.indexOf("X11") != -1) OSName = "UNIX";

switch (OSName) {
case "MacOS":
$('.dl-mac').addClass('selected');
$('.id-mac').removeClass('hidden').addClass('shown');
break;
case "Windows":
if (navigator.userAgent.indexOf("WOW64") != -1 || navigator.userAgent.indexOf("Win64") != -1) {
$('.dl-win64').addClass('selected');
$('.id-win64').removeClass('hidden').addClass('shown');
}
break;
case "Linux":
var is64 = navigator.userAgent.indexOf("x86_64") != -1;
if (navigator.userAgent.indexOf("Ubuntu") != -1 || navigator.userAgent.indexOf("Debian") != -1) {
$(is64 ? '.dl-deb64' : '.dl-deb32').addClass('selected');
$(is64 ? '.id-deb64' : '.id-deb32').removeClass('hidden').addClass('shown');
} else if (navigator.userAgent.indexOf("Redhat") != -1 ||
navigator.userAgent.indexOf("CentOS") != -1 ||
navigator.userAgent.indexOf("Fedora") != -1) {
$(is64 ? '.dl-rpm64' : '.dl-rpm32').addClass('selected');
$(is64 ? '.id-rpm64' : '.id-rpm32').removeClass('hidden').addClass('shown');
}
break;
}


var userAgent = navigator.userAgent || navigator.vendor || window.opera;
if (/windows phone/i.test(userAgent)) {
//nothing yet
}
if (/android/i.test(userAgent)) {
$('.downloads-android').removeClass('hidden').addClass('shown');
$('.id-all').removeClass('hidden').addClass('shown');
}
if (/iPad|iPhone|iPod/.test(userAgent) && !window.MSStream) {
$('.downloads-ios').removeClass('hidden').addClass('shown');
$('.id-all').removeClass('hidden').addClass('shown');
}



//console.log(OSName);

// add virtual pageview and event tracking for download attempts
$('.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());
});



$( document ).ready( function() {


/**************************************************
detect os to show correct download links
**************************************************/

var desktop = true;
var uAgent = navigator.userAgent || navigator.vendor || window.opera;
var osName = "unknown";
var downloadLink = "<site_url_placeholder>/downloads";

if( uAgent.indexOf( "Win" ) > -1 ) {
osName = "win64";
downloadLink = "https://github.com/bisq-network/bisq/releases/download/v<bisq_version_placeholder>/Bisq-64bit-<bisq_version_placeholder>.exe";
} else if( uAgent.indexOf( "Mac" ) > -1 ) {
osName = "mac";
downloadLink = "https://github.com/bisq-network/bisq/releases/download/v<bisq_version_placeholder>/Bisq-<bisq_version_placeholder>.dmg";
} else if( uAgent.indexOf( "Linux" ) > -1 && ( uAgent.indexOf( "Ubuntu" ) > -1 || uAgent.indexOf( "Debian" ) > -1 ) ) {
osName = "deb64";
downloadLink = "https://github.com/bisq-network/bisq/releases/download/v<bisq_version_placeholder>/Bisq-64bit-<bisq_version_placeholder>.deb";
}

//mobile
if( /android/i.test( uAgent ) ) {
desktop = false;
$( '.downloads-android' ).removeClass( 'hidden' ).addClass( 'shown' );
$( '.id-all').removeClass( 'hidden' ).addClass( 'shown' );
}
if( /iPad|iPhone|iPod/.test( uAgent ) && !window.MSStream ) {
desktop = false;
$( '.downloads-ios' ).removeClass('hidden').addClass( 'shown' );
$( '.id-all' ).removeClass( 'hidden' ).addClass( 'shown' );
}

//desktop
if( desktop ) {
if( osName !== 'unknown' ) {
showOSDownloads( osName );
} else {
$( '.id-all').removeClass('hidden').addClass('shown');
}
}

//capture click on currently-selected value in dropdown (otherwise
//link click event doesn't register on firefox)
$( 'button.selected-os-download' ).on( 'click', function(e) {
if( ( e.target.className ).indexOf( 'dl-' ) > -1 ) {
return;
} else {
serveDownload( $( e.currentTarget ).attr( 'data-bisq-version' ), $( e.currentTarget ).attr( 'data-site-url' ) );
}
});

$( '.dl-win64, .dl-mac, .dl-deb64' ).on( 'click', function() {
sendAnalytic( $(this).attr('class').split('-').pop().split(" ").shift() );
});

//change dom to show downloads for the specific os
function showOSDownloads( os ) {
$( '.dl-' + os ).addClass( 'selected' );
$( '.id-' + os ).removeClass( 'hidden' ).addClass( 'shown' );
return;
}

//for non-link clicks (i.e., the 'download for xx' text on closed dropdown)
function serveDownload( bisqVersion, siteURL ) {
if( osName === 'unknown' ) {
downloadLink = downloadLink.replace( /<site_url_placeholder>/g, siteURL );
} else {
downloadLink = downloadLink.replace( /<bisq_version_placeholder>/g, bisqVersion );
sendAnalytic( osName );
}
location.href = downloadLink;
return;
}

//add virtual pageview and event tracking for download attempts
function sendAnalytic( platform ) {
ga( 'send', 'pageview', location.pathname + 'release' );
ga( 'send', 'event', 'Release Build', 'download', platform );
return;
}