From 7f028a68bab510693c8f7f2833af4a1432f59e95 Mon Sep 17 00:00:00 2001 From: Igor Kuzmenko Date: Tue, 18 Jul 2017 17:50:37 +0200 Subject: [PATCH] Fixes wallet menu, list and container for correct links and translation --- _includes/layout/base/wallets-list.html | 8 ++++++-- _includes/layout/base/wallets-menu.html | 9 +++++++-- _layouts/wallet-container.html | 2 ++ _sass/_wallets.scss | 1 + 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/_includes/layout/base/wallets-list.html b/_includes/layout/base/wallets-list.html index d48430c1..350b2689 100644 --- a/_includes/layout/base/wallets-list.html +++ b/_includes/layout/base/wallets-list.html @@ -8,8 +8,8 @@ http://opensource.org/licenses/MIT. {% assign platform = page.platform['name'] %} {% assign os = page.os['name'] %} {% if wallet.compat contains platform and wallet.compat contains os %} -
- +
+ {{ wallet.title }} {{ wallet.titleshort }} @@ -17,3 +17,7 @@ http://opensource.org/licenses/MIT. {% endif %} {% endfor %}
+ + diff --git a/_includes/layout/base/wallets-menu.html b/_includes/layout/base/wallets-menu.html index 89603f4f..57f1745f 100644 --- a/_includes/layout/base/wallets-menu.html +++ b/_includes/layout/base/wallets-menu.html @@ -26,7 +26,12 @@ http://opensource.org/licenses/MIT. {% assign platformClass = platformClass | append: " active" %} {% endif %}
  • - {% translate walletcat{{platformName}} choose-your-wallet %} + {% if platformName == 'hardware' or platformName == 'web' %} + {% assign platformHref = "/" | append: page.lang | append: "/wallets/" | append: platformName | append: "/" | append: platformName | append: "/" %} + {% else %} + {% assign platformHref = "#" %} + {% endif %} + {% translate walletcat{{platformName}} choose-your-wallet %} {% if platform.items.size > 1 %}
      {% for item in platform.items %} @@ -35,7 +40,7 @@ http://opensource.org/licenses/MIT. {% assign osClass = osClass | append: " active" %} {% endif %}
    • - + {% translate platform{{item.os.name}} choose-your-wallet %}
    • diff --git a/_layouts/wallet-container.html b/_layouts/wallet-container.html index 4ec055dd..84c90e83 100644 --- a/_layouts/wallet-container.html +++ b/_layouts/wallet-container.html @@ -33,6 +33,7 @@ max_wallet_text_length: 418 ## Unicode characters alt="{% translate platform{{os.name}} choose-your-wallet %}" title="{% translate platform{{os.name}} choose-your-wallet %}" /> {% translate platform{{os.name}} choose-your-wallet %} + {% translate walletcat{{os.name}} choose-your-wallet %} {% endfor %} {% endfor %} @@ -47,6 +48,7 @@ max_wallet_text_length: 418 ## Unicode characters alt="{% translate platform{{os.name}} choose-your-wallet %}" title="{% translate platform{{os.name}} choose-your-wallet %}" />

      {% translate platform{{os.name}} choose-your-wallet %}

      +

      {% translate walletcat{{os.name}} choose-your-wallet %}

  • {% if os.link == 'bitcoincore' %} diff --git a/_sass/_wallets.scss b/_sass/_wallets.scss index 48b6dadc..b45a8309 100644 --- a/_sass/_wallets.scss +++ b/_sass/_wallets.scss @@ -387,6 +387,7 @@ $scores: .hover { .wallet-os-check-details { + z-index: 100; display: block; border: 2px solid; border-radius: 4px;