joshua/dash-docs
1
0
Fork 0
mirror of https://github.com/seigler/dash-docs synced 2025-07-27 01:36:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1716 from kuzzmi/fix-platform-os-url-master

Browse source 
Fixes an issue with URLs like /web/web/
This commit is contained in:
Will Binns 2017-07-31 16:46:02 -06:00 • committed by GitHub
commit 671f8688c6
4 changed files with 21 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
_includes/layout/base/wallets-list.html
View file

@ -9,8 +9,13 @@ http://opensource.org/licenses/MIT.
{% assign os = page.os['name'] %}
{% if wallet.compat contains platform and wallet.compat contains os %}
<div class="wallet-list-item" data-walletlevel="{{ wallet.level }}">
{% if platform == os %}
<a class="wallet-list-item-link"
href="/{{ page.lang}}/wallets/{{ platform }}/{{ wallet.id }}/">
{% else %}
<a class="wallet-list-item-link"
href="/{{ page.lang}}/wallets/{{ platform }}/{{ os }}/{{ wallet.id }}/">
{% endif %}
<img src="/img/wallet/{{ wallet.id }}.png" alt="{{ wallet.title }}" />
{{ wallet.titleshort }}
</a>

2
_includes/layout/base/wallets-menu.html
View file

@ -27,7 +27,7 @@ http://opensource.org/licenses/MIT.
{% endif %}
<li class="{{ platformClass }}">
{% if platformName == 'hardware' or platformName == 'web' %}
{% assign platformHref = "/" | append: page.lang | append: "/wallets/" | append: platformName | append: "/" | append: platformName | append: "/" %}
{% assign platformHref = "/" | append: page.lang | append: "/wallets/" | append: platformName | append: "/" %}
<a href="{{ platformHref }}">{% translate walletcat{{platformName}} choose-your-wallet %}</a>
{% else %}
<a>{% translate walletcat{{platformName}} choose-your-wallet %}</a>

5
_layouts/wallet-container.html
View file

@ -27,8 +27,13 @@ max_wallet_text_length: 418 ## Unicode characters
{% if page.id contains os.name %}
{% assign btnClass = btnClass | append: " active" %}
{% endif %}
{% if platform.name == os.name %}
<a class="{{ btnClass }}"
href="/{{ page.lang }}/wallets/{{platform.name}}/{{page.wallet.id}}/">
{% else %}
<a class="{{ btnClass }}"
href="/{{ page.lang }}/wallets/{{platform.name}}/{{os.name}}/{{page.wallet.id}}/">
{% endif %}
<img src="/img/os/{{ os.name }}.png"
alt="{% translate platform{{os.name}} choose-your-wallet %}{% translate walletcat{{os.name}} choose-your-wallet %}"
title="{% translate platform{{os.name}} choose-your-wallet %}" />

12
_plugins/wallets.rb
View file

@ -79,7 +79,11 @@ module Jekyll
data = YAML.load_file(file)
platform = data['platform']
os = data['os']
dir = File.join(platform['name'], os['name'])
if platform['name'] == os['name']
dir = File.join(platform['name'])
else
dir = File.join(platform['name'], os['name'])
end
platformTitle = locs[lang]['choose-your-wallet']['walletcat' + platform['name']]
osTitle = locs[lang]['choose-your-wallet']['platform' + os['name']]
@ -103,7 +107,11 @@ module Jekyll
# This allows generation only of valid wallet pages
if platform['name']
dir = File.join(platform['name'], os['name'], wallet['id'])
if platform['name'] == os['name']
dir = File.join(platform['name'], wallet['id'])
else
dir = File.join(platform['name'], os['name'], wallet['id'])
end
platformTitle = locs[lang]['choose-your-wallet']['walletcat' + platform['name']]
osTitle = locs[lang]['choose-your-wallet']['platform' + os['name']]