From e038560ab7b836a26efcdaff2d0087f27b966fe4 Mon Sep 17 00:00:00 2001 From: "David A. Harding" Date: Fri, 17 Jul 2015 17:16:36 -0400 Subject: [PATCH 1/5] Copyrights: Add MIT License Header To More Files - Makefile: extend copyright check test to scan all files with YAML headers - Exclude alerts from check -- lack of a license shouldn't prevent us from publishing emergency information - Also add license to Makefile itself - Fix all errors caught by new test - For release notes, also link to github.com/bitcoin/bitcoin repository as origin - Also update README.md release instructions to include license --- 404.html | 3 +++ Makefile | 10 ++++++++-- README.md | 3 +++ _alerts/2015-07-04-spv-mining.md | 3 +++ _posts/2015-06-16-hard-fork-policy.md | 3 +++ _posts/2015-06-23-repository-move.md | 3 +++ _releases/0.10.0.md | 5 +++++ _releases/0.10.1.md | 5 +++++ _releases/0.10.2.md | 5 +++++ _releases/0.11.0.md | 5 +++++ _releases/0.3.21.md | 5 +++++ _releases/0.3.22.md | 5 +++++ _releases/0.3.23.md | 5 +++++ _releases/0.3.24.md | 5 +++++ _releases/0.4.0.md | 5 +++++ _releases/0.5.0.md | 5 +++++ _releases/0.5.1.md | 5 +++++ _releases/0.5.2.md | 5 +++++ _releases/0.5.3.1.md | 5 +++++ _releases/0.5.3.md | 5 +++++ _releases/0.6.0.md | 5 +++++ _releases/0.6.1.md | 5 +++++ _releases/0.6.2.md | 5 +++++ _releases/0.6.3.md | 5 +++++ _releases/0.7.0.md | 5 +++++ _releases/0.7.1.md | 5 +++++ _releases/0.7.2.md | 5 +++++ _releases/0.8.0.md | 5 +++++ _releases/0.8.1.md | 5 +++++ _releases/0.8.2.md | 5 +++++ _releases/0.8.3.md | 5 +++++ _releases/0.8.4.md | 5 +++++ _releases/0.8.5.md | 5 +++++ _releases/0.8.6.md | 5 +++++ _releases/0.9.0.md | 5 +++++ _releases/0.9.1.md | 5 +++++ _releases/0.9.2.1.md | 5 +++++ _releases/0.9.2.md | 5 +++++ _releases/0.9.3.md | 5 +++++ _templates/privacy.html | 3 +++ js/events.js | 3 +++ 41 files changed, 194 insertions(+), 2 deletions(-) diff --git a/404.html b/404.html index aeec2a08..b596eee8 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/_posts/2015-06-16-hard-fork-policy.md b/_posts/2015-06-16-hard-fork-policy.md index 81cacae2..e2ad00a5 100644 --- a/_posts/2015-06-16-hard-fork-policy.md +++ b/_posts/2015-06-16-hard-fork-policy.md @@ -1,4 +1,7 @@ --- +# This file is licensed under the MIT License (MIT) available on +# http://opensource.org/licenses/MIT. + type: posts layout: post lang: en diff --git a/_posts/2015-06-23-repository-move.md b/_posts/2015-06-23-repository-move.md index 88334f1a..cf5f9c5c 100644 --- a/_posts/2015-06-23-repository-move.md +++ b/_posts/2015-06-23-repository-move.md @@ -1,4 +1,7 @@ --- +# This file is licensed under the MIT License (MIT) available on +# http://opensource.org/licenses/MIT. + type: posts layout: post lang: en diff --git a/_releases/0.10.0.md b/_releases/0.10.0.md index 39c00e46..39be7f17 100644 --- a/_releases/0.10.0.md +++ b/_releases/0.10.0.md @@ -1,4 +1,9 @@ --- +# This file is licensed under the MIT License (MIT) available on +# http://opensource.org/licenses/MIT. +# Text originally from Bitcoin Core project +# Metadata and small formatting changes from Bitcoin.org project + ## 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/_releases/0.10.1.md b/_releases/0.10.1.md index 1917ba0e..493b2300 100644 --- a/_releases/0.10.1.md +++ b/_releases/0.10.1.md @@ -1,4 +1,9 @@ --- +# This file is licensed under the MIT License (MIT) available on +# http://opensource.org/licenses/MIT. +# Text originally from Bitcoin Core project +# Metadata and small formatting changes from Bitcoin.org project + ## Required value below populates the %v variable (note: % needs to be escaped in YAML if it starts a value) required_version: 0.10.1 ## Optional release date. May be filled in hours/days after a release diff --git a/_releases/0.10.2.md b/_releases/0.10.2.md index cfc94cbf..44d5d48d 100644 --- a/_releases/0.10.2.md +++ b/_releases/0.10.2.md @@ -1,4 +1,9 @@ --- +# This file is licensed under the MIT License (MIT) available on +# http://opensource.org/licenses/MIT. +# Text originally from Bitcoin Core project +# Metadata and small formatting changes from Bitcoin.org project + ## Required value below populates the %v variable (note: % needs to be escaped in YAML if it starts a value) required_version: 0.10.2 ## Optional release date. May be filled in hours/days after a release diff --git a/_releases/0.11.0.md b/_releases/0.11.0.md index 4cfa982a..b9f54625 100644 --- a/_releases/0.11.0.md +++ b/_releases/0.11.0.md @@ -1,4 +1,9 @@ --- +# This file is licensed under the MIT License (MIT) available on +# http://opensource.org/licenses/MIT. +# Text originally from Bitcoin Core project +# Metadata and small formatting changes from Bitcoin.org project + ## Required value below populates the %v variable (note: % needs to be escaped in YAML if it starts a value) required_version: 0.11.0 ## Optional release date. May be filled in hours/days after a release diff --git a/_releases/0.3.21.md b/_releases/0.3.21.md index 97373c6e..fbe62f00 100644 --- a/_releases/0.3.21.md +++ b/_releases/0.3.21.md @@ -1,4 +1,9 @@ --- +# This file is licensed under the MIT License (MIT) available on +# http://opensource.org/licenses/MIT. +# Text originally from Bitcoin Core project +# Metadata and small formatting changes from Bitcoin.org project + ## Please see _releases/0.10.0.md for a release template required_version: 0.3.21 optional_date: 2011-04-27 diff --git a/_releases/0.3.22.md b/_releases/0.3.22.md index ace35601..b1a4b1cc 100644 --- a/_releases/0.3.22.md +++ b/_releases/0.3.22.md @@ -1,4 +1,9 @@ --- +# This file is licensed under the MIT License (MIT) available on +# http://opensource.org/licenses/MIT. +# Text originally from Bitcoin Core project +# Metadata and small formatting changes from Bitcoin.org project + ## Please see _releases/0.10.0.md for a release template required_version: 0.3.22 optional_date: 2011-06-05 diff --git a/_releases/0.3.23.md b/_releases/0.3.23.md index 11d86181..5a8ab003 100644 --- a/_releases/0.3.23.md +++ b/_releases/0.3.23.md @@ -1,4 +1,9 @@ --- +# This file is licensed under the MIT License (MIT) available on +# http://opensource.org/licenses/MIT. +# Text originally from Bitcoin Core project +# Metadata and small formatting changes from Bitcoin.org project + ## Please see _releases/0.10.0.md for a release template required_version: 0.3.23 optional_date: 2011-06-14 diff --git a/_releases/0.3.24.md b/_releases/0.3.24.md index 8bd6bfa0..0701fe9d 100644 --- a/_releases/0.3.24.md +++ b/_releases/0.3.24.md @@ -1,4 +1,9 @@ --- +# This file is licensed under the MIT License (MIT) available on +# http://opensource.org/licenses/MIT. +# Text originally from Bitcoin Core project +# Metadata and small formatting changes from Bitcoin.org project + ## Please see _releases/0.10.0.md for a release template required_version: 0.3.24 optional_date: 2011-07-08 diff --git a/_releases/0.4.0.md b/_releases/0.4.0.md index 0b3888f5..1d5809c5 100644 --- a/_releases/0.4.0.md +++ b/_releases/0.4.0.md @@ -1,4 +1,9 @@ --- +# This file is licensed under the MIT License (MIT) available on +# http://opensource.org/licenses/MIT. +# Text originally from Bitcoin Core project +# Metadata and small formatting changes from Bitcoin.org project + ## Please see _releases/0.10.0.md for a release template required_version: 0.4.0 optional_date: 2011-09-23 diff --git a/_releases/0.5.0.md b/_releases/0.5.0.md index b8682250..c9a13d92 100644 --- a/_releases/0.5.0.md +++ b/_releases/0.5.0.md @@ -1,4 +1,9 @@ --- +# This file is licensed under the MIT License (MIT) available on +# http://opensource.org/licenses/MIT. +# Text originally from Bitcoin Core project +# Metadata and small formatting changes from Bitcoin.org project + ## Please see _releases/0.10.0.md for a release template required_version: 0.5.0 optional_date: 2011-11-21 diff --git a/_releases/0.5.1.md b/_releases/0.5.1.md index b0883a7e..bb4d2280 100644 --- a/_releases/0.5.1.md +++ b/_releases/0.5.1.md @@ -1,4 +1,9 @@ --- +# This file is licensed under the MIT License (MIT) available on +# http://opensource.org/licenses/MIT. +# Text originally from Bitcoin Core project +# Metadata and small formatting changes from Bitcoin.org project + ## Please see _releases/0.10.0.md for a release template required_version: 0.5.1 optional_date: 2011-12-15 diff --git a/_releases/0.5.2.md b/_releases/0.5.2.md index 6bd0d915..2baf9f09 100644 --- a/_releases/0.5.2.md +++ b/_releases/0.5.2.md @@ -1,4 +1,9 @@ --- +# This file is licensed under the MIT License (MIT) available on +# http://opensource.org/licenses/MIT. +# Text originally from Bitcoin Core project +# Metadata and small formatting changes from Bitcoin.org project + ## Please see _releases/0.10.0.md for a release template required_version: 0.5.2 optional_date: 2012-01-09 diff --git a/_releases/0.5.3.1.md b/_releases/0.5.3.1.md index 8a1fda29..bfda6840 100644 --- a/_releases/0.5.3.1.md +++ b/_releases/0.5.3.1.md @@ -1,4 +1,9 @@ --- +# This file is licensed under the MIT License (MIT) available on +# http://opensource.org/licenses/MIT. +# Text originally from Bitcoin Core project +# Metadata and small formatting changes from Bitcoin.org project + ## Please see _releases/0.10.0.md for a release template required_version: 0.5.3.1 optional_date: 2012-03-16 diff --git a/_releases/0.5.3.md b/_releases/0.5.3.md index 67e4e050..0e3e4988 100644 --- a/_releases/0.5.3.md +++ b/_releases/0.5.3.md @@ -1,4 +1,9 @@ --- +# This file is licensed under the MIT License (MIT) available on +# http://opensource.org/licenses/MIT. +# Text originally from Bitcoin Core project +# Metadata and small formatting changes from Bitcoin.org project + ## Please see _releases/0.10.0.md for a release template required_version: 0.5.3 optional_date: 2012-03-14 diff --git a/_releases/0.6.0.md b/_releases/0.6.0.md index 3e7bc397..cfcd0b75 100644 --- a/_releases/0.6.0.md +++ b/_releases/0.6.0.md @@ -1,4 +1,9 @@ --- +# This file is licensed under the MIT License (MIT) available on +# http://opensource.org/licenses/MIT. +# Text originally from Bitcoin Core project +# Metadata and small formatting changes from Bitcoin.org project + ## Please see _releases/0.10.0.md for a release template required_version: 0.6.0 optional_date: 2012-03-30 diff --git a/_releases/0.6.1.md b/_releases/0.6.1.md index 6cb1472c..295ba12e 100644 --- a/_releases/0.6.1.md +++ b/_releases/0.6.1.md @@ -1,4 +1,9 @@ --- +# This file is licensed under the MIT License (MIT) available on +# http://opensource.org/licenses/MIT. +# Text originally from Bitcoin Core project +# Metadata and small formatting changes from Bitcoin.org project + ## Please see _releases/0.10.0.md for a release template required_version: 0.6.1 optional_date: 2012-05-04 diff --git a/_releases/0.6.2.md b/_releases/0.6.2.md index ba927fa6..20e7ef83 100644 --- a/_releases/0.6.2.md +++ b/_releases/0.6.2.md @@ -1,4 +1,9 @@ --- +# This file is licensed under the MIT License (MIT) available on +# http://opensource.org/licenses/MIT. +# Text originally from Bitcoin Core project +# Metadata and small formatting changes from Bitcoin.org project + ## Please see _releases/0.10.0.md for a release template required_version: 0.6.2 optional_date: 2012-05-08 diff --git a/_releases/0.6.3.md b/_releases/0.6.3.md index 8dc00ff1..666b1c87 100644 --- a/_releases/0.6.3.md +++ b/_releases/0.6.3.md @@ -1,4 +1,9 @@ --- +# This file is licensed under the MIT License (MIT) available on +# http://opensource.org/licenses/MIT. +# Text originally from Bitcoin Core project +# Metadata and small formatting changes from Bitcoin.org project + ## Please see _releases/0.10.0.md for a release template required_version: 0.6.3 optional_date: 2012-06-25 diff --git a/_releases/0.7.0.md b/_releases/0.7.0.md index 7f5b288c..e0ebcb70 100644 --- a/_releases/0.7.0.md +++ b/_releases/0.7.0.md @@ -1,4 +1,9 @@ --- +# This file is licensed under the MIT License (MIT) available on +# http://opensource.org/licenses/MIT. +# Text originally from Bitcoin Core project +# Metadata and small formatting changes from Bitcoin.org project + ## Please see _releases/0.10.0.md for a release template required_version: 0.7.0 optional_date: 2012-09-17 diff --git a/_releases/0.7.1.md b/_releases/0.7.1.md index c762be54..767582b6 100644 --- a/_releases/0.7.1.md +++ b/_releases/0.7.1.md @@ -1,4 +1,9 @@ --- +# This file is licensed under the MIT License (MIT) available on +# http://opensource.org/licenses/MIT. +# Text originally from Bitcoin Core project +# Metadata and small formatting changes from Bitcoin.org project + ## Please see _releases/0.10.0.md for a release template required_version: 0.7.1 optional_date: 2012-10-19 diff --git a/_releases/0.7.2.md b/_releases/0.7.2.md index 52e803a4..5f7e9e56 100644 --- a/_releases/0.7.2.md +++ b/_releases/0.7.2.md @@ -1,4 +1,9 @@ --- +# This file is licensed under the MIT License (MIT) available on +# http://opensource.org/licenses/MIT. +# Text originally from Bitcoin Core project +# Metadata and small formatting changes from Bitcoin.org project + ## Please see _releases/0.10.0.md for a release template required_version: 0.7.2 optional_date: 2012-12-14 diff --git a/_releases/0.8.0.md b/_releases/0.8.0.md index edc49847..d8c80dbe 100644 --- a/_releases/0.8.0.md +++ b/_releases/0.8.0.md @@ -1,4 +1,9 @@ --- +# This file is licensed under the MIT License (MIT) available on +# http://opensource.org/licenses/MIT. +# Text originally from Bitcoin Core project +# Metadata and small formatting changes from Bitcoin.org project + ## Please see _releases/0.10.0.md for a release template required_version: 0.8.0 optional_date: 2013-02-19 diff --git a/_releases/0.8.1.md b/_releases/0.8.1.md index a06f87db..ca6cd3dc 100644 --- a/_releases/0.8.1.md +++ b/_releases/0.8.1.md @@ -1,4 +1,9 @@ --- +# This file is licensed under the MIT License (MIT) available on +# http://opensource.org/licenses/MIT. +# Text originally from Bitcoin Core project +# Metadata and small formatting changes from Bitcoin.org project + ## Please see _releases/0.10.0.md for a release template required_version: 0.8.1 optional_date: 2013-03-18 diff --git a/_releases/0.8.2.md b/_releases/0.8.2.md index 95ca0ce9..a987177b 100644 --- a/_releases/0.8.2.md +++ b/_releases/0.8.2.md @@ -1,4 +1,9 @@ --- +# This file is licensed under the MIT License (MIT) available on +# http://opensource.org/licenses/MIT. +# Text originally from Bitcoin Core project +# Metadata and small formatting changes from Bitcoin.org project + ## Please see _releases/0.10.0.md for a release template required_version: 0.8.2 optional_date: 2013-05-29 diff --git a/_releases/0.8.3.md b/_releases/0.8.3.md index 4549a57f..22ac8563 100644 --- a/_releases/0.8.3.md +++ b/_releases/0.8.3.md @@ -1,4 +1,9 @@ --- +# This file is licensed under the MIT License (MIT) available on +# http://opensource.org/licenses/MIT. +# Text originally from Bitcoin Core project +# Metadata and small formatting changes from Bitcoin.org project + ## Please see _releases/0.10.0.md for a release template required_version: 0.8.3 optional_date: 2013-06-25 diff --git a/_releases/0.8.4.md b/_releases/0.8.4.md index 8ab559fa..b275ecab 100644 --- a/_releases/0.8.4.md +++ b/_releases/0.8.4.md @@ -1,4 +1,9 @@ --- +# This file is licensed under the MIT License (MIT) available on +# http://opensource.org/licenses/MIT. +# Text originally from Bitcoin Core project +# Metadata and small formatting changes from Bitcoin.org project + ## Please see _releases/0.10.0.md for a release template required_version: 0.8.4 optional_date: 2013-09-03 diff --git a/_releases/0.8.5.md b/_releases/0.8.5.md index 2c288dfd..c1236ae3 100644 --- a/_releases/0.8.5.md +++ b/_releases/0.8.5.md @@ -1,4 +1,9 @@ --- +# This file is licensed under the MIT License (MIT) available on +# http://opensource.org/licenses/MIT. +# Text originally from Bitcoin Core project +# Metadata and small formatting changes from Bitcoin.org project + ## Please see _releases/0.10.0.md for a release template required_version: 0.8.5 optional_date: 2013-09-13 diff --git a/_releases/0.8.6.md b/_releases/0.8.6.md index 41d5f5cf..5ce19ddd 100644 --- a/_releases/0.8.6.md +++ b/_releases/0.8.6.md @@ -1,4 +1,9 @@ --- +# This file is licensed under the MIT License (MIT) available on +# http://opensource.org/licenses/MIT. +# Text originally from Bitcoin Core project +# Metadata and small formatting changes from Bitcoin.org project + ## Please see _releases/0.10.0.md for a release template required_version: 0.8.6 optional_date: 2013-12-09 diff --git a/_releases/0.9.0.md b/_releases/0.9.0.md index ead5708e..86a1d26b 100644 --- a/_releases/0.9.0.md +++ b/_releases/0.9.0.md @@ -1,4 +1,9 @@ --- +# This file is licensed under the MIT License (MIT) available on +# http://opensource.org/licenses/MIT. +# Text originally from Bitcoin Core project +# Metadata and small formatting changes from Bitcoin.org project + ## Please see _releases/0.10.0.md for a release template required_version: 0.9.0 optional_date: 2014-03-19 diff --git a/_releases/0.9.1.md b/_releases/0.9.1.md index d2577b51..9a5a7edd 100644 --- a/_releases/0.9.1.md +++ b/_releases/0.9.1.md @@ -1,4 +1,9 @@ --- +# This file is licensed under the MIT License (MIT) available on +# http://opensource.org/licenses/MIT. +# Text originally from Bitcoin Core project +# Metadata and small formatting changes from Bitcoin.org project + ## Please see _releases/0.10.0.md for a release template required_version: 0.9.1 optional_date: 2014-04-08 diff --git a/_releases/0.9.2.1.md b/_releases/0.9.2.1.md index c40ba8ae..867b7061 100644 --- a/_releases/0.9.2.1.md +++ b/_releases/0.9.2.1.md @@ -1,4 +1,9 @@ --- +# This file is licensed under the MIT License (MIT) available on +# http://opensource.org/licenses/MIT. +# Text originally from Bitcoin Core project +# Metadata and small formatting changes from Bitcoin.org project + ## Please see _releases/0.10.0.md for a release template required_version: 0.9.2.1 optional_date: 2014-06-19 diff --git a/_releases/0.9.2.md b/_releases/0.9.2.md index 646cecec..1d478797 100644 --- a/_releases/0.9.2.md +++ b/_releases/0.9.2.md @@ -1,4 +1,9 @@ --- +# This file is licensed under the MIT License (MIT) available on +# http://opensource.org/licenses/MIT. +# Text originally from Bitcoin Core project +# Metadata and small formatting changes from Bitcoin.org project + ## Please see _releases/0.10.0.md for a release template required_version: 0.9.2 optional_date: 2014-06-16 diff --git a/_releases/0.9.3.md b/_releases/0.9.3.md index 7d29a4a5..fef71a57 100644 --- a/_releases/0.9.3.md +++ b/_releases/0.9.3.md @@ -1,4 +1,9 @@ --- +# This file is licensed under the MIT License (MIT) available on +# http://opensource.org/licenses/MIT. +# Text originally from Bitcoin Core project +# Metadata and small formatting changes from Bitcoin.org project + ## Please see _releases/0.10.0.md for a release template required_version: 0.9.3 optional_date: 2014-09-27 diff --git a/_templates/privacy.html b/_templates/privacy.html index 750069fb..5f1e252c 100755 --- a/_templates/privacy.html +++ b/_templates/privacy.html @@ -1,4 +1,7 @@ --- +# This file is licensed under the MIT License (MIT) available on +# http://opensource.org/licenses/MIT. + layout: base id: privacy --- diff --git a/js/events.js b/js/events.js index 0d446cd1..bf21ef25 100644 --- a/js/events.js +++ b/js/events.js @@ -1,4 +1,7 @@ --- +# This file is licensed under the MIT License (MIT) available on +# http://opensource.org/licenses/MIT. + layout: null --- From 6bfb8849ddd32d5c43a748051a4a56b65c4caa19 Mon Sep 17 00:00:00 2001 From: "David A. Harding" Date: Sat, 27 Jun 2015 21:35:41 -0400 Subject: [PATCH 2/5] Layout: Split Base Layout --- _includes/layout/base/content.html | 3 + _includes/layout/base/footer-js.html | 4 + _includes/layout/base/footer-license.html | 1 + _includes/layout/base/footer-menu.html | 13 +++ _includes/layout/base/footer-sponsor.html | 3 + .../layout/base/head-language-dropdown.html | 13 +++ .../layout/base/head-language-select.html | 5 + _includes/layout/base/head-logo.html | 1 + _includes/layout/base/head-menu.html | 30 +++++ _includes/layout/base/head-mobile-menu.html | 1 + _includes/layout/base/html-head.html | 14 +++ _includes/layout/base/pagetop-alert.html | 5 + .../layout/base/pagetop-detect-mobile.html | 1 + _layouts/base.html | 106 +----------------- 14 files changed, 100 insertions(+), 100 deletions(-) create mode 100644 _includes/layout/base/content.html create mode 100644 _includes/layout/base/footer-js.html create mode 100644 _includes/layout/base/footer-license.html create mode 100644 _includes/layout/base/footer-menu.html create mode 100644 _includes/layout/base/footer-sponsor.html create mode 100644 _includes/layout/base/head-language-dropdown.html create mode 100644 _includes/layout/base/head-language-select.html create mode 100644 _includes/layout/base/head-logo.html create mode 100644 _includes/layout/base/head-menu.html create mode 100644 _includes/layout/base/head-mobile-menu.html create mode 100644 _includes/layout/base/html-head.html create mode 100644 _includes/layout/base/pagetop-alert.html create mode 100644 _includes/layout/base/pagetop-detect-mobile.html diff --git a/_includes/layout/base/content.html b/_includes/layout/base/content.html new file mode 100644 index 00000000..1c941fcb --- /dev/null +++ b/_includes/layout/base/content.html @@ -0,0 +1,3 @@ +{% 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..d8a499c9 --- /dev/null +++ b/_includes/layout/base/footer-js.html @@ -0,0 +1,4 @@ +{% 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..a6c06aad --- /dev/null +++ b/_includes/layout/base/footer-license.html @@ -0,0 +1 @@ +{% 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..664751f3 --- /dev/null +++ b/_includes/layout/base/footer-menu.html @@ -0,0 +1,13 @@ +{% 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..b776ddd0 --- /dev/null +++ b/_includes/layout/base/footer-sponsor.html @@ -0,0 +1,3 @@ +{% 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..f34ac841 --- /dev/null +++ b/_includes/layout/base/head-language-dropdown.html @@ -0,0 +1,13 @@ +{% 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..ff4077ed --- /dev/null +++ b/_includes/layout/base/head-language-select.html @@ -0,0 +1,5 @@ +{% 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..e40134e5 --- /dev/null +++ b/_includes/layout/base/head-logo.html @@ -0,0 +1 @@ +{% 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..4fc657b3 --- /dev/null +++ b/_includes/layout/base/head-menu.html @@ -0,0 +1,30 @@ +{% 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..071ea8e5 --- /dev/null +++ b/_includes/layout/base/head-mobile-menu.html @@ -0,0 +1 @@ +{% 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..932bac00 --- /dev/null +++ b/_includes/layout/base/html-head.html @@ -0,0 +1,14 @@ +{% 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..c37a5814 --- /dev/null +++ b/_includes/layout/base/pagetop-alert.html @@ -0,0 +1,5 @@ +{% 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..81f46d6f --- /dev/null +++ b/_includes/layout/base/pagetop-detect-mobile.html @@ -0,0 +1 @@ +{% 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 14183d3d..371af2b3 100644 --- a/_layouts/base.html +++ b/_layouts/base.html @@ -5,108 +5,14 @@ - - - -{% 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 %} - -{% endif %} -
-
    -
  • {{ site.langs[page.lang] }} -
      -
      • - {% assign i = 0 %}{% assign c = site.langsorder.size | divided_by: 2 | plus: 1 %} - {% for lang in site.langsorder %}{% assign mod = i | modulo: c %}{% assign active = ''%}{% if lang == page.lang %}{% assign active = ' class="active"'%}{% endif %} - {% if mod == 0 and i != 0 %}
      • -
    -
    • -
- - -
- -
+{% include layout/base/pagetop-detect-mobile.html %}{% include layout/base/pagetop-alert.html %}
+{% include layout/base/head-language-dropdown.html %}{% include layout/base/head-mobile-menu.html %}{% include layout/base/head-logo.html %}{% include layout/base/head-language-select.html %}{% include layout/base/head-menu.html %}
-
- {{ content }} -
-
-
- 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 -
-
-
{% translate sponsor layout %} Bitcoin Foundation
-
-
© Bitcoin Project 2009-{{ site.time | date: '%Y' }} {% translate footer layout %}
-
+{% include layout/base/content.html %}
+{% include layout/base/footer-menu.html %}{% include layout/base/footer-sponsor.html %}{% include layout/base/footer-license.html %}
- - +{% include layout/base/footer-js.html %} From df3b8dcf28aa5f9a0635e94fbf6ad2e78d972a34 Mon Sep 17 00:00:00 2001 From: "David A. Harding" Date: Thu, 9 Jul 2015 07:48:42 -0400 Subject: [PATCH 3/5] Layout: Add Whitespace To Layouts --- _includes/layout/base/content.html | 11 +++- _includes/layout/base/footer-js.html | 13 ++-- _includes/layout/base/footer-license.html | 7 ++- _includes/layout/base/footer-menu.html | 31 +++++---- _includes/layout/base/footer-sponsor.html | 11 +++- .../layout/base/head-language-dropdown.html | 22 ++++--- .../layout/base/head-language-select.html | 8 ++- _includes/layout/base/head-logo.html | 7 ++- _includes/layout/base/head-menu.html | 63 ++++++++++--------- _includes/layout/base/head-mobile-menu.html | 7 ++- _includes/layout/base/html-head.html | 7 ++- _includes/layout/base/pagetop-alert.html | 7 ++- .../layout/base/pagetop-detect-mobile.html | 7 ++- _layouts/base.html | 32 +++++++--- 14 files changed, 157 insertions(+), 76 deletions(-) diff --git a/_includes/layout/base/content.html b/_includes/layout/base/content.html index 1c941fcb..001db305 100644 --- a/_includes/layout/base/content.html +++ b/_includes/layout/base/content.html @@ -1,3 +1,8 @@ -{% comment %} This file is licensed under the MIT License (MIT) available on http://opensource.org/licenses/MIT. {% endcomment %}
- {{ content }} -
+{% 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 index d8a499c9..b75ea04a 100644 --- a/_includes/layout/base/footer-js.html +++ b/_includes/layout/base/footer-js.html @@ -1,4 +1,9 @@ -{% comment %} This file is licensed under the MIT License (MIT) available on http://opensource.org/licenses/MIT. {% endcomment %} +{% 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 index a6c06aad..3332cef0 100644 --- a/_includes/layout/base/footer-license.html +++ b/_includes/layout/base/footer-license.html @@ -1 +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 %}
+{% 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 index 664751f3..1af12879 100644 --- a/_includes/layout/base/footer-menu.html +++ b/_includes/layout/base/footer-menu.html @@ -1,13 +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 -
+{% 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 index b776ddd0..9922946e 100644 --- a/_includes/layout/base/footer-sponsor.html +++ b/_includes/layout/base/footer-sponsor.html @@ -1,3 +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
-
+{% 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 index f34ac841..8e3b7db6 100644 --- a/_includes/layout/base/head-language-dropdown.html +++ b/_includes/layout/base/head-language-dropdown.html @@ -1,13 +1,17 @@ -{% comment %} This file is licensed under the MIT License (MIT) available on http://opensource.org/licenses/MIT. {% endcomment %}
    -
  • {{ site.langs[page.lang] }} -
      -
      • - {% assign i = 0 %}{% assign c = site.langsorder.size | divided_by: 2 | plus: 1 %} - {% for lang in site.langsorder %}{% assign mod = i | modulo: c %}{% assign active = ''%}{% if lang == page.lang %}{% assign active = ' class="active"'%}{% endif %} +{% comment %} +This file is licensed under the MIT License (MIT) available on +http://opensource.org/licenses/MIT. +{% endcomment %} +
          +
        • {{ site.langs[page.lang] }} +
            +
            • + {% assign i = 0 %}{% assign c = site.langsorder.size | divided_by: 2 | plus: 1 %} + {% for lang in site.langsorder %}{% assign mod = i | modulo: c %}{% assign active = ''%}{% if lang == page.lang %}{% assign active = ' class="active"'%}{% endif %} {% if mod == 0 and i != 0 %}
            • -
          -
          • +
      +
      • +
    diff --git a/_includes/layout/base/head-language-select.html b/_includes/layout/base/head-language-select.html index ff4077ed..ada4678f 100644 --- a/_includes/layout/base/head-language-select.html +++ b/_includes/layout/base/head-language-select.html @@ -1,5 +1,9 @@ -{% comment %} This file is licensed under the MIT License (MIT) available on http://opensource.org/licenses/MIT. {% endcomment %}
    {% for lang in site.langsorder %}{% assign active = ''%}{% if lang == page.lang %}{% assign active = ' selected="selected"'%}{% endif %} {% endfor %} -
    + diff --git a/_includes/layout/base/head-logo.html b/_includes/layout/base/head-logo.html index e40134e5..1de7c8f6 100644 --- a/_includes/layout/base/head-logo.html +++ b/_includes/layout/base/head-logo.html @@ -1 +1,6 @@ -{% comment %} This file is licensed under the MIT License (MIT) available on http://opensource.org/licenses/MIT. {% endcomment %} +{% 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 index 4fc657b3..5f56ccd4 100644 --- a/_includes/layout/base/head-menu.html +++ b/_includes/layout/base/head-menu.html @@ -1,30 +1,35 @@ -{% comment %} This file is licensed under the MIT License (MIT) available on http://opensource.org/licenses/MIT. {% endcomment %}