From ed451871df91411b3d3cbfb0f558d92903e219c4 Mon Sep 17 00:00:00 2001 From: Andrew Senetar Date: Tue, 14 May 2019 21:20:43 -0500 Subject: [PATCH] Update site to fix links - Fix #569 - Windows links point to 4.0.4 release - Source release point to 4.0.4 github archives - OS X and Ubuntu point to previous 4.0.3 releases until new 4.0.4 ones are built - Add downloads page for more detailed links to other builds etc. - Update stylesheet to fix some download button formatting - Update other links pointing at old repository urls --- Gemfile.lock | 38 +++++++++++++++++++------------------- _data/downloads.yml | 30 +++++++++++++++++++++--------- _data/externallinks.yml | 2 +- _layouts/home.html | 12 +++++++----- about.md | 6 +++--- assets/main.scss | 9 ++++++--- downloads.md | 16 ++++++++++++++++ 7 files changed, 73 insertions(+), 40 deletions(-) create mode 100644 downloads.md diff --git a/Gemfile.lock b/Gemfile.lock index 43f3be86..9e84e173 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,12 +1,12 @@ GEM remote: https://rubygems.org/ specs: - activesupport (4.2.10) + activesupport (4.2.11.1) i18n (~> 0.7) minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) - addressable (2.5.2) + addressable (2.6.0) public_suffix (>= 2.0.2, < 4.0) coffee-script (2.4.1) coffee-script-source @@ -29,11 +29,11 @@ GEM multipart-post (>= 1.2, < 3) ffi (1.10.0) forwardable-extended (2.6.0) - gemoji (3.0.0) - github-pages (197) - activesupport (= 4.2.10) + gemoji (3.0.1) + github-pages (198) + activesupport (= 4.2.11.1) github-pages-health-check (= 1.16.1) - jekyll (= 3.7.4) + jekyll (= 3.8.5) jekyll-avatar (= 0.6.0) jekyll-coffeescript (= 1.1.1) jekyll-commonmark-ghpages (= 0.1.5) @@ -81,13 +81,13 @@ GEM octokit (~> 4.0) public_suffix (~> 3.0) typhoeus (~> 1.3) - html-pipeline (2.10.0) + html-pipeline (2.11.0) activesupport (>= 2) nokogiri (>= 1.4) http_parser.rb (0.6.0) i18n (0.9.5) concurrent-ruby (~> 1.0) - jekyll (3.7.4) + jekyll (3.8.5) addressable (~> 2.4) colorator (~> 1.0) em-websocket (~> 0.5) @@ -105,9 +105,9 @@ GEM jekyll-coffeescript (1.1.1) coffee-script (~> 2.2) coffee-script-source (~> 1.11.1) - jekyll-commonmark (1.2.0) + jekyll-commonmark (1.3.1) commonmarker (~> 0.14) - jekyll (>= 3.0, < 4.0) + jekyll (>= 3.7, < 5.0) jekyll-commonmark-ghpages (0.1.5) commonmarker (~> 0.17.6) jekyll-commonmark (~> 1) @@ -185,7 +185,7 @@ GEM jekyll-seo-tag (~> 2.0) jekyll-titles-from-headings (0.5.1) jekyll (~> 3.3) - jekyll-watch (2.1.2) + jekyll-watch (2.2.1) listen (~> 3.0) jemoji (0.10.2) gemoji (~> 3.0) @@ -204,10 +204,10 @@ GEM jekyll-feed (~> 0.9) jekyll-seo-tag (~> 2.1) minitest (5.11.3) - multipart-post (2.0.0) - nokogiri (1.10.1) + multipart-post (2.1.1) + nokogiri (1.10.3) mini_portile2 (~> 2.4.0) - octokit (4.13.0) + octokit (4.14.0) sawyer (~> 0.8.0, >= 0.5.3) pathutil (0.16.2) forwardable-extended (~> 2.6) @@ -221,14 +221,14 @@ GEM ruby_dep (1.5.0) rubyzip (1.2.2) safe_yaml (1.0.5) - sass (3.7.3) + sass (3.7.4) sass-listen (~> 4.0.0) sass-listen (4.0.0) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) - sawyer (0.8.1) - addressable (>= 2.3.5, < 2.6) - faraday (~> 0.8, < 1.0) + sawyer (0.8.2) + addressable (>= 2.3.5) + faraday (> 0.8, < 2.0) terminal-table (1.8.0) unicode-display_width (~> 1.1, >= 1.1.1) thread_safe (0.3.6) @@ -236,7 +236,7 @@ GEM ethon (>= 0.9.0) tzinfo (1.2.5) thread_safe (~> 0.1) - unicode-display_width (1.5.0) + unicode-display_width (1.6.0) PLATFORMS ruby diff --git a/_data/downloads.yml b/_data/downloads.yml index e63d0865..380d319c 100644 --- a/_data/downloads.yml +++ b/_data/downloads.yml @@ -1,15 +1,27 @@ -version: 4.0.3 -files: - - name: Windows (x64) - link: https://github.com/arsenetar/dupeguru/releases/download/4.0.3-InstallFix/dupeGuru_win64_4.0.3.exe - icon: windows - - name: Linux (ppa) - link: https://launchpad.net/~hsoft/+archive/ppa/+packages +oses: + - name: Windows + icon: windows + packages: + - arch: x64 + link: https://github.com/arsenetar/dupeguru/releases/download/4.0.4/dupeGuru_win64_4.0.4.exe + - arch: x32 + link: https://github.com/arsenetar/dupeguru/releases/download/4.0.4/dupeGuru_win32_4.0.4.exe + - name: Ubuntu icon: linux + packages: + - arch: x32, x64 + link: https://launchpad.net/~hsoft/+archive/ppa/+packages - name: OS X - link: https://download.hardcoded.net/dupeguru_osx_4_0_3.dmg + icon: apple + packages: + - arch: "10.10+" + link: https://github.com/arsenetar/dupeguru/releases/download/4.0.3/dupeguru_osx_4_0_3.dmg icon: apple - name: Source - link: https://github.com/arsenetar/dupeguru/archive/4.0.3-InstallFix.tar.gz icon: github + packages: + - arch: zip + link: https://github.com/arsenetar/dupeguru/archive/4.0.4.zip + - arch: tar.gz + link: https://github.com/arsenetar/dupeguru/archive/4.0.4.tar.gz \ No newline at end of file diff --git a/_data/externallinks.yml b/_data/externallinks.yml index 3937f2ad..ca6f2a3e 100644 --- a/_data/externallinks.yml +++ b/_data/externallinks.yml @@ -1,4 +1,4 @@ - title: Help url: /help/en/ - title: Github - url: https://github.com/hsoft/dupeguru/ \ No newline at end of file + url: https://github.com/arsenetar/dupeguru/ \ No newline at end of file diff --git a/_layouts/home.html b/_layouts/home.html index e9d493d1..a9331109 100644 --- a/_layouts/home.html +++ b/_layouts/home.html @@ -5,13 +5,15 @@ layout: default

{{ page.title | default: site.title }}

{%- if site.data.downloads -%} -

Download Latest Version: {{ site.data.downloads.version }}

-
- {%- for download in site.data.downloads.files -%} - - {{ download.name }} +

Latest Downloads:

+
+ {%- for os in site.data.downloads.oses -%} + {%- for package in os.packages -%} + + {{ os.name }} ({{ package.arch }}) {%- endfor -%} + {%- endfor -%}
{%- endif -%}
diff --git a/about.md b/about.md index d0808a8f..4145afd6 100644 --- a/about.md +++ b/about.md @@ -3,12 +3,12 @@ title: About permalink: /about/ --- -[Issue Tracker](https://github.com/hsoft/dupeguru/issues) +[Issue Tracker](https://github.com/arsenetar/dupeguru/issues) -[Get Involved](https://www.hardcoded.net/dupeguru/help/en/contribute.html) +[Get Involved](https://github.com/arsenetar/dupeguru/wiki/Get-involved) [Linux Notes](https://www.hardcoded.net/linux_notes) -[Changelog](https://www.hardcoded.net/dupeguru/help/en/changelog) +[Changelog](../help/en/changelog) [Screenshots?](https://www.hardcoded.net/dupeguru/screenshots) diff --git a/assets/main.scss b/assets/main.scss index d7696667..ad959336 100644 --- a/assets/main.scss +++ b/assets/main.scss @@ -6,7 +6,7 @@ .container { margin: 10px auto; - max-width: 600px; + max-width: 800px; text-align: center; } .container h1 { @@ -19,13 +19,16 @@ display: flex; flex-wrap: wrap; margin-bottom: 2em; + align-items: center; + justify-content: center; } .download, .download:visited { text-align: center; flex-grow: 1; flex-shrink: 1; flex-basis: 0; - min-width: 120px; + min-width: 200px; + max-width: 300px; background-color: #4caf50; border-color: transparent; border-width: 1px; @@ -46,7 +49,7 @@ height: 1em; display: inline-block; padding-right: 5px; - vertical-align: text-top; + vertical-align: baseline; fill: currentColor; color: currentColor; } diff --git a/downloads.md b/downloads.md new file mode 100644 index 00000000..a59342a0 --- /dev/null +++ b/downloads.md @@ -0,0 +1,16 @@ +--- +title: Downloads +permalink: /downloads/ +--- + +## Latest Version +Latest release files can be found at: + +## Nightly Builds +Coming soon... will use Travis CI and possibly Appveyor. + +## Older Releases (pre-4.0.4) +Releases before 4.0.4 are available as archives at: + + +*Note: github source archives do not contain submodules*