From fda3f0149d9879a293a6384478ee3fd44968a127 Mon Sep 17 00:00:00 2001 From: Saivann Date: Mon, 17 Nov 2014 12:28:05 -0500 Subject: [PATCH 1/3] Add a "Privacy" page and link to public stats (fixes #605) --- _layouts/base.html | 25 +++++++++------ _less/rtl.less | 6 ---- _less/screen.less | 70 +++++++++++++++++------------------------ _templates/privacy.html | 11 +++++++ _translations/en.yml | 10 ++++++ 5 files changed, 66 insertions(+), 56 deletions(-) create mode 100755 _templates/privacy.html diff --git a/_layouts/base.html b/_layouts/base.html index 635726ef..bed0bcc6 100644 --- a/_layouts/base.html +++ b/_layouts/base.html @@ -94,6 +94,7 @@
Network Status + {% translate menu-stats layout %} {% case page.lang %} {% when 'fa' or 'pl' or 'tr' or 'zh_TW' %} Legal @@ -101,6 +102,12 @@ {% translate menu-legal layout %} {% endcase %} {% case page.lang %} + {% when 'ar' or 'bg' or 'da' or 'de' or 'es' or 'fa' or 'fr' or 'hi' or 'hu' or 'id' or 'it' or 'ja' or 'ko' or 'nl' or 'pl' or 'pt_BR' or 'ro' or 'ru' or 'sl' or 'sv' or 'tr' or 'uk' or 'zh_CN' or 'zh_TW' %} + Privacy + {% else %} + {% translate menu-privacy layout %} + {% endcase %} + {% case page.lang %} {% when 'bg' or 'de' or 'fa' or 'hi' or 'id' or 'it' or 'ko' or 'pl' or 'ro' or 'ru' or 'sv' or 'tr' or 'zh_CN' or 'zh_TW' %} Press {% else %} @@ -113,16 +120,16 @@ {% translate menu-about-us layout %} {% endcase %}
- © Bitcoin Project 2009-2014 {% translate footer layout %} +
+ {% case page.lang %} + {% when 'fa' %} +
{% translate sponsor layout %} Bitcoin Foundation
+ {% else %} +
{% translate sponsor layout %} Bitcoin Foundation
+ {% endcase %} +
+
© Bitcoin Project 2009-2014 {% translate footer layout %}
- - diff --git a/_less/rtl.less b/_less/rtl.less index 97b94dcb..77ad6397 100644 --- a/_less/rtl.less +++ b/_less/rtl.less @@ -41,9 +41,6 @@ p{ right:0; left:auto; } -.footermenu{ - display:inline-block; -} .footermenu a{ margin-right:0; margin-left:15px; @@ -346,9 +343,6 @@ h2 .rssicon{ .content{ text-align:right; } - .footermenu{ - display:block; - } .resources, .resources p{ text-align:center; diff --git a/_less/screen.less b/_less/screen.less index e834f2a4..e1522dfc 100644 --- a/_less/screen.less +++ b/_less/screen.less @@ -159,33 +159,6 @@ table td,table th{ background-color:#0d579b; } -.sponsor-banner{ - text-align:center; - width:940px; - margin:auto; -} -.sponsor-banner div{ - display:inline-block; - color:#8D8D8D; - margin:10px 0 20px 0; - line-height:2em; -} -.sponsor-banner span{ - white-space:nowrap; -} -.sponsor-banner span, -.sponsor-banner a, -.sponsor-banner a:link, -.sponsor-banner a:active, -.sponsor-banner a:visited{ - display:inline-block; - margin:5px; -} -.sponsor-banner img{ - width:245px; - height:18px; -} - .head{ margin:30px 0 30px 0; } @@ -393,19 +366,44 @@ table td,table th{ } .footer{ - position:relative; - padding:20px 0; text-align:center; width:940px; - font-size:94%; + margin:auto; } .footermenu{ - display:inline; + position:relative; + padding:20px 0; + font-size:94%; } .footermenu a{ margin-right:15px; white-space:nowrap; } +.footersponsor div{ + display:inline-block; + color:#8D8D8D; + margin:0 0 25px 0; + line-height:2em; +} +.footersponsor span{ + white-space:nowrap; +} +.footersponsor span, +.footersponsor a, +.footersponsor a:link, +.footersponsor a:active, +.footersponsor a:visited{ + display:inline-block; + margin:5px; +} +.footersponsor img{ + width:245px; + height:18px; +} +.footerlicense{ + font-size:94%; + padding-bottom:20px; +} .statusmenu{ display:inline-block; @@ -2006,9 +2004,6 @@ h2 .rssicon{ .footer{ display:none; } - .sponsor-banner{ - display:none; - } .content{ padding:0; border:0; @@ -2130,13 +2125,6 @@ h2 .rssicon{ line-height:1.5em; width:auto; } - .footermenu{ - display:block; - margin-bottom:20px; - } - .sponsor-banner{ - width:auto; - } .index{ padding:15px; } diff --git a/_templates/privacy.html b/_templates/privacy.html new file mode 100755 index 00000000..7778f1cd --- /dev/null +++ b/_templates/privacy.html @@ -0,0 +1,11 @@ +--- +layout: base +id: privacy +--- +

{% translate pagetitle %}

+ +

{% translate datacollect %}

+

{% translate datacollecttxt %}

+ +

{% translate datause %}

+

{% translate datausetxt %}

diff --git a/_translations/en.yml b/_translations/en.yml index 9657633f..ed709a12 100644 --- a/_translations/en.yml +++ b/_translations/en.yml @@ -480,6 +480,13 @@ en: faqmore: "To learn more about Bitcoin, please visit the complete FAQ or the Bitcoin Wiki." materialpicture: "Pictures" materialpicturemore: "Show more pictures..." + privacy: + title: "Privacy - Bitcoin" + pagetitle: "Privacy" + datacollect: "Data collected" + datacollecttxt: "Bitcoin.org collects anonymized server logs. These logs include IP addresses with replaced last bit, time of the visit, requested page, user agent and referer url. Bitcoin.org does not collect data using cookies." + datause: "Usage of data" + datausetxt: "Collected data is used to provide transparent public stats." protect-your-privacy: title: "Protect your privacy - Bitcoin" pagetitle: "Protect your privacy" @@ -646,7 +653,9 @@ en: menu-intro: Introduction menu-legal: "Legal" menu-press: "Press" + menu-privacy: "Privacy" menu-resources: Resources + menu-stats: "Stats" menu-support-bitcoin: Participate menu-vocabulary: Vocabulary menu-you-need-to-know: "You need to know" @@ -670,6 +679,7 @@ en: innovation: innovation legal: legal press: press + privacy: privacy protect-your-privacy: protect-your-privacy resources: resources secure-your-wallet: secure-your-wallet From b26b0d7791cb7e8dc56ef7dc05ba3297b2b60670 Mon Sep 17 00:00:00 2001 From: Saivann Date: Mon, 17 Nov 2014 13:46:05 -0500 Subject: [PATCH 2/3] Replace typo s/bit/byte (thanks @harding) --- _translations/en.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_translations/en.yml b/_translations/en.yml index ed709a12..5855c3b5 100644 --- a/_translations/en.yml +++ b/_translations/en.yml @@ -484,7 +484,7 @@ en: title: "Privacy - Bitcoin" pagetitle: "Privacy" datacollect: "Data collected" - datacollecttxt: "Bitcoin.org collects anonymized server logs. These logs include IP addresses with replaced last bit, time of the visit, requested page, user agent and referer url. Bitcoin.org does not collect data using cookies." + datacollecttxt: "Bitcoin.org collects anonymized server logs. These logs include IP addresses with replaced last byte, time of the visit, requested page, user agent and referer url. Bitcoin.org does not collect data using cookies." datause: "Usage of data" datausetxt: "Collected data is used to provide transparent public stats." protect-your-privacy: From 7d981b183a30fa8f98004c26a8d1321cec8ed57d Mon Sep 17 00:00:00 2001 From: Saivann Date: Mon, 17 Nov 2014 13:56:16 -0500 Subject: [PATCH 3/3] Drop obsolete CSS lines --- _less/ie.css | 13 ------------- _less/rtl.less | 7 ------- 2 files changed, 20 deletions(-) diff --git a/_less/ie.css b/_less/ie.css index a214b35b..3288badf 100644 --- a/_less/ie.css +++ b/_less/ie.css @@ -274,19 +274,6 @@ body{ display:inline; } -.sponsor-banner div{ - display:inline; - zoom:1; -} -.sponsor-banner span, -.sponsor-banner a, -.sponsor-banner a:link, -.sponsor-banner a:active, -.sponsor-banner a:visited{ - display:inline; - zoom:1; -} - .devprojectlist li{ display:expression((this.parentNode.childNodes[0]==this||this.parentNode.childNodes[1]==this||this.parentNode.childNodes[2]==this||this.parentNode.childNodes[3]==this)?'list-item':''); } diff --git a/_less/rtl.less b/_less/rtl.less index 77ad6397..906419b8 100644 --- a/_less/rtl.less +++ b/_less/rtl.less @@ -166,13 +166,6 @@ h2 .rssicon{ right:-24px; } -.sponsor-banner a, -.sponsor-banner a:link, -.sponsor-banner a:active, -.sponsor-banner a:visited{ - direction:ltr; -} - .listtable div div{ text-align:right; padding-right:0;