From d29b451a9322087f82915aeeea9322a2ed84e28a Mon Sep 17 00:00:00 2001 From: Saivann Date: Mon, 27 Oct 2014 22:31:43 -0400 Subject: [PATCH] Translate, update and reposition press page --- _layouts/base.html | 7 ++- _less/ie.css | 17 ------- _less/screen.less | 46 ++---------------- {en => _templates}/press.html | 91 ++++++----------------------------- _translations/en.yml | 12 +++++ 5 files changed, 36 insertions(+), 137 deletions(-) rename {en => _templates}/press.html (76%) mode change 100755 => 100644 diff --git a/_layouts/base.html b/_layouts/base.html index 95fcf92f..afc20ecf 100644 --- a/_layouts/base.html +++ b/_layouts/base.html @@ -76,7 +76,6 @@ {% else %} {% translate menu-events layout %} {% endcase %} - {% if page.lang == 'en' %}Press{% endif %} {% translate menu-innovation layout %} @@ -102,6 +101,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 'zh_CN' or 'zh_TW' %} + Press + {% else %} + {% translate menu-press layout %} + {% endcase %} + {% case page.lang %} {% when 'fa' %} About bitcoin.org {% else %} diff --git a/_less/ie.css b/_less/ie.css index abe97f84..a214b35b 100644 --- a/_less/ie.css +++ b/_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%; -} diff --git a/_less/screen.less b/_less/screen.less index 4a0b64b4..be2d9ea5 100644 --- a/_less/screen.less +++ b/_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%; diff --git a/en/press.html b/_templates/press.html old mode 100755 new mode 100644 similarity index 76% rename from en/press.html rename to _templates/press.html index bfd4ff4f..ef9b0207 --- a/en/press.html +++ b/_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 FAQ or the Bitcoin Wiki." 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 %} -

{{ page.dialogs.pagetitle }}

-

{{ page.dialogs.summary }}

+

{% translate pagetitle %}

+

{% translate summary %}

-{% if page.lang == 'en' %} - -

{{ page.dialogs.volunteer }}

+

{% translate volunteer %}

-

Communicate with the Bitcoin Foundation or local non-profit organizations.

+

{% translate volunteernonprofit %}

-

Find more potential press contacts at the independent bitcoinpresscenter.org.

+

{% translate volunteerpresscenter %}

-{% endif %} - -

{{ page.dialogs.faq }}

+

{% translate menu-faq layout %}

@@ -218,10 +202,12 @@ dialogs:

{% translate anonymoustxt2 faq %}

-

{{ page.dialogs.faqmore }}

+

{% translate faqmore %}

+{% if page.lang == 'en' %} +

{{ page.dialogs.materialvideo }}

@@ -241,9 +227,11 @@ dialogs:
+{% endif %} +
-

{{ page.dialogs.materialpicture }}

+

{% translate materialpicture %}

Bitcoin Kiez sign Bitcoin logo @@ -263,10 +251,12 @@ dialogs: Bitcoin euro Bitcoin gold
-{{ page.dialogs.materialpicturemore }} +{% translate materialpicturemore %}
+{% if page.lang == 'en' %} +

{{ page.dialogs.materialquote }}

@@ -294,55 +284,4 @@ dialogs:
-{% if page.lang == 'en' %} - -

{{ page.dialogs.presscoverage }}

- -
- -
- Preview - Finextra, Bullish on Bitcoin - 2013-10-22 -

Richard Brown, executive architect, IBM thinks the future for crypto-currencies looks very bright.

-
-
- Preview - News Channel 8, Andrea Castillo discusses Bitcoin - 2013-08-09 -

Andrea Castillio from the Mercatus Center discusses and explains Bitcoin.

-
-
- Preview - Financial Times, The rise of Bitcoin - 2013-07-05 -

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.

-
-
- Preview - Forbes, Why bitcoiners believe in the digital currency - 2013-05-13 -

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.

-
-
- Preview - The Guardian, Berlin streets where you can shop with Bitcoin - 2013-04-26 -

The Guardian meets the Bitcoin Kiez, among the first point-of-sales shops and restaurants to accept Bitcoin.

-
-
- Preview - Bloomberg on the future of Bitcoin currency - 2013-04-11 -

Convergex's Nicholas Colas and Holland & Company's Michael Holland discuss the future of Bitcoin on Bloomberg Television's.

-
-
- Preview - FOX Business with Trace Mayer - 2013-04-05 -

Is Bitcoin for real? Bitcoin investor Trace Mayer explains the virtual currency.

-
- -
- {% endif %} diff --git a/_translations/en.yml b/_translations/en.yml index aa49c56a..61d81c20 100644 --- a/_translations/en.yml +++ b/_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 GitHub." + press: + title: "Press - Bitcoin" + pagetitle: "Press center" + summary: "Find interviewees, answers and high quality press materials." + volunteer: "Interviewees" + volunteernonprofit: "Communicate with the Bitcoin Foundation or local non-profit organizations." + volunteerpresscenter: "Find more potential press contacts at the independent bitcoinpresscenter.org." + faqmore: "To learn more about Bitcoin, please visit the complete FAQ or the Bitcoin Wiki." + 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