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           | Bin 0 -> 3931 bytes
 6 files changed, 22 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 0000000000000000000000000000000000000000..94da669e1085eda1e7642f00689d579fecbf8933
GIT binary patch
literal 3931
zcmds4NpIse6u#$Iu*xNaT9l}jRISWm1_R8soua)JjKtXLXe&j>c7A;yC6SVyq@7-h
zq6&hDZ(qLmsBGV#ni@R`IaFPnI|Ta<5^d3yRlCcbpTB%^se=Z^+mhE^D{`mpocH%P
z+wWW#eUO4HQKDm|_ULo_btrf*(A{3CKJ&ce@rbLLh&#FS-XYh$zq#2CPrDn05cq9}
ztSoY8R_G719tF$76SZhWs|Jr?;yH_Wv4|Jid-WuWu4%e<7&Y7Bb|oy!M{8V1a|}lz
z!Wi@XzzYHwB;4WLDt>Y=RUyXLR0H4lJ>V@)zD+6{prAecT5&_bLwAscc!UB8+zRD=
z{PNK=OxMSyDi>#&si!sbqR1_8#L)9X44x4l^^aAl_PG-V<7qFd-Co&aRpt(4HStzh
zAfvFclUa_BBZ?y=84KAcVgk;}uFw(WPE~Zj!2z3MStH`qcT%~JRV^k-uMuU%y<feD
zN)=tzjy)<4QbPZ|s@ZwQRNqc@zczI$d#Ee(FN2-^oDK6HK(sBz<DkKWkWN{jA_sXR
z%ch{CDxWHGTm&EZAV%v5^?V12t2>!Hw~ym9Gafow3Tar$_*}3$=t`x|(~Qlw=kdt2
zRm=Bb24CS1dtP?O+?l!r85rf~u4{59#f-2Rey(+kQ|`C{W?@Vc620K+fI>{t(5Kft
z=-)w4p?hd6HRMizx|W#R<ktKwpd#a+2{Z@|`|h}ty3UWhw)L}7AFCG9ac5kTguY06
zmM~Z)evn-IpG6?Ux3nR>;6>82TEkCOQ#}g^kr)^>Lh+I-zBJ!ZQb*$iKm<!8`|;za
z=>+GZ$bRYM*GWT5XaWAv9bmv_ol&nWG8prQtNW^fe(OE*JuJbkw=k@YEzs1t7nU%a
zm15c#b^)xHW?3`<uwHmSsj99&YbSGB+P{WB7_C$-CdiK@Z;pP>&08h6g~^<XF%HPM
zv{$gJ`Gcr)=L4_*I0$6AZu`5F-Jx%~5_Z7|3)4C%_61Co<n5sAk~`yT4OhyYzj2}6
zJ`R&0cxUS_3T5gssB;aLVT;t+Ei7etei)SOzKW~k1h6c?@yvJYsugfiWe{Imu8F_H
z^0}l!IfbkNBPxrG<UFPsF@%!CWJ<};Sqm5BoaVG(Bt#rA8e5`4JH<)DQflywkOeux
zEQX{*s{+^#G4o;5Mhg*84F!r)oW$`$U6m59;#%AhDC0W|fvpbb8w&VV8mWzGP9qH{
zj#Cnu-mlUK36269FDiNo#WU5cD1^p5Lby&?#F8b@o~!*|1*+TbUN_>u(s%%PgMtvl
zx(cFj18vg%BPhm{B|Zr^0S+S)Az1SfU}NJ_%mS7mH^IJ7lazu$oKS|IZN2pp)inVu
zEw!_gR&*^OT6NNeb^OHDLBeF1eF%Ga{`3HNmO`%w*yM$N-l(?`*P^+@Wnsg3ZRq|%
zE9}Jlixa4;7N+yJfnIpF8v0s<4MW)lOcyplGsb>+iEqo6S{suQ;|u&3w!U^=uq`r1
zs~c+`70BPfhb|4HBn=UK^}#hBGQh#?0Kxq|y{>7q2Hp58{;W(HT@#Hu0Y|R!6aWOZ
zBg!_`J~EOkl92~LmTNTWLNdG+ZdVHlu02_u?qDsjkOY)$eE3;TE`h0lU<k}hKyVWH
z(Q0vB?1TR!KFv4X6+RiJN#dtuS)&$V1t1Le3SmhUyu#M_1a=w*Br=~rE8}v~zG9E~
zgpWZQ!cZg|YktHhv=?rmC{7UoC`~C%n3kAKAlJNxYogWB5H%8!M&M|Gf~^(RzG{$K
zRb+)Xi!idXYogH!!JQF+1#F!yH1ihy4Oo4>vZG`Mt2se%fge+nYOqF_0Bj9dx84r^
LIo6+c_cwn6#K=?1

literal 0
HcmV?d00001