diff --git a/404.html b/404.html index c54ed6c8..bfb66f08 100644 --- a/404.html +++ b/404.html @@ -1,4 +1,7 @@ --- +# This file is licensed under the MIT License (MIT) available on +# http://opensource.org/licenses/MIT. + layout: base lang: en id: index diff --git a/Makefile b/Makefile index 33d64168..384ecb91 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ -## Optional Makefile: only used for testing & maintainer automation; -## not used to build live site +## This file is licensed under the MIT License (MIT) available on +## http://opensource.org/licenses/MIT. S=@ ## Silent: only print errors by default; ## run `make S='' [other args]` to print commands as they're run @@ -198,6 +198,12 @@ check-for-missing-copyright-licenses: ## say MIT license, but it has to say something.) This can be extended ## to include other directories by adding them after "_includes/" $S git grep -iL 'This file is licensed' _includes/ | eval $(ERROR_ON_OUTPUT) + $S git ls-files | grep -v '^_alerts' \ + | while read file ; do \ + if sed -n 1p $$file | grep -q '^---$$' ; then \ + grep -iL 'This file is licensed' $$file ; \ + fi ; \ + done | eval $(ERROR_ON_OUTPUT) check-for-missing-rpc-summaries: ## Make sure the Quick Reference section has a summary for each RPC we diff --git a/README.md b/README.md index 15fe83f3..21c9dfd8 100644 --- a/README.md +++ b/README.md @@ -408,6 +408,9 @@ recommend naming it after the release, such as `0.10.0.md` Then copy in the following YAML header (the part between the three dashes, ---): ~~~ --- +# This file is licensed under the MIT License (MIT) available on +# http://opensource.org/licenses/MIT. + ## Required value below populates the %v variable (note: % needs to be escaped in YAML if it starts a value) required_version: 0.10.0 ## Optional release date. May be filled in hours/days after a release diff --git a/_alerts/2015-07-04-spv-mining.md b/_alerts/2015-07-04-spv-mining.md index 5824734c..a641cf5e 100644 --- a/_alerts/2015-07-04-spv-mining.md +++ b/_alerts/2015-07-04-spv-mining.md @@ -1,4 +1,7 @@ --- +## This file is licensed under the MIT License (MIT) available on +## http://opensource.org/licenses/MIT. + title: "Some Miners Generating Invalid Blocks" alias: "spv-mining" active: false diff --git a/_events.yml b/_events.yml index 3bb0dcf0..376698c0 100644 --- a/_events.yml +++ b/_events.yml @@ -174,6 +174,14 @@ country: "United States" link: "http://www.imtconferences.com/mtbit/" +- date: 2015-12-14 + title: "Inside Bitcoins San Diego" + venue: "San Diego Convention Center" + address: "111 W. Harbor Drive" + city: "San Diego" + country: "United States" + link: "http://insidebitcoins.com/san-diego/2015?utm_source=bitcoinorg&utm_medium=eventlisting&utm_campaign=bitcoinorgeventlistingibsd" + - date: 2016-04-04 title: "Money 20/20 Europe" venue: "Bella Center" diff --git a/_includes/layout/base/breadcrumbs.html b/_includes/layout/base/breadcrumbs.html new file mode 100644 index 00000000..fd2f430d --- /dev/null +++ b/_includes/layout/base/breadcrumbs.html @@ -0,0 +1,28 @@ +{% comment %} +This file is licensed under the MIT License (MIT) available on +http://opensource.org/licenses/MIT. +{% endcomment %} + +
+ {% for crumb in page.breadcrumbs %} + {% if forloop.last %} + {% case crumb %} + {% when "GLOSSARY_ENTRY_TITLE" %} + {% comment %} ## Only show first synonym in crumb ## {% endcomment %} + {% for synonym in page.required.synonyms_shown_in_glossary_capitalize_first_letter %} + {% if forloop.first %}{{synonym}}{% endif %} + {% endfor %} + {% else %}{{crumb}} + {% endcase %} + {% else %} + {% case crumb %} + {% comment %}/// Alphabetical order by crumb \\\{% endcomment %} + {% when "bitcoin" %}{% translate bitcoin vocabulary %} + {% when "dev docs" %}Dev Docs + {% when "glossary" %}Glossary + {% else %}{% die "Breadcrumb not found in _includes/layout/breadcrumbs.html" %} + {% endcase %} + > + {% endif %} + {% endfor %} +
diff --git a/_includes/layout/base/content.html b/_includes/layout/base/content.html new file mode 100644 index 00000000..001db305 --- /dev/null +++ b/_includes/layout/base/content.html @@ -0,0 +1,8 @@ +{% comment %} +This file is licensed under the MIT License (MIT) available on +http://opensource.org/licenses/MIT. +{% endcomment %} + +
+ {{ content }} +
diff --git a/_includes/layout/base/footer-js.html b/_includes/layout/base/footer-js.html new file mode 100644 index 00000000..b75ea04a --- /dev/null +++ b/_includes/layout/base/footer-js.html @@ -0,0 +1,9 @@ +{% comment %} +This file is licensed under the MIT License (MIT) available on +http://opensource.org/licenses/MIT. +{% endcomment %} + + diff --git a/_includes/layout/base/footer-license.html b/_includes/layout/base/footer-license.html new file mode 100644 index 00000000..3332cef0 --- /dev/null +++ b/_includes/layout/base/footer-license.html @@ -0,0 +1,6 @@ +{% comment %} +This file is licensed under the MIT License (MIT) available on +http://opensource.org/licenses/MIT. +{% endcomment %} + +
© Bitcoin Project 2009-{{ site.time | date: '%Y' }} {% translate footer layout %}
diff --git a/_includes/layout/base/footer-menu.html b/_includes/layout/base/footer-menu.html new file mode 100644 index 00000000..1af12879 --- /dev/null +++ b/_includes/layout/base/footer-menu.html @@ -0,0 +1,18 @@ +{% comment %} +This file is licensed under the MIT License (MIT) available on +http://opensource.org/licenses/MIT. +{% endcomment %} + +
+ Network Status + {% translate menu-legal layout %} + {% case page.lang %} + {% when 'ar' or 'es' or 'sl' %} + Privacy + {% else %} + {% translate menu-privacy layout %} + {% endcase %} + {% translate menu-press layout %} + {% translate menu-about-us layout %} + Blog +
diff --git a/_includes/layout/base/footer-sponsor.html b/_includes/layout/base/footer-sponsor.html new file mode 100644 index 00000000..9922946e --- /dev/null +++ b/_includes/layout/base/footer-sponsor.html @@ -0,0 +1,8 @@ +{% comment %} +This file is licensed under the MIT License (MIT) available on +http://opensource.org/licenses/MIT. +{% endcomment %} + +
+
{% translate sponsor layout %} Bitcoin Foundation
+
diff --git a/_includes/layout/base/head-language-dropdown.html b/_includes/layout/base/head-language-dropdown.html new file mode 100644 index 00000000..770ba9e9 --- /dev/null +++ b/_includes/layout/base/head-language-dropdown.html @@ -0,0 +1,17 @@ +{% comment %} +This file is licensed under the MIT License (MIT) available on +http://opensource.org/licenses/MIT. +{% endcomment %} + diff --git a/_includes/layout/base/head-language-select.html b/_includes/layout/base/head-language-select.html new file mode 100644 index 00000000..ada4678f --- /dev/null +++ b/_includes/layout/base/head-language-select.html @@ -0,0 +1,9 @@ +{% comment %} +This file is licensed under the MIT License (MIT) available on +http://opensource.org/licenses/MIT. +{% endcomment %} +
diff --git a/_includes/layout/base/head-logo.html b/_includes/layout/base/head-logo.html new file mode 100644 index 00000000..1de7c8f6 --- /dev/null +++ b/_includes/layout/base/head-logo.html @@ -0,0 +1,6 @@ +{% comment %} +This file is licensed under the MIT License (MIT) available on +http://opensource.org/licenses/MIT. +{% endcomment %} + + diff --git a/_includes/layout/base/head-menu.html b/_includes/layout/base/head-menu.html new file mode 100644 index 00000000..af454160 --- /dev/null +++ b/_includes/layout/base/head-menu.html @@ -0,0 +1,35 @@ +{% comment %} +This file is licensed under the MIT License (MIT) available on +http://opensource.org/licenses/MIT. +{% endcomment %} + + diff --git a/_includes/layout/base/head-mobile-menu.html b/_includes/layout/base/head-mobile-menu.html new file mode 100644 index 00000000..8ffe3ea4 --- /dev/null +++ b/_includes/layout/base/head-mobile-menu.html @@ -0,0 +1,6 @@ +{% comment %} +This file is licensed under the MIT License (MIT) available on +http://opensource.org/licenses/MIT. +{% endcomment %} + + diff --git a/_includes/layout/base/html-head.html b/_includes/layout/base/html-head.html new file mode 100644 index 00000000..2b6b4b05 --- /dev/null +++ b/_includes/layout/base/html-head.html @@ -0,0 +1,19 @@ +{% comment %} +This file is licensed under the MIT License (MIT) available on +http://opensource.org/licenses/MIT. +{% endcomment %} + + + + +{% capture title %}{% translate title %}{% endcapture %}{% if title != '' %}{{ title }}{% else %}{{ page.title }}{% endif %} +{% capture metadescription %}{% translate metadescription %}{% endcapture %}{% if metadescription != '' %}{% endif %} +{% lesscss main.less %} + + +{% if page.lang == 'ar' or page.lang == 'fa' %}{% lesscss rtl.less %}{% endif %} +{% if page.lang == 'bg' or page.lang == 'el' or page.lang == 'ko' or page.lang == 'hi' or page.lang == 'pl' or page.lang == 'sl' or page.lang == 'ro' or page.lang == 'ru' or page.lang == 'tr' or page.lang == 'uk' or page.lang == 'zh_CN' or page.lang == 'zh_TW' %}{% lesscss sans.less %}{% endif %} + +{% if page.id != 'download' %}{% endif %} + + diff --git a/_includes/layout/base/pagetop-alert.html b/_includes/layout/base/pagetop-alert.html new file mode 100644 index 00000000..6e2a2836 --- /dev/null +++ b/_includes/layout/base/pagetop-alert.html @@ -0,0 +1,10 @@ +{% comment %} +This file is licensed under the MIT License (MIT) available on +http://opensource.org/licenses/MIT. +{% endcomment %} + +{% if site.ALERT %} + +{% endif %} diff --git a/_includes/layout/base/pagetop-detect-mobile.html b/_includes/layout/base/pagetop-detect-mobile.html new file mode 100644 index 00000000..45e06444 --- /dev/null +++ b/_includes/layout/base/pagetop-detect-mobile.html @@ -0,0 +1,6 @@ +{% comment %} +This file is licensed under the MIT License (MIT) available on +http://opensource.org/licenses/MIT. +{% endcomment %} + +
diff --git a/_layouts/base.html b/_layouts/base.html index 6b8c26ef..6996621a 100644 --- a/_layouts/base.html +++ b/_layouts/base.html @@ -4,109 +4,34 @@ --- + - - - -{% capture title %}{% translate title %}{% endcapture %}{% if title != '' %}{{ title }}{% else %}{{ page.title }}{% endif %} -{% capture metadescription %}{% translate metadescription %}{% endcapture %}{% if metadescription != '' %}{% endif %} -{% lesscss main.less %} - - -{% if page.lang == 'ar' or page.lang == 'fa' %}{% lesscss rtl.less %}{% endif %} -{% if page.lang == 'bg' or page.lang == 'el' or page.lang == 'ko' or page.lang == 'hi' or page.lang == 'pl' or page.lang == 'sl' or page.lang == 'ro' or page.lang == 'ru' or page.lang == 'tr' or page.lang == 'uk' or page.lang == 'zh_CN' or page.lang == 'zh_TW' %}{% lesscss sans.less %}{% endif %} - -{% if page.id != 'download' %}{% endif %} - - +{% include layout/base/html-head.html %} + -
-{% if site.ALERT %} -