From 936f55edf93b563419e22910d7d77a05b769a9dd Mon Sep 17 00:00:00 2001 From: rulingcom Date: Fri, 17 Sep 2021 04:57:58 +0000 Subject: [PATCH] update tempate --- assets/images/design_thumb.png | Bin 0 -> 42278 bytes assets/stylesheets/bootstrap/_mixins.scss | 12 + .../template/modules/ad_banner.scss | 3 + .../template/modules/announcement.scss | 4 + .../stylesheets/template/modules/member.scss | 1 + modules/active/active_index.html.erb | 13 +- modules/active/active_index1.html.erb | 25 + modules/active/active_index2.html.erb | 32 + modules/active/info.json | 22 +- .../active/thumbs/active_index1_thumbs.png | Bin 0 -> 2130 bytes .../active/thumbs/active_index2_thumbs.png | Bin 0 -> 3379 bytes modules/ad_banner/_ad_banner_widget1.html.erb | 33 +- .../_ad_banner_widget2_video.html.erb | 150 ++++- modules/announcement/_annc_widget15.html.erb | 162 +++-- modules/announcement/_annc_widget18.html.erb | 86 +++ modules/announcement/_annc_widget4.html.erb | 81 ++- modules/announcement/annc_index11.html.erb | 19 +- modules/announcement/annc_index12.html.erb | 19 +- modules/announcement/annc_index15.html.erb | 19 +- modules/announcement/annc_index16.html.erb | 19 +- modules/announcement/info.json | 560 +++++++++--------- modules/announcement/show.html.erb | 293 ++++++++- modules/archive/archive_index7.html.erb | 60 ++ modules/archive/archive_index8.html.erb | 48 ++ modules/archive/info.json | 71 +-- modules/faq/faq_index2.html.erb | 1 + modules/member/member_index2.html.erb | 6 +- modules/member/show.html.erb | 2 +- modules/personal_activity/index.html.erb | 19 +- modules/personal_book/index_search1.html.erb | 2 +- .../index_search1.html.erb | 2 +- modules/personal_course/index.html.erb | 19 +- modules/personal_honor/index.html.erb | 19 +- .../personal_journal/index_search1.html.erb | 2 +- modules/personal_lab/index.html.erb | 19 +- .../personal_patent/index_search1.html.erb | 2 +- modules/personal_research/index.html.erb | 19 +- .../ruling_bus/_ruling_bus_widget1.html.erb | 57 ++ modules/ruling_bus/info.json | 14 + .../web_resource/_web_res_widget1.html.erb | 5 +- .../web_resource/_web_res_widget2.html.erb | 21 + modules/web_resource/info.json | 12 +- modules/web_resource/web_res_index1.html.erb | 19 +- modules/web_resource/web_res_index2.html.erb | 21 +- partial/_head.html.erb | 11 +- template.json | 5 +- .../_site_menu_widget1.html.erb | 2 +- .../_site_menu_widget2.html.erb | 2 +- 48 files changed, 1445 insertions(+), 568 deletions(-) create mode 100644 assets/images/design_thumb.png create mode 100644 modules/active/active_index1.html.erb create mode 100644 modules/active/active_index2.html.erb create mode 100644 modules/active/thumbs/active_index1_thumbs.png create mode 100644 modules/active/thumbs/active_index2_thumbs.png create mode 100644 modules/announcement/_annc_widget18.html.erb create mode 100644 modules/archive/archive_index7.html.erb create mode 100644 modules/archive/archive_index8.html.erb create mode 100644 modules/ruling_bus/_ruling_bus_widget1.html.erb create mode 100644 modules/ruling_bus/info.json create mode 100644 modules/web_resource/_web_res_widget2.html.erb diff --git a/assets/images/design_thumb.png b/assets/images/design_thumb.png new file mode 100644 index 0000000000000000000000000000000000000000..eb650d2d87e056aa8e464611f66b31a0d8649fc6 GIT binary patch literal 42278 zcmeFZWmuJK7d5&}R0Kp(8blO9N=h0mL`eY!Bt=TPI~Iz9NGTx=N_Tg6hjg>(MK3xR ztTWl~yWewN=hyl9{rL7}u!$$`d(JV(7<1lwy_OLtxI%FSfj|(vdih))fjAEzoEeB`E3?PDxdj!h(Y!tm@)#154;4&4+p9?G_3$+06&k-$(DRf+!a4S9C&`=P=_ z*H-(Md0Adwo|D~JXBk)C3%AeLo?fE+a{7meQMkYQng4tYpD0IONBr+=oQTVa|9;z- zYvgX{5&!%I{PFE-^{loMqPn^Hl97>-CAw4EmxAZxNIuisG{t*PyDMbmeQk zDR{WKA=Xe;?9a~r?>&(RjKTF1~V=8*3@Z)9l!ki zN&GHPFTs9e`t%y@VO*5Pas7rRjyn%-Fi2I`)je}O`@cnGKbQ_(hM)J%et*W zTKnr$U%q~wnw#69Ba-~*+RljKT-~~chOddz5%RImFH=!d=M)y64E0}+`LwX`5qo@G zVli`ZZEdZ%q=fkT_062Ld(TS`CxsCg2`K8bwd%6-@_Hkta2qpCQjvT=S4WF((9p=p z%gd*Z8gWykXJi~qd$Wgf>R#zjeOos)q^zFRZ#Z0RK~FF4SKrixuAr4w>C057q^GAR zq!q#Dq}@4Pz>QbAxw#*z-OgMk=R8kI8R4%^{qxN87cV$n4z2aNqNSyz+MULg*2YRw z)XNG5=ni|6Wce*;FUiJ;xMUsOBoEyDBM(s(WQFcz5{Qy<7!JHI8`S7a$()#&Xuu{J z*Ud;sNZ6X9kQ9W(Cn8c($^ZE0BX>BFt#Ovb@!^ibGLQLWwZ8`KtAM-z{EC-lo$H8D z+SuKFR6KuU`q}#KuHxo=$B~A}XfU&qA|bUv{DQT>y+@A}&8pyb{MHLUXsBKfTvC%sE;mK7ViyEo#Z$3iG^ zOm{Ec{`cNNyFt8W8Vy}t>@KR-PqE_giqdsSe40;oNEq7PmRk+wL z{Cz?|=tIT78HXgjmw;@I5-hTus=aWJjcu)fiG@XqT*%(sadoebO06Z}UhwhJ9;I{G zEmoE7PF?!s=RGE-SCC#8kH#yU_LzG+qXY>kT&Hn?MMXs)bajK-Vpc6?8ksI%zASOHyBhrT z>lG${8ez^M)ZahPg5jH)sReD{TP-YT@xi(*t$n% z6H@l}#S@zn!4DD+Lu>X@G^< z)LAVpt-fSAcSz2eP-{DTZZ2)-v@r+lxySpPrku+j* ze8>|a_@B`5aQO@so|Vebbm1^1~CM1V`^$D6(e#SwaXgdOCucab>n^jvl5$P zhDrmJjG;;wL2puay~*lN`NqQmkdu~^)n~XV>KLq?orNGy^``5+Fj$BEzalRY)s2l8 z_4W1L=gRCbG9jBc#cBozLnK4k7FpTf<;G9kI6G04|L8=aJz7}xGvc38nPP5XaUh#_ z+*DsbIX5S!qjR^wu>X!yrke9kzmmO^lhs`7O>2Ru@Ik1FzAv6ZKr?<~EAwJ~~Kl>RPHK3zHI zjlx8^18RQzn}0n#E-7h9(L|;3aBdL0W;B!u3hs~9xw>uHg@p|86!`|d7iDE-d9q>| z0g=@?NrhoN;V*0nDBHpQ~DdW*X-#SmC-ZUk4gkqLP2Rw6sIiP~#IaLZ@4_Nx^BqYyY zzPtn*RoByV{iUnV5iGg=?h5%H2Bly7<+3BM=N7ulKPl<{&!0clN-V#s6c|?QSl}WQ z)8>+5T&KI^#GSV~c)5)Rd>}*{{ixe^S4a6Bw;3~33SyzWI^qO1=2usJeSHbwwyw*L z_KuF6CL`QX%TT30xFz=;#7i%q#BW|+QvfN8h5k_IOi`5?MJp(O3g?&;qZ!eLmEpX_ z!7P+h^3PM^P@j|rIBU?F#CTIj!}@iM!a+1YyddJ617_%6Rr^EHY`#xFOf z8<^zdFU_@uD2HwD z>Ld@|T(YyX+nj4_0=(SV+?<9F&!0aJZy@VO#lO&#fNyJSOC{nQdWtnFGVo&#o3oeU z9qPCw{f+%7#&D`fuzVi1T| za}d*wFfM%t)k5R35-V}))bOC7FYfMj%#;+1~#Ew;mFe!BdX+I0^AaD3ThYdZzb26-C|LG z40Q3#{!&_2^G|xbnMPlFCMGYF(LxT#?T?0onH_%Af)h*o3PP^fPYK_aBM z?tLd^mjSpR28xiXn{PTE4tF7>;yVR$NS!vya|l=yKrOWIP6W_xJv}|gXAgUN#qkmG zd;3^;LAlg7Db~#F8B)^HVS;vSbFIN~fCgr78*{Xqimex~136w)6Z|J(x>Q?tbUu8D z6;R~m;OKsj&G+*1(x?O4_Z=z@F%69$AS(j{1CSe7*7#kjmnB=tj91Q_ITI=DbPGz@ zc&SbIM{Y=xbIHO8dA7CH)zyQ|Hg@2Bk$e`PA-Q0A_#8IxK6>;BR&IT==A5&$^EY4L z2FON_GdkB`*_Ke6t_Sx#iD>8B*sIP5H0}FS^0M`>%CEf%VR_f{ej+b_sW0V*C=Sa- zK*2q^*qg*{(DS9io3zS85Q#)mQBgg7^oW6pspY-PhY!=t_cd@c{-O^#IQ{?*J{J?? zu$q^G@9DGL0wuU)TUl8NyT7y(YEL`g8D;eFD&Qzv`FCJNKrgjGhcJGx1+XILx4bLn zeT#=I;DnQlEANfxr3AgPVhi{+6MW{I-Nuu%2q=?4xT@bDd^(5s^5x4($ViA&b4Z!m zx;jn%?%L(hhzLq&H{d4QvC5b_sMl_@S_m8=;`GOU+dYQTLcs9c+R7?$4fhXwU_Z_F z*MFWGbRyTr_@6#|_6f-#D+u6KS_uV&gh~FnOOz#==l1Q}(snnkW}BZtP7mj3dyb6$ z1|0qJz9|iky<>rI;1_rNy#^Xg*tCUCC zk=r^?*I%v}1Z;XM>J9wIb3TcjFM8J z#8MY3OS0_&Dpwc(na5QvRHX}u)b1o%TAP^rve9?x=srQo=Yk4uIon(VxE1zL>$AqS zIrZn_;#{^X%D@03mJX#O9wn4IcgKnW#z#QiKYPkFPZ^#MIhTf@=ogtJ1<$AD5=x99UcyY zby{Gp0zeffzx4yE1nPEdAD9SlV!qw}hXJ2}a)H`|NYinH90JvLe@Ln|vvGCmdDT+1Y_^^mly&524}v&AP$C!S_AeA@JUQKk3D< zlaV#UlA(%Yki0Z@Yh$kfNmEn`9>9lFkSpn`MSc*^+Pbeah!Y<>xnA&JY8X4;KDba(H50k&+hGQ?rykfl*^>GEYQ z&;b`muhNP{0w_~Redg0^Cxb%x3Q|FnUr30NaiIXiaTkwWDP8#w>2n9#puI4_u$w@n z=79ILM%=x7mr>l0N-k9?D-+@=$$_@8u&@=bb+wi9;d{3ahK7e4{_OX5mIu4uES>Vf?!3LSiOCH-vT1{ zV>L81TH&U_=kN#_dCex?#Ky(lhCLR{Y0!B>&ZLzCmCv z66e~0LTLhq%AL}Db`W#Ge&m61Bmg^qppv2JG zV$VG>@H*T+n3!bj9~>~fO?}hdmel<*2pleE;OP<|*c4coBg`u0K4@zP|9R$_I(Iyn z|GwsILvwTU`w~x2&sfIq)030yolV#YC&X-9h(C~!Wt);KAVx+!gWzy6?EQ%8p{ztw#Fq8~_y zrX2=(_gTSRJR+JtRmEa+t?##3zn7Hof5j(loS2w+|Fi&-GR1DmMj%RH#{TKkv#o*Kw_AhT)9RR{Bw@C*iH#T>A7PP#-to_P{>mpfRUx{t6P{Z0IpGQkhtGHR6b zmD#RNLyp1ax5kMc5=378-TT0xbN7#S`5pCHk1TYwZw9{>;NQJV)ja8pb!==)9P z%15aC{pWrIqgq0N(5mb24~CCZtj>Z?SYMxd200ieO5Xjgr zP(RuE`Sso1KOekJeVrnI528>4I8yhb^;H_7(9>uYIEV9u6#eAsDPH=EoS66tx-)7K zxPIxcqssV4N$Q3tl0@6}_0JI(iD;zE&DWW?653OK1mM)m_YjXkf%H}R(~5S2{=F)r z@#YN)Shv%_KAewMix6*;U!S>gBk;{R1du&l@FB23mzJ)kGEL9SyeqS1g(`^str>vh zG?=PNXrg2~eX)%aK$Ji5{UDwh)T42%^`o0xTc=KLXlST4GZ*lB&?CU!uZMFRJdF~t z>1(N_6?JV-eVewvzJ8mNlXHBR>7>edtoUc9dfDdj9;%8119}*>Px2|>9&^SmgqC$< zw&ezZpnS*P$}ks=h;wq~BOac9RWoB_pS(OSR+aqU0Q#rGj*E-SePIdE;q+<2_*t|k zF)M^ygDa87>#YYC(vwPng+Q<_b_!w{&5l`Q|HCxL!JAEnBo?$=!`^i|`%N|mOawMI zHps8piXd8Y@)i#QN(lKnCnilSPQYoGlH9t-CwC7zt}K@BhX8zL~m%x_a6vE`GF(FW!T3EQXsez@8?B9j5on5@;4 zmJ`)h5$^Y^1ZJB7Hls&a)+S=N{ZknO|gZ?}0I{N14HxEH`m0BPO z>VJ~z_&=SAdK{^spddJVr>&5C5<%4vh``xhRt&wm9z(Ez&k8j29O!2-KA*gN+1!-* z>)PTHyf+Y5Nl;X7vtBn&4wu<~v8jV*R{}D958S*{!^idbFvY+2Wg0{#>|irgFAEzR zaFj7FRR8PcY_vGRh68-(K_!8v48dKzGf?4&tB|6wnb1p+%hC`AIvG6ANq^@~vF$1a zDZ55}Z!g!lemu!PG!_03;l&6eKn95cZh+PN5JJ;M`=rUAHqQ>DfdD=I_apb?O|qlE ze_z9X*zd2?f%`OdxU&p3uc~Va|KEN~%-21U%kQP6t}-j8L!amy#7)}P8SJV115a37 zTAHihMRWVW0?Bma(vr0R)UL|}1os34D8wAHEdFAX#-S@GEg1qt9wCAFTF%)BgxiZaC~71S+66|UcTwa1 z{{HtlIONt={&x>d4IaV&+vb{{`CHEK{qHsCL~I!7ayV$q2>)H5FZNyWcy9lG{pXpN zh{ykScbXA*5&t2PaC;rZ|G!4sy8ocn?Jzqk2!Y5zan$NvKs zt@{2Q7Vd3rrK!B%jIB+XwUkT(<7tB~XLm@SI%@!?iP+v0F|a(D5an-zP_&KFMNFQI zm-VG>1W$09e7N)J%o(*3Yp;qjA!R;0n&Z;F$>y487e~d##jNIMUx8H58kc?gw3d00 zdIa;TY@YS%uOj2IFWTbeJ+`;mS5Ot6nu6AMPtM`0FW_AuXW81@a?+;X-V`%Cv|W~g zq(ex~v%l~AL5E53OIiGz%A>@l&Z(Tqc*WguPirT4E^ExT1$#k?TJ(uahP2e(2b=+u zzu!mi@0-u{+}p)W)P>J6hw|terea$5<>JhvgwYvGG`A>Pi854jOnUX)ZH{a)iKDWj z$n4wINrxx+8yp8m2UCT*_@#sAH*4!^`K&hYGKa9})-Ir4Nl3^KE<%3C#$9$eiM%f& zq9$ZV=ua&;RB90zj&4nmyjW#{v)$ac5Xd(??rgH!IpQ9n2a(HE?Wx_uI@cg>tABEi{gn;Xp)V0a`|#C=2oD;`ls#L zo@}~qx$dRqAlexAs??gDsw`rfTQ3v^1tT}-;@(fyavS%AJ{7yN9863_(wdfV#U@Dy|UQb9xWPk_Cl1y_T-r=o5SwkGAYLh z88TrN%ucv3WpnU-BD$`a-c_{b)y?IAfNz(GlGMF_g@!Iv=?)AGq>p5atlnqxh1J>5 zkyiEaC$Ce|96URjlEp4sg!?2n(Swk8JSnbZhXUemjG?tC6!TYHl(A11HcT3#pw0me$nOUJ-)5n8f9 z&;ByplPi8nY>94pwpQ+N37>#IDXz|_jhxGQpBZWH=}XhWOR#jV1?{}@jrcs?g}kBu z;D*dh!^+@g+=qkMhA*C9<#1`?j=J&Au06d;`zN@n;j%XO;oiilLNoR-PTj+y{(~wz z*t*@d&D#$i1fcHA^r@24&~$!p@Gh}m6O#M+lZ0`hy-U4xU97~?FdE$zo#Wj7p}Z^R zz6f3P=dV|`BnLBtSkxc%AAkMov1wJdJ8N$KzGdm{qAis_jnMm!?>DLV?Z4$HFlg)R zH+7nf+G7`pWu2YZcN}W-Cf}#0r!&4Q<<<;h7YD(2NFFBOdRCl}=1p6hp}u(K*#nFA zVDId|uXA-e4o8l~zj)r*#PUBm^9h_U8ex0HV^?Sdp_)maz3`3KsPnkk=0YQ^*S<~+ zU%u5Db=2y@rk+P}L!mc6GMcw_0WF)>pKCMoLTGP|p7G%|VC`xuMX|5)^vs0p41&A6 zEI`{(4xF^m$wK}+?hqES{fWMe~pcU7KFhatj`N~oTeOYe1c2_nqcI8@j~pvY`|cHvK5 zyT(IWx9(@2a@nuxQk~!VW>z=`>@HEE+|STfR+ zH+6Yz-mM8a?3c<=pQx35U*a)JEX8=EyR4>G_*qz4`!6~GB$meC-PvhV3t@54J|~cI z(Vyx}^|n{w$Noar&aYPj1no=_GE~B?0|b;7>V-k#M6{f?`q%s+&=MH7-XVOiep~sjnG6{8+Q8OJZ(2KS)T;q?vPvzR^#sR}-0|z5GZKTd-Ea zlPlV=r-_YwmNxL_U{lhOXaR@RT+5-?INfi^hR1Q;uPf!nDt2DIdUbUf6|<21(RBsO z3^GCMXujhr?ZY2mnSTYMhQpwx;ju$|+T~mB#WONuwk=tGzwdU2MZN4Ip18RCF&p3+ z&}z&0(VutI6yq*>D`kAB|6QXdfc#`e(T6@6cRGLJf?RdU?OXG=bXvl{UT6!6>t3*{ z?KLb2V%3bko*X}_>^723 z#^+2n*Q)e-Yj0tU+{ma7(Ld)sA%#7*`%c3AqQb0-M>(taUXJz2*<5tHSI(Jn3PrCRX!>{)-*wthq1T*Y8Yt^KLtov3%>#5k#AZ4LMM$};O#vTuJXHHyQeJDizRBV{%>!*<$ErkcwBrxjOg$KEr&AeQF|VR4OdWnQgu^^i@Oa+ddb&!#UFV zj_8i^cX^9~_SXXzziG<!QpABj*)XcCU}ohTjy-2x z9wKJfV-J;m{}`eA$oMw=s2lOCk-MES!fn5HmJOz-YYWnp`lHWR<>Nj8RYj9n{lV>t9d{4Fp4#$16)Jp5S z>%$888Z8sY#!F4Vpx=*BUG*Zql9l?v9-I!qs7xcGLEm~Nmhqs)yww~;+ z^CUCke*WV54_IRx7pQK?jCXa7qJ!XvC8HKpD^KPrD>%V@4;8kdxa{TSLnBHjKmm2Bba&-d+auJu*EtfpYp60$^n~!@ErgqolOHrSHpa?AOe>ta({&{g z58h<9qm(i&hqfMk${^HWxu`(-9 zmohu997Sn&P9N?UOE%9WUe7^GE?qe{=<`?njiy*JFq5|i!+BPQN_{2XrY@MoFexw? z_NBMbb)D6>UldhKtA5Vc}tx&AovE36g1T;NTbA%v@w0&Hv-v z@SR0H`xQqIS3Ie&MmfoS;mR9(-G8k=T5*$wR* zDn%wn*_|9pY$LcKuL5R8`N|JsS4de?Gr2f9W8Z{vZc}q#gND0J$=(4z`1E90zJwwX z_0sDU*Pnj)a0h_zu3TDz%y{XkqWL+~I8|taZ_2Lz@hUk_K#O)$kN)K2rM|2thP|kC z)q?Lp#2g98symDZm8@p3e%IPcF7R z;B2HI7`B?7#17{@|Kh2TZLa0II>4jeH3O2R$Y|p82sDprZZ*Qfye3IjC}I;n+|eCh z>R*{ylnGFjEct$OLC`*1gSP=hmvWKg%}Np3<|tnFs4^P`CsB}2pU_<~a+%H-fOCEG z`Su%@=_(EXXCtMoT*F1qXi=n}Rn6yZ8a}sLvF{80%VUeZ*aAI*6WL?))|eQL=HNbJ`Ug5Ivd5ZckgIQ1kyD$!}N<}LKf_86|!YBEO~&q}}Z zY_-dg?O2hS{+#A=a|Ao>cbO(lqru#!@u>A|bBSMU(wI-@nwMweO)-VK%z}j`GY;kt z{YtEQGqv%S`qK7BEKzUaJ2c8Pw2h^X&8qs#_zGZFLd3~7mOjw^PeSGXXX!P;mcyPX zaRmj1)A1zl{+Og^Y5kmL11u`8sBrz7F8lr1BMZlGFt@b$`K$Bb*jMa@D+u%DM(O+! z;{gy?x`B9)<9A%R&lOh|pZpXhpy&B-aRxj*>bmU@ZP z(W5Qg%e6zQ8`K@Ls{!XwUY9RFZ>mogHlyI}$G|LC%~Q5WLGiF$T_)w^-=$+#T{MMe zBT`)_#~`uvm-a93ABZFzd!tJAYiimpr%#MefEwfPP2w`DWcHpf+1#IcwmI7&2}{&RQ)tk#C15aqG7(kAqFVfeaxhcN z)Ktb-rC>ipoG6{^T~*>X^10ZH(+!r1;`4%Txo^0uXY4{(*A#lWZ4>mH_0%1(TkkY@ zcURb%MdIK5&=ZZ|f{k5@va_)ODyoo)a#0U{k3x|gnR56^6_F~`m-s(tslW?VMd>kf#UJaJv zlKf)cXL;hC^B`i{S8&FN;xjzp+zcjtcmWz+Jw2T2OQNnzBzm$Doo;`gDVM&dyZJyV)@skxk)Vep zIQ5NI&G$K-&PZ~Ac4(qMIuDmpYjKYA2kh#0gEP?Lm;#8q&Xiw0SeNKlxKZ z0gv#}UN8Rb{!|6e$2i0t`a8wQJvK4#oA;EWg;s_NgTeVQU;TcvA&NX1`z>>TPg32r z$K+CGlcZneI%~)FJJZP=C(_8!2&^dF@zY0xu*zo$k)1sxh=qK^QI8t>7v{sG5!9+h z7VuZ3pWik)-;c@Pw-s4c8^4Qr_X}!(7}A41FU~i7g*F}Mvs}NX?LpLJvv_?c6zGUg zaPZBF!#(Y z;0967&r&#b$sWDGt=sx5!6nI$Z(d@e(Wa9M^!N<4pqm#bn>|DaIrBA9+8M0EUokwHQA>u1jG6hS-CY6f*^eaheL5xbA-fnZ@ZeVr|%;B3 zJ!v(yWQDBgk$N z=gaI#$&aaEuHPoo8Ok>tX`m9e{>B`_#$me|Z_VEXvQh}2u(7B0yV%yeToSYlAhE!z zKzI_`PeU1^5wt~^&y4VJ>UU!Zpc4%~{PtQ;@czDidwV-<=p33&{o%mJ^}Ve)eKd-% z7%6)Cptvl$YyPw%@h>t|`i=_e05`t*dexvev`4J>KV=#A*S3#QxxosaT9CHJ!>v0; zNQK|Oxj@w>zKtl9B0CnWxVVjuI6TBXD>9p?1#!CltKm6i=jb|Hq91M7_-N7MSO(=T ze=hi^Obou{?%Hd*hCkHhND}>G9*+`IH|uEEX{IT08MG^dZu`9GeL&L_fVP>)KMrj2 zUqr>>HAn=#9|}cXCb+EC-=iz!xbHTMe=9zvX~L%^u*Cl4EH(0kyh*KOXgS9l7<2$T za&t%1S&izP<4z+mCyx^m3WXat3Qb1Z!N^sv&=OX6+>O_od2#Ba0J~KvQQ5@I!S0Z8 zm|r8H;GItDjPm;S?R`VQz4kBxUvRdnG9~Vu+c!RofRZT{CX5fFj9?&`MO}rO*#)xxcGB>K4|Ic#ntlc^GHRwcPch&0E!0+W@L@kHKP0J(9h zjA^QD6OsPWEXtKWz(?G@zapLb5Bc#)DWn?r3mN>#B>~TGH2K_n#BdQFYrZQwa0&f^ z_y=p5FqeE7-@;my;Lzx3-c*+j)mT*wjmyywfZR;=idNv_VLUbugk4vqj%1?tQx&Cs zG_Zl9`_pU2^77Z~E?(7Hn-)XlAN;8hAlLei60q%Ya#>w^%Q-wWS!#V5saf)Lp5+~x zs9_L=n4iC_>r%bD(;niRm!H;BxzCushaeEd2F)*1DtD{?^yk=Sp3v!6r<}ml1K!y~Il^YTv zSY)C-)p~QO0j86gK#<+zV|-%K6KAHWrgG2D ziB&D15deICVXBVXcr4T#-KhYs+X(iDvt8!X1c~~F#%c6XQ0v>YM3uEBPGl$TY)44f zwZt#8^j)v!s;Gqd%5!+Cv!Oa#nPGU5!Bly_?BKcai6 z#N-zC+q&}iPmcCDaXyiv&mb1-aEl6!vQYtvShG9mecFsFhz9d)tG%^1X>v0K2feNJ zeL-`}Cptjm)o@2;sd_*YbU>krY5V|zjR>uz@$4k0hXIX9F^E5W*%iu``Jq}G@_mUCL>G7S!MQX zRFWq=eGlL~*pznT>#{Y`I>yT5%*$bUI$lIE5(a{dPzj&}lQx z+I@W#tHuxc*LKjWzwJ0oK*RAl_h#$4mQ^>oXC9NwTVJ5dfK!MbbQs??g6L=*@LaZHVYhoDh6@JTPGz-XksYs5fE5Q#^K7IT91I^;XfonuRihPab z1u2V|oXycre^+@n34745YiBw>JqUcvdgJU5XK~v1`_-SmeD%0aO4&5vOKGq(-FAzV zwreDqxqlTmp0M~M>Hga^CH=l)3un1XDgf)}-HQ)Fdl&7ew?cb#tKI|0;67X{gNZP~kAo@nh|8B->MlrW`Ve5cv)F^v6zN4o{9-h* z=JCZVs~ubVUCAmHj-^pm=ZxFH$=klNJr?j*jeLJbxFUYRs=_kF+`7l-$K~=v|Y5pm-zpB2u`QR6MA{WK)9vm#R_+>Qgv3cpS#uYLan1CU z-t?_JB3zaVyXwLIPW9cQi|9mfWR(t5v$D450{%jGky+_p@lUI(y|{gMSdPwUfri$5 zlFfm<{!dY!p*Fl^u2HuAQAMsKpxuImsntq}? zJG%a5f>k>Ue`xHi-*5xB(}q439C-qic=_N>YBP-Mlkr-TfGb1BYjdUZ0*;(bE7;?{ zn9ZxX%Zfj+=UE>|**%!UWtjYG*Xhbc_CBbf3{0qGtYa&pmWtu?`t638zA^3P5 z5!5v_M5a25%q)Q>2$Os|86^&T1A|ZMaEl7^0Etz8F{9?I&xmp_rKYz(Kv3g1psnp4b#VGti^-JkBB4;``gt%{8PWf7Fn0SD*m zXK3gtf@NoCS3`g4X^iK4op`P3?ZvzGO*behCDDY`2Z^pO1$Iv*NK=E@jv@YmnLWLrA@I+)UWMooyi)(-!x8UG!vA;W8-A zPAMg&3M6)dlCnqx>F)yA`+R)J z1RP0-)=*8_O@xYU>Ww2enRi;faDztzrki(9RPuf~*1*(B&PyONnXh9B+ zS21PjOif`UTty0w_rYPmf-i}0YhtIpb-1I`5gwe#s`@umy9pN|c;QsX&GqPlWX`Wq z!~cP;%Cm0?K!9=YMXOR+Ytp6&yrvE|qu3nknqr3hxiTiqTi{m|z6|3Gd1bS!9Uh{% zH%_DlFp2PmbgL%bI_o6URG0@>oT9*}xe=2@OTsD_8SQe!sl7?k`ZoFT_{E(a8ZIZ? zg!<;J^x8OkHsK;Q{45TZ2;d+xu*i_zBG@o`7j>8MmHS-?z&q!w-+?H=XaEGY^A99Y*9xyDK zve$*YhbFTLn1ISQh3oS#V2?K6$|Mof!X|e^M@mm7>@-&{!K_hr7m=I$k??Si2_>lM zncO1YkctX|(qU12LcKl7Gj7D^@U)^@!nNYWd!d_Jd02WYF;TC+>HfL`8kIblO_wAa z*%#4!A)w5^D)TZE(t(`ug4+yS(huc!H1a zoP&l$>Gr~tpC80v8aP&VFu%hte*F+NnLqE)yZb#B4#)h7jtS8%$fM`HgY}*J;_>AJ z{AV6`Ytc*n-&ue;T^JjL<{vFRJ;7-+MaW_6IyAM5BTjD?<(%fCOaRWfS&any;w*VB9P^uwJOk6SnsnBFot za0b~@3xa)1_u1V&`E|Y8&1tiKw#aa%r;#;M?UHcn{Yh$N$ef^cNNC`J5|Su)Xzvs$eL+;^{-Lh zNYnTcie2821p^0q0u>g{-QOD|zd59Qil%|iahop2yZ*WO={t`(Y$XSN9)~6YVCi*D z?$VeGcvj$4+Kf^W@*hkk(Uw>(Kg!|Ya8#c^?er!*cw20_cpZ9Ciux?B2RXK<#u89T ztcby#Xs3XtMj%u7BPxV}c~AD_-Xow`^zWwR`Vc>1MDOcCD2l5GE7`$b)M1*|ME-gN zuQB2_ALAw8pTvLIDXf@oNF^r89vmYnnTXdNU&^OhtP<6n;mK@1f@c)9? zcI-(3jT^VUaN3y8x@`&~oIg@8w>6qk-f89hPkAE))?-CUNrktS1^Kqew=y(Y3kG`z zDsSC%Vh&PHRgsVjSL_~oYx3v$bshhewu57i&F1DWxAj7gc1km?)HjXMyH~@|NCTZ5hfJlyekc)TVqHHJ7(i9LC*rFYUSNh|!#NzH2+${;p+B|Q zD??Ezdu;*RmC(aOkC<`%F5#HfiApvs973g(4mnvGEb3CKs&p|eJvqc4pH$7Y<9C|n zSHY>b`8h52xe*lh(dg>Buh8*q;K9a}=RJdcvy&A~^&fuTtiRx_haTE&<%i4O5Pby8 z`@~@wUf-;9**p4y>G>Rdaw1J8Dk6@X&Gz^zK)R72gnqCi9R1MM`DCMrZrDCg+K7uJ zAinDXGkP&8T4iAmQ_j%28I3hd-#=QrCZFSNmF4s;NgObn)c_YoYBISfc+k`>+1 z2`s{$G*b4)iFY}>&iMA6F7ruP*X+_VGQ^YC`Qh>5UKfoZ^1i45HaorWa4AgK$#&Jd z(BE(%{awj%q3C?IyK5*e3~i-w++;nxOq7Ob8}q8-9mSHv%{I|rRt{`@N0D$) zTo{EiLyefUu@$LR7GWw6b}o?WjGrv?9A0$M*xA{^luaKIxM!*d)pfw|wPDChid`)J z@I13-%Y(EGl?eHL%>9_wAr5Ur<^$Qthjg++yUMEvHa0c~OS_}!;1JyC$N9%S=BBDJ z-OmXJ0i~jaN^B=ZU9p15McFVR{!!B^^+yxdy()-MrK|?04!a5KBZgbQ$pvkVJNf3& z2LpDMfl;>O_o^zVzmGT=npJMRSXx@z47>NM*+Tq;8+F*(SzsneS|B^xg{xEfBO7DA zIKo3O?vt#3{eeL-)!>-&zML-wM{Z$bO=x%AR;^W6f8vGAJkzSHPE!r(IrHHKnt%Hv z`NQDMhBLa_^%^{Rix3y_z~UhL>8H6ZKE!RQHThDj9$j;8K7*$>BhA~9>9i6JgSzMl z)C3c<;%IGzq#;qGsKkd%M5u|@L8tO?CrclV8@H)E(mci>t>)QX!z!246^qHia(VM>b_ z)b?Vp)e5nAqLV)j|GfTvXO=uO30MEL)Yf-N(c#Ysk6sm`rlP*#dc5m$+wZ9L<%)Mj zlk?iDxjN0=e3yiBEOGt&+qken4C6ze!g@tn6L*4V6;)M(G8LBXF3g4Ckz$S+bO>X4xNH&=l=5 zvgj~37h*Mk0gdL8Y_E#$$K!!l_6VciqMG%i;Lo*Pnz;X}>g0H9?+DW+f=Bb(ds$X^ z<9VYGjrtJ=R{^3yMo)xGvuza%coFjqEwdHFyN^YO*;Q6cP_U5?Pe!4-;Cx3o zI|+Oe$v##^mZ1STjB}U|TiL0?M6!$S<+6#2Zu#8Bu$&$0J80$7Yj6IFjtV(hHv91| zPhWR))?+KWaA;G~Vddu^{-gX}%aeN{vxTarEk<>kr~f>T5bmIJ+TEBaJB%y<5JI#Xs0A9G&;kEXUPKh*Mcvi|ieAp<9}0+F+*@1!GJn7W)7@ zkzH@Y_1i<`1pQ4j`7x#Kl05n{o!AEUUW=TD%~f@~7M!b5l2l~&B$E!&Rq}vd*@J^S z$Mc*A)+boebSNWm)L>1a?0LUOgmHk^4TjlNN%pqJ2$NsO$bBTO1MPhpD=FJ?m%V%= z6x$#XMGzsipiWtlc0Y|1Ciod4-@_&v2c1HcMN{A4AbQW;tR3pmR+=Q9>w*g#loE%P zZt+dnZdus&yrrcyeQ(yPpk5h~du5oNURC@FSKjWY3Pv`^+rowDmfWxR%0Ty^o5YpJ5Q24 z7h)M4dLEE?OuE3YU`3zAiQZE?;n;ChaJz8DDtD0limK#s%v$ZRfp%WM z@lj(}`RfHBm7BfoZ!1PLXxd~Sb zmj{eXR@bsocQEDQyqsZek|g@-;riQ1)kNxC&)makC@NOLpS6 z9kU(}CW)OU!P8mwunE~;reD<=+rLS>u#}t_+DLKqG+1IgOYGp!7iue~(}O;+JTh;z z+}_K*DKZ<8+tC?Y?0A~;fDHAu&f3;Ls;tGpeLm%MzoXEfIgGJ(FaHSu8qxY5Z-#W- z*KNv<7SNcJc`d!0@piSY-O$y%f%0rM^i<6bCf=@lQ_C=h*AI zX#VHJr%@9GdU5$qa%bSO!1hwzN3*sm<#~DnqPcv2b%m+(6)6h8EAI3Ot9W5?$8DezyM^-U7B!CkFid1(N)ZjmPTu!z^MwcZ} zZP<+pg>`s6PSQt&K$F&;-I@mkG4 znV$BgSr)m_Xy9>gG1&w=k_f5aa#yWL&2 z|2gAG4DT$#&$7GpLfQ@z*+?NBW0>&9P5kXz z3_bRpt^vKYBvfo^+GF0@uw%pB6RIY?|8C61BDoR1JA3k{Q=mw-&Wl9qqu-Y0=@I-I z>IOdxqXci%Dlu6*+P<1Y%5A?>({Spx`&!L`g4eq9`q(_NKSP2Kjs90kL{RHxu7a57 zs?c=j>1rS=76W&X9i}u`@jHw#8ys-k6PfryT@ZI4tR)&FMz~mmGDARg7B5P>FGk-< z`q~da+evWQLiA@?51;J*oOK*Djb8j{jpzU(skrlg$DFq>d3$rbFgIrf(uX+Hq^0Tp zVI|6RVx&;pI6Gte6c9Bzica1AG}GW^&2CO+#2$g69l^j;HnT4XAaXWcPEU(&iw@zSCv7w^&U|h*6>&>$5ru z4`JAjXe?@(ayOrdDHKEJ75ABEL>3K=SuXteK*Wutk{^XwA20Km|qDV5;2Embd?1ve1)`j zzcP?sLb!vc&LddjXilySVx*yQH0(<;U++uN4KRm*b7#z2A#$peFo_1+X>OIQHRZON zFL^X#ay0yiLPX~=uc8?;E)hEAW}T@T8=iiKQlra+)zv&k*D<->MVuT&j+rd-vPvPk zgi(_4>a3Zo{uEN1GG~jqhWYwq&Y*73(WH=XpZR=b5t#eo%&0qLXe`;VL9{)((wfN7 zMStOiMs3NUrr5$J+x9G5@MBMXPbRl%pC*+-1^#Rg^Yi*YE#VN z3SZsDKG$ z`)G=B^s%w7EXKQ3Z0zajIaX#HpM0|0n&93XD|YmAwm)BY*yBxZe({Fe>LAlFkmL!6 z9foshJKabe2*b(0mPAKK-m0ZPPdqS6reNuM2f#a_xqNk!jRx=T(c4#A3XfPcGQ3?1 zft{vU3(VDG`ry8Mu-}C(bCtmCvk#=xsA9NnYNde()}QWc=RI%aL!?qb6JV+mQe1gI zjiX%M=?*aKZE-(gw)juC5pSW7uYAK@jG`e<^Aka8g+>HSZKTL*VR`89PG}!z1o)ZkvrpD z2%E!ZC>e=y02|3mWDyydM~ zN+Yd27Exh>2W%aqu&kd0*%1T)%2Ox(vNhVP0Eh zKC2OeU9>i|eOoY7J>{vt!G5$~P}S|C-BLQNFXBRWq`QuUAz>=pNm{Eft=CIwMB|N@ zO`~mh;}ji#Jyn=*fJ^qw%^qOtnCHf;HsYLyb@|RG!qaxVv}1~RExCq<|9Lhjf^#%g zi9br+5!Hv(`= zhsS~KDbz5V=cg#5f8od(wi|D6Hf&G+7|6^1VlCwETIst?)x@~yk2Ns{U-*)+Cz#m0 zvSzwbFMmdyrktOuIt$-t6rbBnUxdE2QCjTQzrVa5>Ur$CXx3Hhi6ho+|9Ja0pikmX zdN6y8b+Jwu#PIK2p}gxwclody$C%+-PmJHO{b~B$Qz=zC=|}6OSg%oQtX!R!T%Uu( zWU&^)=I56D=xgAJAl`>%ogj0;%Ic%RibXRZ97{))aH#!OT_rybS^?vEu|*KQ;_u<+M1LL+^u;wEbg%}DGVCyaFqE_e$ratxVoPnUtyoQ$kGF49_gFpQ($hvu8;(FBfD=z4O7B5QJ`l>}=qPqP}x7?1TnzaGc9--483U984 zGegl^{-D4>LiN!xJ&7K|=xNmfAG~dwD=#!sQ+r+t;cy?6$2eJS@Gok&$`xJ>%#Ipj zs8hz7*}4Jyla*kB|J@ZC*i}&U6_Nr;4*ViP0M3}X@NgF{v*3Qq;9bBS?t0^XLkO?n zey2e2affR%xZmFR7jXx5$iMNWo-#3)q1AGeIG77~)aEB)=klg_Tf;6oNH{x&cX+J| zw82{~!3QC{x{+}H?*FoeWDtWE$aF}Y9nR{yT~rKDK3y{pIy+IM9o9oLp|U>V`YID1 z1^ubt)8M5XVqKu76L^^NKh-Fi@hB$Tmd31cmrpnb z*;UO3OE@lPMDq@u<|pEAt|#up_@j{F?&$DgzKYxSdPl$tkWSC=|H>}5l;Yb5N=C|; z?}1{F&fZwBgK}q8+_X#+SodeZqNLx}T8^lI-gdL*NMjkNg8mNfoAOz&GLx(Q4|xo$~hIhd|he3=a+ZXl3P5n z<)3MbVB(QtSh$I6fwyOJXAiJWqYv0g$)U+QsK;_F-zgwuq4GmTC1zZKBgIeOb8m3e8d3B4GsITc4Z=)Aj0KOWj?M)x zVnxTJ`Dn02O*&f7Q89e3PnplQ?UkpEjw!@plLF}fUw1k1ODZAL)64(`Qlx#o*pq|r z?F$FrmkzuNT6hUUeg;(L;awf~3l`V4@J5V$$*hR6ijE_%{KXD|o}4DATFJ?EY`y8v zuDHGeiMK7&CJC|XwYZKqJ!+oZl^!CkgW0jGT90a?F{~z30IIw`>nSJ^UbL9xK6G~S zn@VjC)O@yUpyUzHXN5e86XY1TDOUMN&KSq8ZC|su9bI=KhtvN?sQ`GfxlB4~34=DU zw}JAIN%`ed;-JKr{Y)4S9r!YP8}MSufqNm+UkMpcLTCjt{S?ZUO5z})=U~Uf;TFTm zoqTQxJ1g!c62wPg-si|^`ZV(GW^zg2KlgIKv;@86B8MpUQ%-~30PJU;f???C zv#Z$~N+Umu&}4#yAF?@~zZs)Nxe3uKfi%kb~#UTIcMd?qy9?RM(?qzLWURVo2)J)EOEv})cM z@>m@xJ${aB>tFu(%z``p4=(r*6#Mr~!vB!be?NVb;z}SRl%?%*ZhE}z@(7%$#xvSq zGn-@tEbn0~v~$l{>tMXhx{I*&!nKL7Y6vsLJwdw~uTUyP|rGqj*&d&h3Y=ql& z26C;Q6nD7mO^Z9ILj-V#6iB{1kvHxPqNw8zalq|Z17Ux2ez?}~|NDi%&&KP--RX^A zvOx8Z zgUXkkH@4)0_4yS%odY@uzKrs?X|z6Y`zN`rWJfW9*2#><9o-lu^;XNStgM`HN7v9w zxxE#haA^FiUYTFyCgJg$I~T7lB*3~AH8d&?|9puzg{!!(6}Euq0J}0eWPVQq?DxUv zF+-y5vDLJ5goK}&jN%5JIo(WLJ}K9>c%zF0@}(2hjoaQsz<~>_OsC-IpU?k#g}`~! z9cb(2R)QrqS{Yp?dixr|*QXo7H45~6w4thohS*%_Bj8;DYC0#U9Xx5leeE*v8OT>0XB0`3fZL8I#6URVsu98{$PR<#mN!FnD{iU3C*34=noP33ZC#e9_ReXD`*PZGt2uxAH# zuwR$%d;<<~6=_gzS=t?VcF*?9>r8i-dO=A?$E0_EJ~6nj6_R-1kd5Vj2gGb`fI|aj zJ8IFw+165~|8B-_aJs=a7wqa&o0F5{w$((F+u%#Aa>#7<8`Lqq7z zpWiFlSxGryBLy%^8engT%#~q;VR{RqawTUFl!?p*-v<#(Ej7t4SrE4fuqwb6TUC0- zQ~3Mp`8#mW1wa4+?mGj0*YqW(C-)+0?jx`b_V3_BC zLEbPqjUBfUj_)!n9<>o3&vG8OXfcyuVg~NZLBRCB>+$m{l8Xs2@W`Ame6{atF;O~J z*;arqz~~HKx|5(@3N|-TdgcVup+F&bb#Qg>a5h8>%w_3fr&Mdr>Hc^w$n6=nL&1(O5hPfmVMu>S{PB6gt+oco~@(it9QDsw>?3%!gqUM z_-map03jPnZPpW%LY^5KqPDRnprill?;YE5Ba9gtq)DG>GXMmsKv7}GMlzAP4^*nH zYolbjytR8nx&S+R;z&EMYNPV#7fr3Yd-p`gS|a@H2-K2(xW13WwqTaKKU|_JTF#93 z`u0X@x95@Tj2{hdCl#C0LCwG23V#i%j-oN*0CMT#MzI>yTpYE`O2iR5JI+0SAM72J z;MmTgB8?t+uBOtrc?OatcuL3p$>^ida4beKyk>t4w~Nh_aPFGjKAaygoLvH44P){; zoEd`|xXwqCf(Y*OEY&V~dfTsz&Lgi@Rc;nHv z9M3c7&Oo+DxIFPLqIz2?d@de!Vm1bLyIB%L9d)~aJ+49+TqfQyyV}4gHeJRnv&L+3 z!7=A?+vsnvqUp?x&nM)G%>Z!Kn^Cb;{-IdTb*@5 zg<1HwoE)5JSCP&HkqN~qSHq!~CPD0$yIt6-bBG-dqVevjEdXY3!+J24aNOPnis68P`8J*0cbCH0 zzr2kCT3Kebx4NaZiyo2_MFz32Ju+K|RKT%kBzp;1lViFE!i`3SoO&0+TD!X2gMz{RqTp(KW9GrF+tDgbNPmA0f1ax z#qpGE^6ZMz2NlRJmmaTnj;zN3+ynb)1} z=hjT&)ICnTrnaB}FO41A0c1ibZ3nOnPIn29+w?E(^OTLG#Q_iluI%mht7&N&dOA6Q zmS`56b>&RGn+?J#V}K~)(0kqDt9fHFErGPpanoPw36yC1@zg=>@X{6-nVgNv)q*h? zj`vqS-AVdx)}5d|-U1jE#SMl1qp!dLGhl0NGi1{;Ym%j!tuxQ+4X6uV1lV}-2&5;0 zy3qH*puE^g(0v2w#~gSFI<9N!g^8d%1g!H*H7i}vNuWmpU>lrPFU7T+44p4BoFzE9H$TZP5i#09U0l`tg%w39i5?@s1$UG+piqQs;TE%+V zIDl8j`|I&wr9F_&1#LKm#f7LY>YW7}s)XB?PYUB8E7QAa9~?K~NUmQEng}$;{dk)q zMVzXmkn{qo?YMEW0rEHArx&JCq|ClR+f322lDH_T6EV%#45CCff*gZWt|5zT=w)vpKL*YdhaFyM1-{kdQ z+efZsffm9`fD4_F=@H=?1inIpciw~)AMoe@6N$~2fV{kbyCb}0TMnXse)H5&jydE! z?h^W~^k1*Odj9IqJ(d45dK9?~FZBFv{XceCiUtzmKq~_t_DB+M+!N&jsD*wU@@5m5nP=D&zX+MjSUIwI)7wT zPo+5|2B=4zad*V(eSRirF^N~tfx8y^EixJ3=(-FzeW$y_#8z%QRMSO?vtN!Uis9DF zHwBl&21V?bZvsEvb71VmpErOfO$Z73p7X6BHl6^oxwT!z2$4=OGq~_Wo1lJ#!(M1{ z1CpXKx)7PlBlY3-(J473nLHd9o4b}`2do0sPGDepYj*!*S%T~5V|)g8cVS{0)|jF= zaYrY54%*P!4*i+jy2^0pjf3VLysOV1z6{4t#jC7;q^PW|oC;Oa*0D&n)ror6{_OIt z4?n)%x^neT=+8@U*1)3I_OXoE-nH?>`6&!$R);Ofj6KL^G%6px=(_zFw&83h*u9f* zP`xN6`}d;^wq^Y{PrYY6q-|QHejRx*PzqUK9*y~J;Dg;{C@B+7Iw35eqCfcP;NSQ! zJ5Aw~kH$YRb^SRsk3>E4i=`Nq__C>=s6EoMrK@({H|5Zohb~6hl_$l%7ts!{cAvUT z&f2=L_c&T#<*PwN=I7;V|~@a-D%y4t?n(Gh{Z=Sb$p1R zZD;D&uPIToH}o&Ff4OY!PMOpt_F66W>66Fmj;tr+_m9y<7jN{E?kKH12)=467_#o=rtR7lsGgG063kvOGl-n_H zrqGQpDnuP9;ow$Fa^zr8h4=50cS zv+T1@+Z{4XL3_1^tK1K`NLqK}?(Nnwy;jpea?&SW7B`?#=+9&zb-wQRhTx%u-o zS6(MQ{Y?P5D^K=vXR5G$x^j`CIgD8-^+xoxL9)L^-*nw=0+a@A!ik%}XTGtNs0-Db zXR0y;;^^RpLM3^xkr#u}#=pErnA}yE$I*FY4`1pkdy8U-vm*&_Bwo&2mxIV)T}~bH zLT_qo++g5rr={!?$;^GvCUp=*0J%)bW^iml45>F7_T`vi6?64F*ZAu&b--;nxxWea!AkFRoAnLT#x4aCA#?rP$}@6dG-lfx{g$C}r>M7|YnJW3bcjTN3# zrLee_`?=%H>cVY9+F9)42L|CZOA~T^``}-5944FoQ-rI}rJfTHS!sJ?#{?y{Uauxu z|H$ci@xrVstDP(^lwL6P^x*1arV`fUsy3Ei8&_7pUTRm50!sqI*qtXtE`8F(pWjG!lH-O-9_ygU&wm!Xo zt<&eeTOIB9Z<-;}E6ppIM;4wMR{=Y;rp7*RpkIHU{>(q`F;mfy)KJMi;zdr^X6qn3 z!YHFljZoX1<#ZD{JjgUE4o^@@u6BK&9U}G8_y^Y#rhwV%sdsP2i*6B-Xrmw5n>Itk zCu$zlW`?vrtNlWrp*Bh?<6&?+KbB5uopq1rq~Y34+1Q+XM)e!R$=XjI|8Tx`lP(t> zDQ=v7vY`|2FR8PL7UCgDjR`e+%fWxt?v!Ni&5&exTnAoXAOxCEDe6K1BfD{0O5cH^ z^sz1t9C+F>F$`AZf=`!mFA>Dp-6mk|?TfxC^FK=*GDSJy)+(#pqEMTMWhgz3uBlSZ zk2+U#`Zt7(<|swtgy*Lx!<$;!1_@RKmY=83{h-XI#fJ<<_2uC~kn_hZQciET-F%-v z0HhdDXW?rOBd3Vr?lAcuP{l#(q(uwhESJ_kysG3owiZwWC0 zuUP+|98A3Os$HV4ny#HYRGxV~S)$J#un{Cc>L@EvlWMhR+ zb5Dp=geS+Po);_*wnX7_awmimj*r}k1O2)f)ZC7ls>*>)+e0RSw66(k&o?s# zKi|8QUT5?kfcGx@V^gmKmS^*vc;7>Q=l-2NJX7O3GGtvYy?3oLMAit4 zDk0!Zu`EpC-o1`8XQ52wfDd=^dJ zQX4-(WYFdKP6FhDD&B4R^%aiyM~odfy}fhFvX$@YS?{#&$3E@W#Copj6UJ1RYEuR& zF_y`M-9cy1$-X9j;*cLNcIBLHWCy;>(L*f0TJ)I*M0%_nxw5j!+_zTWmhl?6(6Wth zlh~B=%gU^dNj8+*s!OUnBTOOgifg;}!OP8sYhcv-H}Irxp=x+3F4hkkN)STsX0WfF zZr*3#*M0Stqvu8a8b^9U82?G}?XOp_vRH)LT)s?6U-Icqsk7UaH6AT|mPGr&RO|z0 z*$5(ZlruXjO;zM+0Cf7bv_m;WY1Xd;mVKeJP0MtG4c~ziHX%63s=*tajZs163wq{`;&`b zDTUPp_j7ElBNS6kg+3{9o__eW_!Y+bUL-4&UifAO>f=UvpjI~}d(Faoo$pDdYK%o` zF9(RTj&4%Pdu7|xTA(>sIyk+iF3i96W`P=CNWt1!^L5ifmVR=Pr>DEgOO0F0i&;P1 z9J&UypMb$QR?1Mr*&Dq=dNMqqjlUTP>(03NoHkz7JmI$$c6rxx*x!e_)8MhA@ci3# zm%OiiP%Wx|@kSI%*;0O z3#pJxrX$51wxI;(gI$>_VkMKpwGz!=AZwgEb7X*iT^=6_dt=lM#S_I!GnO0Z4?=^PH%w16+JVpxng|4Ec=T5 zYYx#=n&P9KAPx&tJjcffDu5^y0Qhr8q4dQNN6mtjDDmJLW^LhF$AF0+*+r}G;kraq zJlcV$%^FU%EGxA1!I6Z&4ZcqrIQ&w^-By^&?8*`+_>LF(XF6*TBR%OFuQ_z;e;l;)yR#$UOv2R1eUpSX}O(h&Z8GFMef z!yvtR6hi|XzNJerazMb1WqB7b#u?moD3vCGhIx5z=XPDm{FcP`yK}V_8PC5BtEo>B zQ~%Wt{Z!xg?AHvkd}wXQj{GZ5!=_Nn0$7rg`D3aLL1;w&btQ9=#)L>z^BTY`z776T z>aQuSwD}+x@mlxeueeQUD2@{E>RceI`nEOoIRM;}%4S6TLsQ%=!5XW)%;C%)uzc};PZe5R= z?Ij6}Se0KN_kDoL#T}9(3kPqWtD9auKp*wLsqOZLTy*0)?q=P(>$fssRm#rNFCq4Q zUq9VGTIA`xr!>dR&MOB_3s2Ll4Z6=jn_KFx$=-bJ{aUl|M2+=s7CS)IUmTU7W!sZC z_4cFL0??&5cR%PNE+CdIXNVR%1%9c-J8srU`ktXzmzSazp52ObmUjp z6+d{*_7!vJDBWGW4Mhl{8FSa9()iOGoV`}$o}47oR6=f@4-1bJkS8qT<`2c#ew7RP zf`N^UwH+^FT}vbcaMi3v+QF6%2VSHXzjM-+_W-`{adjbm|KQOYp#*3YK<2$;XL?ZW zL-cR0_?aqk0?=5=c-Td$nTObeg&Q^`ZZ~TO9&nZPTW(oB{jP%!;V{wa{hoT|p3z~J ziUnL{J@|r2-5a*!>NDEPp@kW^E0HgBTk}4jnQo(Dh{XUvxWAppd-oP@cnrVh-zJd~ zFdn5hdCXY$B4fpzSmlQM1YuhyF(gxB&k)b%F#c8E(U*HS@;L9`;l2pfuKSS|PE)vu ztl~rH$IrWj&TMI8PH+9>>u4-Y^X^m>I9{N8nVhlvhU9*Y87a2< z5`e-nao1W+B77^mQ6Z@blw7{AAg#MPSAYg__hhm~sIuspw|J9b?QgsfXwRzwHcV&j z{i3Yf0t}xo5fH&&)`{wGr(7qN9yKUsPgyy{vz~Y9{oa7xCQYkagCQT2M6Ay1+Nl5w zq+v+=1B=zWWyCHW{-+w@3k7N>yU}(R!wnAkp~i8iwf$dKf zcar)w7IU4dd5L;cZi>8qh=OA%kDx6TjDinQ3TKCQW05-)vyb`{tK zLc_NybhtXGGU;8vT`JpWO|X7_k%){D5dw_Dp0}>#4e{m$;n2Y+zHnvOCHdjGX9O^r zpc=ySHI@HsJ@K!BYf&b%UU&>huFf6-V_r3F4D8oxK?Rg*-c0FwxD zy8sh(_rSLG^=;y{?eCQC&}!0*Zx>Xqt9O42kV4D!H%qcg>;)2u*~oO{bBsh?2Yv(m zG(|rL@sB__*>^+g>mL~aJ6B*;tbR_F6yh*P!UIc!YM@*^L-RNpqzFCNu_gChmlSJS zQ(iwWocHmPp<;RLCNK9oi>h#PU&+tIwKL!m9QCojOmJ-DG3&VD=^1qz5hR5sjNv4; z)@g2JmiINr49kH0aO>qmBV8g-)ZXB=!oSK-oa!NWvIG20rCxbgn@XkQzVvS$yr?+U{=bv*O8gjBqB$ClA6gyq(_2~bVxruBl)WdE>39te{$0c#8_0?%rHuVJtj7Uw) zpLQtO&Eo`uEh*=pA`3moIdiV-T<5H=FHY?VNx@L0g>rL}V@^q8>=^aKiN<4?A+P$a5j5;lxHZ{o~+)f0*R!{J2xKwQ^v1!EgRNi7DL1 zRAbm7llF}MF3Qw3sEaJe35?cLH1BV{{FRCSZ3 z(Onl?^=*8?eCOMv1K;Y)g$RJvK?Glt+fFH6U>F{g)Uj9o1wdL`UfLBQmg8!I)D}H5 zt$Z5U`chsBaO)G5%fTnlPZ=*v&~IDR@ZjmXUjo>boSxFF?^7#QY}M?;H*#%C99TT} z*Th*#gMD5rcIY5iWb;?5RvoT!BJSWnh~s2&dO>j+P^2HQvD2wz;*}Tklh3F3?Xva& z9%Pt~wl<%Z0c-rjN~MJJi|Ao&nJWtM^}AP91s)Zvnpp2vrKoY$I+=!}eT@{J$#dG% zWb1q@HO4Ylr=QL#l7>6W5$RPB>=2MfD-DOme9avVj5UVvSO3PHG$UUa!KWMeRMmg>?>6?A!gl zleDLgI(Rq$!0NUrgQsG?ikUVmGwTys>s|tWn8^JwL&1h=bt8wnH;%H2)3kG?&mKQF zZL5Eg=+dHoLnICBE*(>CS~8^xova3~uDi{oqCgr)>JvZA3OOn>GqUBm3AM^|=Se{> zVGwOBKpQRb5)YjmjRYLh>Wrf+xy#d@3c$Au0jfol+!vJQhim$AdPSKoqP_F$nAv;;~|Ka7_1 z7q8S>7j4?L4M{~Y^3QHUpP0!B+P0^zcJ=1K{g;AW|eydRSDrh;Bs@euWX0|;pE7KAANGH@_4sOX|yTwP!4z8&y(WOwYQiyx%3h=wqGk@a{yEKCmUuCi` zQG@h&nKST|4^bCU1<_qlY>a}hBkV*h@5*+c!S-z0G&4p+ptC*YR(dkM`s5(Mfa}5Z zSeq#+V7hyUKgu_R=)8xtZqL-@xXDieu{B)TM!S1xK+mc+j6GT88n@5s978q%y=LO4 zH>i0-gvDv(ve-A`s~6tf|MKw4-XEW)pC61TG|L^>&gZ084@Y++-yk~cYs(etN{U&@ zVwma4Io?O)U6NJns3;%USiPOF<8M(DNJ=l*LII|M=hzz1YgmyxMlhT)^U?qaAB=Uu z)468OJ>+etkuET6T0AbTD(zN^D zSM6s?6yb$3(<{}t{A`jh_38(=SNvMO=E>rkGNqsjfJ773$Hi9?xJ=(p z3D{n$m&Umf0_uzuPW;+3Xyfbny<1g5NXXtM`trGno)*gu9LEhg51)UaeO^t|_uFX1 zD88mO?sb1ktH8nH5_A~VyrH*$3Ev3K$+BHiY^G8N3nJAuFU<5z{ThBXTv2M>^F$jL zM+%J6V!wA5NB}HF!0JD9MvQjFh*i%PCGTIjkg~W=c~^|mA3CfvYQPVa;;OXd=M888 zt80&DHiglTRphhF_$he$2l6v@x1S#j&1C6C$}}BOd$oVsd|v94yg=W#ROwQkqjJTk z+db{2^TF$S7O2fHA2ov*{EvU-;g(Jb9wg%~&}?pDUrJ*EH=YQYbs(}(XGe@!eu_3d#%w$gF1MgaPH$1 z(W61Li_fJIM;i%7+h1SVa@{=9H8%x|Eqc6{V9vk|=1>qt3DsXiz7ro&?_NPt2GM<1 zBp|9algo41Sa>VWKg4gung$AmA zT74R&SwkvQ#PO2!p;~3ioNUa=Ey4U`Zq+4J)Pw$J26E3bvfL@E_mY{z;!Bkxp9kKM ze1$Pw0lO-*vZg8br;$NktF918V74D>KycPtF?Ox&(HCiZ1f6WfP^-E!ei1=2MOpuy zE{jS@VqNz_DmY`_;t%Cx=XsMnl2#lfQ5|*h+>A1U0 zzu&4~8X~UWera-$WCyUVX5F0+d(89?4ms{z)BXU=b`^TqMdfSl!c3yH{x8DwOKo+}#gK zfY8`*Z=oDrmd$k8c86|;($GVNJ^=cdT_R}Mc}DMhj_`STzKB2^+5;c{4gikH4_*S= zcr_qkCCMjI)xMsc9#Q-q1Ylu7frm_(1mBzyUgD@4-e7>?a=@Z*u85cW#{z0x%$Oh& z0*Yf!1pRtMwxZ9$3aN*#zz-Md)Hyj)$+@PH*^M|-!UqtXKnTx7WHk??%Ds3$McaUo zq-M!vn9QoJVgM1@Q7GjpcJ|Ryn_s>r6u7nL0|S7zv#4Xkdw{>4E)U|*bvdC)?k3~_ z&a7F%RJ&4&}4j=M)0Wfc*kiU|R~$?tSJqo}*FGu;nSgof>sPv~o9t zB>4J$O|14szc-Ime0~8yfF34z=?TARjS~4dYj}xwjD_f2!1Jhn5e9iAAf%eMvvGsF z;p$wdbgsvVa)TIe0yFx$_G7c_sf;iRJ(8yce=s%xp*1fd;!+X~ypkr&A91)YFq?Xn zxHVVzN{@<@ELBT;C$c(sDkunWid=^>T(j=#G% z&n}x#Gf0*3S23;C*0~SOemWIq-$&N&*Bl)S3d+fNpeL;75_3&sCN6({@0}Uswo;=L zBXwx99R++waa%t}4IetVTQ<*Te0@O$vGB|=$a=sJ@e9B^vn~R`reM!|FJ0oBe@oM= zdX9$xnrc8U>oC8WIq;kk}ty%~i}EYJSUc+d%-EXpqq=#Z9t-@xpi8-<@Bgtt^-&j9RP z@>6|XQ@$g4K~$*xqSRA{qeacvs=U)F$K1!VZahRPmM0RoZwLm2Yt}SPUoAboX?E>g zaOtm5pSIo+G5WQ|N8Ib|j-Ljcs~p`L_kjXsaAy%k`#1yc{0QG@C>lmqFJL?lKJgsodomql4VGr%iNGxOqcJHp$ue(46V6D-dbD zXJeuuuR`lY85=mve3TWH^LZ1}v;CQ!J^u3ulLXKqnh@ZfNSQ4-zJ3x}9Uujt5}FmD zcHE>$>AUlH0Mq=+fJ$kK!NZ)n(T<@%vpIOuwfO=X(=Oajd`qR!t2R zvR-I1O>A(@gh@|*CcZTgNEB|{q}Q{kwx?M+sJ zCy-#h^LVXPW9+#?9!T1m>`zLem?osW!cO-7Tgai@>~a|P3BidHWI7MUdM+y|dtHmc z$n-Amj$(MQV-&!`;8CFsweJ|HG5b@!ta}hUae0CsreUjOAZt_32&|hWuhn-Mr|o

%2KYU~A-H)9R zPrp3O;Gcd`@rvrB*PjQkPSOsS{=O;zqQ{Qs{Tq+#m)g$-NyO2@wK(B{?p-y}?T~yB zT@^&V)IUTp$x#F6>0@C}OPQ5`>maQ_((HFD-$J+iztYj305_5h$3Cc4FzMmNCuWD^QXd;4^0hL9RtB+71-c1MGnZfQ4OeX#NojO|N>1A;8H@h12tq zftf+BvdQIa?(KSFcKeZ(KW_$2gkGw6Ks6WorrF&U(FxGkv>pfYXu|jj)*^xH^6~2T zGo7LwkV^DeQxos6)AKLQ0f@cs(hNK-zoxXkErx)|ms<(QSdnyB!`tu1kF$T=IIRxM zCtT{xE<#vO$ov zc!tLGoJPGNJsqiXun+t@7fbk8jF0qevoWyOEmB`xRwV%?3tHYar^);X0c44Jw73o@ z_-kYMaF3CC@2K!xQdj;WBJ($xA^TQXbW-IXj=sPT`3vD?OaA+v^50p1=;F;wd%}B8 zz`cGZKYJJ<-Wqq9y)*cATp6vruKzk)hj<$u4qGt6(;T_&m+L>x9}L$ZD@~FgO!a*Z zi>gu=bVa5q(8aYR%er7ijMR(XEvztity(=23yOE1dNH`a+X4UdzT$}c_=W9cuUe|f z+^axL0rV8*)T%p1vvwAARgh4tdN=FFfxds?!nis=v6p-_0G%nb48WD^p!aiK>Ns#;LIL7>;BJI+`Sp0HZf!!000D>Nkl-SQzZ20>)w&HzNXPHWItmyqx-8)FCT+_Dd|g9Rp%&@4YvGHW$+IG?$ka6qE8{>yWxzU z+d2FoTE~8NW}Q9@r@H=l#sGk%%GmtUd*F}mge^Z%_Z)K}f?IyOweot?!4KiGqo0JJ zDUg)h>2tzWKW8#=J`oWS5fM=%E=T}i>z;dIEXFIZZMpuc<6VRQ4gdI4002j>x9XT9 zdji)z`|8T;f;ouiulQ!wEGq!yY+cA%JLlcEk(Sq>VDiIU9Iv!38~R>t0H7Gdx?`Vd z_`WN9|82%&VgL4q0|2&MKh_-oTy1-P0GA#4M8o}=D%AWcM7=Mc_jTq%1TEoTR<#Ya zy|M1+-rM~r*s^zbRa;Nr*UmTquo#JojLxC|nfG;ua=PmE^zR=L5fKp)(L%T&0RVq= z=d81v_G~Zg+1|Rx4COSM$9Gg-PYgDFv1hB!Yjj}gjX#gJvHz`VD^44Lxl{Xb`GF5W zk*rhtc(S4UFSO13?uS9i*0j$SV3^@fMVgE?oc2ZE&Rz);%|8>x8*D4o#4%+67Go z3kebt5fKs5nYv__00hIou6jM*U;x0K+KbgEzA)!`D^7j+jQX{ZR`z}o!N}tmx*Grh zV<}lxn*jjAfm@JtZK`{|B3aSD?5$YY`^8F|q~s9{KZfD9*PnHN^41O{+?&t(KGS*Q zzk|6DIpgay_7#ZuZ$iet5&-bB{eOXAopU-lvfQgDv4-VdJ5XoLNWDfmOW^)YKu+1ZmbjTIG?Nw$&&93Esr6S)Y|~UxC5) zduBZ+?7s2kf(PWKY5|N47}W;6%!~4&He6=irY%4S)3MGk!J^ z5fKp)(Nq^C0B~^a-@s6wEMT_!#OGltgetGcnr}lma0>u^;5&67pSO14`11EwUY89{ zw1yt3c}6h&=&XG(DA}_P0Q7af1FrNTIMYX~+6Ap#+n>;{po-?2_M~eA`a0h+>vNit zFXHMw_d(EDPQ1^@uP2%oW(oY(VbQtbody>tr.parent>td:first-child:before, tabl text-align: center; background-color: #aab2bd; border-radius: 4px; + behavior: url("/assets/ie_support/PIE2/PIE.htc"); -webkit-border-radius: 4px; -moz-border-radius: 4px } @@ -947,6 +948,7 @@ table.dataTable.dtr-inline.collapsed>tbody>tr.parent>td:first-child:before, tabl background-color: #4fc1e9; border: 4px solid #f5f7fa; border-radius: 50%; + behavior: url("/assets/ie_support/PIE2/PIE.htc"); -webkit-border-radius: 50%; -moz-border-radius: 50% } @@ -968,6 +970,7 @@ table.dataTable.dtr-inline.collapsed>tbody>tr.parent>td:first-child:before, tabl margin-top: 31px; background-color: #CCC; border-radius: 4px; + behavior: url("/assets/ie_support/PIE2/PIE.htc"); -webkit-border-radius: 4px; -moz-border-radius: 4px } @@ -1021,6 +1024,7 @@ table.dataTable.dtr-inline.collapsed>tbody>tr.parent>td:first-child:before, tabl .VivaTimeline dl dd .events .events-footer ol li { background: #32b487; border-radius: 5px; + behavior: url("/assets/ie_support/PIE2/PIE.htc"); margin: 10px; display: inline-block; width: 10px; diff --git a/assets/stylesheets/template/modules/member.scss b/assets/stylesheets/template/modules/member.scss index 0e719e8..0dac435 100644 --- a/assets/stylesheets/template/modules/member.scss +++ b/assets/stylesheets/template/modules/member.scss @@ -264,6 +264,7 @@ @media(max-width:580px) { overflow: hidden; border-radius: 50%; + behavior: url("/assets/ie_support/PIE2/PIE.htc"); height: 14em; width: 14em; margin: 1.5em auto 1em auto; diff --git a/modules/active/active_index.html.erb b/modules/active/active_index.html.erb index 5bda937..3bb4e90 100644 --- a/modules/active/active_index.html.erb +++ b/modules/active/active_index.html.erb @@ -14,10 +14,15 @@ {{category}} - {{act_start_date}} ~
{{act_end_date}} - {{title}} - {{sign_start_date}} ~
{{sign_end_date}} - {{sign_up}} + {{act_duration_date}} + + + {{status}} + + {{title}} + + {{sign_duration_date}} + {{sign_up}} diff --git a/modules/active/active_index1.html.erb b/modules/active/active_index1.html.erb new file mode 100644 index 0000000..49fe82a --- /dev/null +++ b/modules/active/active_index1.html.erb @@ -0,0 +1,25 @@ +

+

{{page-title}}

+ + + + + + + + + + + + + + + +
{{th_act_time_range}}{{th_title}}{{th_sign_up}}
{{act_duration_date}} + + {{status}} + + {{title}} + {{sign_up}}
+
+{{pagination_goes_here}} diff --git a/modules/active/active_index2.html.erb b/modules/active/active_index2.html.erb new file mode 100644 index 0000000..99f9a19 --- /dev/null +++ b/modules/active/active_index2.html.erb @@ -0,0 +1,32 @@ +
+

{{page-title}}

+ +
+{{pagination_goes_here}} \ No newline at end of file diff --git a/modules/active/info.json b/modules/active/info.json index 97cd820..aa5f20c 100644 --- a/modules/active/info.json +++ b/modules/active/info.json @@ -3,10 +3,26 @@ { "filename" : "active_index", "name" : { - "zh_tw" : "1. 列表", - "en" : "1. List" - }, + "zh_tw" : "1. 列表 (類別, 活動期間, 狀態, 活動標題, 報名期間, 線上報名)", + "en" : "1. List (Category, Event Period, status, Event Title, Registration Period, Register)" + }, "thumbnail" : "thumb.png" + }, + { + "filename" : "active_index1", + "name" : { + "zh_tw" : "2. 精簡表格列表-2 ( 模組標題, 活動期間, 狀態, 標題, 線上報名)", + "en" : "2. Simple Table List (widget-title, Event Period, status, title, Register)" + }, + "thumbnail" : "active_index1_thumbs.png" + }, + { + "filename" : "active_index2", + "name" : { + "zh_tw" : "3. 三欄圖文 ( 模組標題, 圖片, 狀態, 活動期間, 類別, 標題, 副標題, 線上報名)", + "en" : "3. 3-Column Standard Image + Text (widget-title, image, status, postdate, category, title, subtitle, Register)" + }, + "thumbnail" : "active_index2_thumbs.png" } ] } \ No newline at end of file diff --git a/modules/active/thumbs/active_index1_thumbs.png b/modules/active/thumbs/active_index1_thumbs.png new file mode 100644 index 0000000000000000000000000000000000000000..0a58044bcab1badab10347049e79a10fdef28201 GIT binary patch literal 2130 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 literal 0 HcmV?d00001 diff --git a/modules/ad_banner/_ad_banner_widget1.html.erb b/modules/ad_banner/_ad_banner_widget1.html.erb index 5686156..8c32071 100644 --- a/modules/ad_banner/_ad_banner_widget1.html.erb +++ b/modules/ad_banner/_ad_banner_widget1.html.erb @@ -1,5 +1,5 @@ -
-
+
-
- +
-
- +
+
    @@ -58,10 +60,23 @@ \ No newline at end of file diff --git a/modules/ad_banner/_ad_banner_widget2_video.html.erb b/modules/ad_banner/_ad_banner_widget2_video.html.erb index 725db51..949e906 100644 --- a/modules/ad_banner/_ad_banner_widget2_video.html.erb +++ b/modules/ad_banner/_ad_banner_widget2_video.html.erb @@ -1,5 +1,5 @@ -
    -
    +
    - +
      @@ -45,53 +45,116 @@ var firstScriptTag = document.getElementsByTagName('script')[0]; firstScriptTag.parentNode.insertBefore(tag, firstScriptTag); } - - $("document").ready(function(){ - $("*[data-yt-binded=0]").each(function(){ - $(this).attr("data-yt-binded","1"); - var obj = $(this).find("iframe"); - obj.attr("id",$(this).data("youtube-id") + "_" + ad_banners_count); - ad_banners_count++; - }) - }); - + $("*[data-yt-binded=0]").each(function(){ + $(this).attr("data-yt-binded","1"); + var obj = $(this).find("iframe"); + obj.attr("id",$(this).data("youtube-id") + "_" + ad_banners_count); + ad_banners_count++; + }) if (typeof onYouTubeIframeAPIReady !== 'function'){ + if(window.yt_players == undefined) + window.yt_players = {}; + $(".w-ba-banner__wrap[data-overlay=\".w-ad-banner__overlay_{{subpart-id}}\"]"); function onYouTubeIframeAPIReady(){ - $(".w-ba-banner iframe[data-yt-api-binded=0]").each(function(){ - $(this).attr("data-yt-api-binded","1"); - new YT.Player($(this).attr("id"), { - events: { - 'onStateChange': onPlayerStateChange - } - }); + $(".w-ba-banner").each(function(i,banner){ + var iframes = $(banner).find("iframe"); + if(iframes.length > 0){ + var id = $(banner).attr("data-subpart-id"); + if(yt_players[id] == undefined) + yt_players[id] = {}; + var remove_ids = []; + Object.keys(yt_players[id]).forEach(function(k){ + var yt_player = yt_players[id][k]; + if($(yt_player.getIframe()).length == 0){ + yt_player.destroy(); + remove_ids.push(k); + } + }) + remove_ids.forEach(function(k){ + delete yt_players[id][k]; + }) + iframes.each(function(i,iframe){ + console.log($(iframe).attr("id")) + var yt_player = yt_players[id][$(iframe).attr("id")]; + if(yt_player){ + }else{ + yt_player = new YT.Player($(iframe).attr("id"), { + events: { + 'onReady': function(event){ + var height = $(event.target.getIframe()).height(); + var banner_wrap = $(".w-ba-banner__wrap[data-overlay=\".w-ad-banner__overlay_{{subpart-id}}\"]"); + banner_wrap.height(height).css({"padding-bottom":"4em","padding-top":""}); + banner_wrap.find(".cycle-carousel-wrap").css("top","3em"); + delete (event.target.B || event.target.H).onStateChange; + var onStateChange_idx = event.target.l.i.onStateChange; + onStateChange_idx.reverse(); + var event_size = 3; + onStateChange_idx.forEach(function(start_idx){ + event.target.l.h.splice(start_idx,event_size); + }); + event.target.l.i.onStateChange = []; + event.target.l.s = event.target.l.h.length; + event.target.addEventListener('onStateChange',onPlayerStateChange); + {{extra_ready_script}} + }, + 'onStateChange': onPlayerStateChange + } + }); + yt_players[id][$(iframe).attr("id")] = yt_player; + $(iframe).data("yt_player",yt_player); + } + }) + } }) } function onPlayerStateChange(event){ var iframe = $(event.target.h), cyclediv = iframe.parents("div.cycle-slideshow"); - var widget = cyclediv.parents('.ba-banner-widget-youtube') + var widget = cyclediv.parents('.ba-banner-widget-youtube'); if(event.data == YT.PlayerState.PLAYING || event.data == YT.PlayerState.BUFFERING){ + cyclediv[0].need_resume = !(cyclediv.hasClass("cycle-paused")); cyclediv.cycle("pause"); widget.find('.banner-pager,.controlplay,.button-mid,.ad-overlay').css('visibility','hidden') - }else if(event.data == YT.PlayerState.PAUSED || event.data == YT.PlayerState.ENDED){ - cyclediv.cycle("resume"); + }else if(event.data == YT.PlayerState.UNSTARTED || event.data == YT.PlayerState.PAUSED || event.data == YT.PlayerState.ENDED){ + if(cyclediv[0].need_resume) + cyclediv.cycle("resume"); widget.find('.banner-pager,.controlplay,.button-mid,.ad-overlay').css('visibility','') } + {{extra_state_chnage_script}} } $(document).ready(function(){ window.onYouTubePlayerAPIReady = function() { - onYouTubeIframeAPIReady(); + onYouTubeIframeAPIReady.apply(this,arguments); }; + var banner_wrap = $(".w-ba-banner__wrap[data-overlay=\".w-ad-banner__overlay_{{subpart-id}}\"]"); + var opts = banner_wrap.data('cycle.opts'); + banner_wrap.on('cycle-paused',function(opts){ + var controlplay = $(this).nextAll(".controlplay"); + if(controlplay.length != 0){ + controlplay.find(".resume-slide").removeClass("active"); + controlplay.find(".pause-slide").addClass("active"); + } + }) + banner_wrap.on('cycle-resumed',function(opts){ + var controlplay = $(this).nextAll(".controlplay"); + if(controlplay.length != 0){ + controlplay.find(".resume-slide").addClass("active"); + controlplay.find(".pause-slide").removeClass("active"); + } + }) + var height = opts.slides.filter('.active').height() || opts.slides.height(); + banner_wrap.height(height).css("padding-bottom",""); + {{extra_document_ready_script}} $('.pause-slide').off('click').click(function(){ $(this).parent("ul").parent('.w-ba-banner').find(".cycle-slideshow").cycle('pause'); - $(this).addClass('active') - $(this).parents('.controlplay').eq(0).find('.resume-slide').removeClass('active') + $(this).addClass('active'); + $(this).parents('.controlplay').eq(0).find('.resume-slide').removeClass('active'); }); $('.resume-slide').off('click').click(function(){ $(this).parent("ul").parent('.w-ba-banner').find(".cycle-slideshow").cycle('resume'); - $(this).addClass('active') - $(this).parents('.controlplay').eq(0).find('.pause-slide').removeClass('active') + $(this).addClass('active'); + $(this).parents('.controlplay').eq(0).find('.pause-slide').removeClass('active'); }); $('.next-button').off('click').on('click',function(){ $(this).parent("ul").parent('.w-ba-banner').find(".cycle-slideshow").cycle("next"); @@ -99,14 +162,39 @@ if (typeof onYouTubeIframeAPIReady !== 'function'){ $('.prev-button').off('click').on('click',function(){ $(this).parent("ul").parent('.w-ba-banner').find(".cycle-slideshow").cycle("prev"); }) + var resize_timeout_id; + $(window).resize(function(){ + if(resize_timeout_id){ + window.clearTimeout(resize_timeout_id); + } + resize_timeout_id = window.setTimeout(function(){ + var banner_wrap = $(".w-ba-banner__wrap[data-overlay=\".w-ad-banner__overlay_{{subpart-id}}\"]"); + var opts = banner_wrap.data('cycle.opts'); + var height = opts.slides.filter('.active').height() || opts.slides.height(); + banner_wrap.height(height).css("padding-bottom",""); + },300); + }) }) } \ No newline at end of file + .w-ba-banner .controlplay{ + width: auto; + } + .w-ba-banner .button-mid{ + position: absolute; + width: 100%; + height: 100%; + top: 0; + left: 0; + } + .next-button,.prev-button{ + cursor: pointer; + } + diff --git a/modules/announcement/_annc_widget15.html.erb b/modules/announcement/_annc_widget15.html.erb index 5d6b453..908b2bc 100644 --- a/modules/announcement/_annc_widget15.html.erb +++ b/modules/announcement/_annc_widget15.html.erb @@ -1,13 +1,13 @@ -
      +

      {{widget-title}}

      <%= (I18n.locale.to_s =="zh_tw") ? "更多最新消息" : "More NEWS" %>
      -
      - - +
      + +
      • @@ -20,11 +20,11 @@ {{status}} - + {{postdate}} - + {{category}}
      @@ -38,92 +38,126 @@
      \ No newline at end of file diff --git a/modules/announcement/_annc_widget4.html.erb b/modules/announcement/_annc_widget4.html.erb index ecf7c28..7e26d7e 100644 --- a/modules/announcement/_annc_widget4.html.erb +++ b/modules/announcement/_annc_widget4.html.erb @@ -6,7 +6,7 @@ <%= (I18n.locale.to_s =="zh_tw") ? "更多最新消息" : "More NEWS" %>
        -
      • +
      • {{img_description}}
        @@ -16,11 +16,11 @@ {{status}} - + {{postdate}} - + {{category}}
    @@ -32,4 +32,77 @@
- + + diff --git a/modules/announcement/annc_index11.html.erb b/modules/announcement/annc_index11.html.erb index 7a883b6..b191161 100644 --- a/modules/announcement/annc_index11.html.erb +++ b/modules/announcement/annc_index11.html.erb @@ -1,6 +1,6 @@

{{page-title}}

- +
@@ -25,10 +25,15 @@ {{pagination_goes_here}} \ No newline at end of file diff --git a/modules/announcement/annc_index12.html.erb b/modules/announcement/annc_index12.html.erb index 3f2c32d..3e1dbc6 100644 --- a/modules/announcement/annc_index12.html.erb +++ b/modules/announcement/annc_index12.html.erb @@ -1,6 +1,6 @@

{{page-title}}

-
{{date-head}}
+
@@ -27,10 +27,15 @@ {{pagination_goes_here}} \ No newline at end of file diff --git a/modules/announcement/annc_index15.html.erb b/modules/announcement/annc_index15.html.erb index 8b0ffa8..a521e5f 100644 --- a/modules/announcement/annc_index15.html.erb +++ b/modules/announcement/annc_index15.html.erb @@ -1,6 +1,6 @@

{{page-title}}

-
{{date-head}}
+
@@ -25,10 +25,15 @@ {{pagination_goes_here}} \ No newline at end of file diff --git a/modules/announcement/annc_index16.html.erb b/modules/announcement/annc_index16.html.erb index ec0972d..07e10c5 100644 --- a/modules/announcement/annc_index16.html.erb +++ b/modules/announcement/annc_index16.html.erb @@ -1,6 +1,6 @@

{{page-title}}

-
{{date-head}}
+
@@ -39,10 +39,15 @@ {{pagination_goes_here}} \ No newline at end of file diff --git a/modules/announcement/info.json b/modules/announcement/info.json index 4602b2e..f27a6a7 100644 --- a/modules/announcement/info.json +++ b/modules/announcement/info.json @@ -1,278 +1,286 @@ { - "frontend": [ - { - "filename" : "annc_index1", - "name" : { - "zh_tw" : "1. 標準標題列表-1 ( 模組標題, 類別, 狀態, 標題, 日期 )", - "en" : "1. Standard Title List-1 (widget-title, category, status, title, postdate)" - }, - "thumbnail" : "annc_index1_thumbs.png" - }, - { - "filename" : "annc_index2", - "name" : { - "zh_tw" : "2. 標準標題列表-2 ( 模組標題, 日期, 狀態, 標題, 類別 )", - "en" : "2. Standard Title List-2 (widget-title, postdate, status, title, category)" - }, - "thumbnail" : "annc_index2_thumbs.png" - }, - { - "filename" : "annc_index3", - "name" : { - "zh_tw" : "3. 精簡標題列表-1 ( 模組標題, 狀態, 標題, 日期 )", - "en" : "3. Simple Title List-1 (widget-title, status, title, postdate)" - }, - "thumbnail" : "annc_index3_thumbs.png" - }, - { - "filename" : "annc_index4", - "name" : { - "zh_tw" : "4. 精簡標題列表-2 ( 模組標題, 日期, 狀態, 標題 )", - "en" : "4. Simple Title List-2 (widget-title, postdate, status, title)" - }, - "thumbnail" : "annc_index4_thumbs.png" - }, - { - "filename" : "annc_index5", - "name" : { - "zh_tw" : "5. 左圖右文 ( 模組標題, 圖片, 狀態, 日期, 類別, 標題, 副標題 )", - "en" : "5. Balanced Image + Text(Left) (widget-title, image, status, postdate, category, title, subtitle)" - }, - "thumbnail" : "annc_index5_thumbs.png" - }, - { - "filename" : "annc_index6", - "name" : { - "zh_tw" : "6. 右圖左文 ( 模組標題, 圖片, 狀態, 日期, 類別, 標題, 副標題 )", - "en" : "6. Balanced Image + Text(Right) (widget-title, image, status, postdate, category, title, subtitle)" - }, - "thumbnail" : "annc_index6_thumbs.png" - }, - { - "filename" : "annc_index7", - "name" : { - "zh_tw" : "7. 三欄圖文 ( 模組標題, 圖片, 狀態, 日期, 類別, 標題, 副標題 )", - "en" : "7. 3-Column Standard Image + Text (widget-title, image, status, postdate, category, title, subtitle)" - }, - "thumbnail" : "annc_index7_thumbs.png" - }, - { - "filename" : "annc_index8", - "name" : { - "zh_tw" : "8. 標準文字列表 ( 模組標題, 日期, 類別, 狀態, 標題, 副標題 )", - "en" : "8. Standard Text List (widget-title, postdate, category, status, title, subtitle)" - }, - "thumbnail" : "annc_index8_thumbs.png" - }, - { - "filename" : "annc_index9", - "name" : { - "zh_tw" : "9. 標準文字列表三欄 ( 模組標題, 日期, 類別, 狀態, 標題, 副標題 )", - "en" : "9. 3-Column Standard Text List (widget-title, postdate, category, status, title, subtitle)" - }, - "thumbnail" : "annc_index9_thumbs.png" - }, - { - "filename" : "annc_index10", - "name" : { - "zh_tw" : "10. 連結 + 附件表格列表 ( 模組標題, 類別, 狀態, 標題 )", - "en" : "10. Table List including Links and attachments (widget-title, category, status, title, view-count)" - }, - "thumbnail" : "annc_index10_thumbs.png" - }, - { - "filename" : "annc_index11", - "name" : { - "zh_tw" : "11. 標準表格列表-1 ( 模組標題, 日期, 狀態, 標題, 類別 )", - "en" : "11. Standard Table List-1 (widget-title, postdate, status, title, category)" - }, - "thumbnail" : "annc_index11_thumbs.png" - }, - { - "filename" : "annc_index12", - "name" : { - "zh_tw" : "12. 標準表格列表-2 ( 模組標題, 日期, 狀態, 標題, 類別, 瀏覽人次 )", - "en" : "12. Standard Table List-2 (widget-title, postdate, status, title, category, view-count)" - }, - "thumbnail" : "annc_index12_thumbs.png" - }, - { - "filename" : "annc_index13", - "name" : { - "zh_tw" : "13. 精簡表格列表-1 ( 模組標題, 狀態, 標題, 日期 )", - "en" : "13. Simple Table List (widget-title, status, title, postdate)" - }, - "thumbnail" : "annc_index13_thumbs.png" - }, - { - "filename" : "annc_index14", - "name" : { - "zh_tw" : "14. 精簡表格列表-2 ( 模組標題, 日期, 狀態, 標題 )", - "en" : "14. Simple Table List (widget-title, postdate, status, title)" - }, - "thumbnail" : "annc_index14_thumbs.png" - }, - { - "filename" : "annc_index15", - "name" : { - "zh_tw" : "15. 精簡表格列表-3 ( 模組標題, 日期, 狀態, 標題, 瀏覽人次 )", - "en" : "15. Simple Table List (widget-title, postdate, status, title, view-count)" - }, - "thumbnail" : "annc_index15_thumbs.png" - }, - { - "filename" : "annc_index16", - "name" : { - "zh_tw" : "16. 連結 + 附件表格列表 ( 模組標題, 類別, 狀態, 標題 )", - "en" : "16. Table List including Links and attachments (widget-title, category, status, title, view-count)" - }, - "thumbnail" : "annc_index16_thumbs.png" - }, - { - "filename" : "annc_index17", - "name" : { - "zh_tw" : "17. 標準標題列表-1A ( 類別, 標題, 日期, 張貼人 )", - "en" : "1. Standard Title List-1 ( category, title, postdate, department)" - }, - "thumbnail" : "annc_index1_thumbs.png" - } - ], - "widgets" : [ - { - "filename" : "annc_widget1", - "name" : { - "zh_tw" : "1. 標準圖文 ( 模組標題, 圖片, 狀態, 日期, 類別, 標題, 副標題 )", - "en" : "1. Standard Image + Text (widget-title, image, status, postdate, category, title, subtitle)" - }, - "thumbnail" : "annc_widget1_thumbs.png" - }, - { - "filename" : "annc_widget2", - "name" : { - "zh_tw" : "2. 左圖右文 ( 模組標題, 圖片, 狀態, 日期, 類別, 標題, 副標題 )", - "en" : "2. Balanced Image + Text(Left) (widget-title, image, status, postdate, category, title, subtitle)" - }, - "thumbnail" : "annc_widget2_thumbs.png" - }, - { - "filename" : "annc_widget3", - "name" : { - "zh_tw" : "3. 右圖左文 ( 模組標題, 圖片, 狀態, 日期, 類別, 標題, 副標題 )", - "en" : "3. Balanced Image + Text(Right) (widget-title, image, status, postdate, category, title, subtitle)" - }, - "thumbnail" : "annc_widget3_thumbs.png" - }, - { - "filename" : "annc_widget4", - "name" : { - "zh_tw" : "4. 三欄圖文 ( 模組標題, 圖片, 狀態, 日期, 類別, 標題, 副標題 )", - "en" : "4. 3-Column Standard Image + Text (widget-title, image, status, postdate, category, title, subtitle)" - }, - "thumbnail" : "annc_widget4_thumbs.png" - }, - { - "filename" : "annc_widget15", - "name" : { - "zh_tw" : "4.5. 三欄圖文-slide ( 模組標題, 圖片, 狀態, 日期, 類別, 標題, 副標題 )", - "en" : "4.5. 3-Column Standard Image + Text -slide(widget-title, image, status, postdate, category, title, subtitle)" - }, - "thumbnail" : "annc_widget4_thumbs.png" - }, - { - "filename" : "annc_widget5", - "name" : { - "zh_tw" : "5. 標準文字列表 ( 模組標題, 日期, 類別, 狀態, 標題, 副標題 )", - "en" : "5. Standard Text List (widget-title, postdate, category, status, title, subtitle)" - }, - "thumbnail" : "annc_widget5_thumbs.png" - }, - { - "filename" : "annc_widget6", - "name" : { - "zh_tw" : "6. 標準標題列表-1 ( 模組標題, 類別, 狀態, 標題, 日期 )", - "en" : "6. Standard Title List-1 (widget-title, category, status, title, postdate)" - }, - "thumbnail" : "annc_widget6_thumbs.png" - }, - { - "filename" : "annc_widget7", - "name" : { - "zh_tw" : "7. 標準標題列表-2 ( 模組標題, 日期, 狀態, 標題, 類別 )", - "en" : "7. Standard Title List-2 (widget-title, postdate, status, title, category)" - }, - "thumbnail" : "annc_widget7_thumbs.png" - }, - { - "filename" : "annc_widget8", - "name" : { - "zh_tw" : "8. 標準表格列表-1 ( 模組標題, 類別, 狀態, 標題, 日期 )", - "en" : "8. Standard Table List-1 (widget-title, category, status, title, postdate)" - }, - "thumbnail" : "annc_widget8_thumbs.png" - }, - { - "filename" : "annc_widget9", - "name" : { - "zh_tw" : "9. 標準表格列表-2 ( 模組標題, 日期, 狀態, 標題, 類別 )", - "en" : "9. Standard Table List-2 (widget-title, postdate, status, title, category)" - }, - "thumbnail" : "annc_widget9_thumbs.png" - }, - { - "filename" : "annc_widget10", - "name" : { - "zh_tw" : "10. 精簡標題列表-1 ( 模組標題, 狀態, 標題, 日期 )", - "en" : "10. Simple Title List-1 (widget-title, status, title, postdate)" - }, - "thumbnail" : "annc_widget10_thumbs.png" - }, - { - "filename" : "annc_widget11", - "name" : { - "zh_tw" : "11. 精簡標題列表-2 ( 模組標題, 日期, 狀態, 標題 )", - "en" : "11. Simple Title List-2 (widget-title, postdate, status, title)" - }, - "thumbnail" : "annc_widget11_thumbs.png" - }, - { - "filename" : "annc_widget12", - "name" : { - "zh_tw" : "12. 精簡表格列表-1 ( 模組標題, 狀態, 標題, 日期 )", - "en" : "12. Simple Table List (widget-title, status, title, postdate)" - }, - "thumbnail" : "annc_widget12_thumbs.png" - }, - { - "filename" : "annc_widget13", - "name" : { - "zh_tw" : "13. 精簡表格列表-2 ( 模組標題, 日期, 狀態, 標題 )", - "en" : "13. Simple Table List (widget-title, postdate, status, title)" - }, - "thumbnail" : "annc_widget13_thumbs.png" - }, - { - "filename" : "annc_widget14", - "name" : { - "zh_tw" : "14. 一圖 + 標題列表 ( 模組標題, 圖片, 狀態, 標題, 日期 )", - "en" : "14. 1 Image + Title List (widget-title, image, status, title, postdate)" - }, - "thumbnail" : "annc_widget14_thumbs.png" - }, - { - "filename" : "annc_widget16", - "name" : { - "zh_tw" : "16. 單欄圖文輪播 ( 模組標題, 圖片, 狀態, 日期, 類別, 標題 )", - "en" : "16. Image + Text slide (widget-title, image, status, postdate, category, title)" - }, - "thumbnail" : "annc_widget1_thumbs.png" - }, - { - "filename" : "annc_widget17", - "name" : { - "zh_tw" : "17. 含搜尋功能之精簡標題列表-2 ( 模組標題, 日期, 狀態, 標題 )", - "en" : "17. Simple Title List-2 (widget-title, postdate, status, title), including search" - }, - "thumbnail" : "annc_widget11_thumbs.png" - } - ] + "frontend": [ + { + "filename": "annc_index1", + "name": { + "zh_tw": "1. 標準標題列表-1 ( 模組標題, 類別, 狀態, 標題, 日期 )", + "en": "1. Standard Title List-1 (widget-title, category, status, title, postdate)" + }, + "thumbnail": "annc_index1_thumbs.png" + }, + { + "filename": "annc_index2", + "name": { + "zh_tw": "2. 標準標題列表-2 ( 模組標題, 日期, 狀態, 標題, 類別 )", + "en": "2. Standard Title List-2 (widget-title, postdate, status, title, category)" + }, + "thumbnail": "annc_index2_thumbs.png" + }, + { + "filename": "annc_index3", + "name": { + "zh_tw": "3. 精簡標題列表-1 ( 模組標題, 狀態, 標題, 日期 )", + "en": "3. Simple Title List-1 (widget-title, status, title, postdate)" + }, + "thumbnail": "annc_index3_thumbs.png" + }, + { + "filename": "annc_index4", + "name": { + "zh_tw": "4. 精簡標題列表-2 ( 模組標題, 日期, 狀態, 標題 )", + "en": "4. Simple Title List-2 (widget-title, postdate, status, title)" + }, + "thumbnail": "annc_index4_thumbs.png" + }, + { + "filename": "annc_index5", + "name": { + "zh_tw": "5. 左圖右文 ( 模組標題, 圖片, 狀態, 日期, 類別, 標題, 副標題 )", + "en": "5. Balanced Image + Text(Left) (widget-title, image, status, postdate, category, title, subtitle)" + }, + "thumbnail": "annc_index5_thumbs.png" + }, + { + "filename": "annc_index6", + "name": { + "zh_tw": "6. 右圖左文 ( 模組標題, 圖片, 狀態, 日期, 類別, 標題, 副標題 )", + "en": "6. Balanced Image + Text(Right) (widget-title, image, status, postdate, category, title, subtitle)" + }, + "thumbnail": "annc_index6_thumbs.png" + }, + { + "filename": "annc_index7", + "name": { + "zh_tw": "7. 三欄圖文 ( 模組標題, 圖片, 狀態, 日期, 類別, 標題, 副標題 )", + "en": "7. 3-Column Standard Image + Text (widget-title, image, status, postdate, category, title, subtitle)" + }, + "thumbnail": "annc_index7_thumbs.png" + }, + { + "filename": "annc_index8", + "name": { + "zh_tw": "8. 標準文字列表 ( 模組標題, 日期, 類別, 狀態, 標題, 副標題 )", + "en": "8. Standard Text List (widget-title, postdate, category, status, title, subtitle)" + }, + "thumbnail": "annc_index8_thumbs.png" + }, + { + "filename": "annc_index9", + "name": { + "zh_tw": "9. 標準文字列表三欄 ( 模組標題, 日期, 類別, 狀態, 標題, 副標題 )", + "en": "9. 3-Column Standard Text List (widget-title, postdate, category, status, title, subtitle)" + }, + "thumbnail": "annc_index9_thumbs.png" + }, + { + "filename": "annc_index10", + "name": { + "zh_tw": "10. 連結 + 附件表格列表 ( 模組標題, 類別, 狀態, 標題 )", + "en": "10. Table List including Links and attachments (widget-title, category, status, title, view-count)" + }, + "thumbnail": "annc_index10_thumbs.png" + }, + { + "filename": "annc_index11", + "name": { + "zh_tw": "11. 標準表格列表-1 ( 模組標題, 日期, 狀態, 標題, 類別 )", + "en": "11. Standard Table List-1 (widget-title, postdate, status, title, category)" + }, + "thumbnail": "annc_index11_thumbs.png" + }, + { + "filename": "annc_index12", + "name": { + "zh_tw": "12. 標準表格列表-2 ( 模組標題, 日期, 狀態, 標題, 類別, 瀏覽人次 )", + "en": "12. Standard Table List-2 (widget-title, postdate, status, title, category, view-count)" + }, + "thumbnail": "annc_index12_thumbs.png" + }, + { + "filename": "annc_index13", + "name": { + "zh_tw": "13. 精簡表格列表-1 ( 模組標題, 狀態, 標題, 日期 )", + "en": "13. Simple Table List (widget-title, status, title, postdate)" + }, + "thumbnail": "annc_index13_thumbs.png" + }, + { + "filename": "annc_index14", + "name": { + "zh_tw": "14. 精簡表格列表-2 ( 模組標題, 日期, 狀態, 標題 )", + "en": "14. Simple Table List (widget-title, postdate, status, title)" + }, + "thumbnail": "annc_index14_thumbs.png" + }, + { + "filename": "annc_index15", + "name": { + "zh_tw": "15. 精簡表格列表-3 ( 模組標題, 日期, 狀態, 標題, 瀏覽人次 )", + "en": "15. Simple Table List (widget-title, postdate, status, title, view-count)" + }, + "thumbnail": "annc_index15_thumbs.png" + }, + { + "filename": "annc_index16", + "name": { + "zh_tw": "16. 連結 + 附件表格列表 ( 模組標題, 類別, 狀態, 標題 )", + "en": "16. Table List including Links and attachments (widget-title, category, status, title, view-count)" + }, + "thumbnail": "annc_index16_thumbs.png" + }, + { + "filename": "annc_index17", + "name": { + "zh_tw": "17. 標準標題列表-1A ( 類別, 標題, 日期, 張貼人 )", + "en": "1. Standard Title List-1 ( category, title, postdate, department)" + }, + "thumbnail": "annc_index1_thumbs.png" + } + ], + "widgets": [ + { + "filename": "annc_widget1", + "name": { + "zh_tw": "1. 標準圖文 ( 模組標題, 圖片, 狀態, 日期, 類別, 標題, 副標題 )", + "en": "1. Standard Image + Text (widget-title, image, status, postdate, category, title, subtitle)" + }, + "thumbnail": "annc_widget1_thumbs.png" + }, + { + "filename": "annc_widget2", + "name": { + "zh_tw": "2. 左圖右文 ( 模組標題, 圖片, 狀態, 日期, 類別, 標題, 副標題 )", + "en": "2. Balanced Image + Text(Left) (widget-title, image, status, postdate, category, title, subtitle)" + }, + "thumbnail": "annc_widget2_thumbs.png" + }, + { + "filename": "annc_widget3", + "name": { + "zh_tw": "3. 右圖左文 ( 模組標題, 圖片, 狀態, 日期, 類別, 標題, 副標題 )", + "en": "3. Balanced Image + Text(Right) (widget-title, image, status, postdate, category, title, subtitle)" + }, + "thumbnail": "annc_widget3_thumbs.png" + }, + { + "filename": "annc_widget4", + "name": { + "zh_tw": "4. 三欄圖文 ( 模組標題, 圖片, 狀態, 日期, 類別, 標題, 副標題 )", + "en": "4. 3-Column Standard Image + Text (widget-title, image, status, postdate, category, title, subtitle)" + }, + "thumbnail": "annc_widget4_thumbs.png" + }, + { + "filename": "annc_widget15", + "name": { + "zh_tw": "4.5. 三欄圖文-slide ( 模組標題, 圖片, 狀態, 日期, 類別, 標題, 副標題 )", + "en": "4.5. 3-Column Standard Image + Text -slide(widget-title, image, status, postdate, category, title, subtitle)" + }, + "thumbnail": "annc_widget4_thumbs.png" + }, + { + "filename": "annc_widget5", + "name": { + "zh_tw": "5. 標準文字列表 ( 模組標題, 日期, 類別, 狀態, 標題, 副標題 )", + "en": "5. Standard Text List (widget-title, postdate, category, status, title, subtitle)" + }, + "thumbnail": "annc_widget5_thumbs.png" + }, + { + "filename": "annc_widget6", + "name": { + "zh_tw": "6. 標準標題列表-1 ( 模組標題, 類別, 狀態, 標題, 日期 )", + "en": "6. Standard Title List-1 (widget-title, category, status, title, postdate)" + }, + "thumbnail": "annc_widget6_thumbs.png" + }, + { + "filename": "annc_widget7", + "name": { + "zh_tw": "7. 標準標題列表-2 ( 模組標題, 日期, 狀態, 標題, 類別 )", + "en": "7. Standard Title List-2 (widget-title, postdate, status, title, category)" + }, + "thumbnail": "annc_widget7_thumbs.png" + }, + { + "filename": "annc_widget8", + "name": { + "zh_tw": "8. 標準表格列表-1 ( 模組標題, 類別, 狀態, 標題, 日期 )", + "en": "8. Standard Table List-1 (widget-title, category, status, title, postdate)" + }, + "thumbnail": "annc_widget8_thumbs.png" + }, + { + "filename": "annc_widget9", + "name": { + "zh_tw": "9. 標準表格列表-2 ( 模組標題, 日期, 狀態, 標題, 類別 )", + "en": "9. Standard Table List-2 (widget-title, postdate, status, title, category)" + }, + "thumbnail": "annc_widget9_thumbs.png" + }, + { + "filename": "annc_widget10", + "name": { + "zh_tw": "10. 精簡標題列表-1 ( 模組標題, 狀態, 標題, 日期 )", + "en": "10. Simple Title List-1 (widget-title, status, title, postdate)" + }, + "thumbnail": "annc_widget10_thumbs.png" + }, + { + "filename": "annc_widget11", + "name": { + "zh_tw": "11. 精簡標題列表-2 ( 模組標題, 日期, 狀態, 標題 )", + "en": "11. Simple Title List-2 (widget-title, postdate, status, title)" + }, + "thumbnail": "annc_widget11_thumbs.png" + }, + { + "filename": "annc_widget12", + "name": { + "zh_tw": "12. 精簡表格列表-1 ( 模組標題, 狀態, 標題, 日期 )", + "en": "12. Simple Table List (widget-title, status, title, postdate)" + }, + "thumbnail": "annc_widget12_thumbs.png" + }, + { + "filename": "annc_widget13", + "name": { + "zh_tw": "13. 精簡表格列表-2 ( 模組標題, 日期, 狀態, 標題 )", + "en": "13. Simple Table List (widget-title, postdate, status, title)" + }, + "thumbnail": "annc_widget13_thumbs.png" + }, + { + "filename": "annc_widget14", + "name": { + "zh_tw": "14. 一圖 + 標題列表 ( 模組標題, 圖片, 狀態, 標題, 日期 )", + "en": "14. 1 Image + Title List (widget-title, image, status, title, postdate)" + }, + "thumbnail": "annc_widget14_thumbs.png" + }, + { + "filename": "annc_widget16", + "name": { + "zh_tw": "16. 單欄圖文輪播 ( 模組標題, 圖片, 狀態, 日期, 類別, 標題 )", + "en": "16. Image + Text slide (widget-title, image, status, postdate, category, title)" + }, + "thumbnail": "annc_widget1_thumbs.png" + }, + { + "filename": "annc_widget17", + "name": { + "zh_tw": "17. 含搜尋功能之精簡標題列表-2 ( 模組標題, 日期, 狀態, 標題 )", + "en": "17. Simple Title List-2 (widget-title, postdate, status, title), including search" + }, + "thumbnail": "annc_widget11_thumbs.png" + }, + { + "filename": "annc_widget18", + "name": { + "zh_tw": "18. 三欄圖文精簡版 ( 模組標題, 標題, 副標題(只顯示15字) )", + "en": "18. 3-Column Standard Image + Text Lite (widget-title, title, subtitle(only display 15 words))" + }, + "thumbnail": "annc_widget4_thumbs.png" + } + ] } \ No newline at end of file diff --git a/modules/announcement/show.html.erb b/modules/announcement/show.html.erb index 1caf227..4f0adf9 100644 --- a/modules/announcement/show.html.erb +++ b/modules/announcement/show.html.erb @@ -1,3 +1,28 @@ +

{{title}}

@@ -19,7 +44,7 @@
-
+
{{img_description}} {{img_description}}
@@ -44,9 +69,169 @@
+
+
+
+
+ +
+

{{description}}

+
+
+
+
+
+
    + + +
+
+
+

1/{{carousel_count}}

+
    +
  • +
    + {{description_text}} +
    +
    • +
+
    + + +
+
+
{{link_to_edit}} - + \ No newline at end of file diff --git a/modules/archive/archive_index7.html.erb b/modules/archive/archive_index7.html.erb new file mode 100644 index 0000000..cd4449f --- /dev/null +++ b/modules/archive/archive_index7.html.erb @@ -0,0 +1,60 @@ +
+

+ {{page-title}} +

+
+

{{category-title}}

+
+
+
上傳日期
+
標題
+
{{description-head}}
+
檔案下載
+
+
+
+
+
{{created_at}}
+
+ {{archive-title}} + + {{status}} + +
+
{{description}}
+
+ {{file-type}} +
+
+
+
+
+
+
+ + + \ No newline at end of file diff --git a/modules/archive/archive_index8.html.erb b/modules/archive/archive_index8.html.erb new file mode 100644 index 0000000..6e6ef93 --- /dev/null +++ b/modules/archive/archive_index8.html.erb @@ -0,0 +1,48 @@ +
+

+ {{page-title}} +

+
+

{{category-title}}

+
+
+
上傳日期
+
標題
+
{{description-head}}
+
檔案下載
+
+
+
+
+
{{created_at}}
+
+
+
+ {{file-name}} + + {{status}} + +
+
+
+
{{description}}
+
+
+ {{file-type}} +
+
+
+
+
+
+
+
+ + + \ No newline at end of file diff --git a/modules/archive/info.json b/modules/archive/info.json index 3d68c23..e3fa484 100644 --- a/modules/archive/info.json +++ b/modules/archive/info.json @@ -1,70 +1 @@ -{ - "frontend": [ - { - "filename" : "archive_index1", - "name" : { - "zh_tw" : "1. 列表 ( 模組標題, 類別標題, 檔案名稱, 下載連結 )", - "en" : "1. List (widget-title, category, filename, download link)" - }, - "thumbnail" : "ar1.png" - }, - { - "filename" : "archive_index2", - "name" : { - "zh_tw" : "2. 手風琴式列表 ( 模組標題, 類別標題, 檔案名稱, 下載連結 )", - "en" : "2. Accordion list (widget-title, category, filename, download link)" - }, - "thumbnail" : "ar2.png" - }, - { - "filename" : "archive_index3", - "name" : { - "zh_tw" : "3. 列表( 無檔案名稱 ) ( 模組標題, 類別標題, 下載連結 )", - "en" : "3. List(no filename) (widget-title, category, download link)" - }, - "thumbnail" : "ar3.png" - }, - { - "filename" : "archive_index4", - "name" : { - "zh_tw" : "4. 手風琴式列表( 無檔案名稱 ( 模組標題, 類別標題, 下載連結 )", - "en" : "4. Accordion list(no filename) (widget-title, category, download link)" - }, - "thumbnail" : "ar4.png" - }, - { - "filename" : "archive_index5", - "name" : { - "zh_tw" : "5. 表格列表 ( 模組標題, 類別標題, 檔案名稱, 下載連結 )", - "en" : "5. Table list (widget-title, category, filename, download link)" - }, - "thumbnail" : "ar5.png" - }, - { - "filename" : "archive_index6", - "name" : { - "zh_tw" : "6. 表格列表 ( 模組標題, 檔案名稱, 下載連結 )", - "en" : "6. Table list (widget-title, filename, download link)" - }, - "thumbnail" : "ar5.png" - } - ], - "widgets" : [ - { - "filename" : "archive_widget1", - "name" : { - "zh_tw" : "1. 列表 ( 模組標題, 類別標題, 檔案名稱, 下載頁面連結 )", - "en" : "1. List (widget-title, category, link of download page)" - }, - "thumbnail" : "thumb.png" - }, - { - "filename" : "archive_widget2", - "name" : { - "zh_tw" : "2. 手風琴式列表 ( 模組標題, 類別標題, 下載頁面連結 )", - "en" : "2. Accordion list (widget-title, category, link of download page)" - }, - "thumbnail" : "thumb.png" - } - ] -} \ No newline at end of file +{"frontend":[{"filename":"archive_index1","name":{"zh_tw":"1. 列表 ( 模組標題, 類別標題, 檔案名稱, 下載連結 )","en":"1. List (widget-title, category, filename, download link)"},"thumbnail":"ar1.png"},{"filename":"archive_index2","name":{"zh_tw":"2. 手風琴式列表 ( 模組標題, 類別標題, 檔案名稱, 下載連結 )","en":"2. Accordion list (widget-title, category, filename, download link)"},"thumbnail":"ar2.png"},{"filename":"archive_index3","name":{"zh_tw":"3. 列表( 無檔案名稱 ) ( 模組標題, 類別標題, 下載連結 )","en":"3. List(no filename) (widget-title, category, download link)"},"thumbnail":"ar3.png"},{"filename":"archive_index4","name":{"zh_tw":"4. 手風琴式列表( 無檔案名稱 ( 模組標題, 類別標題, 下載連結 )","en":"4. Accordion list(no filename) (widget-title, category, download link)"},"thumbnail":"ar4.png"},{"filename":"archive_index5","name":{"zh_tw":"5. 表格列表 ( 模組標題, 類別標題, 檔案名稱, 下載連結 )","en":"5. Table list (widget-title, category, filename, download link)"},"thumbnail":"ar5.png"},{"filename":"archive_index6","name":{"zh_tw":"6. 表格列表 ( 模組標題, 檔案名稱, 下載連結 )","en":"6. Table list (widget-title, filename, download link)"},"thumbnail":"ar5.png"},{"filename":"archive_index7","name":{"zh_tw":"7. 表格列表 ( 模組標題, 類別標題, 檔案名稱, 檔案簡介, 下載連結 )","en":"7. Table list (widget-title, category, filename, download link)"},"thumbnail":"ar5.png"},{"filename":"archive_index8","name":{"zh_tw":"8. 表格列表 ( 模組標題, 檔案名稱, 檔案簡介, 下載連結 )","en":"8. Table list (widget-title, filename, download link)"},"thumbnail":"ar5.png"}],"widgets":[{"filename":"archive_widget1","name":{"zh_tw":"1. 列表 ( 模組標題, 類別標題, 檔案名稱, 下載頁面連結 )","en":"1. List (widget-title, category, link of download page)"},"thumbnail":"thumb.png"},{"filename":"archive_widget2","name":{"zh_tw":"2. 手風琴式列表 ( 模組標題, 類別標題, 下載頁面連結 )","en":"2. Accordion list (widget-title, category, link of download page)"},"thumbnail":"thumb.png"}]} \ No newline at end of file diff --git a/modules/faq/faq_index2.html.erb b/modules/faq/faq_index2.html.erb index 051b0ba..cce43c1 100644 --- a/modules/faq/faq_index2.html.erb +++ b/modules/faq/faq_index2.html.erb @@ -12,6 +12,7 @@

{{answer}}

+
diff --git a/modules/member/member_index2.html.erb b/modules/member/member_index2.html.erb index 7d4f475..6062e09 100644 --- a/modules/member/member_index2.html.erb +++ b/modules/member/member_index2.html.erb @@ -35,8 +35,8 @@ $('.i-member img').eq(i).parent().attr('title','noname'); } } - for(var i = 0;i < $('.i-member span a').length ; i++){ - if($('.i-member span a').eq(i).html().trim().replace(' ','') == "") - $('.i-member span a').eq(i).html('noname'); + for(var i = 0;i < $('.i-member span.member-data-value-name a').length ; i++){ + if($('.i-member span.member-data-value-name a').eq(i).html().trim().replace(' ','') == "") + $('.i-member span.member-data-value-name a').eq(i).html('noname'); } \ No newline at end of file diff --git a/modules/member/show.html.erb b/modules/member/show.html.erb index 882a89b..d4bc05c 100644 --- a/modules/member/show.html.erb +++ b/modules/member/show.html.erb @@ -21,7 +21,7 @@ {{data_intro_title}} -
{{date-head}}
+
diff --git a/modules/personal_activity/index.html.erb b/modules/personal_activity/index.html.erb index e32c44d..36ad70f 100644 --- a/modules/personal_activity/index.html.erb +++ b/modules/personal_activity/index.html.erb @@ -1,4 +1,4 @@ -
{{plugin_data_title}}
+
@@ -26,10 +26,15 @@ {{pagination_goes_here}} diff --git a/modules/personal_book/index_search1.html.erb b/modules/personal_book/index_search1.html.erb index bd3eeea..2e91d5a 100644 --- a/modules/personal_book/index_search1.html.erb +++ b/modules/personal_book/index_search1.html.erb @@ -23,7 +23,7 @@ $( ".selectbox" ).ready(function() { Clear -

{{widget-title}}
+
diff --git a/modules/personal_conference/index_search1.html.erb b/modules/personal_conference/index_search1.html.erb index 80a021f..eb7fa8e 100644 --- a/modules/personal_conference/index_search1.html.erb +++ b/modules/personal_conference/index_search1.html.erb @@ -23,7 +23,7 @@ $( ".selectbox" ).ready(function() { Clear -
{{head-title}}
+
diff --git a/modules/personal_course/index.html.erb b/modules/personal_course/index.html.erb index 87eb4cb..83fd717 100644 --- a/modules/personal_course/index.html.erb +++ b/modules/personal_course/index.html.erb @@ -1,4 +1,4 @@ -
{{head-title}}
+
@@ -22,10 +22,15 @@ {{pagination_goes_here}} \ No newline at end of file diff --git a/modules/personal_honor/index.html.erb b/modules/personal_honor/index.html.erb index bab8aec..831e4c3 100644 --- a/modules/personal_honor/index.html.erb +++ b/modules/personal_honor/index.html.erb @@ -1,4 +1,4 @@ -

{{widget-title}}
+
@@ -16,10 +16,15 @@ \ No newline at end of file diff --git a/modules/personal_journal/index_search1.html.erb b/modules/personal_journal/index_search1.html.erb index b9d7958..c4f71a1 100644 --- a/modules/personal_journal/index_search1.html.erb +++ b/modules/personal_journal/index_search1.html.erb @@ -23,7 +23,7 @@ $( ".selectbox" ).ready(function() { Clear -

{{widget-title}}
+
diff --git a/modules/personal_lab/index.html.erb b/modules/personal_lab/index.html.erb index 956b7a2..b22a8de 100644 --- a/modules/personal_lab/index.html.erb +++ b/modules/personal_lab/index.html.erb @@ -1,4 +1,4 @@ -
{{head-title}}
+
@@ -31,10 +31,15 @@ for ( var i = 0; i < $('thead th').length ; i++ ) { } } -$('table.personal-lab').DataTable({ - searching: false, - paging: false, - ordering: false, - info: false -}); +$('table.personal-lab').each(function(){ + if($(this).find('thead').length!=0 && $(this).find('td').length!=0 && !$(this).hasClass('dataTable')){ + $(this).DataTable({ + searching: false, + paging: false, + ordering: false, + info: false, + autoWidth: false + }); + } +});; \ No newline at end of file diff --git a/modules/personal_patent/index_search1.html.erb b/modules/personal_patent/index_search1.html.erb index 856793b..03eb09f 100644 --- a/modules/personal_patent/index_search1.html.erb +++ b/modules/personal_patent/index_search1.html.erb @@ -23,7 +23,7 @@ $( ".selectbox" ).ready(function() { Clear -

{{widget-title}}
+
diff --git a/modules/personal_research/index.html.erb b/modules/personal_research/index.html.erb index c9625ef..6538b0b 100644 --- a/modules/personal_research/index.html.erb +++ b/modules/personal_research/index.html.erb @@ -1,4 +1,4 @@ -
{{head-title}}
+
@@ -31,10 +31,15 @@ for ( var i = 0; i < $('thead th').length ; i++ ) { } } -$('table.personal-researchs').DataTable({ - searching: false, - paging: false, - ordering: false, - info: false -}); +$('table.personal-researchs').each(function(){ + if($(this).find('thead').length!=0 && $(this).find('td').length!=0 && !$(this).hasClass('dataTable')){ + $(this).DataTable({ + searching: false, + paging: false, + ordering: false, + info: false, + autoWidth: false + }); + } +});; \ No newline at end of file diff --git a/modules/ruling_bus/_ruling_bus_widget1.html.erb b/modules/ruling_bus/_ruling_bus_widget1.html.erb new file mode 100644 index 0000000..4ec8f60 --- /dev/null +++ b/modules/ruling_bus/_ruling_bus_widget1.html.erb @@ -0,0 +1,57 @@ +
+
+
+
+ + {{bus_title}} +
+
+
+
+
+ {{route_name}}: + {{time_to_arrive}} +
+
+
+
+
+ + diff --git a/modules/ruling_bus/info.json b/modules/ruling_bus/info.json new file mode 100644 index 0000000..f831a6a --- /dev/null +++ b/modules/ruling_bus/info.json @@ -0,0 +1,14 @@ +{ + "frontend": [ + ], + "widgets" : [ + { + "filename" : "ruling_bus_widget1", + "name" : { + "zh_tw" : "1. 公車呈現樣式1", + "en" : "1. Bus layout 1" + }, + "thumbnail" : "bus1_thumbs.png" + } + ] +} \ No newline at end of file diff --git a/modules/web_resource/_web_res_widget1.html.erb b/modules/web_resource/_web_res_widget1.html.erb index 2e2b487..80c965b 100644 --- a/modules/web_resource/_web_res_widget1.html.erb +++ b/modules/web_resource/_web_res_widget1.html.erb @@ -4,7 +4,10 @@
  • - {{title}} +
    + {{img_description}} +
    + {{title}} {{status}} diff --git a/modules/web_resource/_web_res_widget2.html.erb b/modules/web_resource/_web_res_widget2.html.erb new file mode 100644 index 0000000..017ce7f --- /dev/null +++ b/modules/web_resource/_web_res_widget2.html.erb @@ -0,0 +1,21 @@ +
    +

    + {{widget-title}} +

    + +
    + \ No newline at end of file diff --git a/modules/web_resource/info.json b/modules/web_resource/info.json index 3d1bb8f..df326f5 100644 --- a/modules/web_resource/info.json +++ b/modules/web_resource/info.json @@ -21,8 +21,16 @@ { "filename" : "web_res_widget1", "name" : { - "zh_tw" : "1. 列表 ( 模組標題, 連結 )", - "en" : "1. List (widget-title, link)" + "zh_tw" : "1. 直式列表 ( 模組標題, 連結 )", + "en" : "1. Vertical List (widget-title, link)" + }, + "thumbnail" : "thumb.png" + }, + { + "filename" : "web_res_widget2", + "name" : { + "zh_tw" : "2. 橫式列表 ( 模組標題, 連結 )", + "en" : "2. Horizontal List (widget-title, link)" }, "thumbnail" : "thumb.png" } diff --git a/modules/web_resource/web_res_index1.html.erb b/modules/web_resource/web_res_index1.html.erb index 0ed42f6..040dde9 100644 --- a/modules/web_resource/web_res_index1.html.erb +++ b/modules/web_resource/web_res_index1.html.erb @@ -4,13 +4,18 @@ diff --git a/modules/web_resource/web_res_index2.html.erb b/modules/web_resource/web_res_index2.html.erb index c44dc55..86db2aa 100644 --- a/modules/web_resource/web_res_index2.html.erb +++ b/modules/web_resource/web_res_index2.html.erb @@ -4,13 +4,20 @@ diff --git a/partial/_head.html.erb b/partial/_head.html.erb index 1d74814..0469a29 100644 --- a/partial/_head.html.erb +++ b/partial/_head.html.erb @@ -1,3 +1,4 @@ +<%= render 'shared/ie_html5_fix' %> <%= favicon_link_tag (current_site.favicon.blank? ? 'favicon.ico' : current_site.favicon.url) %> @@ -9,14 +10,9 @@ <%= javascript_include_tag "plugin/modernizr.js"%> <%= javascript_include_tag "plugin/picturefill.min.js"%> - <%= javascript_include_tag "jquery.min"%> <%= javascript_include_tag "plugin/jquery.mobile.custom.min.js"%> <%= javascript_include_tag "bootstrap.min"%> - <%= javascript_include_tag "//cdnjs.cloudflare.com/ajax/libs/jquery.cycle2/20140415/jquery.cycle2.min.js"%> - <%= javascript_include_tag "//cdnjs.cloudflare.com/ajax/libs/jquery.cycle2/20140415/jquery.cycle2.carousel.min.js"%> - <%= javascript_include_tag "//cdnjs.cloudflare.com/ajax/libs/jquery.cycle2/20140415/jquery.cycle2.scrollVert.min.js"%> - <%= javascript_include_tag "//cdnjs.cloudflare.com/ajax/libs/jquery.cycle2/20140415/jquery.cycle2.tile.min.js"%> <%= javascript_include_tag "plugin/jquery.cycle2.video.min.js"%> <%= javascript_include_tag "plugin/jquery-bullseye-min.js"%> <%= javascript_include_tag "plugin/jquery.scrolling-tabs.min.js"%> @@ -25,15 +21,10 @@ - <%= javascript_include_tag "//cdn.datatables.net/1.10.7/js/jquery.dataTables.min.js"%> - <%= javascript_include_tag "//cdn.datatables.net/responsive/1.0.7/js/dataTables.responsive.min.js"%> - <%= stylesheet_link_tag "//cdn.datatables.net/responsive/1.0.7/css/responsive.dataTables.min.css"%> - <%= javascript_include_tag "app"%> <%= javascript_include_tag "#{@dataApi}" if @dataApi != nil%> <%= render_google_analytics %> diff --git a/template.json b/template.json index 3f082ce..d02c342 100644 --- a/template.json +++ b/template.json @@ -1,4 +1 @@ -{ - "title" : "orbit_bootstrap2.1", - "key" : "default-theme", - "author" : "chihyu"} \ No newline at end of file +{"key":"default-theme","title":"orbit_bootstrap2.1","author":"chihyu","thumbnail":"assets/images/design_thumb.png"} \ No newline at end of file diff --git a/widgets/site_menu_widget/_site_menu_widget1.html.erb b/widgets/site_menu_widget/_site_menu_widget1.html.erb index 99b9454..149b3a0 100644 --- a/widgets/site_menu_widget/_site_menu_widget1.html.erb +++ b/widgets/site_menu_widget/_site_menu_widget1.html.erb @@ -3,7 +3,7 @@ /accesskey" title="Sitemenu">:::

    {{widget_title}}

      -
    • +
    • {{page_name}}
      • diff --git a/widgets/site_menu_widget/_site_menu_widget2.html.erb b/widgets/site_menu_widget/_site_menu_widget2.html.erb index 8462dc4..9b5f716 100644 --- a/widgets/site_menu_widget/_site_menu_widget2.html.erb +++ b/widgets/site_menu_widget/_site_menu_widget2.html.erb @@ -3,7 +3,7 @@ /accesskey" title="Sitemenu">:::

        {{widget_title}}

{{widget-title}}