From 213d4fc2f05fc302608802a3b25dc3bf1071e7e1 Mon Sep 17 00:00:00 2001
From: Saivann <saivann@gmail.com>
Date: Sat, 9 Nov 2013 14:46:19 -0500
Subject: [PATCH] Add "Documentaries" and "Learning resources" links in
 "Resources" Add link to Bitcoinfilm.org Add link to the Khan academy course

---
 _less/ie.css              |   2 +-
 _less/screen.less         |   7 ++-
 _templates/resources.html |  15 +++++-
 _translations/en.yml      |   2 +
 img/ico_doc.png           | Bin 0 -> 620 bytes
 img/ico_doc.svg           | 100 ++++++++++++++++++++++++++++++++++++++
 6 files changed, 122 insertions(+), 4 deletions(-)
 create mode 100644 img/ico_doc.png
 create mode 100644 img/ico_doc.svg

diff --git a/_less/ie.css b/_less/ie.css
index 98d8e6e9..b21bee66 100644
--- a/_less/ie.css
+++ b/_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;
diff --git a/_less/screen.less b/_less/screen.less
index 487dfc3e..ba1fe266 100644
--- a/_less/screen.less
+++ b/_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{
diff --git a/_templates/resources.html b/_templates/resources.html
index df53b73b..fc1aa020 100644
--- a/_templates/resources.html
+++ b/_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 %}
diff --git a/_translations/en.yml b/_translations/en.yml
index 55137a1f..938b24c1 100644
--- a/_translations/en.yml
+++ b/_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"
diff --git a/img/ico_doc.png b/img/ico_doc.png
new file mode 100644
index 0000000000000000000000000000000000000000..aaecae5990a2f657d866f6408e6eb6458aee51e5
GIT binary patch
literal 620
zcmV-y0+aoTP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800004b3#c}2nYxW
zd<bNS00009a7bBm000fw000fw0YWI7cmMzZ8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10qIFZK~z|U?bbbO6k!kt@ZThwL@<&<L4qh)DcD)0w6{=56+!Sb
zScqUD*!cnMECfX>ZNy4MQdubmEEGw=!WS$=FvKJn@3GiD-E4L@cgN*U&_7JEJM+x*
z-`RPKl#*d$WT?0Q4Fq=8DI($wW^n><@hGKqukQ>}N}B{@cz`vukaGEsr<g3C$<H0C
z(=|zzqw82LTwIh@+%DOl!{=Pz!V?_ni2x?BQFD1)equVeKVNv))^Fewrg|YTlZU#A
zz%tI}_8&@@x21(Eoe(G|;dp+yF>Np&5eG0`W7ERPZTw(s8NS4xZO%;K1-{9`U577S
z6G$m7<BqHXs<4jvl+sd4X&sMczo3j!JnV!(RTWHP!PZ<@!4eJ@Y!BmIuK(dr0^jJl
z40Fe$xQOTYniIN;@e13$xQzR_iPPQmff)8M`dtMPF@?K2%-#;LCM(6}_FV|&tmgXf
zMHVW4*)i;IKNqWDtPfvZ#soyf?ueL+h-Y|>#faEfj=<awL|{>tydNucGgY0i-#ChE
zHM+#kFC@{R8wi0W{3l@81O^g;ranIq0!z3g+p5dR7M~q%L~jcIPswJ@8eU;+(>Rvx
zgZ(BjUoi_tYR7RzT)^?}qFjp=+)63EZ!#MCKJZWX0q_eUf?RN=!XeZE0000<MNUMn
GLSTX~Bnzzo

literal 0
HcmV?d00001

diff --git a/img/ico_doc.svg b/img/ico_doc.svg
new file mode 100644
index 00000000..94da669e
--- /dev/null
+++ b/img/ico_doc.svg
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="32"
+   height="32"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="ico_doc.svg"
+   inkscape:export-filename="/media/X/bitcoin.org/current/img/ico_doc.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="7.9195959"
+     inkscape:cx="-2.9351614"
+     inkscape:cy="13.17308"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1680"
+     inkscape:window-height="1026"
+     inkscape:window-x="0"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Calque 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1020.3622)">
+    <rect
+       style="fill:#000000;stroke:#000000;stroke-width:2.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="rect2985"
+       width="18.669786"
+       height="11.956223"
+       x="3.9093943"
+       y="-1047.6553"
+       transform="scale(1,-1)" />
+    <rect
+       style="fill:#000000;stroke:none"
+       id="rect2987"
+       width="728.57141"
+       height="131.42857"
+       x="-531.42859"
+       y="-130.49496" />
+    <path
+       style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:2.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m 23.026243,1043.901 5.896013,2.3414 0.04985,-8.9296 -6.008678,2.5689 z"
+       id="path2989"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccc" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="path3790"
+       sodipodi:cx="20.892857"
+       sodipodi:cy="5.0357141"
+       sodipodi:rx="2.1428571"
+       sodipodi:ry="2.1428571"
+       d="m 23.035714,5.0357141 c 0,1.1834673 -0.95939,2.1428571 -2.142857,2.1428571 -1.183468,0 -2.142857,-0.9593898 -2.142857,-2.1428571 0,-1.1834672 0.959389,-2.142857 2.142857,-2.142857 1.183467,0 2.142857,0.9593898 2.142857,2.142857 z"
+       transform="matrix(1.4931281,0,0,1.4931281,-12.39591,1021.6204)" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="path3792"
+       sodipodi:cx="9.8660717"
+       sodipodi:cy="3.9196427"
+       sodipodi:rx="3.9732144"
+       sodipodi:ry="3.9732144"
+       d="m 13.839286,3.9196427 c 0,2.1943457 -1.778869,3.9732144 -3.9732143,3.9732144 -2.1943457,0 -3.9732144,-1.7788687 -3.9732144,-3.9732144 0,-2.1943457 1.7788687,-3.9732144 3.9732144,-3.9732144 2.1943453,0 3.9732143,1.7788687 3.9732143,3.9732144 z"
+       transform="matrix(1.0896046,0,0,1.0896046,-2.205817,1024.1591)" />
+  </g>
+</svg>