Translate, update and reposition press page

_layouts/base.html

@@ -76,7 +76,6 @@
           {% else %}
           <li{% if page.id == 'events' %} class="active"{% endif %}><a href="/{{ page.lang }}/{% translate events url %}">{% translate menu-events layout %}</a></li>
           {% endcase %}
-          {% if page.lang == 'en' %}<li{% if page.id == 'press' %} class="active"{% endif %}><a href="/en/press">Press</a></li>{% endif %}
         </ul>
       </li>
       <li{% if page.id == 'innovation' %} class="active"{% endif %}><a href="/{{ page.lang }}/{% translate innovation url %}">{% translate menu-innovation layout %}</a></li>
@@ -102,6 +101,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 'zh_CN' or 'zh_TW' %}
+    <a href="/en/press">Press</a>
+    {% else %}
+    <a href="/{{ page.lang }}/{% translate press url %}">{% translate menu-press layout %}</a>
+    {% endcase %}
+    {% case page.lang %}
     {% when 'fa' %}
     <a href="/en/about-us">About bitcoin.org</a>
     {% else %}

_less/ie.css

@@ -335,20 +335,3 @@ body{
 	display:expression((this.parentNode.getElementsByTagName('SPAN')[0]==this)?'block':'');
 	margin-bottom:expression((this.parentNode.getElementsByTagName('SPAN')[0]==this)?'4px':'');
 }
-
-.press-news div{
-	height:125px;
-	margin-bottom:30px;
-	width:700px;
-}
-.press-news div a img{
-	float:left;
-	margin-right:30px;
-}
-.press-news div a{
-	display:block;
-	margin-bottom:10px;
-}
-.press-news div p{
-	font-size:80%;
-}

_less/screen.less

@@ -1860,6 +1860,9 @@ h2 .rssicon{
 	text-align:justify;
 	line-height:1.5em;
 }
+.press-faq p{
+	text-align:left;
+}
 .press-faq div span p{
 	margin-bottom:0;
 }
@@ -1955,40 +1958,6 @@ h2 .rssicon{
 	content:"”";
 }
 
-.press-news{
-	text-align:left;
-	-webkit-border-radius:8px;
-	-moz-border-radius:8px;
-	border-radius:8px;
-}
-.press-news>div{
-	height:125px;
-	margin-bottom:30px;
-	width:700px;
-}
-.press-news>div>a>img{
-	width:185px;
-	height:123px;
-	float:left;
-	margin-right:30px;
-	-webkit-border-radius:10px;
-	-moz-border-radius:10px;
-	border-radius:10px;
-}
-.press-news>div>a:first-child+a{
-	display:block;
-	margin-bottom:10px;
-}
-.press-news a:link,
-.press-news a:active,
-.press-news a:visited{
-	font-weight:bold;
-	color:#2c6fad;
-}
-.press-news>div>a:first-child+a+a+p{
-	font-size:80%;
-}
-
 /*Styles specific to printing*/
 
 @media print{
@@ -2234,15 +2203,6 @@ h2 .rssicon{
 	.press-quotes p{
 		width:auto;
 	}
-	.press-news>div{
-		width:auto;
-		height:auto;
-	}
-	.press-news>div>a>img{
-		float:none;
-		margin-right:0;
-		margin-bottom:20px;
-	}
 	.mainvideo{
 		position:relative;
 		padding-bottom:56.25%;

_templates/press.html

@@ -1,22 +1,12 @@
 ---
 layout: base
-lang: en
 id: press
-title: "Bitcoin Press Center - Bitcoin"
 
 dialogs:
-  title: "Bitcoin Press Center - Bitcoin"
-  pagetitle: "Bitcoin Press Center"
-  summary: "Find interviewees, answers and high quality press materials."
-  volunteer: "Interviewees"
-  faq: "FAQ"
-  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>."
   materialvideo: "Videos"
   materialvideoformat: "More formats and languages"
   materialvideoyoutube: "Video on Youtube"
   materialvideomore: "More videos"
-  materialpicture: "Pictures"
-  materialpicturemore: "Show more pictures..."
   materialquote: "Quotes"
   materialquotemore: "Show more quotes..."
   quotesatoshi: "With e-currency based on cryptographic proof, without the need to trust a third party middleman, money can be secure and transactions effortless."
@@ -37,33 +27,27 @@ dialogs:
   quotefredwilson: "We believe that Bitcoin represents something fundamental and powerful ... It reminds us of SMTP, HTTP, RSS, and BitTorrent in its architecture and openness."
   quotejohndonohoe: "Digital currency is going to be a very powerful thing."
   quotefrancoisrvelde: "It represents a remarkable conceptual and technical achievement, which may well be used by existing financial institutions (which could issue their own bitcoins) or even by governments themselves."
-  presscoverage: "Press coverage"
 
 ---
-{% comment %} TODO This page contains a lot of texts. But it could be translated if we have enough active translators in the future. {% endcomment %}
 
-<h1>{{ page.dialogs.pagetitle }}</h1>
+<h1>{% translate pagetitle %}</h1>
-<p class="summary">{{ page.dialogs.summary }}</p>
+<p class="summary">{% translate summary %}</p>
 
-{% if page.lang == 'en' %}
+<h2>{% translate volunteer %}</h2>
-
-<h2>{{ page.dialogs.volunteer }}</h2>
 
 <div class="press-volunteer">
 
 <div>
 
-<p>Communicate with the <a href="https://bitcoinfoundation.org/contact/">Bitcoin Foundation</a> or local <a href="/en/community#non-profit">non-profit</a> organizations.</p>
+<p>{% translate volunteernonprofit %}</p>
 
-<p>Find more potential press contacts at the independent <a href="https://bitcoinpresscenter.org">bitcoinpresscenter.org</a>.</p>
+<p>{% translate volunteerpresscenter %}</p>
 
 </div>
 
 </div>
 
-{% endif %}
+<h2>{% translate menu-faq layout %}</h2>
-
-<h2>{{ page.dialogs.faq }}</h2>
 
 <div class="press-faq">
 
@@ -218,10 +202,12 @@ dialogs:
   <p>{% translate anonymoustxt2 faq %}</p>
   </div>
 </div>
-<p>{{ page.dialogs.faqmore }}</p>
+<p>{% translate faqmore %}</p>
 
 </div>
 
+{% if page.lang == 'en' %}
+
 <div class="press-videos">
 
 <h2>{{ page.dialogs.materialvideo }}</h2>
@@ -241,9 +227,11 @@ dialogs:
 
 </div>
 
+{% endif %}
+
 <div class="press-pictures">
 
-<h2>{{ page.dialogs.materialpicture }}</h2>
+<h2>{% translate materialpicture %}</h2>
 <div>
 <a href="https://docs.google.com/uc?export=view&amp;id=0B4t9VJLm_PWhckxzRm5vS2ZtOWM" target="_blank"><img src="/img/press/picture/bitcoin_kiez.jpg" alt="Bitcoin Kiez sign"></a>
 <a href="https://docs.google.com/uc?export=view&amp;id=0BwnE6HIoU4a4bUswMm5UWS1XakU" target="_blank"><img src="/img/press/picture/bitcoin_logo_plain.png" alt="Bitcoin logo"></a>
@@ -263,10 +251,12 @@ dialogs:
 <a href="https://docs.google.com/uc?export=view&amp;id=0BwnE6HIoU4a4MG9oY1hTSTRBMHM" target="_blank"><img src="/img/press/picture/bitcoin_logo_euro.png" alt="Bitcoin euro"></a>
 <a href="https://docs.google.com/uc?export=view&amp;id=0BwnE6HIoU4a4RUZwY1Bzd3ZMa1E" target="_blank"><img src="/img/press/picture/bitcoin_logo_gold.png" alt="Bitcoin gold"></a>
 </div>
-<a href="#" onclick="materialShow(event);">{{ page.dialogs.materialpicturemore }}</a>
+<a href="#" onclick="materialShow(event);">{% translate materialpicturemore %}</a>
 
 </div>
 
+{% if page.lang == 'en' %}
+
 <div class="press-quotes">
 
 <h2>{{ page.dialogs.materialquote }}</h2>
@@ -294,55 +284,4 @@ dialogs:
 
 </div>
 
-{% if page.lang == 'en' %}
-
-<h2>{{ page.dialogs.presscoverage }}</h2>
-
-<div class="press-news">
-
-<div>
-  <a href="http://www.finextra.com/Video/Video.aspx?videoid=513"><img src="/img/press/news/news_finextra.jpg" alt="Preview"></a>
-  <a href="http://www.finextra.com/Video/Video.aspx?videoid=513">Finextra, Bullish on Bitcoin</a>
-  <a>2013-10-22</a>
-  <p>Richard Brown, executive architect, IBM thinks the future for crypto-currencies looks very bright.</p>
-</div>
-<div>
-  <a href="https://www.youtube.com/watch?v=drPkfGUZBqY&feature=player_embedded"><img src="/img/press/news/news_channel8.jpg" alt="Preview"></a>
-  <a href="https://www.youtube.com/watch?v=drPkfGUZBqY&feature=player_embedded">News Channel 8, Andrea Castillo discusses Bitcoin</a>
-  <a>2013-08-09</a>
-  <p>Andrea Castillio from the Mercatus Center discusses and explains Bitcoin.</p>
-</div>
-<div>
-  <a href="http://www.youtube.com/watch?v=FnNnZLkHnG4"><img src="/img/press/news/news_ft.jpg" alt="Preview"></a>
-  <a href="http://www.youtube.com/watch?v=FnNnZLkHnG4">Financial Times, The rise of Bitcoin</a>
-  <a>2013-07-05</a>
-  <p>Bitcoin, a decentralized, virtual currency, is garnering increasing interest from investors and entrepreneurs. Maija Palmer reports from a Bitcoin conference on where the currency is heading and goes to buy her first (fraction) of a Bitcoin.</p>
-</div>
-<div>
-  <a href="http://www.youtube.com/watch?v=_U18FG3ZAno"><img src="/img/press/news/news_forbes.jpg" alt="Preview"></a>
-  <a href="http://www.youtube.com/watch?v=_U18FG3ZAno">Forbes, Why bitcoiners believe in the digital currency</a>
-  <a>2013-05-13</a>
-  <p>After a week of living on the crypto-currency, Forbes reporter Kashmir Hill invites Bitcoin enthusiasts to a dinner meet-up to help her spend the rest of her digital wallet and share their views on the alternative currency.</p>
-</div>
-<div>
-  <a href="http://www.theguardian.com/technology/2013/apr/26/bitcoins-gain-currency-in-berlin"><img src="/img/press/news/news_guardian.jpg" alt="Preview"></a>
-  <a href="http://www.theguardian.com/technology/2013/apr/26/bitcoins-gain-currency-in-berlin">The Guardian, Berlin streets where you can shop with Bitcoin</a>
-  <a>2013-04-26</a>
-  <p>The Guardian meets the Bitcoin Kiez, among the first point-of-sales shops and restaurants to accept Bitcoin.</p>
-</div>
-<div>
-  <a href="http://www.youtube.com/watch?v=6SLPy89gPE0"><img src="/img/press/news/news_bloomberg.jpg" alt="Preview"></a>
-  <a href="http://www.youtube.com/watch?v=6SLPy89gPE0">Bloomberg on the future of Bitcoin currency</a>
-  <a>2013-04-11</a>
-  <p>Convergex's Nicholas Colas and Holland & Company's Michael Holland discuss the future of Bitcoin on Bloomberg Television's.</p>
-</div>
-<div>
-  <a href="http://video.foxbusiness.com/v/2277786423001/"><img src="/img/press/news/news_fox_trace.jpg" alt="Preview"></a>
-  <a href="http://video.foxbusiness.com/v/2277786423001/">FOX Business with Trace Mayer</a>
-  <a>2013-04-05</a>
-  <p>Is Bitcoin for real? Bitcoin investor Trace Mayer explains the virtual currency.</p>
-</div>
-
-</div>
-
 {% endif %}

_translations/en.yml

@@ -465,6 +465,16 @@ en:
     pagetitle: "Legal disclaimer"
     termstxt1: "This website provides information and material of a general nature. This information is intended for informational purposes only. This website may contain information that addresses real or potential legal issues. This information is not a substitute for qualified legal counsel. You are not authorized and nor should you rely on this website for legal advice. In no way are the owners of, or contributors to, this website responsible for the actions, decisions, or other behavior taken or not taken by you in reliance upon this website. This includes but is not limited to legal or technological reasons. You act at your own risk in reliance on the contents of this website. Should you make a decision to act or not act you should contact a licensed attorney in the relevant jurisdiction in which you want or need help."
     termstxt2: "This website may contain translations of the English version of content. These translations are provided only as a convenience. In the event of any conflict between the English language version and the translation version of content, the English language version takes precedence. If you notice any inconsistency, please report them on <a href=\"https://github.com/bitcoin/bitcoin.org\">GitHub</a>."
+  press:
+    title: "Press - Bitcoin"
+    pagetitle: "Press center"
+    summary: "Find interviewees, answers and high quality press materials."
+    volunteer: "Interviewees"
+    volunteernonprofit: "Communicate with the <a href=\"https://bitcoinfoundation.org/contact/\">Bitcoin Foundation</a> or local <a href=\"#community##[community.non-profit]\">non-profit organizations</a>."
+    volunteerpresscenter: "Find more potential press contacts at the independent <a href=\"https://bitcoinpresscenter.org\">bitcoinpresscenter.org</a>."
+    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..."
   protect-your-privacy:
     title: "Protect your privacy - Bitcoin"
     pagetitle: "Protect your privacy"
@@ -628,6 +638,7 @@ en:
     menu-innovation: Innovation
     menu-intro: Introduction
     menu-legal: "Legal"
+    menu-press: "Press"
     menu-resources: Resources
     menu-support-bitcoin: Participate
     menu-vocabulary: Vocabulary
@@ -651,6 +662,7 @@ en:
     how-it-works: how-it-works
     innovation: innovation
     legal: legal
+    press: press
     protect-your-privacy: protect-your-privacy
     resources: resources
     secure-your-wallet: secure-your-wallet