From ec6c93e224a43ec4dc03040fdd6e1e5ff30b8393 Mon Sep 17 00:00:00 2001 From: "David A. Harding" Date: Sat, 25 Jul 2015 10:10:02 -0400 Subject: [PATCH] Alerts: Change 'Alias' Field To 'Shorturl' MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Suggested by Saïvann (thanks!) --- README.md | 12 ++++++------ _alerts/2012-02-18-protocol-change.html | 2 +- _alerts/2012-03-16-critical-vulnerability.html | 2 +- _alerts/2012-05-14-dos.html | 2 +- _alerts/2013-03-11-chain-fork.html | 2 +- _alerts/2013-03-15-upgrade-deadline.html | 2 +- _alerts/2013-08-11-android.html | 2 +- _alerts/2014-04-11-heartbleed.html | 2 +- _alerts/2015-07-04-spv-mining.md | 2 +- _plugins/alerts.rb | 8 ++++---- 10 files changed, 18 insertions(+), 18 deletions(-) diff --git a/README.md b/README.md index a064a58a..7164a3ba 100644 --- a/README.md +++ b/README.md @@ -556,7 +556,7 @@ coordination is usually conducted in #bitcoin-dev on Freenode. #### Basic Alert 1. Open your editor on a file named `_alerts/YYYY-MM-DD-short-title.md` - (the alert will appear as ). + (the alert will appear as ). 2. Paste the following text into the top of the file: @@ -564,8 +564,8 @@ coordination is usually conducted in #bitcoin-dev on Freenode. --- ## Title displayed on alert page title: "11/12 March 2013 Chain Fork" - ## Short URL for use in P2P network alerts: https://bitcoin.org/ - alias: "chainfork" + ## Short URL for use in P2P network alerts: https://bitcoin.org/ + shorturl: "chainfork" ## Active alerts will display the banner (below) on all bitcoin.org content pages active: true ## Banner displayed if 'active: true'. Can use HTML formatting @@ -611,7 +611,7 @@ coordination is usually conducted in #bitcoin-dev on Freenode. displayed on the live site. The site build aborts and starts over when new commits are found. -- Give the `alias` URL (`bitcoin.org/`) to the P2P alert message +- Give the `shorturl` URL (`bitcoin.org/`) to the P2P alert message key holders to use in any alert messages they send. - Proceed to the next section to improve the alert. @@ -628,8 +628,8 @@ The following fields may be defined in the the alert YAML header: --- ## (Required; HTML text) Title displayed on alert page title: "11/12 March 2013 Chain Fork" -## (Optional; display ASCII only) Short URL for use in P2P network alerts: https://bitcoin.org/ -alias: "chainfork" +## (Optional; display ASCII only) Short URL for use in P2P network alerts: https://bitcoin.org/ +shorturl: "chainfork" ## (Optional; default=false) Active alerts will display the banner (below) on all bitcoin.org content pages active: true ## (Optional; HTML text) Banner displayed if 'active: true'. Can use HTML formatting diff --git a/_alerts/2012-02-18-protocol-change.html b/_alerts/2012-02-18-protocol-change.html index 803ff2d8..cc95153d 100644 --- a/_alerts/2012-02-18-protocol-change.html +++ b/_alerts/2012-02-18-protocol-change.html @@ -1,6 +1,6 @@ --- title: "February 20, 2012 Protocol Changes" -alias: "feb20" +shorturl: "feb20" active: false banner: "" --- diff --git a/_alerts/2012-03-16-critical-vulnerability.html b/_alerts/2012-03-16-critical-vulnerability.html index 27da905a..8ef6b867 100644 --- a/_alerts/2012-03-16-critical-vulnerability.html +++ b/_alerts/2012-03-16-critical-vulnerability.html @@ -1,6 +1,6 @@ --- title: "Potentially Critical Security Vulnerability" -alias: "critfix" +shorturl: "critfix" active: false banner: "" --- diff --git a/_alerts/2012-05-14-dos.html b/_alerts/2012-05-14-dos.html index 1a4715af..88cb8855 100644 --- a/_alerts/2012-05-14-dos.html +++ b/_alerts/2012-05-14-dos.html @@ -1,6 +1,6 @@ --- title: "CVE-2012-2459: Critical Vulnerability (denial-of-service)" -alias: "dos" +shorturl: "dos" active: false banner: "" --- diff --git a/_alerts/2013-03-11-chain-fork.html b/_alerts/2013-03-11-chain-fork.html index c3ec6439..6ef31653 100644 --- a/_alerts/2013-03-11-chain-fork.html +++ b/_alerts/2013-03-11-chain-fork.html @@ -1,6 +1,6 @@ --- title: "11/12 March 2013 Chain Fork Information" -alias: "chainfork" +shorturl: "chainfork" active: false banner: "" --- diff --git a/_alerts/2013-03-15-upgrade-deadline.html b/_alerts/2013-03-15-upgrade-deadline.html index 585a8c5e..06f98ff5 100644 --- a/_alerts/2013-03-15-upgrade-deadline.html +++ b/_alerts/2013-03-15-upgrade-deadline.html @@ -1,6 +1,6 @@ --- title: "15 May 2013 Upgrade Deadline" -alias: "may15" +shorturl: "may15" active: false banner: "" --- diff --git a/_alerts/2013-08-11-android.html b/_alerts/2013-08-11-android.html index 29d4b4a5..79175222 100644 --- a/_alerts/2013-08-11-android.html +++ b/_alerts/2013-08-11-android.html @@ -1,7 +1,7 @@ --- title: "Android Security Vulnerability" active: false -alias: "android" +shorturl: "android" banner: "" --- diff --git a/_alerts/2014-04-11-heartbleed.html b/_alerts/2014-04-11-heartbleed.html index b63d11a4..50b98e26 100644 --- a/_alerts/2014-04-11-heartbleed.html +++ b/_alerts/2014-04-11-heartbleed.html @@ -1,6 +1,6 @@ --- title: "OpenSSL Heartbleed vulnerability" -alias: "heartbleed" +shorturl: "heartbleed" active: false banner: "" --- diff --git a/_alerts/2015-07-04-spv-mining.md b/_alerts/2015-07-04-spv-mining.md index 5824734c..a806e0ee 100644 --- a/_alerts/2015-07-04-spv-mining.md +++ b/_alerts/2015-07-04-spv-mining.md @@ -1,6 +1,6 @@ --- title: "Some Miners Generating Invalid Blocks" -alias: "spv-mining" +shorturl: "spv-mining" active: false #banner: "WARNING: many wallets currently vulnerable to double-spending of confirmed transactions (click here to read)" bannerclass: "alert" diff --git a/_plugins/alerts.rb b/_plugins/alerts.rb index 770fdd42..3a7f5ee5 100644 --- a/_plugins/alerts.rb +++ b/_plugins/alerts.rb @@ -12,7 +12,7 @@ #variable is set, allowing a clickable alert banner to be #displayed in _layouts/base.html . -#If "alias" variable is set in one alert file, a short alias +#If "shorturl" variable is set in one alert file, a short alias #file for the alert (like /android.html) is generated for #Bitcoin Core non-clickable alerts. @@ -47,9 +47,9 @@ module Jekyll if self.data.has_key?('active') and !self.data['active'].nil? and self.data['active'] == true site.config['STATUS'] = 1 end - if self.data.has_key?('alias') - site.pages << AlertPage.new(site, base, lang, srcdir, src, '', self.data['alias']+'.'+extension, date) - site.pages << AlertPage.new(site, base, lang, srcdir, src, '', self.data['alias']+'/index.'+extension, date) + if self.data.has_key?('shorturl') + site.pages << AlertPage.new(site, base, lang, srcdir, src, '', self.data['shorturl']+'.'+extension, date) + site.pages << AlertPage.new(site, base, lang, srcdir, src, '', self.data['shorturl']+'/index.'+extension, date) end end end