From ef9e37c3ac24875365377d6285b3271d48eb871d Mon Sep 17 00:00:00 2001 From: sfan5 Date: Fri, 5 May 2017 12:01:17 +0200 Subject: [PATCH] Move Search to different template file (also re-add accidentally deleted catimg) --- img/torrents/12.png | Bin 3145 -> 3243 bytes img/torrents/13.png | Bin 0 -> 3145 bytes main.go | 4 ++ templates/_search.html | 72 ++++++++++++++++++++++++++ templates/index.html | 113 ++++------------------------------------- 5 files changed, 86 insertions(+), 103 deletions(-) create mode 100644 img/torrents/13.png create mode 100644 templates/_search.html diff --git a/img/torrents/12.png b/img/torrents/12.png index 81bfb409090067b196b70edc344290ab09a8ecdc..d5f41bd49d083ca09278733f31190b917bfc6593 100644 GIT binary patch delta 3239 zcmV;Y3|RBY7^@kOB!6;AL_t(&f$f@kY?W0S#@}R&nV2ydl1WJB50lAEoQ%$>fidDT zh~omNY_b&DhJ7o76>8zq(j8i$EnT3{Ld8OX7AuIdlue2hPz$Aq>`0-OT9#61Sz2k| z`JDsbo$uC`w2lVOQ+vq>#=ff0%8UAM z>8>wHH|;2|&^O4o`^k8HLY`!;$FvLM|15vfr=^qjld<}kJYnZN!sm3LZG=QKKJ*t0 zheS)BA!Dda(SOM@2ZF}xQrWJ9c)kHKlVq;G4w;>$ueOs8`W%G3A)|CGWRI3GOK?va z21x_-MF{A{oG#+0&&Uf9`4Xh})mNl9r2Ru*lYaWVbk)Dg-ypQRJ|)jXTs!SA{`#am zO}(Qf_ZfMaddGWCQcFm*1bSqVPLx?1DQS=xt2vUdAAd@bj*$@UBS=;v*!)n7m!-cx z&gQzyNF65AL9h-)wLKuU8w%_p!y$1vWcGvj5fD2Nr9A?1y&$q52lF;6dq&$sZWomK zxcrMXrcxe=T6;p^v)Yvd=_TWI2;b$G3@?G9m}-zDYZyev%W~Zydv%)}(dm+;Z=tlI znCdVX?|%Ym{W0MI;8n^`qpraa=tq5^Ow-;H0I}mVKxR`9!W8>J+yKS|q1s8PZV&`c z!&LtRQJq
SqC;5NcpV+xA(quz_L@38(j+LM3La1r>PhRYJ2BTMx?S*N>E-vKGr zeR3M&LNtoLk(S5^Ha3yA2pw-u0M)*N`Sn3TeSaXPKVuDgL%>j(fnp~zFB)@?hP*L$ zt{;TIMt^q*drF3I2t#%JA0su$f4X`+9*eOZf;ps6oxtZdhk$nR-tneI<@E9uzm}xL3pNK-!G4ljS--yWuXkUmO zB!4jkfZ42 zxRVvlV(OSM?|4(b+t{BAE+4o|6J?F=mqWT)3iPxb*UNHItK^EFhs0g7Pc!5bT`ud1 zya^i2_(42FcqT|LDofJs^0^ktLHd?LQhx#}P2?~(L3knrrn7!7BqmZ%h3L7=PlV7p z+PUp?jgF4i+S*z#l9H0t|Is-0v|Hp=nGZTFP)|Te(|vCAo~<7LFyDFi=c?!TtJLEc z`@imE#g9{qVz2G` zW@e@~{(HwS%5Kj2bB{3uyZhW__ut~hi+$>5UU1iBJAUQLl|Fr@EwpVeu55FQ;qrkS zbccL}+Rj1N7kUBzcMbJ@FW0p}Zhz=4o>eGv9etIIxdh@M_X|0!pP}0Qaun5;=t-~x z6`FNU%1O#a1feWap=BB^TZq!ehvLT^IgEx8GaH-8|pR_h?~ zD*fvr$dFk>zX>u&aY$?11&c*buNR?GwwtS8M zGelHtJ;c>ZotD$LMZVEADSt+V#~`j0g0C_Drq(j25E9Q@pLrSOUbUpxFn_M>(L<1# z$Du4_ZU$-%lpXpGh(OJOBcrvlva(4yggSMH2zR}?a%<+f5!G$6E+BntDZB*6QK^<1 zy}`!U$r*^KhM*e+g$ueDC1qib@5u>*NjWB4jxuX447m;Ry@eTXh<`4FL{m0>SYrT)34dnFZJy2}FbVWslg|i9cr`&Cg`Q4c9@!eu$ipk~U+an=#K2sibZQts=5kX%gj~w3~5t zQV($rT&Zuvluesi=N3afMT$r%%)z2yb%c3L>~@G*0nEH{RkGpm2PPg`v7r8?`)v>%KO^^ftEUe_c2)aBe3?qx*r4xqu`u27k|)h%r>q4Zu@K;MBHTB>qecFr? zD=_C$*15=>3Z5rG6bg*9>s1k4u5kCh26;6QX->Ar=YN!2ij0R2H<^&9Jhjy)%`q^p z!?c;FyWO4Qn7KyT=4tAtJ#s{1(+Z3witb@k*CFvV8<{1JD%w}j zzqS=V$bXHA@<8{Gr~Nl8ouR(zX6P=hxb-*PFj-bUsVkZ-PpXQfOJk~5asMEy8xeu)B) zS|pMdeaPo6qklP{)0!ygAnmuuTAYv@lHJL-Q-62b8qamFxv#kZdj-j3jvXjjn!gm!y^kI85X|QH|9r8@dVu-Bc=_s)dcW~9_lO`#@Khd3;@q6LM#qiTv(*Q%Sd(>+Wkd51h<3 zD}O{jWs{}$R#C*$+(K#~=n5vC$W3K3cin81Qv)H@KyAW&8M4fcrP`~+dYi&jp=NV4 z`3~QAPS4>YN=RKkf;^ACN9J>tThD`ILU52*O_nIn|m7*Bdhf_nW-Zs6<@ei zPvP@UvC(oiU1?uY6@g-W+A&BxO@G@rJWFURLv2;y8bsG{OUXuQ+ado1?%*)Dj$-|i z`MD75FX<%W8#$~L9SnjYF^ci2m~d;~!};KMIqDfQ^S1KFM5w3Ds@v^d6Pix0`^DZK z=Zx>?dN0^1x#_v4ez*65@$!KN$O7$Uerb|fC}x92p{zrZJ4mVvxIyd(2Y-pAXSh+E zf~2$HoJ~=_#UC0Rr|l@j7DHSS3N~1VTj(eO`WB>_x3~i&#*#M;)lZg1_vB6TPyR-F zu!Ly@${Qw;>L=52>=C*fKUE+flfGng62D&c4v9gi zBoLW>_&F>_uxhZ7nMhM+Z5Xd7U=V8*@2^QP%Z`+8VJ22TD_`I$7%Z;ct z7qVXzKkdv~FUfEnCDEG2oPIJ5Gyf8mr(n(-@Pldh{Fk-==NCD3{vb0!fBn~vAN{W# Z{{^X4lBI8Oa!sB!3V|L_t(&-tC%eY+Pk}$A9NC_nXJ#%lI-jah$~2#FW6M%XV2o zDJ4{Lq}@nWR;&^UEs8&}P$~V;L{$=0`~d-K8VTeye2TP!m5Nr{s)V3Lttj0rlr#`X z;=~~rI~iYQ?73ggwI81G5O16k2=LL76lbCHepoyUg{x4RhSrVXi$f#@t^<`>Fw0<-!L~s6 zL3II~I%qynRIm;3wSut-;cm#B0mp#oAS`?Yp)QE7g3Lz{?1s{`+@s?GFpO_5fTN?h zMx;qO=@%ijH-Z8ngO!{wh4L=R9%2{9B@^zDiCM` z#V_+*Mf$cYYrPRrd{8fgCklE9%sNE6p4p3p1d~w7LMRT=D1^J9kOprU z91~Qp?323=-XQo}g=MM&g^cWJIl|1ARZz}?5`dW5&8G5?2?k>TeB!*rWbDNM$-q?h zUN&5N41iC2jxm)u`G*70c0u<*Yo9PnYk-Ld?tl4fxbPp)I}CGI1f=pJL<8UpLqvh( zIym?5;Ey(#8-SKJXw_ly8t7p$14d2ms0Kk%03YbO#{G*whd``D`JWkT? zBbfEE{_b zKrTGRnSnPc2Qyz0KovXzu~&`@vzMUwF@I{#m0&(AY9HilssjDL=fE*rbC{nAS>HTT)EW5=@o=;&w@ylvaIF*Y{V z+;iW)eQY?t71hIS*Cqp1p8)9fgQGOOumhS3t}FJ?8-)J#aODE@t%Cc02$?zX>EQQ@ zP1Af3YlV6h0%16N8p3|)NPrQ5QYTc4@}d+EbSix$5(!Mx|J zKHuzTvsr*<|5okapSRMwty{NZnkG*_{q(Z2aJd7;^HsdC2H^mBePFtvs{)>`01A|H zkWNE31JMZNa**tXo<0%M*QX#J1>F@&M`EHET@8jFf&3>>2HJaI_BvP!1Ojkx{vn?D z`4bq1!N|x6BO@bCMs;;{k$=zUoBgG7WB*p|FX}I~UwGk#WpieFPk(9cDK=0CRh39U z_cs`*z_lrfI_Bm?esp%poZdcJtf-*q&_4iH9m*we%MjMU=ZA1BTsZ~tFyxD{W>D5$ z%Ro>M5;r=UZ~x%Ig8(FxNw#m_&Xz4(ICt*cGUnV41DDF=K|{(p>w>E3eSWa8nwM zjlt}?F9uNAwQHCAKTjOyfwgk1F3rNHm!Y>qT+GKa&>9EJ23$~W7;J@r4g);`ib4ZL zgt52{od;M8FgXKrHmpm^i#q-(w0VN8op_M`=}k;`o*{kTZ+|HHi>&$VetJ(mEI-U& z!dnXiaB=f709Jn>vZflz5-28aYG2%ZjDZifuz%nFWyf^)?%e?FKd>KV>0wtW`}T<* zJ#gRv5~VpzJn$M=Ie-6~1a$G_x((CA zCz#rF;+8*fZsQlTV)X})Et5s%a+w1M4&W*d3hFZX11#$=ts5E|YRaauu?X*n$0;PQ zt}J7eI+UuS(Rw1_vmn|K)iXKx-BobwQd@MWRVCW66@LNVTB-_|fThaLeh+*%1sf9( z1I)a5VYLcw6`ZQ1!vaVO%%e#>?HG4fv%M1>J$e+wFxb6&H^aljghC;5U6*c>Kev)Y z>2#XspMSo&$H0I7)lK(l+CZ}k#WEx!0-Wv$%XC1uMEkjQ=!inT1X>F?s@SbW-@ zWw&w7F@M2p$+51NWxP-WrvhFtV1usFKwSjAPl1|wXW`YwdyeCMFG~6!)AaTAv32WK z0A73TH9q6B+j30#e12I!P)y*Ow-C~11u_{)V1`1F2#ePpTm|RPL9GTG`ydpA{4A{Q zmaL0amlTz0OB&0%k&O<_%}R!6={P$cDAk2|ntv@-u>?rhmKRbn1o%6tzFeH}Vkh~0 zp3|pKH^uU{ZQE{}fh&#u{(YJZ^g2+;$wkcz-x-2Z0m3ct$oJvh_o2TZ3I(_;A;*@6 zQ*m9fc{h4wY{^oGqTtlP6BNdl>k`4lf>6l`xZx0ll2BQYxnDDn+4CX!eV-^sO1_HrQ0ELAd}kvm$M(6$l2PLxq`B5I0~b1+_)6 zOv%~V4HjCiFwHceUW9r@Y^tS#;R=A+0xaZ3E;&_bi-BF0xvJ;RnYUE)k?R~eas
    GQcQ}Y5nt?M{n@Sf43R-~Z;7+(e@!`*p>uWvgBKsZX@6ZM zkR@16EW767@X5wsk!ibtt1f@YyMNh`G1Udhs#I#QZX-Tg8Q`t`2UP@ z1wb_*azhP@-cvQ1qbdRxK+g{a9J3%^6$Ns6_~adE>ubcy2E=*=G@}ki{(sy3eOL#` zOhUX@ez;kK^Jie~cf{UR7UY`;7N~wXx`f1WC>B^%0a#JN)f)oY5Kn#T*CMtR6Lej) zpMMqjTOc=LL76lbCH zepoyUg{x4RhSrVXi$f#@t^<`>Fw0<-!L~s6L3II~I%qynRIm;3wSut-;cm#B0mp#o zAS`?Yp)QE7g3Lz{?1s{`+@s?GFpO_5fTN?h5NHF%FY{bQ`nD@;y%A7+P%ncg3VI04Iz+mm zUIG`H>uG`F6a-VCXy42_-Sr`-{yDv02S5dH6nsH&J3s~2ZG(%)A$L)jQ@jS@Ua$;U zm;~E~Kpa$`(AX)176sc8CfX4J*|s1%0nvW2EQqF{ya=@tgxbI~WRE~nz{CJ=0z6(& zJ>UGJtb;H`@q=kXphK9Y`M?{O8AcWS9Z;GDe>())p;mA076UB^Mjd?KZwr7n=w8q?@CCr*k>j=I zVL15q1X*t5omQ_&B zf)aq3+0CZ%j|m220DR)S!({Bl|H;5q_Fgtzdklb2dyX-cIQfSI&~`!hKx>~cOKX6M z2k!Z6xbPp)I}CGI1f=pJL<8UpLqvh(Iym?5;Ey(#8-SKJXw_ly8t7p$14d2ms0Kk% z03YbO#{G*wNU-I@JvYsp zi%$?KCkYs_=DMlQlX$HlLzlPEmRk)#E*l=+9tw3gSt)=g-C7O@0hlCgfUf7V0zNsBBAYoLL83 zgCX@^QmGVP@8<^Zsi&Ue)IYpOa(*?>J@*^{M~@z5$BrEU96EG}8GEKVws-H|X8XqS z>Z`Bvv)w;y_75F8#D~*ydS*5;JUq-#{`M!$vAuiu^1Ds1QVh?2DF9UvZx>5IFeKhJ zwFd5f818-$hQ14f_riuBK&1rXFx>YbR4XvJQ2_F2Ft`EY3CPTf2OU^1Yjg9UxT5zm z^I%$lCSc-tS!-@$`}XY^hQYJXK8s-(7=}TzD(qP5&(F^@Ha3P~7>tgNE*rbC{nAS> zHTT)EW5=@o=;&w@ylvaIF*Y{V+;iW)eQY?t71hIS*Cqp1p8)9fgQGOOumhS3t}FJ? z8-)J#aODE@t%Cc02$?zX>EQQ@P1Af3YlV6h0%16N8p3|)NPrQ5QYTc4@}d+EbSix$ z5(!Mx8^s=#VxdX-X zRlKkU;Q)AjV7j2I0-mk_3Y2n?PD3^W(Fo*nknDz@J`vK_ryw2$-4#klVxkva4Tc_p z{3lQb+IwL3I#>z>0&s8sA)fg86BvfU$jAsIBO^^lb#---&*z){rE+8cR_!n9FSTEI z;e};$W_nM5Y3(UCPzP0&NI>^D7^uLtDTzAf=0tvUcFCOHK3S}&py<#)09GB!C2-3S z*1+e7a4TFn1@SQCi?C);)?Ld$P!AF}I+}0);K73cB$G+DZ{N(PeW}sT2zf3q1MclK|}bmnV7fU&R?+_>*I#2TtA|fWA<} z^Qz$SL7@aE|66QX*@m(rz+JrrsVFQK;rsUpfUb}f%_q!tt;RJ6`ud?ZE1{mpk(acp z7p9BgwK|{(p>w>E3eSWa8nwMjlt}?F9uNAwQHCAKTjOyfwgk1F3rNHm!Y>qT+GKa&>9EJ z23$~W7;J@r4g);`ib4ZLgt52{od;M8FgXKrHmpm^i#q-(w0VN8op_M`=}k;`o*{kT zZz%bTtoiJIdQUwpKg?gkTMGklaq}?%R(~L}rW(l-C?;-dU)+3*fe*H@f8YLP$8`7Z z-2m)AupedVVOJ>o_K6-naNqzEr8!JI@GBO2F5qhRvbpOH?h*zXIygwgFkJ-G2i=`8 zpNAg|!}?bE#c6RErVV~S^tFIjl`v3MK4+rt1snmqRD<7M1Kozf4v2Wbu)z&L*+jGWi26>o2Vv z8X9WKrm?XI?}x`JB(JV4W0X3Ss-n?)BH*(i+7Q(J}8G=#)!Y%N~_u<|5 zp}!vr1-L6A$Ciduab2-_H+p1j$x?@+;MBkq6vme862ZiRP{|3n;Shw9P+5?H(MX*fC+1U*iTCOn7G@xFDdPQuirGnuKfY|~pm;3%Bhp{aP_#oiI`iBIF+*Ro96i-_#K_DjSY}b<1lrJivX(7ZDC~*A@v?s+W zIF2yXs7f52U63Pe7?8_CYCymXwLsPW`ch1aqY+>1WBu8!_zaOjb#IBY>wir-l%aEW z1A`YIzG+=0kR@16EW767@X5wsk!ibtt1f@YyMNh`G1Udhs#I#QZX-Yq6;wldfvQbrAe`?Ul3|C~_OJl52gpo9yjOm>S%dRuVC{Fr-c=Uln+F!CemS~?#BnGVSXBX7QNh(40@)Bxed^aD zwiOd}U9_Kn75G~qH!04>>;HBGsJO1n=;)~XUxSD7$Hj5fa}bNcn(u*6Z7?j-_=2X3 z!%)2q5v@yZ4@Ew0I#m(oCtnw~Iu5j?pzk5L@NcmCQJDS++WVlGhMMv11ny7Y-NpF$ jxT5^=uN`;x*N*=MvK27-*z?>600000NkvXXu0mjf8vN_u literal 0 HcmV?d00001 diff --git a/main.go b/main.go index c15dcbfa..9d69cc98 100644 --- a/main.go +++ b/main.go @@ -103,6 +103,7 @@ func apiViewHandler(w http.ResponseWriter, r *http.Request) { func searchHandler(w http.ResponseWriter, r *http.Request) { var templates = template.Must(template.New("home").Funcs(funcMap).ParseFiles("templates/index.html", "templates/home.html")) + templates.ParseGlob("templates/_*.html") // common vars := mux.Vars(r) page := vars["page"] @@ -184,6 +185,7 @@ func safe(s string) template.URL { func faqHandler(w http.ResponseWriter, r *http.Request) { var templates = template.Must(template.New("FAQ").Funcs(funcMap).ParseFiles("templates/index.html", "templates/FAQ.html")) + templates.ParseGlob("templates/_*.html") // common err := templates.ExecuteTemplate(w, "index.html", FaqTemplateVariables{Navigation{}, NewSearchForm(), r.URL, mux.CurrentRoute(r)}) if err != nil { http.Error(w, err.Error(), http.StatusInternalServerError) @@ -238,6 +240,7 @@ func rssHandler(w http.ResponseWriter, r *http.Request) { } func viewHandler(w http.ResponseWriter, r *http.Request) { var templates = template.Must(template.ParseFiles("templates/index.html", "templates/view.html")) + templates.ParseGlob("templates/_*.html") // common vars := mux.Vars(r) id := vars["id"] @@ -254,6 +257,7 @@ func viewHandler(w http.ResponseWriter, r *http.Request) { func rootHandler(w http.ResponseWriter, r *http.Request) { var templates = template.Must(template.New("home").Funcs(funcMap).ParseFiles("templates/index.html", "templates/home.html")) + templates.ParseGlob("templates/_*.html") // common vars := mux.Vars(r) page := vars["page"] diff --git a/templates/_search.html b/templates/_search.html new file mode 100644 index 00000000..dc29e66e --- /dev/null +++ b/templates/_search.html @@ -0,0 +1,72 @@ +{{define "search_common"}} + + +{{end}} +{{define "search_advanced"}} + + + +{{end}} + +{{define "search_button"}} +
    + + + + +
    +{{end}} diff --git a/templates/index.html b/templates/index.html index 16ec2113..89deb750 100644 --- a/templates/index.html +++ b/templates/index.html @@ -42,45 +42,8 @@ @@ -90,70 +53,14 @@

    Advanced Search

    - -
    + +
    {{block "content" .}}Nothing Here.{{end}}