Misc updates

- Remove redirects to removed pages
 - Add some folders to ignore list
 - Update URL in sitemap plugin
This commit is contained in:
thephez 2018-01-04 16:55:22 -05:00
parent c8266c68af
commit f3631fb9f4
5 changed files with 9 additions and 187 deletions

View file

@ -55,94 +55,19 @@ langs:
'zh_TW': '繁體中文'
redirects:
/news: /en/version-history
/clients: /en/choose-your-wallet
/about: /en/faq
/ar/بت-كوين-للهواة: /ar/innovation
/ar/عن: /ar/faq
/ar/بت-كوين-للمطورين: /ar/bitcoin-for-developers
/ar/بت-كوين-للأفراد: /ar/bitcoin-for-individuals
/ar/إختر-محفظتك: /ar/choose-your-wallet
/ar/بت-كوين-للأعمال: /ar/bitcoin-for-businesses
/ar/إختر-محفظتك: /ar/choose-your-wallet
/ar/مجتمع: /ar/community
/ar/تطوير: /ar/development
/ar/تحميل: /ar/download
/ar/كيف-يعمل: /ar/how-it-works
/ar/مصادر: /ar/resources
/ar/إدعم-ألبت-كوين: /ar/support-bitcoin
/ar/مفردات: /ar/vocabulary
/ar/تحتاج-أن-تعلم: /ar/you-need-to-know
/fa/بیت-کوین-برای-علاقه-مندان: /fa/innovation
/fa/درباره: /fa/faq
/fa/بیت-کوین-برای-توسعه-دهندگان: /fa/bitcoin-for-developers
/fa/بیت-کوین-برای-افراد: /fa/bitcoin-for-individuals
/fa/بیت-کوین-برای-کسب-و-کار: /fa/bitcoin-for-businesses
/fa/انتخاب-کیف-پول: /fa/choose-your-wallet
/fa/انجمن: /fa/community
/fa/توسعه: /fa/development
/fa/دانلود: /fa/download
/fa/چگونه-کار-می-کند: /fa/how-it-works
/fa/منابع: /fa/resources
/fa/کیف-پولتان-را-ایمن-کنید: /fa/secure-your-wallet
/fa/حمایت-از-بیت-کوین: /fa/support-bitcoin
/fa/واژگان: /fa/vocabulary
/fa/آن-چه-باید-بدانید: /fa/you-need-to-know
/ru/биткоин-разработчикам: /ru/bitcoin-for-developers
/ru/биткоин-частным-лицам: /ru/bitcoin-for-individuals
/ru/биткоин-бизнесу: /ru/bitcoin-for-businesses
/ru/выберите-свой-кошелек: /ru/choose-your-wallet
/ru/сообщество: /ru/community
/ru/разработка: /ru/development
/ru/загрузки: /ru/download
/ru/как-это-работает: /ru/how-it-works
/ru/ресурсы: /ru/resources
/ru/поддержать-биткоин: /ru/support-bitcoin
/ru/термины: /ru/vocabulary
/ru/вам-нужно-знать: /ru/you-need-to-know
/ru/описание: /ru/faq
/ru/биткоин-энтузиастам: /ru/innovation
/tr/bilmelisiniz: /tr/bilmeniz-gerekenler
/tr/yeni-baslamak: /tr/baslarken
/en/bitcoin-for-press: /en/press
/de/ueber: /de/faq
/en/about: /en/faq
/es/acerca-de: /es/faq
/fr/a-propos: /fr/faq
/it/a-proposito: /it/faq
/nl/over-bitcoin: /nl/faq
/pl/o: /pl/faq
/tr/hakkinda: /tr/sss
/zh_CN/about: /zh_CN/faq
/zh_TW/about: /zh_TW/faq
/de/bitcoin-fuer-enthusiasten: /de/innovation
/en/bitcoin-for-enthusiasts: /en/innovation
/es/bitcoin-para-entusiastas: /es/innovacion
/fr/bitcoin-pour-passionnes: /fr/innovation
/it/bitcoin-per-appassionati: /it/innovazione
/nl/bitcoin-voor-liefhebbers: /nl/innovatie
/pl/bitcoin-dla-entuzjastow: /pl/innowacje
## Old releases pages; stop adding to this list after 0.8.2
/releases/2011/04/27/v0.3.21: /en/release/v0.3.21
/releases/2011/06/05/v0.3.22: /en/release/v0.3.22
/releases/2011/06/14/v0.3.23: /en/release/v0.3.23
/releases/2011/07/08/v0.3.24: /en/release/v0.3.24
/releases/2011/09/23/v0.4.0: /en/release/v0.4.0
/releases/2011/11/21/v0.5.0: /en/release/v0.5.0
/releases/2011/12/15/v0.5.1: /en/release/v0.5.1
/releases/2012/01/09/v0.5.2: /en/release/v0.5.2
/releases/2012/03/14/v0.5.3: /en/release/v0.5.3
/releases/2012/03/16/v0.5.3.1: /en/release/v0.5.3.1
/releases/2012/03/30/v0.6.0: /en/release/v0.6.0
/releases/2012/05/04/v0.6.1: /en/release/v0.6.1
/releases/2012/05/08/v0.6.2: /en/release/v0.6.2
/releases/2012/06/25/v0.6.3: /en/release/v0.6.3
/releases/2012/09/17/v0.7.0: /en/release/v0.7.0
/releases/2012/10/19/v0.7.1: /en/release/v0.7.1
/releases/2012/12/14/v0.7.2: /en/release/v0.7.2
/releases/2013/02/19/v0.8.0: /en/release/v0.8.0
/releases/2013/03/18/v0.8.1: /en/release/v0.8.1
/releases/2013/05/29/v0.8.2: /en/release/v0.8.2
/bitcoin_es_latam.pdf: /files/bitcoin-paper/bitcoin_es_latam.pdf
/bitcoin_ru.pdf: /files/bitcoin-paper/bitcoin_ru.pdf
@ -182,6 +107,9 @@ exclude:
- Gemfile.lock
- Makefile
- vendor # Travis CI creates a vendor/ dir with files we shouldn't render
- doxygen
- scripts
- ignore
future: true
lsi: false
@ -602,30 +530,6 @@ donation_banner:
- 25
- 50
defaults:
- scope:
path: ""
type: alerts
values:
layout: alert
lang: en
- scope:
path: ""
type: releases
values:
layout: release
lang: en
breadcrumbs:
- bitcoin
- bcc
- bcc news
- RELEASE
- scope:
path: ""
type: posts
values:
lang: en
## Options as of version 3.4.20 are: nested (default), compact, compressed, or expanded
sass:
style: compressed

View file

@ -1,29 +0,0 @@
{% comment %}
This file is licensed under the MIT License (MIT) available on
http://opensource.org/licenses/MIT.
{% endcomment %}
<div class="wallet-list" id="wallets" onclick="walletListener(event);" ontouchstart="walletListener(event);">
{% for wallet in site.wallets %}
{% assign platform = page.platform['name'] %}
{% 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>
</div>
{% endif %}
{% endfor %}
</div>
<script type="text/javascript" charset="utf-8">
walletRotate();
</script>

View file

@ -1,53 +0,0 @@
{% comment %}
This file is licensed under the MIT License (MIT) available on
http://opensource.org/licenses/MIT.
{% endcomment %}
<div class="walletmenu" id="walletmenu" onclick="walletMenuListener(event);" ontouchstart="walletMenuListener(event);">
{% assign platformsByPlatform = site.platforms | group_by: "platform" %}
<ul>
{% for platform in platformsByPlatform %}
{% comment %}
! WORKAROUND START
Working around an issue with getting proper platform name from the list
of platforms. After original group_by, the "name" key becomes a stringified
hash. So we need to make these "hackish" transformations to make it working
properly.
{% endcomment %}
{% capture platformName %}{{ platform.name | split: "=>" | last | split: '"' }}{% endcapture %}
{% assign platformName = platformName | trim | replace: '}' '' | replace: ' ' '' %}
{% comment %}
! WORKAROUND END
{% endcomment %}
{% assign platformClass = "wallet-" | append: platformName %}
{% if page.id contains platformName %}
{% assign platformClass = platformClass | append: " active" %}
{% endif %}
<li class="{{ platformClass }}">
{% if platformName == 'hardware' or platformName == 'web' %}
{% 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>
{% endif %}
{% if platform.items.size > 1 %}
<ul>
{% for item in platform.items %}
{% assign osClass = "wallet-" | append: item.os.name %}
{% if page.id contains item.id %}
{% assign osClass = osClass | append: " active" %}
{% endif %}
<li class="{{ osClass }}">
<a href="/{{ page.lang }}/wallets/{{ platformName }}/{{ item.os.name }}/">
{% translate platform{{item.os.name}} choose-your-wallet %}
</a>
</li>
{% endfor %}
</ul>
{% endif %}
</li>
{% endfor %}
</ul>
</div>

View file

@ -50,13 +50,13 @@ module Jekyll
#Don't add a page if their url is not translated
next if locs[lang]['url'][id].nil? or locs[lang]['url'][id] == ''
sitemap.puts '<url>'
sitemap.puts ' <loc>https://bitcoin.org/'+lang+'/'+CGI::escape(locs[lang]['url'][id])+'</loc>'
sitemap.puts ' <loc>https://dash-docs.github.io/'+lang+'/'+CGI::escape(locs[lang]['url'][id])+'</loc>'
locs.each do |altlang,value|
next if locs[altlang]['url'][id].nil? or locs[altlang]['url'][id] == '' or altlang == lang
sitemap.puts ' <xhtml:link'
sitemap.puts ' rel="alternate"'
sitemap.puts ' hreflang="'+altlang+'"'
sitemap.puts ' href="https://bitcoin.org/'+altlang+'/'+CGI::escape(locs[altlang]['url'][id])+'" />'
sitemap.puts ' href="https://dash-docs.github.io/'+altlang+'/'+CGI::escape(locs[altlang]['url'][id])+'" />'
end
sitemap.puts '</url>'
end

View file

@ -7,13 +7,13 @@ one](https://www.atlassian.com/git/tutorial/git-basics).
In order to use GitHub, you need to [sign up](http://github.com/signup) and [set
up git](https://help.github.com/articles/set-up-git). You will also need to
click the **Fork** button on the bitcoin.org [GitHub
page](https://github.com/bitcoin-dot-org/bitcoin.org) and clone your GitHub
click the **Fork** button on the dash.org [GitHub
page](https://github.com/thephez/dash.org) and clone your GitHub
repository into a local directory with the following command lines:
```
git clone (url provided by GitHub on your fork's page) bitcoin.org
cd bitcoin.org
git clone (url provided by GitHub on your fork's page) dash.org
cd dash.org
git remote add upstream https://github.com/thephez/dash.org.git
```