From 9ca91aa2ce7996dc8d854893725f9bc10cee4b3a Mon Sep 17 00:00:00 2001
From: Awilum <awilum@msn.com>
Date: Wed, 28 Feb 2018 01:43:10 +0300
Subject: [PATCH] #431 fix default theme

---
 site/themes/default/assets/img/morfy-logo.png | Bin 5296 -> 0 bytes
 site/themes/default/index.php                 |   2 +-
 site/themes/default/partials/footer.php       |   2 +-
 site/themes/default/partials/head.php         |  13 +++++++++----
 site/themes/default/partials/tail.php         |   6 ++----
 5 files changed, 13 insertions(+), 10 deletions(-)
 delete mode 100755 site/themes/default/assets/img/morfy-logo.png

diff --git a/site/themes/default/assets/img/morfy-logo.png b/site/themes/default/assets/img/morfy-logo.png
deleted file mode 100755
index 74b938a6270b39eea3742dc0c8a9967af823d4f2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5296
zcmdT|Ra+E{!lZNQPU&u>C6`)QdZ`7Zkq`la<)uS9q`MbbQUrmeyOD0`mXs6_iSIp^
z-}wh;E@tL(p1GTe(bZNXz@x=OK|vt^sVnQFprAJX>vwR_|78-5KAwN2Q5OtR`B(qv
zpzp7T{5Q0Wm%g?E$^$wU8N)2~H4ARf=@!x5a>!m(z26$In<Y>$`Qost&{PO80#@V5
zj+gHcE0cDpfsbc+4^$f3I=4PaB*dYhkhz1D6(Rquoc4zPr-+cEr%I|ywEy2pmWBVS
zHW^L{N(U+`GgGYaYh(c}k+85ZC_#Ar{N=4h&f>TvVDEE%-1#i8wWw%ruwM0oa})H7
z(ckZu>+4T9dNNcA>-$OAmoQSeLzh*aF0m{9{5Yimf58Q1MK<4cMXXUpwo8hT&K}&M
zicw5JR}_*7UAiX<zi+$v`FQ3h;@0CXd)(x)5d>4MR8ghM2bA^wa9!QOcC+>RAVcXJ
z4hkE+I(oLbSv!&8T6%yD>Xg*5ZLWsH9SLk@p?tHU!fV>OYM<=U2lKR)L050df4K1=
z5rou_X%Pih(OcQy4hd8qj3Mufw&g{qI*Th4OinRX>m)#mSXCEP*Nz{b8HG39=&)Am
zl>ub;RO6zdsuz9c$wcX*h(*!^k6d!G_G;od&0VGM`UlQ!Bi>YcwtxtE*+LfBh4PGH
zi0n_5M}h@2f>;sVPSg2%v^*Re%FFmwroZH3RQE#L<=i}(1UEGIx)u!zRNvl@bY9a4
zF1yBlPFR+xl5OMuEv{Q*$`-*EX99O!);BwOwqTLVrtn1YT~z%_;6sM>B$zrAriKfv
z$j}oEh8fkr;<JfJn&9VYbZOZ4I0tV)h`RJ%dnGl`QdSrh4jPU9G2S696!?QVN-(}%
z+UA?is~qFJKENj)T0vr<`K6yOXq0Ze-oQT#+KsF*%4GK=UcO5skZq!ueyDUg_NAn-
zrQR)-mfM;e$?Bss;q$;(j7qtsR}hEu^+a97rW`d9Z6V$r>K<Al0<V4e8UIwwXOyRe
zK1b&mT#@fsfk%0ow+9;Lv|Y!wrnO@`ANh|c(#N<oGkNI(HLn$wS<4Q4C*4Lx>EDd~
zXm)?SA43Bm(Y^Xyk{hkIsawgfa=FsGfsXmLEqiTbNdBBWaJb-1?*izw04D&<lvQxg
zuN2H{SMBL1c`02Ys>}w$S#(-h<T)Fgf-<^wr?f<uffkC+Dm$Tim9;H!O8r(tpo=m&
z01fAjeS=HP(hDFapZY;-B|b%l-aG!s_=~QO!>Uui0(Ayed~e8v15AnOy)`H5%JI`?
zbva0fS9mr)0BZ2N{Uim$Y<65ej-%kh=A@Rsx`*ZL*DuMKypTQT*l#noA~9v_T51+O
zrgXSLoAyK)qbx=b;4KSpyoa8mBc;&3b%VaoYti2!Srqr51?Xn?7TMy=x?z4XF*WR+
zy>b_%pl{<z<1PNpu@VbJ8P-PbA(sc75hh8@n71g03Eq{$o%J%kbJ%3p=pKsage!VZ
zk#?sQlgb|j6rPk|r-fIwE-`*#Dq6u94Kg_u{;YzR6(cA`?@EXGiYnrONOP;PXKtVc
z-6{=M7O=zrry<PegJHb#OQy=nag8mT>uB&NdeXved>3^Q5(F1f9hu=;aY_@|0!s>d
zG{>Ta=VE0rh`iVijRg>+d%CkgJrGwsZXtNR5z+m8Jxe!jX$IA8ki<M0f2=HzWEyq7
zTbedU1|u{gkoq%8Lr4MQeig~93C)_%ge*3q>ZkEX3g!&2j3|<c4BbM)D8$<@+dUU*
z7o~8(Q)+juO7CKVLFx5r$Bk9cERstl@7pcsRJA$L?w1R)q_1l8yOC$-rJQ@fMH9Bs
zQne(l0p1ru!kj$n!!a>4MyeR^AX}GWWGII6Ek;dM7k(i(9yri}|9AUTD?$(q7%<fC
zt%Ud~_|N*j!qDj5Oc(XL{g%?uEh<by`jB>&gRk!yvtsF@(F@<oY&H`n@AQrOp{Y69
z?Ncv`DzSIdoc||se`*iqxzN)f2%eu%2Gvhe8`l~P8RKL?3-~A<XWvWt)+2@m!dxtS
zrWVd**$@$PE#-kpkyzR4PBR?FY#qa*agElBI`5!dznmIxe<~`r*%Bs!D7LZ8f^j;U
zO~;pKyd^Sj+0&j0{Y69Sj%oIYX*$PU;_mcYhr-4f?Rz7Yh}Y^`siWDb$Rfh6c;^)l
zt+3DS+cQ+YQgQ{fxaA}o<7tlAuaxVzHmBq48VV66a=x{kZDpOwBe@?jF(a!f{Xh5%
z8^P@C_e2h`jF5A*Y|33V@uX-Hgud1YLLo02m9r+}!p1I@8H8Bnt6R~?oeiTeTq~y^
zzz(Y$u5gznWA+Yq(&>7a&@PqiXeit!&DZ5!{by0^HDXl{s(#UnOt(+8bK9<Ipg%vu
zgGqh3<JQ}zB247LVx)4X=4-CY(m)L_X@*Fwq)GSjbjjgRhreG9otx`=<JT#`rBb88
zi$c8oXDvfe3h)}}b^47o9si|&WH$L<N;T@GIDozv`IwXZK^8!}RoNJs2{Jt!je7O&
zuIB0S*Oj+$V6?S2!!{r~uut7xO0|Zy$i4=MXRN(dgEwu&i`L^C(9F~Fkl&6f1*y0u
zFkaX<<9)nXJ~7WE5T^r=hjAAIrRVYHWVhFo<|O-RCB+n^e=`V(4)DXuH8TRcB`cbJ
zhzP8nJxc|TRR-YdQ-BK6+%U?rXR@WRiHEg*f1Laz>XOCIyJ6NbNydxp{D|+iGFDwU
z@?WeooF8KM7*MAiA{)~_+QL(~fIaYqt>$C6lJlG5v|UQ`1%-otF_T~O5xX|avsXi?
zo-EcFZlTO`+3HG)Z0uGuF#0+L*5RZzgLe=O3cAE!AyT-J*iPg_gSIus{DSUm#HEn!
zA1#ZJMG4a5y^)E4scoo$z$d`P-qc(_He=zD6N^{dJza(n9OxpyZwktY#ZM+_8T@)9
zVzvj!q#hs$F&;7xDBRap2NQ>rOBTh68IHZ481vjcai?$(pFvycQ#XLTIK08T{4u~!
zG`&`p8hmd7F?$s$G{SPfI^BuV_E<2~@V9;^=3eBj#MSqs&=8hcaI;ewd2D1l=*sJ~
zIP&NC$MQt*T}c`KmrUplf4MyXj#e0`FQZA<VcgoShwPB(H2!pbo#29#R_hx&Ok}`R
zdW|*a^YB3uPysu5K7W7lRJ-98L8@taTxgdWe0PbS&<<rWZtr0;@4+hUTMK;LTb4*A
zX`UCotNYe6o+EdX>==~e)2r0Y6F9xQ4!4j*nGbVL1NQ6ar!RXlWXO<oiaH6J^gt)=
z5A41g^<!75jsKa5j4p*}#*4xe9NTXr%LmqoPm|VY?5o~Y?G};8pn)=x?2k@t9f?=v
z1KJH(-m0S65(Ux@G~2O3FZaFTn6+EH{f;a-_(>@OXUaHB;%^WQ6jKA!c8u=Ftlgv_
zrW<!tq(f`N7V+>qYPv6iA>^P;@wgbNm%wz?+(ao283jt$k{f>ptc!#8EQ6=uncen`
zl>uFwXc;AQTAJC3%9r}S_li~~Wa@i!uR{$jrG26QbbSVl>;CW!Sei{H)=SdPP^{FN
zEjz1t2ODe_A;a4tT$;7V4#Zm8#Vf!X-m;&)3*rMh1y@@(1vPxitxDS0$??sSAa~^S
zH1I?0L=i9^xvF5Y25{G%fAy1?-}cMX8$or%^?CY-LI1m)_^a3u!GjeqoOoh}OG9tf
zB5Dt@_P^Ne%vdxLK{7vwPm<)kt#L`W^cdvwuT{NtrNshfHtd1r9`B$2nh75Pl0W_U
zhf`Y6kI!dAiiz*tn_OFmw@m`1N{+zwfv^}Yb-X}($UTH04m9!-Z(Mi8SU}`NlFVh7
ztn!|4lq*0f^U|i%S8Kt~GMOa4FtUIB$9C{Iz=yK_`^R@+M>Ta>&CVMojtmJq-mtHC
zG4^}SG2Z_Ou-RQP`DoCibl~ZKEyZj40AAEU|0um~)a__+>az*)Wu%V@pAFxi6xG{{
zXkoS%3TYW?S0EGF`3sj{n4-r`U3x=wJb-^HqLBP#5oyw+v%r0r@j|ygXTbhf&FJ9}
z{&@i{b1j-lxkN<ix%SAY;Rye4d!AHLR+B@U$XzflIs`<LcDOl8A&alG7VcD7O`|f=
z8jSM7;Ip!ZEzrvIXrWy!*2J%Es&vB3fGkf_<6=7B!|Ys@+{cRFqA1ds_VX{KvQkEq
zSC}Y%5LlZi@0=7Hw4BPjJ<b~5);g}yiRN+EXeM|Qddxni;*5!hWZxXbD`HNiPU1gz
zxmcEZ6ljuNZ?}J2@g*th8>D#Lwsh*F-vCOEX&-1~&+2!29R+UAS>%Z)dci|ttAYz^
z2Fed8gs2hwE!RTngE9uY>|i(ZnQNJF`8|*Pd^T5x$~W)$7$zS&^rzqDX|`_w#Zw$X
zx0(=TWBd^o9kR;F+tG|t{XSG7xeK0^X2v4a8LH1GX-epMoAL+gb5&u>z7?74WXR@Q
zrJ;ZZl0`1CB}-%iE>(n@oYT1whRN8ZmZY?N73H2#UFBzWLFq;WFkC8V_K~U$giN3*
z6qgWM%%4-A9y+tvOAe!P<adwdUqMMU?ZkPHG&hI#eT!UN;M<=?7qU>EHU`wgPMb`3
z=2u@WR?k)ak-Jm8UQ*BLMkyCECb>Sua-6GO8Y`);JtaN|T#2QU(OXT;e|1Np?($a_
zo#S*SWDI;HbNpSX#p&>Bx?S}bA^DmoPspuE)Z!VRJkzs%U?+#M=!^u{XJ<PLrxA5R
z9<k-c?3Svo;WBdgx?*Yo$EY~B1R)4u@Yr^`8TWDxK>Ln%OVIIa17WDgS<Tw5k%G$@
z*Rc4UF?Cp4*_`+BMHf51p}aF7U>P$HW42IWrGnV4{WLYABi$g;yb-^|wDL28%4Oq%
zM4f=>$cq|v6-NMO7uDA9H%`x5Y8R4}U-VOS2oHD#R!j3Pclqra!4c<@)$_LX74ou=
z!W@GjMQ3v)qiYIe`P`o4Rb*FA%O<p`EC4l`d~Zp}W9*>-{Nd>{Ei<@GKqx<UMhHtp
ze@JsG_DkJDDeWHo<L~d&mL^GzfzsmXfuY1?uDCY|5225(SpIhtnz=00T4xoo83I(B
zyEnPN!=?NX{(fwzG&3G$zOz@$yva*uKsLRmk#@pMx1&+udtEwvf@^96t~DEYaq7-j
z9p;FXn-`yo^=~Q%+Fza(fa8Z$uSW{n#uY{{4F<-M1wy@Bq5rJf|EjEymNbr;=zu34
zEwKG{z;7ufF^q+OiDn>&MuT|7iWPvv;McvU@^>mW2@P=ZYT7I)iqQFC=ShjuS<>8F
z5z8A}r0&_qgL*7h1u=N82EAIKbecVg_(LUau~|=}>VAF}?Qcb&X^y0#eA(dwm6+X>
z6u1#LT5-YCuTKP*zq{C@7B&r&x6Uq=t)hv*+kMc1$iPT`!l^Lj1|K#CIja19w6Q-^
z4poAi)&%Na`=KLe&BVaY;zbyKx{*ptBP-sJDY`2kGiHNz(R>}Y@Gqr@Wlb7KBiU;-
zq#DMAo?XB?VZrr-(6wHfQ{P~=5|m^jM4{0u?I3BgG3;m9G{q~I;-28sFnyn_-?W`c
zIJDHUX*ICKFvV5OtRf|MbZHZ<S1*^j0=j$He_({ANOB~xhF~{X(r4+j%~U*6oXrDz
z8NlJcoyp}xsUWm&4KBAJyB3+5#L|l0K4isF<ZWbTka&|eeW5yKKQi#NVD1f2rkDFt
zC_(wO=0z$_n_%1RqQo;<x-JO|Meya3QdsNULYu-8@AMl@axR9~jM+_~rZE0<Ds1!F
z0-nS({k8rx=|b0J2Xs)>*Y2HNH5vm&Ix_5P+(8Qc$7u{$deK=#Z0ZV!!dMmHlsAkr
zbY)RNsR{dZ_Cw`!h{uCSag*BE1{Olb(dVj2OtH6?saOOPq4<fX_bl9%Pk#y6%7pFn
z=LyX0?S3t5?|SDD^6|vn^6}wIr=II!l$Y60H!RW*Ax^X9gq8~iO{C(<X^H*|L8aKo
zUW(i*xSLScN)#|v)ZvHRvO{0b&14u6m@3sV{g`7@!%D594ik~Ud0zR8eM4r4TsI=q
zkv2g{fW^(4EFB$EdBst$iXTrmBJvE2%`&9g5ynAG<u+!IYD)?&5DXv+kjo^KH%A(o
z18R>Does5`%>u36-EZaE4u&b$x%t=Og&zWM5bt*1pjol3XRDk2DfU2%ms$QvR>c^4
zL|!l@?kff{;E!d9H#18iC33qs*~f9(x?I+u46CAG!w#BIpjZ3e=%<w4hRa#=>HVe)
z_hg>6pKQq(hW3}Tca3))QDs`Uz(Gth?boHk4OKhNiB96Gs1{>+BQ9uU&#(^hOCx(}
z@4|<x<L|Ma!_}*-z11<m5?dID@Y0uob!KB-eBH5NUHaiTIiTpl!%wOf#Y)Rq+e}5_
zj8S*)GhX`3ycuJ2uXFh%QFor6T2^Jfx==EQaA7wu#yM;l`*pDivjIV*`JCtaiFrd8
z<6mU>OT0K!9rpcb?o4-70QjKlbVKs0>g`R7_ttor<J3o)N5${esentp8QVuZK0(U9
zL;GXD0`$5LckFK-izzcML_Jq<&U1M#SPRXYZrH3;iZ+7|rg{Bja`EY0BYnZSfBjk=
zJO0TEf9!3~RY`o`mbgy?bx}nRd-fadU0hoQK)-{ONWa}PmPsuj)piJb_Zks_tKn%S
zH3w{BJ`dkZ+%MJ`kWy!yNOpMrQeKbP1VyJs)A@dMIVl+@YYyN0VS%qw_M6nCE1eGe
z)r$yxRqos@5FgQSdbi>CRMy|g6fZnPZTsK!q!xr;DLv#RvU-mA&&LK*(N?ZivI_e@
D^|#HP

diff --git a/site/themes/default/index.php b/site/themes/default/index.php
index f212fdc..4f4a684 100755
--- a/site/themes/default/index.php
+++ b/site/themes/default/index.php
@@ -1,3 +1,3 @@
 <?php Theme::getTemplate('partials/head'); ?>
-index
+<?php echo Pages::getCurrentPage()['content']; ?>
 <?php Theme::getTemplate('partials/footer'); ?>
diff --git a/site/themes/default/partials/footer.php b/site/themes/default/partials/footer.php
index 26f8078..7587c81 100755
--- a/site/themes/default/partials/footer.php
+++ b/site/themes/default/partials/footer.php
@@ -1,3 +1,3 @@
-    <?php Theme::getTemplate('tail'); ?>
+    <?php Theme::getTemplate('partials/tail'); ?>
   </body>
 </html>
diff --git a/site/themes/default/partials/head.php b/site/themes/default/partials/head.php
index 52008d7..c46c7eb 100755
--- a/site/themes/default/partials/head.php
+++ b/site/themes/default/partials/head.php
@@ -5,14 +5,19 @@
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
     <meta name="description" content="">
     <meta name="author" content="">
-    <link rel="icon" href="../../../../favicon.ico">
 
-    <title>Cover Template for Bootstrap</title>
+		<?php Action::run('theme_meta'); ?>
+
+		<link rel="shortcut icon" href="<?php echo Url::getBase(); ?>/favicon.ico">
+
+		<title><?php echo Config::get('site.title'); ?> | <?php echo Pages::getCurrentPage()['title']; ?></title>
 
     <!-- Bootstrap core CSS -->
-    <link href="../../../../dist/css/bootstrap.min.css" rel="stylesheet">
+		<link href="<?php echo Url::getBase(); ?>/site/themes/<?php echo Config::get('site.theme'); ?>/node_modules/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet">
 
     <!-- Custom styles for this template -->
-    <link href="cover.css" rel="stylesheet">
+		<link href="<?php echo Url::getBase(); ?>/site/themes/<?php echo Config::get('site.theme'); ?>/assets/css/theme.css" rel="stylesheet">
+		<?php Action::run('theme_header'); ?>
   </head>
   <body>
+  <?php Theme::getTemplate('partials/navigation'); ?>
diff --git a/site/themes/default/partials/tail.php b/site/themes/default/partials/tail.php
index da6fb7f..64d4c85 100755
--- a/site/themes/default/partials/tail.php
+++ b/site/themes/default/partials/tail.php
@@ -1,5 +1,3 @@
-{* Bootstrap core JavaScript *}
-{* Placed at the end of the document so the pages load faster *}
-<script src="<?php echo Url::getBase(); ?>/themes/<?php echo Config::get('site.theme'); ?>/bower_components/jquery/dist/jquery.min.js"></script>
-<script src="<?php echo Url::getBase(); ?>}/themes/<?php echo Config::get('site.theme'); ?>/bower_components/bootstrap/dist/js/bootstrap.min.js"></script>
+<script src="<?php echo Url::getBase(); ?>/site-katerinasitnikova/themes/<?php echo Config::get('site.theme'); ?>/node_modules/jquery/dist/jquery.slim.min.js"></script>
+<script src="<?php echo Url::getBase(); ?>/site-katerinasitnikova/themes/<?php echo Config::get('site.theme'); ?>/node_modules/bootstrap/dist/js/bootstrap.min.js"></script>
 <?php Action::run('theme_footer'); ?>