Merge pull request #264 from bitcoin/resources

Add "Documentaries" and "Learning resources" links in "Resources"

_less/ie.css

@@ -148,7 +148,7 @@ body{
 }
 
 .resources div{
-	border-top:expression((this.parentNode.getElementsByTagName('DIV')[3]==this)?'1px solid #e0e0e0':'');
+	border-top:expression((this.parentNode!=this.parentNode.parentNode.getElementsByTagName('DIV')[0])?'1px solid #e0e0e0':'0');
 }
 .resources div div{
 	zoom:1;

_less/screen.less

@@ -644,9 +644,12 @@ li p{
 .resources{
 	text-align:left;
 }
-.resources>div:first-child+div{
+.resources>div{
 	border-top:1px solid #e0e0e0;
 }
+.resources>div:first-child{
+	border-top:0;
+}
 .resources div div{
 	display:inline-block;
 	width:380px;
@@ -1373,7 +1376,7 @@ h2 .rssicon{
 		padding-left:0;
 		margin-left:0;
 	}
-	.resources>div:first-child+div{
+	.resources>div{
 		border-top:0;
 	}
 	.resources div div{

_templates/resources.html

@@ -65,7 +65,6 @@ id: resources
     <p><a href="http://bitcoinmagazine.com/">Bitcoin Magazine</a></p>
     <p><a href="http://www.coindesk.com/">CoinDesk</a></p>
     <p><a href="http://thegenesisblock.com/">The Genesis Block</a></p>
-    <p><a href="http://letstalkbitcoin.com/">Let's Talk Bitcoin</a></p>
     <p><a href="https://bitcointalk.org/index.php?board=77.0">Bitcoin Forum / Press</a></p>
   </div><div>
     <h2><img src="/img/ico_market.svg" class="titleicon" alt="Icon">{% translate charts %}</h2>
@@ -74,6 +73,20 @@ id: resources
     <p><a href="http://bitcoincharts.com/charts/">Bitcoincharts.com</a></p>
   </div>
 </div>
+{% case page.lang %}
+{% when 'ar' or 'de' or 'es' or 'fa' or 'fr' or 'id' or 'it' or 'nl' or 'pl' or 'ru' or 'tr' or 'zh_CN' or 'zh_TW' %}
+{% else %}
+<div>
+  <div>
+    <h2><img src="/img/ico_doc.svg" class="titleicon" alt="Icon">{% translate documentaries %}</h2>
+    <p><a href="http://bitcoinfilm.org/">BitcoinFilm.org</a></p>
+  </div><div>
+    <h2><img src="/img/ico_solve.svg" class="titleicon" alt="Icon">{% translate learn %}</h2>
+    <p><a href="http://letstalkbitcoin.com/">Let's Talk Bitcoin</a></p>
+    <p><a href="https://www.khanacademy.org/economics-finance-domain/core-finance/money-and-banking/bitcoin/v/bitcoin-what-is-it">Khan Academy</a></p>
+  </div>
+</div>
+{% endcase %}
 </div>
 
 {% endcase %}

_translations/en.yml

@@ -412,6 +412,8 @@ en:
     linkmerchantstools: "Merchant tools"
     charts: "Charts and statistics"
     news: "News"
+    documentaries: "Documentaries"
+    learn: "Learning resources"
   secure-your-wallet:
     title: "Securing your wallet - Bitcoin"
     pagetitle: "Securing your wallet"