From 24e09bc235b3ff6e659e901dfbdbcc23e6e14ba7 Mon Sep 17 00:00:00 2001
From: Radek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>
Date: Wed, 29 Feb 2012 12:38:05 +0100
Subject: [PATCH 1/1] prettier player window, minor display fixes

---
 apps/catalogue/templatetags/catalogue_tags.py |  11 +++
 apps/catalogue/views.py                       |   3 +-
 lib/librarian                                 |   2 +-
 wolnelektury/settings.py                      |   1 +
 wolnelektury/static/css/catalogue.css         |   2 +-
 wolnelektury/static/css/header.css            |   1 +
 wolnelektury/static/css/main_page.css         |   3 +
 wolnelektury/static/css/player.css            |  17 +++++
 wolnelektury/static/img/logo-220.png          | Bin 0 -> 16465 bytes
 .../static/jplayer/jplayer.blue.monday.css    |  10 +--
 wolnelektury/static/js/base.js                |   2 +-
 .../templates/catalogue/audiobook_list.html   |  15 +++++
 .../templates/catalogue/book_list.html        |   4 +-
 .../templates/catalogue/book_text.html        |   4 +-
 wolnelektury/templates/catalogue/menu.html    |  10 +--
 wolnelektury/templates/catalogue/player.html  |  63 +++++++++---------
 wolnelektury/views.py                         |   2 +-
 17 files changed, 100 insertions(+), 50 deletions(-)
 create mode 100644 wolnelektury/static/css/player.css
 create mode 100644 wolnelektury/static/img/logo-220.png

diff --git a/apps/catalogue/templatetags/catalogue_tags.py b/apps/catalogue/templatetags/catalogue_tags.py
index e2aac35c7..14ed64da8 100644
--- a/apps/catalogue/templatetags/catalogue_tags.py
+++ b/apps/catalogue/templatetags/catalogue_tags.py
@@ -148,6 +148,17 @@ def book_tree(book_list, books_by_parent):
     else:
         return ''
 
+@register.simple_tag
+def audiobook_tree(book_list, books_by_parent):
+    text = "".join("<li><a class='open-player' href='%s'>%s</a>%s</li>" % (
+        reverse("book_player", args=[book.slug]), book.title, audiobook_tree(books_by_parent.get(book, ()), books_by_parent)
+        ) for book in book_list)
+
+    if text:
+        return "<ol>%s</ol>" % text
+    else:
+        return ''
+
 @register.simple_tag
 def book_tree_texml(book_list, books_by_parent, depth=1):
     return "".join("""
diff --git a/apps/catalogue/views.py b/apps/catalogue/views.py
index 6405a49a9..fad77751e 100644
--- a/apps/catalogue/views.py
+++ b/apps/catalogue/views.py
@@ -246,10 +246,11 @@ def player(request, slug):
         else:
             have_oggs = False
         audiobooks.append(media)
-    print audiobooks
 
     projects = sorted(projects)
 
+    extra_info = book.get_extra_info_value()
+
     return render_to_response('catalogue/player.html', locals(),
         context_instance=RequestContext(request))
 
diff --git a/lib/librarian b/lib/librarian
index 361fd53b4..6badff080 160000
--- a/lib/librarian
+++ b/lib/librarian
@@ -1 +1 @@
-Subproject commit 361fd53b42fae8bafe8fd680a0c697757aa19cf3
+Subproject commit 6badff0808ac498cca8f405d047316940aac8a03
diff --git a/wolnelektury/settings.py b/wolnelektury/settings.py
index 54359513e..ac80dafff 100644
--- a/wolnelektury/settings.py
+++ b/wolnelektury/settings.py
@@ -221,6 +221,7 @@ COMPRESS_CSS = {
     'player': {
         'source_filenames': [
             'jplayer/jplayer.blue.monday.css', 
+            'css/player.css', 
         ],
         'output_filename': 'css/player.min?.css',
     },
diff --git a/wolnelektury/static/css/catalogue.css b/wolnelektury/static/css/catalogue.css
index c23547b44..74338f877 100755
--- a/wolnelektury/static/css/catalogue.css
+++ b/wolnelektury/static/css/catalogue.css
@@ -123,7 +123,7 @@
 	margin: 0;
 }
 .inline-body li {
-	display: inline;
+	display: inline-block;
 	margin-right: 1em;
 }
 
diff --git a/wolnelektury/static/css/header.css b/wolnelektury/static/css/header.css
index cdb74f84d..ef47897e3 100755
--- a/wolnelektury/static/css/header.css
+++ b/wolnelektury/static/css/header.css
@@ -41,6 +41,7 @@
 #logo a {
     color:#f7f7f7;
     font-size: 2.05em;
+    text-shadow: 0 0 10px #17CFDB;
 }
 
 #tagline {
diff --git a/wolnelektury/static/css/main_page.css b/wolnelektury/static/css/main_page.css
index e52a28341..bc8e68fda 100755
--- a/wolnelektury/static/css/main_page.css
+++ b/wolnelektury/static/css/main_page.css
@@ -80,6 +80,9 @@
     line-height: 1.45em;
 }
 
+.infopages-box li {
+	margin-bottom: .25em;
+}
 
 .infopages-box .social-links {
     margin-top: 1em;
diff --git a/wolnelektury/static/css/player.css b/wolnelektury/static/css/player.css
new file mode 100644
index 000000000..c449803e5
--- /dev/null
+++ b/wolnelektury/static/css/player.css
@@ -0,0 +1,17 @@
+#player h1 {
+	font-size: 2em;
+	margin: .5em;
+}
+
+.player-info {
+	margin: 1em;
+}
+
+
+.play {
+	cursor: pointer;
+}
+
+.play:hover {
+	color: #0D7E85;
+}
diff --git a/wolnelektury/static/img/logo-220.png b/wolnelektury/static/img/logo-220.png
new file mode 100644
index 0000000000000000000000000000000000000000..9b15e88a308e0a49d7468d9284b2ae34f4c5a34d
GIT binary patch
literal 16465
zcmZ|0V{9%=)HPh2r?%Tu+qT`SHcxHawryRtb!yw~scqZsdq2;Q@5}q+&1BC?_GD)!
zYbJXqYqBGi6eJPhaN$5eKoF&+#8m#n&Hqds2I{|=gf-%S7NCq}CB;C#|7ToaF9rSQ
zfpw75a{dpc{?{bNtp)za>E<A8@gM$gJjfUEIspiXpqI3mu$ssERkwSN#_-e651;c*
zm+g*OpjqXDH(JSWV{q|$Lye&zJ(I|+Axw$}2@}p|O;lRr!r#A(e*f-%>7;}2vbni=
z`Pk;}72J-dV1CPjfD{zeN8at;?0%Wae8^j!%FJ}0f%$;_79e221y%H4KbosB(SPu*
zVY&rC9KZL}J{)A-sI4c_&gc_$xjG3(xvM8?WsH^)(4Vc_^80rp>H9;?;22{w&#=5B
zaT!Cnq~xpjfDz?`^78bJOO`0D(TQZ+b$K2<>BlI9-!_}^Z8gc3*w*f_O%@hIW4x^x
zu)M#@Gml<cUlH`xL0<P@8Y0WMfxvy2V*?N)=NM2D${e`{foifDd@4Br#i{dFK3??~
z`ALo>3ww8&Ecurf&q<SjohIiE2QKvQ`zIKIEY*JKMPLBN6hj~x?w3ag@OB%oo)<$q
zHYis$UhHD>k7`qL__j6Cd6sf|)0WkRd@;`>9B!Sz*ePLH4v(hBB`+4X(MHe87U-u}
z{SL}ZG^M~7wkM_5y?A9hkGK7l)I|X;|MJ{2u0-S@_Glqp?TmzH`4d>p93-!-TeSzD
z+tc&KP3d*m%0zXLEjJ0<sG}zQ(gqQA-8H)do<wi*Mn9)4G>gzrAJ(Fs4E2z`o_-dG
zp>Bu?$`!t|B_RZvl6KXloQmxQF?&~y+NE{(f3(1VAnu*h^reW>nZtuio5x~9fn?Jx
z1}&~*sCONmmvx|8o^UUS7UUnu*wgABVt1$nHHr=#*OZsJclfVIu(Rt}IQE=m!LyfP
zff$sB`Dv!XF+r4+-ami%c5KwKA-B=lwp<nO5V=PUCK_qHbBUPCtzib&^o;U`);m!(
zQlh<=Kzo!eSj?B3X*>FD^{i}yerEkg4FgJ8v_a72F-8N8pmkxp(_hz;4T7)qTGd+!
zdf(Tt@6ur$OL%SdBl$-;VpY)v06x?(y#;P!^ibkUw2`CG*lmg~{2Jrmt+;cF?C(M*
zk2;LMtSzeQ$xOC8!}xjBUJ@`oqa<|`EFI{X2FGVbPV-4<ZOdx*f07HSR^J*~q-W8^
z&r^p%gGb7*t*8H^3HD>!<>&drNK2<sTeoV$7+|b^`gHk`n=486bdri3a-pC-rYCBF
zdhV$5rJ#MCf;lbtHH}(z?d0RR&|acV)@`ta7U5Mb$y8fdgZ5yi<bR8IDFZMhhuFDD
z;24_k>g0Ntm`jwcX|(M+YP;Z5@UIZDzsSqsu#8wVy7>GH3drhJ-5}}>^G=eA<if|-
za2xhj@9~)Nk~{IO=>UIaH|iz9?^~s!zOXnfcI*<S_l%?Uy&&-%V5f~lC%;}(gFSL4
zJghyisDC(+=lj;S@ToE=OyOb}RLE~6k@oo-5el?06$7Yqv7*b!^*!&_KCCAalvqO$
zoO$}B5}o8|F?Y0^d>k`A-(<90*SXuo7;yQK*pHMsS{$<Xv{T*bO3HS^(3{j-7MjSY
z6}FD{tgQdfJsO}Y1jvVX{i2V;f~R{)Rlp^8?~lW7d*qA|`fz!@(nJaDs>7LP7r$`i
z+bT;d9hsX&miaKm$gUYZ8JUA#ef0TGZIydHReIDjq(JZ5XTyM6;o48prbLJs!pe6W
zc&D-dvbpX!z;odnGIm%QC&mhTAeDRd*2yZU36@d4bDi9*r~#GQS(V`pFu-`G9RL+m
zSwFj(=^9&YpFty09Vo-vPbT_4@fIf}Hwi$g1Xih4<-f|r9ZdA;*^)kiTJJ#Xjvm2O
zWem$=_Wvn>#xF0~pI|Z^bu*2{pU>vpv5Y1cRe_mWW4fEXnc#jzufWR@iyAD1QkfJx
z7HlhJ&^PF=YjFkX<+yYYp&i#9y-=hhHg(NIm0^nU^3pCZS+{$Zyz!^~6B&xn?wD&)
z@Q;&)&)QutD)P(+{KAJ!QYu;K;EyH0+MqL|ONqD;lC<g-&V#3Yc{y+N0+sWzWwv8{
zz)sKW;7b+QWS<rWqD6l{W>l1qRz@bq?jZGtwhr{I^`M_*yOw0%`X{?s)u-)>MI4ut
z<`R2ue(rkW<oD)%{x#7Ga+;bgDYYHv-h~J|LOtkN3c9;&b-97j=^><C`Zd3^A)Fco
zsvTT8myB8DXcsELe<mM|@?21a{f;_(M`(lG(hR?Ibs%d?;H{i)T_kzs|J#@g6l`k}
z$HU4l_u#@Mg^h|>a`b@49~<i<4Z_<HqsNL?Nk#dHmK9~8dTximeMRz3t^Y0t0RcBA
z2eKQCt<K$4iGWVicFpfRD%MBqdC*<LK=$)VA=Fi8VQ+eNOq{oCZb}1F0Wk{~fX(yA
z!1@Bj&-UL93^Y@PH^iQ)O-`M-7K20_ym-!KnptS|wBp{1h0$@`P<LEl3q3@!<8u3q
z@S2e>caMwZ?_e*z$}}*vg#IVXN>qq-^0Nl&KgFbzye3fQtLnXwnP<0sWC<@UbY3`a
z<f0CofBnZvT;9tlz-_y;51FJebc{0dX;$(d#^d9opdCPdkUl8()a|BA^7SR#7uG6!
zddft?c@l$(%Bd9T&qb@}E%B4#>!vP8zGer`c77lA;|~CAFwHvK5pKzx9PZ;ZBjGQq
z7o>yjqLH`l@>6WE0g-e&I7ivSXz9#nGVL8`V#Rake5IWmXZVNDC)MUxxpckNZ|jez
zx13G;{xj$^&Gp{dV<XV<db5=$*Vgp^<uBBa*z)lg$F0+0-6}&-^*fgy#v+I*`LeND
zOFZh#n<Wf8--N04<fH)~U4$$6)E9w`zETa2SPbt<B3v>PrkF;YW7&%f8C{%f$Wr+Y
zQ|UXz+`Gp@6W_MivubT^i@}IAe`E9fy4!7gqGn^<Iyi^hWJ?x=z1{jbLKv@!5xAq&
z`lmL~P4|nQl?BjG+=d-oaqnZRS)YH@6nXofBM_#|fOX=O_4XOo339Z>;k_F1(C38O
z=lve%S1)-J%wu+$#rg-jFu&H3I1bP=<AHlMx|vuDag#IDy>ohj@-5{fx;K;G*`lA~
z_gV$w>S?k+HiM|BMpC~~m(gNq@QMYTqxj9!hqc<t_iuRKU#ImokTQ~?Z+DD(?KptM
z#dat5SiOWP<ZYF%CGn126V8XfQ5(hAZ1{6=Z(XBSJTByJl&Xz+$wx1lIfxmJTzQyt
zt&^q<*lOL88~kou3>GzPR-6@lD4V_?x+b*QIb+6Haxj0rN0BmXVzo@si<oN+yS(j&
z_WN`fZTfqelmC<OiQ~1GtwtDIU!C9%Fraw$9?<hA%JEx77s&Jz+yiw?GRK5wpR_%~
z;ht!B3Sxd_5vj4ytjU|H&tp&kwou&3otRr6%3N5N9>@f=>kANHn~4?nJ!mek&o|-1
zT0j;QLvK{2oIMFNaS%_&WpDXlX-$0a!(}yduG0@Qv5B@wwn&Y8(fXgee!hQ#hwujc
zKz*?9f!Ot84OlXnvrXwOCN;&a&+t1VnQbN{d-_i7ECx%L;f3w(k118*lOu)xT5YRn
zuz#hVF~bfscFkH@>phF}xEi0HD#T&%hlA<1O07HhEjy|5VYz)hM4VzcDh4WPn}j39
z#t^1nI~Yry{T7+irkOz4Sb1~u+(Erq#V7u+^mG2Zfo+3^*ASUM3mdyj(`2t!2)$VM
z@6TR)X?n{jrTqK5#j#Nmndq!eK>WM)UBi+*0bi<xL*MhN!g@bn!M8|UFg?;pG+iWK
zP~l~|gn(U}ojmeUf&rQxi+_m+!L?AMG3l4a{e^E24TgDIm5tQ1%`lHmKMs}c^Gk~W
z((Y>HSC+#ID0rM3Nlr*jLv_BM{EtcJpxa>oMVygQU0X8v$RQW$7KA0Hk}W;y8r*!w
zDIVQAv-`^c)?-ER=m26^e0a-^K;Nl1)VU13e_L1z`YEO|4=I}?ajE)vRj8+H8Y9ry
z=SjV1>nYu?a^AiB*oC`{Rqv?Zw<Znz6~m;LT$f}HeJ+#pVg1p2tr^su5XyifsKehn
zH;uH}UHqMwR20z#iv$a%NDb7npdoY(@OrZ4tE@lXrO{`QR5*-BKqd<2C7ZTK8Vu!|
z$|Ylou%ZD&>yvMmZEZGAd2!WV^dvn0rbEMhSPeO3Ayk0LVIORA9Y!zyp)LAfwHW@d
zS`38Ej-=zyM6<4DQN|K1YUY+ixbn1<`VyFikUfGlVz_}=`%>(Lmjc~NX}FC{zDY%#
zLY+Qs=|8Hk6BhFA|32j``LSo#STB(3zgAo(<l{=mT{|S5b4v9wavQfTS&tU@x&z?K
zb=xyq@<qeb>hCQ{Y$Fz)hkR=?!C!j=zTzB)1CY_5Epzv<ojK;#L(?R<)QClm%IoM}
z)CA+BXKDv`(umUk)LwANpj{D2_|Y<ri4xJbY`#cLZm!STZnR3sVYPIYF-REw{&USH
z(OKCj0qCs<8mI&8sAsG;2N-gF*v`29sj6J4<P}c)kK+Z5+@}MFD4^@z>vvG?=o4Vk
zpKP7w#>OTk$f1|F1gaZP4=c{AxxVAJrZ1}4&$BkS3e`cGC80uDA-%xO^6pKS*4+nQ
zT`dj?Gi~u7IK|$JJ8@f9X~kkP65)cyOK^amz$u9@MX}GL4h?piI&bz!#vVRg`;7*C
zj&sePocp^T^=Z&gqQ3vQAMZ0P*xlv80X@_tY6Q55*O<A6FO=-3PETw~G#K(?;T%RF
zFf%C?L=M;)yb;&FkJwFy;Y->fMrAc+BW+{42fqMY@*~GU3=_S!L#3BDWULm~+0YUN
zf^s65CBcm5j#kb;tiHI5{PJ{C^}9GqsaVVP#&^N5DWGo!jeD(ylLJKqKS{36RMQ~m
ziJes+M2vD;jplnm6Uky6GH7ZbiZC&U0R}JCep*;Dw$hQ|2aYx$rY74;%gBn;{C^kN
zkJX>9xC^d^9Iw@^?U7|K&!$y%H_8lR)+qxEqR;3^2T@p6LTcf<l)FI8(ptXLt^T#{
z53aINu!o)l!3($lHz7x3Vk6Sw!-+31n|oH&U!6C9$~F$ad1vi?C5*8`N$8aRu6_U0
zz5HNZ!*6X?|2do|+gi&xdKIIQ%_Lk>F2t&=XPCH^G-jFy?8yyjoQdGBnc<P&cLN&^
zXCEBl96D$5X4o;lAZpeB#BX_KQ4@q-gin-=aU>exSp(^ycY0}wLfX}c`R^IRrC5-x
zQ6^-PALkW}kx6i=7c$kpJLH~c&{)s@zAJ9qSQ-nTKhC5G*Y$0z<(+kyTU4TC7ako$
z3H2#%z$og(Ag2`JtSbXzw<M!@ag8AG{oV0Ae7T4lKkIv!c2}D3t+ZV-y{^^#{pH)>
zx>|LU8*~oAys%S1;2n!EdLz*N|DU8OzyTZ4a2*Cg%}hG?oO^jCuOsXH?#j*e{hxFk
z`b2&0ws3x3;Z?Zon%|6U&UaMfUuRXP8q1qLM@-Ci6$AWc{XF2c$W))9l~oil7fK~4
zqp6MkLG=JM9FW^7$_1fg&GlV6t#*VxVNZZAI>iC-g^h?#Jm|)~@Z)pk%I$L7T(#l}
zFra?s9dHGGPje$LSU~=>AFVJ^6ElnNz0w*a93AyFyk+jNn$uDucuP$!WMT+&yZh%h
zBAXZ=+H?r8(_Jna?q%)Dc?yTRPLp&o`c-4~RVRc5VCP59{Gtrzs18|R@i>F@3$O1M
zm4v#q8faXEK6q=C2Bc$4D#%SNtzckaDQoEb2rkdJ?NF5Q2mJUO^^)QD-EXzjqMj8g
z;k3|cE|7+P1cxhalagG^3L*Qo?=L#vH?RQ}EN#RjXsVllRmU0x<yY?nD&@cjbSJT?
zf|8hKFF-DA39d;TEI@4{36sF@cVCOf-N+Fq2#Rcxc8y;F%`~4N)8WEo-0>XQ`}eBr
zhrm2i!u5~;zdD$5I9H33MToXa7;yBJB|MII1%c_>Y{gZdNh8*jlpFr0QC2hS)zn}8
z__hVvb?@t^$C7HmwN1B!BFJ&gTt=nHM6!ca3~4BT&<T#+h^WTawI}(kuO_C@E|7n>
zGtj`5{2HKV6t}05pWAtq8SU=&$Irq0*D-P=!rW>%TgFZg&+CTG9CXBs>^?h)Li>?p
zT-RM)q%1Q3b98Et0cxCpQr>kkor`-xF%7M+ssY^XDp5x_%AbYXrfkzBf<uqcd#hAN
z(y_G>M=Cr{hcaNBG5{-btZ=0rI`Zir@I;Gx#$fDaeQs~*ch>IDu=_d5{hegO<W~*y
zDkt{-{_7myjvw3MyBOH=#@EmAV-!x<QEI8@EW>&%Z%L9M71FHOFmUVE;e%)9f5aMT
z{llp|YY?6Cx72wNUY&8~oO}Oy=;-diKXKs&uLct=Kh`b64z2?U0W3(Mvj9kkY2QgP
zGvwdy|4uTHl^hBn(8GMPi;YgcfPtpvc{z|;++uJG06s%p9dzPZD}6!yp(6#il3T1O
z$_GVdJ|4@PB{&aBqkmKG5ZKY4S*YP0Y2bk;ry~{JSKi^4ar=~fihhF~;9o0N?ea)^
zNFj36*G$S;d0Ku!F47DCIR*Uu`gz)9f@?XOILMDR^*WR0^IY3bwD=K=NN2##Hr?E%
zS0H{(aO9*C!E4I?iof}?{AUkyB3|GotW-kti$e;p3f&VZn^gUu1jGy?aGf<Z1!{>7
zX68s?J**TY&#QE^Atc0&|Hmekx{aMsiGHsBOTwIQWu^sa0JLHr$w8Uls<gTS3#IQ<
zTEOMp_F3bC%H>76?mdBaTK2hz{rf|ser2WRjuS3Qj*r-TJr$T{>+kgCr;%wGgw69d
z0qZz9PMBke!EJuHJztneM5ukQx~qeoT9e|NLc4Eo*W!2gK7*`i-)2CWzOI8p4iHBI
zEGGj>d4*=5CjAl{U+@NO@kwId>lMg)78g*VfC&clW%ZL~EGsW40(is-M5@#Eg{hZZ
zjkJz!9jfUKrH;O~Tgq#~FM$PP9)^+#UDX{LRegD-L-k}K!ArJcu9&3ZhG1Jk9BJV#
zO~O1lqi5@1U(2uCcCTC0E&@;JDp_oMbIcYf*gWX^N<M-;;4U~)oOsCWI;CeWd<P-<
zy1f?)L06)}g$p$7J>|xQvYt%Xp2w*FY=6AVi2xqE9SVGn?VRzoXOj;%uKNS?g1*fk
z1uaE>UTGoIUzDblP@77E0jnoh(P_8N#=jjHNI62RAePAs-ZFpy7y6B_XsQ2EoYb)Q
z_O1JcvtUdM>9n=9TX|s+E{mFLcr)q@W?heGZ4!-XtU4c?`tewY{^Fo|j-yKao{BE^
zuTgA$qwiLE@phGMFb1;>Y~-1H3n~E%=W@-i2G0EI2N}%qFgtjkSen~A*_`Ol&l7f4
zMjf|g-Uk)EACe~C%K*-_(a`r@@!7eVWchG>2m(#?Xs{LAbQIxH9q=uy;-n!xbiSLo
z_XGzxNdxcyMa<2-A5>Jj@0Q29Q5wOaXe1wdE=)h1+J+K7*4u1<M{@)kfFMG5>zGJG
zlyXI|jc>Il@w}wtEWN-FV1TvwUUV2L*!5w*6aR`C1j=%zU##a%2R}S)uvNN5Lzh5`
zVwLj-QYFWF@{@1=A)eNtT+!ig8W@?~!Km=QiZltHw}J(Q_=QPfgtDq(q6`NjnYbyW
z-5Pxk2WZ6}?GVv@u{~&i(NI6h?=ZeiLE4Jr=e1mQGeMF+my-Xu<MOCzxqz&Wc)as5
zy{;e;?1&?sb426<=r>%{uVD+P>Vn6nI|^#4cK>MmZ}2<tUF=Rsa}aZmvXII9f(s4<
z+}^80Y!VB?Vk(N&Yv4cwPJg%u@3+Df@xaefVubG33BfY}{JU6*hP}#Xod<MZCp^*;
zM=0VZG+B+E2H6*KLY>*z(2;XE{oqy@m_vY@>QROmPq&l4(zk~AxS#`b>d;w&i3ZrR
zEACKYJ+XoOUe09w;u*c@_hhlm^cXJyM~}R?-Ec;tkRbE18ejx_^^&8u3l-5v&%_$*
zNg=ywKHd_x9`;|{pSmd&={NZxb_fh(!D)O1JGtVX7Cc1uG_akZo5kOThs1_v`daYB
zKfMcE7+s;?8`hsn<uOjEUcADr6~l<&RC?|=t3R_Aw0NKOddjP!LB=TI5PK@gFM8gu
zS`8Mbip>cn@z)-C9(oT3C8u9u4j@66HU;o9>O*7spw%kC`YB0+=M+z1XRXYqEe<cP
z_}8;ci74g9f?JY*h@yV2!~0`;WY0?jRuGL4Dr_Wq*k8FOGu6!1bD8Ru^e#~LG>_t}
zQ^~GHS&NG4ac0tK4DKOpR*2I;=3rsEKaprle4`C`K09IJB~=XyNE%yhkvsSw$ro*`
zSrQX~QLk8wY0a7_MpD#+1*f3zym`+bU&4B$eA)#Hz_L{#K>8^(a2if_d#4^g9s|nj
z^J0ASoqsf+mVuZwB3KM03+lx&_%)L_ZbZCdJ_Ir$bE`4;Qny#^XZ7V9{gN}J%b1*w
zC&LLopTtI0HZPvxnV#18-<9Wl)P8VwYjY^106ZMgLC*1@1LwddV<C>iX*eQdRC7rz
zGY8BQsj;vwAPA&M@Kt7S(rQ_3()iQkbr-xu4{O6y-&J@~f%`w9os$8ElHFHY*U~(u
zS)(LA!UZ#NW`&0;m_wx$iPko8mon}zhCudR^0~*9wD1UjXY{CVE1m`rRmHbN?<4Xm
zXPP?OF9G&4&=O?_zldQaviX)~hHLz!hT66Q7>J_N@$`Okom%E_rEKl#A(2k%T3<Uy
z{mU^)hffAF`g_q{Btm#1J0Iz|4QuKs(w*h^G_54WN?n*n{>Cc(k$?EjUS_}&8-in{
zR>#%U%s*)Xozb65vl}eucK(cp(&iG01OMu@*MCu(mm^e|w!YMPzx34>DlO;7mN8n-
zn^K##+rmt`5XpK#eL}x|+TIZRR!EKG00o6Qt1u!~`zHtr+#lq%op0XRn^hW%zt5A|
z=)%`L9}*3J(I>a9B4oFDn<Npv{n7aSot|-{7ly^Z{k~lZeCJ&fC_425k=gznf0C`)
z+9XcG<V9i!S}j@8$~%)f_q^J%UdOqUkfS^mZGLX#nm*$7Sx0{?xES*Ax-S)fIzT$j
zj&z_#;Y$J?N&vZ1?<2)~tsFmIE;^+?)*e-)Fr60b>CQ_~aIMsLmq=_xjtCv2hzF?_
zRF@Z&_q_+HsG6t%YYc$WG*hAyxyKWu^S>QG;r24be9m-r%cled_BX1>TA<)x=S%6`
z0&eTGuMse}q(68_b4Rp)2!lsLclbZ(tAE`eeRTYgU2;ctts?&Yc!%cmG#F$qKNuDD
z<sU}dF`Pe8Bnt$wV-nNyMa$!D!El~TQ~g)oLa=i*^`4X%pH8Q9;Kx5_`PAOh&^6fd
z-8z%53u3t_oEm(MJBxFYduM;)`7YI7c4W^a!YmW|Bup}joKX_Y(*_;dx*m8}oa!*5
zj8FqN8DbgBa)4o$%R=h9W$iw!jc}cPZH^#_K(>>}P)u`oMuS1Rq+KPiHs<Mu>0+=P
zEGP(Jp^v1R&Ux|;d-aQu0?tzCSvl6@w5j&hu=*GIT~{+Z5xdp>lB8aCmZocT))nvi
zlHIJ}>A0nPnNMrsOOGAH58h^&dJ!(9cwu5h$rt-gq(S|wZ|vesSdxm9K;7}_DDK{w
z4jrU=GIn>5BJfeiuFSxUI$P%aOxa+xOrhqV<IW3yFNc}oukL3;v}p=q9&EfI)o%!R
z%)S(V0Y=Re|3R6ax9fqq!upmR*0_qj1j+EluZUWo`<JdiFH0EP$6DFrxj8a*RR;U9
z)T_6*L~UptHF0gv?J!?>8YH9TG{@GFU~yzP!eo^N;*SB-w46){fibztYeq*2t>xPJ
z#i-g*QbOXBe|0TtFX=p!j8~kv<T4=ap&*siO28^w)9}TdKsaj7<cQmYIA@hRZHa`M
zn9p>1yP;z|;^W(Lg6K7qFQJ;F5yxPx*{8L|LKdyS%Qz#=W?)d5kcvPp&a<YU+$&Wc
zs-`)Z88h2&JcT)xk}C4bNX3rnkiJNVfA~U@CxzaFyI+5NZ?@bA=>0>k_14UwK{rtJ
zq4}XonE75<w$x{+SYBkUbX-lJjPw!}kAJZTp$<zU35RDFdcv5;hhM}88KKe15ClPj
zfuS;V<KDN5<_pw2^b5iiI!sv4Ig|M;B9`St!T5Z8?%y~onuO)ctUdE^=sB~WC^}V6
z2}Cu5PLi4#*u%eQI*`RIXciMFAhr=f#{0l@69ts^eiUj$%&ZRHmbn94&M!H@NKG{<
zKFVYT*4cJVxNP0M(QH&)Lx`B%wU1DuJFW0c<vur7A>=-&jP)3Mla@V+d=Q9wl3#O+
zwQUofP%STTZQtLATIDRcBb&!>otmBt&!^@{o|=FMx#T?%Y}##=)>!h)y)9{|>g=QI
zV%|!nndD_7I|DQjU@FASB0`8llN=6r>?kn-MBo>LSE~<<g>bVyi1Ts@zy2)2&EO#T
z`=PTzL%9YUZ9OlHi(PG?aknFbFHy+*SXsN@kFV>Y5Jp&FX^GLGG=NpYRDP1mQVOO^
zSAy2Z`mcAlZ9=htJH1QCqox+thHF1aWH+JpS}(zDdtn4n>ZCaymuTQPUbxu&fGyBW
z#87KeY?aprBfbc^Q3Oloz&6-(CZHK)TM3awI>&{kFiFaNhwUk_zU$5JHm^4!>n>gJ
zdY%X0&LRGgmw`k$taGORC7`oX)9Ai;8HMG$hS+S=Gud_=_U!!o+tu`?Di8Md_ABA#
zz*lRR6Q%O*Jho6NW>-t4h_Zp~!{H<_Bpd3za<aH*xqn4tH3Gd$!klM92XxSDM-m-r
zH2?v`<AJ(>B-%iY{n%TZHt3+LS-rm`6kN{tl+KDpbkLWq4oHgz3n|h4D1}!H>KutZ
zLcOjT!V=gHBJuAs;_oR8Bd*7CAB1w=o$<SnmEPY^om}kSbOG6Q0e@ZR3MKd7^9e(|
ziGm?zd#hgZiDVx0e_(b7;zXWl-jVsRdEAPxiOrtFV_$bKj$_6$z&ko_4N+4)sRfiE
zhWf}O6Sys{kwx|{o@<E(gSrI<5W5f61^lm#c9)30Noj+ndX3ngoc^8H1<hJe)C%7J
z_LZ1sr`ek~CM^z*b;jCGWqzg@W1wP9?!{y~nT|4sd(S&paAKSgl8ejCa5H5cHBINZ
zHmI;lf8x5{90vcZ?phTC*@l;0R$Kf6d-4_lv;z5q?s;xo>3cwN#cpLo>l3+jv)<FA
zqt2-ZQ143=mn3=rm1)nt)cTe&zdC!M!UJ~En`{u$LDVaHqin*<v%d+6AjwY9vg0;x
zeE3@<SMV9z^_rHJ2I&r4@H<~_a*{Dj??!F3jS!8d$<S9(^-p~k7DJuXqG`vrh&!aN
zBqmOkyHyS&tFgW<Aj!Lk=N=zLZOjG1N0VA9J;NjPbEd&7oCOlK*cPa=>2MY`)8e1g
z!&W|%VSUik${~SXXklCS!O%0~kRsDi{ZPZRp9PKXgwXk0?QClo`#eT@NyD+>dut7P
zlmp+F)`V?d*mlDODc(RpInT4sB*{Qc&;Pj|jA-}yA~kXt%jseg>DHal8<V3t^g|F^
zqV!@90*oAa-28%5r~PKoYCZNsF->D^w914|KM}e5EpX<$2UiADw2RW=o>`DkFVXvU
z+~p>1A_n$LYR7>-yv=S<0S$?q0FXyd%y`Y$@;bCM(tynHk+EB(0Jq0iK*)ws`m{V+
zJ6!Uzw-@fG-gD(Uka{y^z4;NcIMenVYB^cnh`SDs*Z)wFeaE4rmbi4YhOh^dW=I>T
zv$U`p#XG^?StVQEW3SuE9DEZ0A_9tr9}^PC8TmJvKG4l-8Iq6LJROa#jxpkhzujeh
zBXs}xnnWrkgn-gmu3pu(aMAm4P52<p4%%s;;Z=N6RvnX6L|TzbwnVEdsg+H|w(+Sj
z@rvU#MZ*`h5U`<p--<u=mvg&p_TPhdL?W~@zXU*BY@bFY=Qe3&#A+NPF&n|0L|_u_
zVBZSc3(qI-)=3I(@Nh44eNu*cx9XP=#YJf(!EeMYKQKvcYuI-4rh~Jmz?o|-KXx_y
zIdWtkpcPEX$ZJ*|-1G^o_mn(ZdPWF!n|i|>DXxPG61<WD5li{|1aV6gHe9_A;Y&3G
z?d01ZeYdW7hN<@`2UKvBzhNl31vl7TCfTa_Iot``;f&^6oX~d*1#Q^X_P!s>TQA!K
zN{2DE7OU{1kP9qjf)D!l7wNfwNjQv*tt+MAsbZ~u#rKqm@(0V3Tx34nJ=0xCQH>_%
zeXsH^Eb{B&Bd;-vWS^L=;BZ&F!pS0EEB&ps#?$P6>Y`++o%G3z-5%7jZsZovvq%={
zN)_BR*lciMY2)Jx!+FMabNyL@SV-z5C&L0Vp*U<x-7nZ`KbW8B`JPng{uJ$)F8yPX
ze%&aeZqDrLj?C6;Un{paFuU6~K;9E8$;5W<?jM0h7Ib~8UAFy~^Fs_Sxg+&f+Y)#^
znuo#jr;pmzR@?ni(7P_nS}=RYM#Y=B8DK3;j!=@{XvfT$=inCxze=hbC#6aZcL{c`
zEdQTIwTwyXl-q7su^PeL#^USFj_zYX7?8q}U4%1Y3&jId(%@L)+h#ILgPh~AeHWpN
z@F>PE9%F-CC9rNX<XH#$w44neAmSCv%?UsHMg|;I!$4gF<%>M0%XTpPY>FT(2i6S#
zac_6y-j)|4c>hNpCg?#hPMKLNdL6jm!gr_DCPU=I453T1__XY*OK>Slrlw?|p{ZzH
zRCN#>L!0|$$~{F&6^+8iw6?TS2Wl>8;(65X_b&^?&aA3E8J9to%nCui!PIKeBMYPB
z-wXRVwlXv&)$+)RK#LE2GSRxobnR><uQ!CV-3A1)m2hZ1s_O=4+<r(ejJ@^^p~!pI
zXLe77P2OT5l5NITsLG~3ms7aCC7DFmJBd3(ePOkulQrxFebPCDr~5+fiS3XyWfD(N
zeN2Olfg<}xKm;wM#F6o=l!fb&KH!_f!gqaoPtkoN@|kDm>=wrU+?X)iPa%!D>?>i)
zbz|Jb!itvoDjco*dQbuR-#T6I$r!vCxo<P6zsM;KFj5~2hnRGbtmkE8Mlvq12ncCx
ziX{_=y~tpmqXei~QEG<w@<AG<3kbL0ya?I2aOMKIF0Zo{c$dP4GV(S>`3dRGhdnAW
zy?zLB-5YDGOmvua-Gd=8n1@kz8J7skSdkV<$X2&h3GjVyCZO7(?;!)T!0E)FXj;Cd
z`|JbT#7s3rGePH?hM2);2=TVaq?j72Qefs`dE<zaVv-<C3s~4t;0$8N7Ok%CtZbbD
z*@Y|5LWc^YsRs;DjegFct9b$;A*-;XYzZ|&0Q>ruW&cR8`<9|?RAm&g67|Hb7+#`J
zY{^{CFoCw5Y+W^N4j0+GXHhRiF4`qxXYqjz2(U1TWoZSem}Zq>;l6=HKc(##{I@=|
zyw(9ORMLW*{j+@N)x%V<(_oMwEcpTIiU+k)F$kj424NlT@OkwX+JJ-l{->wZXoY`D
zy~opHDznppH&<;pmV+`7qQsgOr8MLG!g`s%Yjr)eJ!#!P)1kp{2fFl_U?m?AE@<-<
z@z4q$SXDa%q-bX+a0HyH%(<{KObMF?799;Fz4ADk1VAsUsuD`2R1L=OQcc09lg@K@
z$D@r_@45dn6~cFw=O$C4I=2y}Aa^Hp{LBONSbo5!?4P!1B=Zw3D4>&)>R`>6^C?F1
z$VlTsbJes0?)k>l3KRevzzN&JlEYwhIN?_I=G1L2yTztsAE_6zkAWzGIXbK<qQ1(l
zUf6J81(2+WV8AH5mAZ~!%Yu;VmxDy~7?F@78Z(wAGtL%&x=;-pcvvtG3~?hu3+=F!
zhS&^bYy`9Q@_JQwyuPQ=REqdy{1&di{&JVt@;B5PYmRhS#3LPboK(>?+ov=!JGLtU
z3Kptl4dQPvj8mfJbxIIYV{y5^g-Fw4T=xBA&a7cCtv<@hS2Com&Sep=#C1^nM>j6j
z`DUVVZVp4A7%h?%LkWs%S|KoAH=^iiFNz}>JJE@4F$aGwbNV7d&aHE`W8s6u2RKmW
z)M$6KB5Gj(pc*oOHAA`^9-szllLlL*qJH;xj5gnHca4dqw-;p1%ydDm1y5W({H>3H
zs&8U4Gs}o}5UF8G=8S^>8R84V!8$K5tF4!T`d?_@V>w~;)S+*5b?K;R2${jX1dBti
z*#-PR$KET_b?^>T3uQ5QTZm-q3pA*Z7$j@B+)J-qBNkoOY_l&d9aMZM58R^<(rEq2
z5T@D8Q;695NEP}QBbSnhJdyxB$Rvss!AZj)hQ$%FdJ@*9a8|x5`Ra4WkyOGjBAcOl
zQ`wy=21$(S&hg(=!QY67!o(4$21?#(C!QKr_Kcuq(Gg(XsN6K#D%w@R2WcCkmi`Qq
z8zOGaD2B`dR5D4H`^7e{i~dmWTte@i61EX&W0+}Q>#V67ef>k8HTt2kP<30YBKa(r
zltT|&Uq>!}O9+`4DEF!g?GMMP2O5z;LrJylAmx;`%GN)A53I<Xz4i->Dk+R|?G25y
zu!_^Fjxy-kvV&z&z-1^fPqs@Nu-eoLY*LOrJlNkIQ9%L38%n<asWN>XKpJB?gM<~u
z8GN<v`L_l6U*q!lJPa+sPSRs@mz@QV!+GN)x|AMbB;#Y?(~Ul-r6qO$kqhHvvTo`Q
zNH4%zm3c&TnvikrmkBu(N_bgd!v64+tm6^boC`4x;cR%r;=YVty+Sl}E;cYvV==u+
zWn09R5Sji1+%oh*)mkQZTPmue<$=Gd3*D-Q0&S14C2L8^;J*)`)=b{hh%I*KWA$fM
z!LEQ)!V|Mwz6k2wj3F3}ni0gpGeoOPLlFh9({_1r3tOIuMf2KoY~+k&UjtFn3VY`L
zv4$4ZyvdmHYZ@2Yxxv+t#XysPM=*?CdA_3_Sy;96_wTAs#x;aAskYr;PDFQf&2bdj
zBZ<8401wv|gtsC4a?p<T_pDO5kyJI*E6Srg#;}}x8KYiZ3HvwNfg&rWZ1F>;U#f9<
z!_htS4ZqQ|mpJLR+&y>$abU=l5u=&64r*e^m(MIB)=I6i;hp@H3$D`Te-_Fr(31g}
z#D*4Smzq};%dT6|-f@DXtpU(Wl@zPm<<4}++z~ic!0_8#T4h$$aoBQkuPBF9;PsvC
z4#>OXZyWUa-@BFCpahzhS@^9$aw;MHK$lur?rsVG+#0UcqV*mUt^&fbx;wmm1wd~d
zB{M^i6#>eJFf?eF+SAK?=c$3(Q?!^^5X~P<5gnD2T`mc{Jn<UD=&_p^6Uw)h4&+in
z6iL%4?H?;f`(+mI`#)YW_}RE99qPLh0C{;AXgYxH>3kv&Dj#HZk{uakOq~I?<{t!2
z*)Vop0#2ul8&y4PIh*B!H_ER!&cktcZOFVVHzNr{_q#cdA>S$FjJ6tD`)qROtk=#h
z><KXx_(~v`L<MUYDUp{rqT=BTjUXwRb0u?`cF~U6=f)zp5x%1+X+K@;FuqIr4Q)>y
ze`LnPfq@y3Zg1E7zDFP5NhRU(tz0mmP){%2WHI`}YM-#Gq`!Lx8z|nfLH}|CV@|>N
zIG7v7AYi6<8NvRbm7P>VYJ)M)Q?;%htGj9B3D}vF_|eq$Tx#=bwi30sV*iu6vJB1c
zEW?=-^D^&b(f`U$+4eTTBep^|B3YtYBWORK#A%Z2)l8OTK<~$9CzV6gUM^n(LBoo_
z(=-{N2+;ua%D{feVZLS^aiol7w#Oms<^H&we4*ifeupUsrjj<I{h=W(CX*J99;2|b
zef8!vi%e`nwT!kxmWr{9P=M*Wiyh5P9&cWqOn>EQUwFZ;0P>3;QgEWYwQF?iF^XVH
zycc_A(Ck66Gc>CAW_Ec$<f(wcE>IIIfS@W?qA%ayX#Q4CDbIcH9JgaSg-0hFQEjQE
zEDF?7NtXlapv6m=RgxolBUH3>i`}9&LAtaINS=Qr<5Ov>Eta$_F0VPE7}tU^s4Vjr
zdj$dol&q{*ZY*~KfRMB$6{1c}j8*qh@p2zkxMw9mdY@9)rLkZIu@UVmS-4IPdLdK<
zc|FO_*R(u!c1d3cJ=7g3#fu9zVGfdYB*@VMP)UK?gLguS>xb%RC5=1<fw6C88rtni
z0w*7YG9$?Ouqi202sJiMEQ&I9K}US<$+q>e0fLo8YjN_$_pB0FmN%d#0Bq&gBSQJn
zQ3xeusF|ar)$(deKw@awivOe~PQ*2Xfr!Mg$jY*)Q{&P4L+@TDW2c|Ikb1>(zj`~z
z@z`1rxlWbVZ|`aw+uNXV8A~kpDzK!36)J<dc8(re!R;G%*i$#*1LA4a#a4@*21ugI
zw7o02c3vY9pcfd57=$u?T!=OO)1EfKm(;N!`dMw6%uMm6uo_y%_Omx$_0tUI<U@SF
z^C3V#Dv#zrN!Yqcj2tPY%8Cqt7%^s6fk?hW4D!19&O`E6h0N!C{U&B@+68+GPI`|r
zrw!1d_8KQ-gaB+coyJF0qh9J!N<V1r<Pb&EMr&z^eX-y-sfO@>hg4O!pmEre>$g0y
zd&T48mG)D}p#&#l+ODQ&yumx!)F}g4na$a={)MOvqq#Hydys5cNV!)=kjEoRki<=~
zfm;Cf`GDB9$n)2X_vAK3=_YKUVMs@|`KvN5NfsGz@}o?ZuOY<~N-ARa4|N^yo-*x8
z6vGHME-W2!AEG5n+;HZKJ`Metwnlg>+NcdmMoc3vxREiQ$P2R80iFLohv)`;^U4W^
zQzhj(lkqCn9}$#Jg0o@x079g|q<ya4;VT5koN|J2+8RYl(s6YR=3U%1qZIcVE4f%*
zBVYMniI||0tV@fKT#bAv2{S`a-4YG&NkKR$H~S95r~L5j%KCnYQ5Wa;*{#uhf54Im
zUYg0~WRzn_&LgUCeQTNr_N*K+f)sw!jIdjPxko0paLv$FU-wBN{t3gjB%{HJ;454)
z_wOZuL9aT;n!f#ve<u)&AI`?)rF1|f?PZO71c{-k0$hnQKQ^TuDXU+K`(3&wH=a~b
zJOTd(FvCN_R<^{7iJ@jz0(&t`T1g{-VQS2z`_UPUu_pFbB!L75fYy-*qa`B320PcM
z4<HYcDG-}l(PaQp9!xE!l8uxV(%bVP1)~XR@-g+Df30mu_AwR=MH0X-NGNW~YK&q6
za?In$#;EOO88jqC5!s!|kL)HjiByK~s1}=ov0NkmM96H8oE_Zvhxyo(*_>uX4ucFW
z0B>nsKQff8!PpdX!nMKU^JrO8K7w(FBNERJTs~vUdrAj%YCv(-*{stewJXRzV%af{
zY1y^naAOZ;o}a%b$T6Y|X#;Ekt-rmy;)Hn%^Lc`6h%+soU{Ge&sO8{-$Rw5Jr&D$1
z160w#F=q3MOJz^T)_iZjoq4*4N>l_nEdgVp7Pl)dIbKJ#s^wY#4(EjDUT)6F>R)P`
zZoBBdSD4P;7l~$_JM`SBp5!t1^5|FlF(7rQ4W&&Zt0GUdrU%_F``W;NQr(W|3p_f{
zQKPRUx~*bO>7i%jNf+AAiNJHl^$>Q{N&fe7y!hL%;lvPHU0WIAbNEgr09EDr1C4n)
z>Q<-}2C0M?4|m*-2=M{5DXR+nryfA?<Fp$YM3cEDT+eC0D*q!-pLjo))T8{PhyUhX
zX?wJ)TrOf7d%>>m-lQ(x0j>6(fB@OoTUkZ@xzvz>eWY2Vg|@~%|L*)NHjw;Ie99GO
zS}01`qOxUH@cui*Ra6lN{H|rwb3}XBQrq<4<;G{ETHZ3Sbe}66R1$7M_ZQv>ulN;T
zw4Y;<v*%teczUshK|dN^T;QyL`228?jf9-+TxpSCv*X6KwsO5?BlaR%g{rl|S|UFi
zVbx!2Mb#>ZN~lHv#(!$g=15y?T{YkF7Pe*8v?(WgtMSy0uy--8QdMk##HE%VItm$K
z0@ZC^%e#zvz1v$2QBQH>D?AN@bo(=JnjUuR?`DxTOFnvZ@C9dfgwbBt@jfl?&?8!#
zJ_L+ChXWZZ;sy^84E41d^>l7^i%{85GkN4_F?g)r;l$v*KyHE_1dDbHY~d`=dDmh|
z`&P!8u&OvcH2>RTyV;NdY<!&H<#>YSBB<6YY1zn76hu_ad_NjFetm1F<NR0s{9Nnu
z(1BXK#~MTcV5Ep_eS=JfW08cb<~q}}cr+P3s-!5j{PNEkmH|uhnKd+B^hcnXhP!p#
zSbRA1TdKpTg~M^8&ew?rf^NO{c2ej<i+tZmjd_l*{@?Sj^x(i42il7&?0&cu^(m~K
z%TEV|>iK#|KRQhJBvt;ZB^VWO8sOo3Pfv(Z0=6?#L4_UqqwA1AC)rEEkoJ$ByYty_
z`TSGA&YR9pS9JbkEnTe?9Lr;<bdLYXT8{rLQ^eH?B}HGv97}Gu@8*KXbr~Mmh;*aK
zG({-yMR}=~TSiWs+~ylDiB2JT9A*ksr$qP!q{FIqMh<c_2yu%iH095?M?{W+*XstE
z!0(CKZ>}Ijnj!&?70O;pxAXf-U5{Ip-~6%g4BS`@IMDgNGQMU$`dsV|l`!-*H~v{U
z%m04%*X~^K-QLrs3;VbQMmBm}^(^0(ZiYQ7(}J!={wx~Sa!8a6V>O9pgLMVjDAY!~
zw;XR}5NVo=DS&gU#kdgfDKo+>SJ(+<#-AgAZ8wr7w~7tV9Au0N1cleWt}t_UtZ(RH
z!SL;4Q)?`{11}CjqxlToBm9DOTc5wPMDy`lyeBiC3H+bmk-rkM>3XD9#PJKavCmn7
z=hiDSt=%6}--peg8KXPWe?QzU>~0D3{7$oS6fAQV+<5eZA>9`bH15)OzG|*RIX48A
z@!;fI^RE4#LRyw#2c%nI*b$e|Z0r4i;12KBBI$cfrXb9?)^gFiH?wef`RmfjgX>O5
z-ren&b=o`c)m7(h-FKWbU7B;U19E@g@Fe1)&c1KZ>}z$vlGEYbQ-s>YPlq-HBZR3G
zFpXXx8RYp(dEtyJkZJIE3_3Pid6Boh-eNoX9}@G(W^2%z{}yii+5c!nv}R-$u~rJM
zH#sVohwIXFMmN~xJl|-{_x&d5eEFMbbY1?676-MvSe_ruxI*>m^TOg62AFW<<EaWT
z%f8+V4dq-KZk3e13|~C2>##>40?Zf>%S*3>b=h2X(6`ph6WdOnSF#p`Qk8&<?maj4
zQsDJvnc*4UsY898DfMtYsH`aXvUi%=JpfCavNWLU;6?;G42iLNzR^p}2Vd|0etufl
z`-$$$e)<%xIuAZ`(_6t&QCeW4`+bchM_#aYZK!h-z;zwEF;FwU>TCLH^W>>Su*jqI
z77i++{kc2Y*dg|N6@p6pi0Q)EsQPE~yMnHJw&@$YnqRqwU)uMFyydy1{U&}(#p=ec
zr_{qQdAv@Ni2DwX)OY4&BG-OkrKW`a(6ZOi9ZRRP_#Is5Ahu?#D#v5-RNigvK`8z=
z{K>L|Cr-{sANn<y2X1QYY|IMBnNsI}oq+yk$}7*drDt8)1Z|yG;vEfG@j0_cZC8}#
z9Zv5c#8|i|B3}0z)mePqMpWP<1h6Ajdto|;?hmTQkjrN}D_z}HqkloGRsw}(8!j>X
zup@ba%RQlw#_f-~{~B-zeF%>gWi>YxykV#YrNeD0sj%$26f?dCl3&&5PJ~MGrXI!C
zI6sXBdu^H943LYxsis0&CHv+_Uk+xl@E!<>h0n_Wbct2}F7@bi`q;Z&ncVS01uZb9
zONek(l^>N-Q32E=)EzDKTSsG-&ur<Rb}vA(ejNML_#fT(?)SPpw*9oF8-Sq^{rgzj
zJ>dgo=TF9zL@L#Kpd5-BY&^EzEfehfdU4)g(DF&#47zWzF7&oPor9|V@o%5s^yM7S
zZeyX-R_MTx0T*^_{v$oU_3|AJtses2+P5Nc`}pTphk_yBjpOfwSCAsV_h3{QM1k*z
z^J|~lMB9-Y$H-q89u($MP4Ddm>N*9p+hnE}nGt>;G)BHRl4f`oXHi8vqLfrkD=`Pu
zW4il<iHp6)$Vb`<6QgW}+b*I=EiEH#$Lym8jeOI`1=>AxaDy*rm*+jIzO{qhsChP<
z`=I1^NkTtM%1n9Mj@{ekpZQg%L66f#L>}Z|Kb+fhUWXCb+rx5#;J^a!Zi_>!Q6s<l
zZGG>%dUj7UvxKcv3u}s>kkRc6(P$4)$a2@dpNjSdv7BD-o;Veh)kNf$bwT@&bnD4B
zeHuBd4?X`ilO@ksf<#WXy?}akfFynXx$U{TSC06!PO;wToarbp`q$a^kA8c1fbTB}
zuEQZRt@&nxqwKbU^88P}&=?}*BBhik(Sa{sF2%*q9J3@n^{uY{UZ>!vt7zIX`HFy(
z0NGzJ6jXz|{SNQk4rif)KBI3M{R2G?@6R`fuguj<n@^GAxc$}Y1Le@+BrVqlQP1(x
zdOzt8Fm~F|C&wZm<S@Lq)5h(88Fjyf%TqkY&O(;;s8#ft++G!IBi25|nZCcp)?*}c
zkrJ2A;o2xyI~IbyYZS?MWl~L^qUP3<BCovB&l9DQ9zSO2Yep*?*5a7$D_SI@$0$*M
zN+{4UYtOxnu+o}sqB$l)1i$anE5~~K>)7pHECy&DGFYw$UbOhAv4ODA-3Qxxr-Cz9
zyEwZ)<_lk?RfZGg4jWl5d|v%G)Z6=xCt9j^HJ2^H5+l0M>061|g%>nNZ!TOFkO^?p
zxcv!)4y$AdIXh{FX=HAO4$bU*m@my8s4!eUDAlXcguX7ycR)+&F+nl-M{M@iM3bot
zt1BkvM!-<s-@`B1Ub*l4ACM2psL(IS1I|Gbqq2P7<e*5gMI`UY(K>AS!LU33R2z`)
zE($QQc*Yw!L-@@%9`9J29{HG&I)3=!XnT@MaqgR*XYz+)6sJOEcn^o8Vjr~+jH>iQ
z(T@dmc@B%$Q`<aAXH*BhwbS?a0O!Z+{Y4G;VVa+m_gSu$sHpT?#-#cd^WG_-XMn?w
zWbhl-pRFWS{cFi4oP5=%-Qo{zpaF!p3YnZY|6K>?nEL!~`FKWn$72t7&iyoP*#L9U
zE^o_dqnR(YVl!_JtA-%%KNjAEV~E_IB%7J15H$XH1nH9C+0oSv@Qtg@bBZ-Fm#g@R
z<Bt)=>PE20>J1}1UdU^&m-48O=v|OKKM2o_*5tMtBcx||!j%_)#6T!xKCkVj@lJh-
z+DSQU<S~<cw;F{XFK>34&k(J}WMJ}O4Su+O&k+jU+6v`nJXoB~(0M)>z)huLXPpuQ
z{cDnZRh_L&Dw7yyh)G-2YoSNIUvLj(4{6t8u!>d3;STn#BC&_-z8;X3-~itwV2sDH
z5qo3Z_ws9eMXb+}BI>^5?r~d4+(tn=+}5v}EfM8NG8w&tAxbPTGlE-pzHWIP(dOUe
zxXLpa63R7*9|y$3AQu#2t}wgOna(tzv|q<{Hp$PJ4K4Tvn;OlmBXC@Q%71lsh7P6$
ze<q3AbJKq?`lqwNXi)R3ziR#KpW{te|EmmuUf}zFQYJl@-^ZY8H~+RbH_-(I`qrL!
zURJZ~o;EChyJCndDICR_0H3&M7h6=kFEJ<}5yQ$;v08wF*_W@m;Jpdc;u-k4p~X5b
z{g%^Jr}usX&-0@D?Q#e)<Ks|m&~T8kFVO|GGSGg8t=4`}9r_f%`vFy&PlOq9ZfE+h
zC7;4YT+_wW$i<Au#L4VG0AXQbW};`}qG#q%W9HytW94CIr)6T{VPbOR`HBC(0&ML~
aEzLdu-vJ;NlC1v)fJlogh}DW12K^smRZx2X

literal 0
HcmV?d00001

diff --git a/wolnelektury/static/jplayer/jplayer.blue.monday.css b/wolnelektury/static/jplayer/jplayer.blue.monday.css
index 3cef6fa0a..f8b314b6e 100644
--- a/wolnelektury/static/jplayer/jplayer.blue.monday.css
+++ b/wolnelektury/static/jplayer/jplayer.blue.monday.css
@@ -379,7 +379,7 @@ div.jp-playlist ul {
 	list-style-type:none;
 	margin:0;
 	padding:0 20px;
-	font-size:.72em;
+	font-size:.8em;
 }
 
 div.jp-title li {
@@ -411,10 +411,10 @@ div.jp-type-playlist div.jp-playlist a {
 	text-decoration: none;
 }
 div.jp-type-playlist div.jp-playlist a:hover {
-	color:#0d88c1;
+	color:#0D7E85;
 }
 div.jp-type-playlist div.jp-playlist a.jp-playlist-current {
-	color:#0d88c1;
+	color:#0D7E85;
 }
 
 div.jp-type-playlist div.jp-playlist a.jp-playlist-item-remove {
@@ -426,7 +426,7 @@ div.jp-type-playlist div.jp-playlist a.jp-playlist-item-remove {
 	color:#666;
 }
 div.jp-type-playlist div.jp-playlist a.jp-playlist-item-remove:hover {
-	color:#0d88c1;
+	color:#0D7E85;
 }
 div.jp-type-playlist div.jp-playlist span.jp-free-media {
 	float:right;
@@ -438,7 +438,7 @@ div.jp-type-playlist div.jp-playlist span.jp-free-media a{
 	color:#565656;
 }
 div.jp-type-playlist div.jp-playlist span.jp-free-media a:hover{
-	color:#0d88c1;
+	color:#0D7E85;
 }
 span.jp-artist {
 	font-size:.8em;
diff --git a/wolnelektury/static/js/base.js b/wolnelektury/static/js/base.js
index 7c02f030a..33026ac04 100755
--- a/wolnelektury/static/js/base.js
+++ b/wolnelektury/static/js/base.js
@@ -101,7 +101,7 @@ $('.open-player').click(function(event) {
     event.preventDefault();
     window.open($(this).attr('href'),
         'player',
-        'width=420, height=500'
+        'width=422, height=500'
         );
 });
 
diff --git a/wolnelektury/templates/catalogue/audiobook_list.html b/wolnelektury/templates/catalogue/audiobook_list.html
index d794cd938..427f89934 100644
--- a/wolnelektury/templates/catalogue/audiobook_list.html
+++ b/wolnelektury/templates/catalogue/audiobook_list.html
@@ -1,5 +1,6 @@
 {% extends "catalogue/book_list.html" %}
 {% load i18n %}
+{% load catalogue_tags %}
 
 {% block bodyid %}book-a-list{% endblock %}
 
@@ -19,3 +20,17 @@
 Możecie z niej korzystać bezpłatnie i bez ograniczeń.
 Audiobooki nagrywają znani aktorzy, wśród nich Danuta Stenka i Jan Peszek.{% endblocktrans %}</p>
 {% endblock %}
+
+
+{% block book_list %}
+    {% audiobook_tree orphans books_by_parent %}
+    {% for author, group in books_by_author.items %}
+        {% if group %}
+            <a name="{{ author.slug }}"></a>
+            <div class="group">
+                <h2><a href="{{ author.get_absolute_url }}">{{ author }}</a></h2>
+                {% audiobook_tree group books_by_parent %}
+            </div>
+        {% endif %}
+    {% endfor %}
+{% endblock %}
diff --git a/wolnelektury/templates/catalogue/book_list.html b/wolnelektury/templates/catalogue/book_list.html
index 318f1b446..a32f60f01 100644
--- a/wolnelektury/templates/catalogue/book_list.html
+++ b/wolnelektury/templates/catalogue/book_list.html
@@ -15,7 +15,7 @@
 
     <div style='clear:both;'></div>
 
-    <a name="top">
+    <a name="top"></a>
 
     <div id="book-list-nav" class="normal-text">
         {% trans "Table of Content" %}
@@ -35,7 +35,7 @@
         {% book_tree orphans books_by_parent %}
         {% for author, group in books_by_author.items %}
             {% if group %}
-                <a name="{{ author.slug }}">
+                <a name="{{ author.slug }}"></a>
                 <div class="group">
                     <h2><a href="{{ author.get_absolute_url }}">{{ author }}</a></h2>
                     {% book_tree group books_by_parent %}
diff --git a/wolnelektury/templates/catalogue/book_text.html b/wolnelektury/templates/catalogue/book_text.html
index 6754ac6d5..cef76f8b5 100644
--- a/wolnelektury/templates/catalogue/book_text.html
+++ b/wolnelektury/templates/catalogue/book_text.html
@@ -47,9 +47,7 @@
             </ul>
         </div>
         <div id="header">
-            <div id="logo">
-                <a href="/">Wolne Lektury</a>
-            </div>
+            <a href="/"><img src="{{ STATIC_URL }}img/logo-220.png" alt="Wolne Lektury" /></a>
         </div>
         <div id="themes">
             <ol>
diff --git a/wolnelektury/templates/catalogue/menu.html b/wolnelektury/templates/catalogue/menu.html
index 99d85157e..1a90b5c4a 100644
--- a/wolnelektury/templates/catalogue/menu.html
+++ b/wolnelektury/templates/catalogue/menu.html
@@ -5,27 +5,27 @@
 	<li class="hidden-box-wrapper menu">
 		<a href="{% url catalogue %}#autorzy" class="hidden-box-trigger menu">
 			<span class='mono'>{% trans "Authors" %}</span></a>
-		<div class="hidden-box">{% tag_list author %}</div>
+		<div class="hidden-box">{% if author %}{% tag_list author %}{% endif %}</div>
 	</li>
 	<li class="hidden-box-wrapper menu">
 		<a href="{% url catalogue %}#gatunki" class="hidden-box-trigger menu">
 			<span class='mono'>{% trans "Genres" %}</span></a>
-		<div class="hidden-box">{% tag_list genre %}</div>
+		<div class="hidden-box">{% if genre %}{% tag_list genre %}{% endif %}</div>
 	</li>
 	<li class="hidden-box-wrapper menu">
 		<a href="{% url catalogue %}#rodzaje" class="hidden-box-trigger menu">
 			<span class='mono'>{% trans "Kinds" %}</span></a>
-		<div class="hidden-box">{% tag_list kind %}</div>
+		<div class="hidden-box">{% if kind %}{% tag_list kind %}{% endif %}</div>
 	</li>
 	<li class="hidden-box-wrapper menu">
 		<a href="{% url catalogue %}#epoki" class="hidden-box-trigger menu">
 			<span class='mono'>{% trans "Epochs" %}</span></a>
-		<div class="hidden-box">{% tag_list epoch %}</div>
+		<div class="hidden-box">{% if epoch %}{% tag_list epoch %}{% endif %}</div>
 	</li>
 	<li class="hidden-box-wrapper menu">
 		<a href="{% url catalogue %}#motywy" class="hidden-box-trigger menu">
 			<span class='mono'>{% trans "Themes" %}</span></a>
-		<div class="hidden-box">{% tag_list theme %}</div>
+		<div class="hidden-box">{% if theme %}{% tag_list theme %}{% endif %}</div>
 	</li>
 	<li class="menu">
 		<a href="{% url book_list %}" class="menu">
diff --git a/wolnelektury/templates/catalogue/player.html b/wolnelektury/templates/catalogue/player.html
index d38b53f68..155d14e0d 100755
--- a/wolnelektury/templates/catalogue/player.html
+++ b/wolnelektury/templates/catalogue/player.html
@@ -1,6 +1,8 @@
 <!DOCTYPE html>
 <html>
     {% load i18n compressed %}
+    {% load catalogue_tags %}
+    {% load thumbnail %}
     <head>
         <meta http-equiv="Content-type" content="text/html; charset=utf-8" />
         <meta name="description" 
@@ -14,8 +16,37 @@
     </head>
     <body id="{% block bodyid %}player{% endblock %}">
 
+	        {% if book.cover %}
+            <img src="
+                {% thumbnail book.cover "101x140" as thumb %}
+                    {{ thumb.url }}
+                {% empty %}
+                    {{ book.cover.url }}
+                {% endthumbnail %}
+            " alt="Cover" style="float: left; margin: .5em 1em 1em 1em;" />
+        {% endif %}
+	
+
+<h1>{% book_title book %}</h1>
+
+<div class="player-info normal-text">
+	<p><a target="_blank" href="{{ book.get_absolute_url }}">{% trans "Book's page" %}</a>.</p>
+	<p>{% trans "Download as" %}
+        <a href="{% url download_zip_mp3 book.slug %}">MP3</a>{% if have_oggs %},
+            <a href="{% url download_zip_ogg book.slug %}">Ogg Vorbis</a>{% endif %}.
+    </p>
 
+    {% if book.has_daisy_file %}
+        <p>DAISY:</p>
+        <ul class="daisy-list">
+        {% for media in book.get_daisy %}
+            <li><a href="{{ media.file.url }}">{{ media.name }}</a></li>
+        {% endfor %}
+        </ul>
+    {% endif %}
+</div>
 
+<div style="clear: both"></div>
 
 <div class="jp-type-playlist">
   <div id="jplayer" class="jp-jplayer"
@@ -54,11 +85,12 @@
               (<a class='mp3' href='{{ i.mp3.file.url }}'>mp3</a>{% if i.ogg %}
               | <a class='ogg' href='{{ i.ogg.file.url }}'>ogg</a>{% endif %})
             </span>
-            <span class='play'>{{ i.mp3.name }}</span>
+            <div class='play'>{{ i.mp3.name }}
             <div class='extra-info'>
               {% trans "Artist" %}: <span class='artist'>{{ i.mp3.get_extra_info_value.artist_name }}</span>,
               {% trans "Director" %}: <span class='director'>{{ i.mp3.get_extra_info_value.director_name }}</span>
             </div>
+            </div>
           </li>
         {% endfor %}
 
@@ -74,22 +106,6 @@
 </div>
 
 
-    <p>{% trans "Download as" %}:
-        <a href="{% url download_zip_mp3 book.slug %}">MP3</a>{% if have_oggs %},
-            <a href="{% url download_zip_ogg book.slug %}">Ogg Vorbis</a>{% endif %}.
-    </p>
-
-
-        {% if book.has_daisy_file %}
-            <p>DAISY:</p>
-            <ul class="audiobook-list" id="daisy-files">
-            {% for media in book.get_daisy %}
-                <li><a href="{{ media.file.url }}">{{ media.name }}</a></li>
-            {% endfor %}
-            </ul>
-        {% endif %}
-
-
         {% if projects|length > 1 %}
             <p>{% trans "Audiobooks were prepared as a part of the projects:" %}</p>
             <ul>
@@ -118,19 +134,6 @@
         {% endif %}
 
 
-
-
-
-
-
-
-
-        <div class="clearboth"></div>
-
-
-
-
-
         <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js"></script>
         {% compressed_js "player" %}
 
diff --git a/wolnelektury/views.py b/wolnelektury/views.py
index 361ec3745..c2624793b 100755
--- a/wolnelektury/views.py
+++ b/wolnelektury/views.py
@@ -19,7 +19,7 @@ from ajaxable.utils import placeholdized
 
 @never_cache
 def main_page(request):
-    last_published = Book.objects.exclude(html_file='').order_by('-created_at')[:4]
+    last_published = Book.objects.filter(parent=None).order_by('-created_at')[:4]
 
     return render_to_response("main_page.html", locals(),
         context_instance=RequestContext(request))
-- 
2.20.1