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.

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

New Bitcoin Core sub-site #1044

Merged
merged 7 commits into from
Sep 14, 2015
Merged
Changes from 1 commit
Commits
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
Next Next commit
New Bitcoin Core subsite
This commit contains a large number of contributions from Saïvann
Carignan.
harding committed Sep 14, 2015
commit 706c791e922d712dd2c8487dd5d325121d93b5ed
10 changes: 8 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
@@ -56,7 +56,8 @@ pre-build-tests-fast: check-for-non-ascii-urls check-for-wrong-filename-assignme
check-for-missing-rpc-summaries \
check-for-missing-copyright-licenses \
check-bundle \
check-for-english-in-en-dir
check-for-english-in-en-dir \
check-for-consistent-bitcoin-core-titles

## Post-build tests which, aggregated together, take less than 10 seconds to run on a typical PC
post-build-tests-fast: check-for-build-errors ensure-each-svg-has-a-png check-for-liquid-errors \
@@ -151,7 +152,7 @@ check-for-non-ascii-urls:
## characters or spaces.
$S find _translations -name '*.yml' -type f | while read file \
; do grep -H . $$file | sed -n -e '/url:/,$$p' \
| grep -P ': +[a-z0-9\-]+: +.*([^\x00-\x7f]|[^a-z0-9\-"]).*$$' \
| grep -P ': +[a-z0-9\-]+: +.*([^\x00-\x7f]|[^a-z0-9\/\-"]).*$$' \
; done | eval $(ERROR_ON_OUTPUT)

check-for-broken-kramdown-tables:
@@ -278,3 +279,8 @@ check-for-javascript-in-svgs:
check-for-english-in-en-dir:
## All pages must have page.lang set to work properly with the site templates
$S grep -rl -- '---' en/ | xargs grep -L '^ *lang: *en' | eval $(ERROR_ON_OUTPUT)

check-for-consistent-bitcoin-core-titles:
## Ensure all page titles in the en/bitcoin-core/ hierarchy mention
## Bitcoin Core
$S grep -r -L '^title:.*Bitcoin Core' en/bitcoin-core/ | eval $(ERROR_ON_OUTPUT)
17 changes: 17 additions & 0 deletions _config.yml
Original file line number Diff line number Diff line change
@@ -208,6 +208,23 @@ kramdown:
coderay_bold_every: 10
coderay_css: style

text:
## Values last updated 2015-08-26
## All variable names must indicate unit type for easy translation of adjacent text,
## such as: subsidy_in_decimal_bitcoins or
## bitcoin_org_docs_maintainer_email_link
subsidy_in_decimal_bitcoins: 25
chain_gb: 50
bitcoin_datadir_gb: 60
bitcoin_datadir_gb_pruned: 3
total_tx_count_in_millions: 40
typical_ibd_time_in_hours: 4
typical_144_block_catchup_time_in_minutes: 5
bitcoin_org_docs_maintainer_email_link: '<a href="mailto:[email protected]">Dave Harding</a>'
## Before updating this, verify all assertions are still correct: git grep site.text.assertion_month
## Use ISO-8601 format, but feel free to round to the nearest month
assertion_month: 2015-09-01


## Items in devsearches will appear in the search box in the order they
## are listed below. For the top-level ("Glossary", "RPCs", etc...) this
27 changes: 27 additions & 0 deletions _includes/bitcoin-core/bitcoin-core-possible-problems.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
{% comment %}
This file is licensed under the MIT License (MIT) available on
http://opensource.org/licenses/MIT.
{% endcomment %}

- **Legal:** Bitcoin use is [prohibited or restricted in some
areas.](https://en.wikipedia.org/wiki/Legality_of_bitcoin_by_country)

- **Bandwidth limits**: Some Internet plans will charge an additional
amount for any excess upload bandwidth used that isn't included in
the plan. Worse, some providers may terminate your connection without
warning because of overuse. We advise that you check whether your
Internet connection is subjected to such limitations and monitor your
bandwidth use so that you can stop Bitcoin Core before you reach your
upload limit.

- **Anti-virus:** Several people have placed parts of known computer
viruses in the Bitcoin block chain. This block chain data can't infect
your computer, but some anti-virus programs quarantine the data
anyway, making it more difficult to run Bitcoin Core. This problem mostly
affects computers running Windows.

- **Attack target:** Bitcoin Core powers the Bitcoin peer-to-peer
network, so people who want to disrupt the network may
attack Bitcoin Core users in ways that will affect other things
you do with your computer, such as an attack that limits your
available download bandwidth.
12 changes: 12 additions & 0 deletions _includes/bitcoin-core/core-committers.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{% comment %}
This file is licensed under the MIT License (MIT) available on
http://opensource.org/licenses/MIT.
{% endcomment %}

<div class="listtable coredevtable">
<div><div>Wladimir J. van der Laan</div><div><a href="mailto:[email protected]">[email protected]</a></div><div><a href="/laanwj.asc">PGP</a></div></div>
<div><div>Gavin Andresen</div><div><a href="mailto:[email protected]">[email protected]</a></div><div><a href="/gavinandresen.asc">PGP</a></div></div>
<div><div>Jeff Garzik</div><div><a href="mailto:[email protected]">[email protected]</a></div><div><a href="/jgarzik-bitpay.asc">PGP</a></div></div>
<div><div>Gregory Maxwell</div><div><a href="mailto:[email protected]">[email protected]</a></div><div><a href="/gmaxwell.asc">PGP</a></div></div>
<div><div>Pieter Wuille</div><div><a href="mailto:[email protected]">[email protected]</a></div><div><a href="/pieterwuille.asc">PGP</a></div></div>
</div>
12 changes: 12 additions & 0 deletions _includes/bitcoin-core/download-bitcoin-core.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{% comment %}
This file is licensed under the MIT License (MIT) available on
http://opensource.org/licenses/MIT.
{% endcomment %}

<div class="callout">
<p><a href="/{{page.lang}}/{% translate download url %}">{% translate download-bitcoin-core bitcoin-core-overview %}</a>
<img src="/img/os/windows.png" alt="Windows">
<img src="/img/os/mac.png" alt="Mac">
<img src="/img/os/linux.png" alt="Linux">
</p>
</div>
10 changes: 10 additions & 0 deletions _includes/layout/base-core/content.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{% comment %}
This file is licensed under the MIT License (MIT) available on
http://opensource.org/licenses/MIT.
{% endcomment %}

<div id="content" class="content">
<div {% if page.columns == 1 and page.lang == 'en' %}class="one-column"{% endif %}>
{{ content }}
</div>
</div>
9 changes: 9 additions & 0 deletions _includes/layout/base-core/footer-js-extra.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{% comment %}
This file is licensed under the MIT License (MIT) available on
http://opensource.org/licenses/MIT.
{% endcomment %}

{% comment %}<!-- Try to minimize the amount of JS on the download page -->{% endcomment %}
{% if page.id != 'download' %}
<script src="/js/bitcoin-core.js"></script>
{% endif %}
6 changes: 6 additions & 0 deletions _includes/layout/base-core/head-logo.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{% comment %}
This file is licensed under the MIT License (MIT) available on
http://opensource.org/licenses/MIT.
{% endcomment %}

<a class="logo" href="/{{page.lang}}/{% translate bitcoin-core-overview url %}"><img src="/img/bitcoin-core/bitcoin-core.svg" alt="Bitcoin"></a>
29 changes: 29 additions & 0 deletions _includes/layout/base-core/head-menu.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
{% comment %}
This file is licensed under the MIT License (MIT) available on
http://opensource.org/licenses/MIT.
{% endcomment %}

<ul id="menusimple" class="menusimple menucore" onclick="mobileMenuHover(event);" ontouchstart="mobileMenuHover(event);">
<li><a>{% translate menu-bcc-features layout %}</a>
<ul>
<li{% if page.id == 'bitcoin-core-feature-overview' %} class="active"{% endif %}><a href="/{{page.lang}}/{% translate bitcoin-core-features url %}">{% translate menu-bcc-features-overview layout %}</a></li>
<li{% if page.id == 'bitcoin-core-validation' %} class="active"{% endif %}><a href="/{{page.lang}}/{% translate bitcoin-core-validation url %}">{% translate menu-bcc-validation layout %}</a></li>
<li{% if page.id == 'bitcoin-core-privacy' %} class="active"{% endif %}><a href="/{{page.lang}}/{% translate bitcoin-core-privacy url %}">{% translate menu-bcc-privacy layout %}</a></li>
<li{% if page.id == 'bitcoin-core-requirements' %} class="active"{% endif %}><a href="/{{page.lang}}/{% translate bitcoin-core-requirements url %}">{% translate menu-bcc-requirements layout %}</a></li>
<li{% if page.id == 'bitcoin-core-user-interface' %} class="active"{% endif %}><a href="/{{page.lang}}/{% translate bitcoin-core-user-interface url %}">{% translate menu-bcc-user-interface layout %}</a></li>
<li{% if page.id == 'bitcoin-core-donate-bandwidth' %} class="active"{% endif %}><a href="/{{page.lang}}/{% translate bitcoin-core-network-support url %}">{% translate menu-bcc-network-support layout %}</a></li>
</ul>
</li>
<li{% if page.id == 'bitcoin-core-help' %} class="active"{% endif %}><a href="/{{page.lang}}/{% translate bitcoin-core-help url %}">{% translate menu-bcc-help layout %}</a></li>
<li{% if page.id == 'bitcoin-core-contribute' %} class="active"{% endif %}><a>{% translate menu-bcc-contribute layout %}</a>
<ul>
<li{% if page.id == 'bitcoin-core-contribute-issues' %} class="active"{% endif %}><a href="/{{page.lang}}/{% translate bitcoin-core-contribute-issues url %}">{% translate menu-bcc-contribute-issues layout %}</a></li>
<li{% if page.id == 'development' %} class="active"{% endif %}><a href="/{{page.lang}}/{% translate development url %}">{% translate menu-bcc-contribute-code layout %}</a></li>
<li{% if page.id == 'bitcoin-core-contribute-documentation' %} class="active"{% endif %}><a href="/{{page.lang}}/{% translate bitcoin-core-contribute-documentation url %}">{% translate menu-bcc-contribute-documentation layout %}</a></li>
<li{% if page.id == 'bitcoin-core-contribute-translations' %} class="active"{% endif %}><a href="/{{page.lang}}/{% translate bitcoin-core-contribute-translations url %}">{% translate menu-bcc-contribute-translations layout %}</a></li>
<li{% if page.id == 'bitcoin-core-contribute-tech-support' %} class="active"{% endif %}><a href="/{{page.lang}}/{% translate bitcoin-core-contribute-tech-support url %}">{% translate menu-bcc-contribute-tech-support layout %}</a></li>
</ul>
</li>
<li{% if page.id == 'version-history' %} class="active"{% endif %}><a href="/en/version-history">{% translate menu-bcc-news layout %}</a></li>
<li{% if page.id == 'download' %} class="active"{% endif %}><a href="/{{ page.lang }}/{% translate download url %}">{% translate menu-bcc-download layout %}</a></li>
</ul>
10 changes: 10 additions & 0 deletions _includes/layout/base-core/html-head-extra.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{% comment %}
This file is licensed under the MIT License (MIT) available on
http://opensource.org/licenses/MIT.
{% endcomment %}

{% comment %}<!-- try to minimize the amount of JS on the Download page -->{% endcomment %}
{% if page.id != 'download' %}
<script src="/js/jquery/jquery-1.11.2.min.js"></script>
<script src="/js/jquery/jquery-ui.min.js"></script>
{% endif %}
9 changes: 9 additions & 0 deletions _includes/layout/base-core/html-head-jquery-css.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{% comment %}
This file is licensed under the MIT License (MIT) available on
http://opensource.org/licenses/MIT.

<!-- this must come before the main style sheet so that our
definitions override the defaults -->
{% endcomment %}

<link rel="stylesheet" href="/css/jquery-ui.min.css">
9 changes: 9 additions & 0 deletions _includes/layout/base/breadcrumbs.html
Original file line number Diff line number Diff line change
@@ -12,11 +12,20 @@
{% for synonym in page.required.synonyms_shown_in_glossary_capitalize_first_letter %}
{% if forloop.first %}{{synonym}}{% endif %}
{% endfor %}
{% when "RELEASE" %}
{% comment %}<!-- for Bitcoin Core releases, show the version number -->{% endcomment %}
{{page.required_version}}
{% else %}{{crumb}}
{% endcase %}
{% else %}
{% case crumb %}
{% comment %}/// Alphabetical order by crumb \\\{% endcomment %}
{% when "bcc" %}<a href="/en/bitcoin-core/">Core</a>
{% when "bcc contribute" %}<a href="/en/bitcoin-core/contribute/">Contribute</a>
{% when "bcc documentation" %}<a href="/en/bitcoin-core/help#documentation">Documentation</a>
{% when "bcc features" %}<a href="/en/bitcoin-core/features/">Features</a>
{% when "bcc help" %}<a href="/en/bitcoin-core/help">Help</a>
{% when "bcc news" %}<a href="/en/version-history">News</a>
{% when "bitcoin" %}<a href="/{{page.lang}}/">{% translate bitcoin vocabulary %}</a>
{% when "dev docs" %}<a href="/en/developer-documentation">Dev Docs</a>
{% when "glossary" %}<a href="/en/developer-glossary">Glossary</a>
8 changes: 7 additions & 1 deletion _includes/layout/base/head-menu.html
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
http://opensource.org/licenses/MIT.
{% endcomment %}

<ul id="menusimple" class="menusimple" onclick="mobileMenuHover(event);" ontouchstart="mobileMenuHover(event);">
<ul id="menusimple" class="menusimple menumain" onclick="mobileMenuHover(event);" ontouchstart="mobileMenuHover(event);">
<li><a>{% translate menu-intro layout %}</a>
<ul>
<li{% if page.id == 'bitcoin-for-individuals' %} class="active"{% endif %}><a href="/{{ page.lang }}/{% translate bitcoin-for-individuals url %}">{% translate menu-bitcoin-for-individuals layout %}</a></li>
@@ -21,6 +21,12 @@
{% if page.lang == 'en' %}<li{% if page.id == 'developer-documentation' %} class="active"{% endif %}><a href="/en/developer-documentation">Documentation</a></li>{% endif %}
<li{% if page.id == 'vocabulary' %} class="active"{% endif %}><a href="/{{ page.lang }}/{% translate vocabulary url %}">{% translate menu-vocabulary layout %}</a></li>
<li{% if page.id == 'events' %} class="active"{% endif %}><a href="/{{ page.lang }}/{% translate events url %}">{% translate menu-events layout %}</a></li>
{% case page.lang %}
{% when 'id' or 'da' or 'de' or 'es' or 'fr' or 'it' or 'hu' or 'nl' or 'pl' or 'pt_BR' or 'ro' or 'sl' or 'sv' or 'tr' or 'el' or 'bg' or 'ru' or 'uk' or 'ar' or 'fa' or 'hi' or 'ko' or 'ja' or 'zh_CN' or 'zh_TW' %}
<li{% if page.id == 'download' %} class="active"{% endif %}><a href="/{{page.lang}}/{% translate download url %}">{% translate bitcoin-core layout %}</a></li>
{% else %}
<li><a href="/{{page.lang}}/{% translate bitcoin-core-overview url %}">{% translate bitcoin-core layout %}</a></li>
{% endcase %}
</ul>
</li>
<li{% if page.id == 'innovation' %} class="active"{% endif %}><a href="/{{ page.lang }}/{% translate innovation url %}">{% translate menu-innovation layout %}</a></li>
Loading