From 50203f5cc42f7c19b8d6eee3a8ba37c879cef9d1 Mon Sep 17 00:00:00 2001 From: Saivann Date: Tue, 28 Oct 2014 00:14:51 -0400 Subject: [PATCH] Display a status icon on the Network status menu entry --- _layouts/base.html | 2 +- _less/rtl.less | 5 +++ _less/screen.less | 11 +++++++ _plugins/alerts.rb | 4 +++ en/alerts.html | 3 +- img/netstatus_alert.png | Bin 0 -> 389 bytes img/netstatus_alert.svg | 65 ++++++++++++++++++++++++++++++++++++ img/netstatus_normal.png | Bin 0 -> 294 bytes img/netstatus_normal.svg | 69 +++++++++++++++++++++++++++++++++++++++ 9 files changed, 156 insertions(+), 3 deletions(-) create mode 100644 img/netstatus_alert.png create mode 100644 img/netstatus_alert.svg create mode 100644 img/netstatus_normal.png create mode 100644 img/netstatus_normal.svg diff --git a/_layouts/base.html b/_layouts/base.html index 95fcf92f..5b540656 100644 --- a/_layouts/base.html +++ b/_layouts/base.html @@ -94,7 +94,7 @@
- Network Status + Network Status {% case page.lang %} {% when 'fa' or 'pl' or 'tr' or 'zh_TW' %} Legal diff --git a/_less/rtl.less b/_less/rtl.less index 912027e1..2f262e40 100644 --- a/_less/rtl.less +++ b/_less/rtl.less @@ -48,6 +48,11 @@ p{ margin-right:0; margin-left:15px; } +.statusmenu{ + padding-left:0; + padding-right:20px; + background-position:right center; +} .titleicon{ margin-right:auto; margin-left:5px; diff --git a/_less/screen.less b/_less/screen.less index 4a0b64b4..5bd9bd16 100644 --- a/_less/screen.less +++ b/_less/screen.less @@ -405,6 +405,17 @@ table td,table th{ white-space:nowrap; } +.statusmenu{ + display:inline-block; + padding-left:20px; + background-position:left center; + background-repeat:no-repeat; + background-image:url(/img/netstatus_normal.svg); +} +.statusmenu.alert{ + background-image:url(/img/netstatus_alert.svg); +} + /*Styles specific to elements in pages*/ .mainsummary, diff --git a/_plugins/alerts.rb b/_plugins/alerts.rb index 2141e405..78092f1a 100644 --- a/_plugins/alerts.rb +++ b/_plugins/alerts.rb @@ -35,6 +35,9 @@ module Jekyll if self.data.has_key?('banner') and !self.data['banner'].nil? and self.data['banner'].length>0 site.config['ALERT']=''+self.data['banner']+'' end + 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']+'.html', date) site.pages << AlertPage.new(site, base, lang, srcdir, src, '', self.data['alias']+'/index.html', date) @@ -46,6 +49,7 @@ module Jekyll class AlertPageGenerator < Generator def generate(site) #generate each alert based on templates + site.config['STATUS'] = 0 Dir.foreach('_alerts') do |file| next if file == '.' or file == '..' lang = 'en' diff --git a/en/alerts.html b/en/alerts.html index 566b569a..a1fbe6b6 100644 --- a/en/alerts.html +++ b/en/alerts.html @@ -7,8 +7,7 @@ title: Network status and alerts - Bitcoin

Network status and alertsrss

- {% assign active = false %}{% filter_for p in site.pages reversed sort_by:date category:alert %}{% if p.active == true %}{% assign active = true %}{% endif %}{% endfilter_for %} - {% if active == false %} + {% if site.STATUS == 0 %}
There is no ongoing event on the Bitcoin network.
{% else %}
The following network event is ongoing.
diff --git a/img/netstatus_alert.png b/img/netstatus_alert.png new file mode 100644 index 0000000000000000000000000000000000000000..9368bbd6d9a44d33443a632ad753990daa606367 GIT binary patch literal 389 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf2?p zUk71ECym(^Ktah8*NBqf{Irtt#G+J&^73-M%)IR41y?ra{b7?jkifcQR@f$w7SLx_Z7Z5 z>ZB}o3{Hud?;CJZZ?|Ff>EqVzr={IOrWzS8ec^Plm*sG9p*QEf-&@Q6Jerq%&Gy*y zsb~LlDjCKv3TN_NpvrPxVbg|$En#n&-r6soyCeSY>048OhX2^H#(b~;yoReg@80lx z>-M+e&#c=Aem_xRX5;wlb?J2Ohq7l@Sx@v{^2N;@Ouui-& zB|&7D@`SZaj0(3456do-UadDmNHDGrlvQ h$C%~x(l7ac*fMy$`JZiS&;bS+gQu&X%Q~loCII16pQr!; literal 0 HcmV?d00001 diff --git a/img/netstatus_alert.svg b/img/netstatus_alert.svg new file mode 100644 index 00000000..da4d0348 --- /dev/null +++ b/img/netstatus_alert.svg @@ -0,0 +1,65 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/img/netstatus_normal.png b/img/netstatus_normal.png new file mode 100644 index 0000000000000000000000000000000000000000..9c169f2c09ed55ca80550942869b229d5158ce64 GIT binary patch literal 294 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf2?p zUk71ECym(^Ktah8*NBqf{Irtt#G+J&^73-M%)IR4 + + + + + + + + + image/svg+xml + + + + + + + + +