Merge pull request #650 from bitcoin/statsprivacy

Add a "Privacy" page and link to public stats (fixes #605)

_layouts/base.html

@@ -94,6 +94,7 @@
     <div class="footer">
     <div class="footermenu">
     <a href="/en/alerts" class="statusmenu{% if site.STATUS == 1 %} alert{% endif %}">Network Status</a>
+    <a href="/stats/">{% translate menu-stats layout %}</a>
     {% case page.lang %}
     {% when 'fa' or 'pl' or 'tr' or 'zh_TW' %}
     <a href="/en/legal">Legal</a>
@@ -101,6 +102,12 @@
     <a href="/{{ page.lang }}/{% translate legal url %}">{% translate menu-legal layout %}</a>
     {% 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' %}
+    <a href="/en/privacy">Privacy</a>
+    {% else %}
+    <a href="/{{ page.lang }}/{% translate privacy url %}">{% translate menu-privacy layout %}</a>
+    {% 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' %}
     <a href="/en/press">Press</a>
     {% else %}
@@ -113,10 +120,7 @@
     <a href="/{{ page.lang }}/{% translate about-us url %}">{% translate menu-about-us layout %}</a>
     {% endcase %}
     </div>
-    <span>© Bitcoin Project 2009-2014 {% translate footer layout %}</span>
+    <div class="footersponsor">
-    </div>
-  </div>
-  <div class="sponsor-banner">
       {% case page.lang %}
       {% when 'fa' %}
       <div style="direction:ltr;"><span>{% translate sponsor layout %}</span> <a href="https://bitcoinfoundation.org/"><img src="/img/brand/bitcoinfoundation.png" alt="Bitcoin Foundation"></a></div>
@@ -124,6 +128,9 @@
       <div><span>{% translate sponsor layout %}</span> <a href="https://bitcoinfoundation.org/"><img src="/img/brand/bitcoinfoundation.png" alt="Bitcoin Foundation"></a></div>
       {% endcase %}
     </div>
+    <div class="footerlicense">© Bitcoin Project 2009-2014 {% translate footer layout %}</div>
+    </div>
+  </div>
   <script type="text/javascript">fallbackSVG();</script>
 </body>
 

_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':'');
 }

_less/rtl.less

@@ -41,9 +41,6 @@ p{
 	right:0;
 	left:auto;
 }
-.footermenu{
-	display:inline-block;
-}
 .footermenu a{
 	margin-right:0;
 	margin-left:15px;
@@ -169,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;
@@ -346,9 +336,6 @@ h2 .rssicon{
 	.content{
 		text-align:right;
 	}
-	.footermenu{
-		display:block;
-	}
 	.resources,
 	.resources p{
 		text-align:center;

_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;
 	}

_templates/privacy.html

@@ -0,0 +1,11 @@
+---
+layout: base
+id: privacy
+---
+<h1>{% translate pagetitle %}</h1>
+
+<h2>{% translate datacollect %}</h2>
+<p>{% translate datacollecttxt %}</p>
+
+<h2>{% translate datause %}</h2>
+<p>{% translate datausetxt %}</p>

_translations/en.yml

@@ -480,6 +480,13 @@ en:
     faqmore: "To learn more about Bitcoin, please visit the complete <a href=\"/en/faq\">FAQ</a> or the <a href=\"https://en.bitcoin.it/wiki/FAQ\">Bitcoin Wiki</a>."
     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 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 <a href=\"/stats/\">transparent public stats</a>."
   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