From e36a58a2019f1d0fb2dacc12598d19f997dda34a Mon Sep 17 00:00:00 2001
From: Ilia Ryabokon Associer aux sons
En mode édition, pour créer un nouvel exercice, cliquez sur “Nouveau bloc” en bas, puis
"+ "Pour supprimer une zone image, cliquez sur la croix située dans le coin supérieur droit de l’image.
"+ "Pour remplacer un son, glissez-déposez simplement un nouveau son.
"+ -======= - "En mode édition, pour créer un nouvel exercice, cliquez sur “Nouveau bloc” en bas, puis
"+ - "Pour supprimer une zone image, cliquez sur la croix située dans le coin supérieur droit de l’image.
"+ - "Pour remplacer un son, glissez-déposez simplement un nouveau son.
"+ ->>>>>>> 986e8e8f3435c5208d294c97db33e0cf54790514 + + "Pour supprimer un exercice, cliquez sur la croix à gauche du numéro de l’exercice.
"+ diff --git a/resources/library/interactivities/Cat images.wgt/js/script.js b/resources/library/interactivities/Cat images.wgt/js/script.js index cf2f6d0c..9c4358b4 100644 --- a/resources/library/interactivities/Cat images.wgt/js/script.js +++ b/resources/library/interactivities/Cat images.wgt/js/script.js @@ -1,5 +1,5 @@ var sankoreLang = { - display: "Close", + display: "Display", edit: "Edit", first_desc: "Odd numbers", second_desc: "Even numbers", @@ -7,9 +7,9 @@ var sankoreLang = { add: "Add new block", wgt_name: "Categorize images", reload: "Reload", - slate: "Wood", - pad: "Pad", - none: "None", + slate: "slate", + pad: "pad", + none: "none", help: "Help", help_content: "This is an example of help content ...", theme: "Theme" diff --git a/resources/library/interactivities/Cat images.wgt/locales/fr/js/script.js b/resources/library/interactivities/Cat images.wgt/locales/fr/js/script.js index 5b20fcd1..a23d77b7 100644 --- a/resources/library/interactivities/Cat images.wgt/locales/fr/js/script.js +++ b/resources/library/interactivities/Cat images.wgt/locales/fr/js/script.js @@ -1,5 +1,5 @@ var sankoreLang = { - display: "Fermer", + display: "Afficher", edit: "Modifier", first_desc: "Les nombres impairs", second_desc: "Les nombres pairs", diff --git a/resources/library/interactivities/Cat text.wgt/js/script.js b/resources/library/interactivities/Cat text.wgt/js/script.js index a53fc178..5744ce0a 100644 --- a/resources/library/interactivities/Cat text.wgt/js/script.js +++ b/resources/library/interactivities/Cat text.wgt/js/script.js @@ -1,5 +1,5 @@ var sankoreLang = { - display: "Close", + display: "Display", edit: "Edit", first_desc: "Fruits", second_desc: "Vegetables", @@ -13,9 +13,9 @@ var sankoreLang = { text: "Some text", wgt_name: "Categorize text", reload: "Reload", - slate: "Wood", - pad: "Pad", - none: "None", + slate: "slate", + pad: "pad", + none: "none", help: "Help", help_content: "This is an example of help content ...", theme: "Theme" diff --git a/resources/library/interactivities/Choisir.wgt/locales/fr/scripts/selQuestionApp.js b/resources/library/interactivities/Choisir.wgt/locales/fr/scripts/selQuestionApp.js index 36b0c319..720c3b5f 100644 --- a/resources/library/interactivities/Choisir.wgt/locales/fr/scripts/selQuestionApp.js +++ b/resources/library/interactivities/Choisir.wgt/locales/fr/scripts/selQuestionApp.js @@ -15,7 +15,7 @@ var sankoreLang = { edit: "Modifier", - display:"Fermer", + display:"Afficher", question:"La question", example_question:"Ceci est un exemple de question", answer:"Ceci est une réponse possible", diff --git a/resources/library/interactivities/Choisir.wgt/scripts/selQuestionApp.js b/resources/library/interactivities/Choisir.wgt/scripts/selQuestionApp.js index e04f2e83..8bb552c3 100644 --- a/resources/library/interactivities/Choisir.wgt/scripts/selQuestionApp.js +++ b/resources/library/interactivities/Choisir.wgt/scripts/selQuestionApp.js @@ -15,7 +15,7 @@ var sankoreLang = { edit: "Edit", - display:"Close", + display:"Display", question:"Question", example_question:"This is an example of the question", answer:"This is one possible answer", @@ -37,9 +37,9 @@ var sankoreLang = { a:"A", wgt_name: "Choose the right answer", reload: "Reload", - slate: "Wood", - pad: "Pad", - none: "None", + slate: "slate", + pad: "pad", + none: "none", help: "Help", help_content: "This is an example of help content ...", theme: "Theme" diff --git a/resources/library/interactivities/Contraste.wgt/scripts/blackYellow.js b/resources/library/interactivities/Contraste.wgt/scripts/blackYellow.js index 89e6df3f..26746d70 100644 --- a/resources/library/interactivities/Contraste.wgt/scripts/blackYellow.js +++ b/resources/library/interactivities/Contraste.wgt/scripts/blackYellow.js @@ -23,7 +23,7 @@ var sankoreLang = { cancel: "Cancel", wgt_name: "Contrast", reload: "Reload", - slate: "wood", + slate: "slate", pad: "pad", none: "none", help: "Help", From 1e8c94befcd08fbd66fe79c34a2b1189a18f3e0f Mon Sep 17 00:00:00 2001 From: maximXbs>aN`4^P+{?-|ntN-*HQx)6TATclZsO zo&Fx|-2@w`qA@lHZwR=N+Zm@kM()CieUF6j;@u z)mi($s_Ysvx4W0z_|a%I-kmsd`n$gx%6iMvq#cE>+C1~I!bkC=j@Ke9y34+lpX6OO zXN{YVLI+|JqM4(EH*d ZK0ZN_9zS>AbgtOE=W%4d;Ch`fL$EeKN)-=9-`HC9acSx8 zbHfe+YYP2)*757zy}9~}F3sClx|W|lGxp6A7yCw}U0j#zcW6gI!{`sg-Mpq@0`?9r zI{8uSv0oOt48Bp`a`51plR{yL5B}6 ?A zn6+53i74n3D8uy*faXX_P-Ns!MPbcr9*&;Smml8kTUhv^*(-3Tmz%ysXf nT}n zS3@r1|K+6%kiUS72|H8u1LTW{Lf1JdS`d>v4N6Qnu+_cDrU-h519XxnWlyUk}jQt8p z= &zWj`@f?)hRmBjc+fG@{DtW) zE9k9Mk*#ASIIF&>sA%r)F@HOhXn#Zx41Cbi($dc(E7i(b0o5j9XGHaD@B#zpioNaL z-V0;wDznGF{;}Hn`rbKhq5CUj2b?!9-j ) z(t)e-1*S()rv8gt&fa~}v$N#)Aa@-KUrlR>ygu#lc*cbdc?pQK8DAy7RoHC(ciOmn ZDi8|3Y4kkxbj0!-_pb~$&L3vDaAXI=gPRvNf*c8S$Ood*7f2B<470o|&+qb$b4UIY z13>CP>OuPOnGLstkOR8%{g1qObmu=Q0HhwIk75S^eUb3s#)bdn0FXYAeu^Bhd-aTS z|0w`a{dn!bn+;`^bqp!VV#MfYB#=_6QA{$9mV`ss0iQp-IZBD)pWhRqpFlQo_)i&d zptvOb{rlHea%_g`qr4~v(gJ_~{<%zw YKh_U?Zrw@-n>WPS6;vE1r zEP==XNFXwOfiY3-0T}r6=l54;W)?17>VZN3jfI7ko0J9#3n|%Z%fg=f0wNOHxa2>) zd2yfQyh>~ofWWf{H{at6dyqT{S)6cfhz|IL#UD~4PjM7%n%~7BDX)rC{`te(3^a`b zU{mWgfu`7NQlo$*2LQ!35XgcXNOb^7*$@Qgcjh%IY8cj{i{HO-zB#dcQXRSjs2T-O r^#wS5UqE6-M>qsV8zl4q009O7eJ4TJ=dcL@00000NkvXXu0mjfuXXIg diff --git a/resources/library/interactivities/Contraste.wgt/images/slate-help.png b/resources/library/interactivities/Contraste.wgt/images/slate-help.png deleted file mode 100644 index 069052d0061dacbeaa3bd022259a5db0e37a9f16..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1795 zcmaJ?Yfuws6kQ%FAfUs`V%6>}AZQ`UCO}LiA%P?U8VVsuP)1ymg+xd;B#Q|FDK9}0 z8N@1s4oc9DRuQEwqAdt&i&AZiqUGTrC}=y1Kv4#(6uUvd{wUp<-S08yoO|y5?l-$P zB7B3L&2k$60PI3Tcp_p1O|R8L;;S_nUJ-*U&X?d(SR$@NG$_E8VF@T0szj1d5sJvt zQ`^u00I&cRVhJu0ZemI?B?&QMNP4B3U;{uvpk9qglTjQ@K$8?I7BupGGXyGREGWiL zND-=oQMn?-ph2Sy;bN&FS;~+>fow29&m;ttD2{-7Wr|A6)U%*zT_!O%ZIdBz8iFUY zp!cRE!U!-J)1aUqiQ*%r_)|cCm;}>&>2$g`NTt9OGKETpsXj2BNux3;6maH&h-eyF zB2&Z@%)}yAEJ%*yY9^Vi)9FY$8VS=RkzoddVbY*deF%h)HeH1ydLNb6ZB~JYYNZ;5 z8dqQ{(4>eYU}-oDBAmWYL8+dTRcU9+L==pyN7Q7PL@}i_3ls|fAF5Q&p|!XO{owaM zg|*^zHA)ttS}aW?B@Qmp%@j(_4A!6sj%magmNHw#2swshS~;c$gQNVw7==oP>9o^m zp^zD>(&C6piiYx75Wy!Y6f!2mpC*8P>ApOe0mCpK=K8_G!Twxs5TDNA(ip+BTplJ( zQ=%$-mMi jbiz!<{9dT@>dkOv^LwGq%Ow+L$fjfc z*D=p-5xrxY&NVHum}`4fMfAFcXlh6v9!K1j^iUpGtnV3$5y~C8A65R{=k6<1bcmgb z?mN|=s;;Z^5Y<6m{Ptj@$lGSs$wiU8(e`6JABgn|`eLnNyubI1hs)$;v0>?FVWiE; zJCr@EkEZPGY&6FI5$e#ek(5Qbok**gxI!N}T47Z(aA8Zq%^fTJJi!>+>*0vb=(bdW zQ)`cVB #c7TK8~u9FEq=w zjgCeo=0L6`aA#nBaSjz!Jn(;cHf(fi_wbq+%OgQoxj=#_8|f8x4DtZM+V-SkzJ)Qx z|JL%nw7goYnsYU;+uvrg* }Sl{vk4nq1j(+WN9(W@MmLwt67aBRfL& zdr9%9=7*t@G#no-4pD6?3G3Rj0L(+H(d+9b!`tt{om*3%{Z;wpQRYh5oXO;qb@|}&BeSBtV*>m%b98Oi7 z9Z cy=DH6cSl%_cgub0zd7DKmf6xU@a7G@+%tZ~xY&$WO|Q%B zZ%=Lgx;ac&ztrAhYO3SL;8^n{&0*>t 000W>0fLJSS^xk59CSrkbW?9;ba!ELWdK2BZ(?O2Mrm?o zcW-iQb09-gHF34$HUIzs7IZ~ebVG7wVRUJ4ZXi@?ZDjy5HZL$UFEKLOh$^H200sF; zL_t(&f$djKY*bYg{_ef+Z-&|q(9%Lf5RkS>N2CdV36vJ&LKf0SMI$U6ipGRRVWDv$ zV1XDz XF&u`9%@cdO0P&MlK|j(9u!4^=XoH6!1scb61uL#wrx;K2XtL; z{NRh9)A{fViUCbkdtBE|GRD9;2LM=>1;!W{V<3bCZgw08@pv4R(xhYCJz?0P1U@{t zE9G*&gAf8KB{WR~r4)=YSe6CHabQ^%q?90pKv5KM&LM<=ZWudGzx{lwC<5i>OWP@> z;GDy89GIpF*L9(38Wcqdyx{+*l!8(UDJ3$Q43;lTv=>F-{{3_V0K{T3NGYMJDq^u1 zT-OEXJP0r;B|OiA5CW7^XqpC1(=eHyZYYX?qA0 RW-;2P16DbQp!Llj6^5_AKWy}dHL)Inv@b!N?4W! zN@w91W3X)-j^l*EhZCsT@HB)FLAv=-?#F|!>i`hszvp>DmKcVC+M2b+5!kkQ<5d8` z>3sJBfa|*OJTGvwA9#Ky*tU)Ox^-8J^FZDDW6Am&FvbFRQ%Vtw#pY#!>$)&a6Ts}X zNhy)6uR$_dd#oq|WbLcHFEnqvv@}r)LI^0Oa9uYDNX|Jt&kKT32m#JHR#vUROM99x zVcovoq6h#$NlE;`q0}n_i9~7OUd9+yRfVD`P!t7@ wHr}@^EBJ2PHZ0465CQ;Z%df6uV{*ga@tDy_*1Vkd*NP$l0OXn1 z(_1$``|gq@@gN(75QxQM0RdH2p{feD@7R1osokFj5LyQceh>Ka=f#g_?%bV-`vK^? zT?hdo1Xfj5WRiQ2E%Eik@Izlj56h3g{60K6IaTjxh2uCuaL&dB8=kB0m+V{;`Aw)Q ztlG~6&+~#N QBg6yLd@pv2qH-{qOMZSW{%JOOeK}+VGL)Z17HJ6o@REJ^A zmB?A(4u0L8G3}N=uHOv0p|0z&EDPJVJcrV BDEvpO~u~HWx&W0RVXC(7p$XVZb#_sD=Ru0T2Subsro)bAFy~KI1?E z9(dfc=(FJy0*g){@_63S*3=9j1)vo`*_@>*0Nnt(I?i71^*=tcI?&P9lmO86bnT{= zO*>yiT|*=ESkQH0n==@^eg*w~KValm{{;Z4j zwzYqeQM_T&E$A$_r?#uYtknB9t(pNNrj<%-M$Y6gY {6M4t$ z(EXDk`@_;uO4(dY8fNzwR|#F$xwsI^*?q;AVku?9^Z1P@# tm_QaRRiFb>g~nLqxqx$bhA}0cOW*T&Mp4wqH=g%=`N?piysAFedU|4f zIM>?$N|Y-AfZHRtCiD6J_Q boZq?FzH2uLZrqYzlocz*6o`>C~c4aXn;K0J8+^uhN(oj0C` r;YapBcF)lqr#~7M|H*j1=mh=+SUN~Huv8Y*00000NkvXXu0mjf859-D literal 0 HcmV?d00001 diff --git a/resources/library/interactivities/Contraste.wgt/images/slate-toolbar-reload-white.png b/resources/library/interactivities/Contraste.wgt/images/slate-toolbar-reload-white.png deleted file mode 100644 index 78d146ec37fd55bc97dbac2bf21e599468ee8d36..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1619 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz$r9IylHmNblJdl&R0hYC{G?O` z&)mfH)S%SFl*+=BsWuD@%nF$y5hW46K32*3xq68pHF_1f1wh>l3^w)^1&PVosU-?Y zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP zs8ErclUHn2VXFi-*9yo63F|8 pIh$D;n7J8P zI>Ge1 4w>EaktaqCUE zeMXd{ME$g&z>Gq{!c_^51snY4TFqGcLLjQ(k}BKWT(|8URw)zHiUpPV%6ybN9$az| z mu;Sc#D(ln%u|sTI=_3w%fVq$30uq+-Wr*9>1G+|L*tQ*8A<3KdPL!+jr;j zyPNI^?l>Rxp=xiU$?=&!b?m?K{Re;o6oTci2uHuq-+4#ku0izm_8tZol1k;`!%% z;ZByeIC;BvdFM4@+U;$ZUw -yu+ 3!qAh)ffylanGm54`^_&&$TFd03vI{mjOFEP7!Ret4N3Q(;gIHk&>5PTAf# z`$@Zlx$<9B{;iv@E}bmI!Pd;WvsnEJhi9t_pG)!aN5MP9I+z*{1f0t*D=(kEZn;BW zW0OIF)!eMLVXs5qw3#=0ElpbFuQ=1EF6>F0dC#v)rBQ3WZ)*P#zx1}uo~w58#TBW~ zm|9}2?A|LZnV0Xp;9|y<#ESkeSF=p5B@aH>B;V`idFW;rL(t*Ly_XGz&V9~Ze;~oY zW^vp8sRBP#OLW9ecjxvzwkl2A{Bxzjyt8TXGgyv2E)0BeJ7-&a#FK xv%aW=iUaN&X&+75LUZLyb_4t6%LZ9WqX;HC>cO0K}C{;QZ+BU?z zo8YnfVQ6Hp-%}TLq0TeU1BxQohOK`pAo@7g;nhLsSNjh>Ewbc0{v+8!W}aS_!@_^F zuXpbFEIa-5SB|B3rnah0K53WakhOMJfuedt|G$R0g-e4n H{(tuF)I_U^4vQ~# zT))8{lzqKLB<}NU&Xrj;(pOuw6XK`DdOc;ieq@bwi1Z%blhz6SRpKvJlru7Z{Jhz< les}r7ySG2opO9x{WB7J{-|3FTiSIzgyr-+5%Q~loCIA;2bXNcX diff --git a/resources/library/interactivities/Contraste.wgt/images/slate-toolbar-reload.png b/resources/library/interactivities/Contraste.wgt/images/slate-toolbar-reload.png index 685a5cb2a93933036bec2353f4e1291358ec3ca1..844169a963567982f39336dcff5b0c56568f58ce 100644 GIT binary patch literal 2289 zcmV 000W>0fLJSS^xk59CSrkbW?9;ba!ELWdK2BZ(?O2Mrm?o zcW-iQb09-gHF34$HUIzs7IZ~ebVG7wVRUJ4ZXi@?ZDjy5HZL$UFEKLOh$^H200>D* zL_t(&f$f-oY*W`2$G`XevSWTZ2@nE>7|2Mpl*FtpZCR)t!P+rRg9%EvbX9^!VVX7p z8WNeRG%x%ZNE0IJD%Nf*37ytzV?a=+vB5S%L)Ne%;;n3jk_smXl0hJWB+q_7&;E!V zY{!lrvcW$b>B;Zi=X<}Od+zbQ=a>-@9;R^*Rs9hF03p7CF&6V&T~R6nsM~SyOkbq! zwO5w71wrrva075jk_1&%14QH}qNbhiw)m3?#>X5R(GUetv+g;!D2i 9+K?ndG$EtK)pGHIw1OcXLLf3U< zW=_F3U;N4$Q534#+%-*c-D&|qzxb<_j~6YFkDq9EpZ9+Pj^iMT;zR(y-?ef1=XG80 z6Gic!R=oJm4a;1rs%_IW4IIY}yBq*|d+%WH8x1W&L3zCRu!)5)A7lA1En4wqPu&a4 zzX(wjVObUwMaktjRuwIt5P-<~nZx0LBuQa!aNv0!cDo&-C_+`WZLe1@btMCc7@POv zmPI9nTjtMw42&_@Y&HPcTwPJ>jQ-w;C8+wrdIcDY1tNlwkr5#q`m`*Vx{mD)&8Zk5 z6qMIpKlA2_e_#CUdBzwF!?0y#Im-d;PYNIwzPu{s$YZeF-02%1FIsTra(f4KU5DLf zTOSSZf8UDP{I!7z4*MlwXgNcwS`hvIft&@|S }D z=Xt2A3XZYewcqxRITl`fWr>^P_-z>(83+c0C|EETIn%T1QUWm7>Za0Xzu=FY_o5`( z1%Yp_S@&Gp5IZ+4^V;pUW=+$eC<-P_aNya+#V0X;Z6HP~Sw29Y{l@#}Qy-l=`}dDw znkI%45n*6(P}$4#eBJhj<~}5_og0=p4a3;Xaa;{!463Svh_L4CFDUNf!lJYR0DwA< z$c;z-P;>751vnfIsHzH46rt 8< 0uIoeZ z!#kWPiqJF-q9~$dVF5f#pSqiwow+F@4vaA?j`2j`up6eiufKoLd%o>o=(yU2uI`)A zG#!>@Vd8`gOr4sAg3q~7STGOH?92uLwam3T5Hp#vWW@4sDQAflKn+79gg-Z>&7f6H-_eV#z$JG-f`r<+n) zUr#qRzO$QTpT{5eR&u>$0J6`sDsa&sGw4{YyR)6%u6?yX8X_$K+2?T{daL$Eit(=y z(NQ9*316p(s5kygA!Q&2A}xS@Ti5PMHe ruiTb7l*k4_FBB6TNnvT_z?DM$NgxDP2_rnj~4aIw5 z1OO2=js_66v;Y7g6de3xq*F*4pr8EkTi+cO;D2pI DcL!TBllWJNnM^R{e1(G``Po0#$BFIoSaz_ zc^ tH53JjqmS*En@-zz%+D)7sMhArEd51k^zJvWB@hM5UnQ t1K+I@ra1a;Un$g|aj_%HO z0Kkkn`EV61f~(LyJnMMz@OZIr(m4x=Xj6P7rDK+5-XWsOQT5UR2zPYTP}-HQ)l-6F zJMADG1;hoQ0{7~I$p8O=@YM+57-KAuq<^g5XtRD0_RveSM*#l?BwzixKjlZG00000 LNkvXXu0mjfx#&Pd literal 2110 zcmaJ?dpMN&9)IPULP##F%)TzQVlKvI3?q{ qH!AU7rX(x^@3SCarV%3VJMx2>8?fK(4@AJIx@A7;;pYQGSJa5i{eLgzc zX4(J%==k|k7>X68e6=(bUvYBsykap$yhD*dI0i{%i6DT?fukXmAD zgcs0+aUzv6FdhR}Q$x1LZCyDg^it!a_;;@d7bXN&-LV5*2&pH3md|fFL{) z_(xKq0S8cCun0mqp|SRCtTPtnj6>t_jxH`Pb|?od4vWD$U~mrhI2R(`fr!PTK0cr# znurraWKgIdV<}D~Fb+Y4L<}Y|F%g}JN5i6649?ZnRjJ|NV6Q;fi<1NhOKL9=TdpZk zATe9S6(U?%fKn>5qG1U_0u`D5Q37B1Nmd~K*d|58FjAHfgF|DLC9MGi0{%ag&;NuL zBMj)zeE+AgI4DU7VHl7YmWbGj!NpiALkWpqB8Y{+q97QKU+dz5I2eJ&aj+2O73hQt z;R-l#qWA+kAb{v65F;!B8}g%&Km{Mo<#LE#1S)}oCpf!0VZCuUZydqZ#g*bpcEIDj z_B!Kn&TCu>%$D#W0kX#B{K<7$m#Z`aU#N&ofkfOR5Qi#)`KS*C6S?c>;<&EfM=odm zT%6YBVid_>lw v!TOA^$jt_3;ju**OX8P$^oD_)9J9RL$2fBKz4t>mXtnfX zCTH=~3$vOfy9VqesDhx 15g3?a?>skiv{n@Obd%}_~SD+n8j;di)UX{ zyg94a#&OuVC=xEJEWZMT=B-Z`|0SDUc=9}D`q7j0`BuG(h9=vs+B?zpOQylLMs*Dh zCl3^5Kkk0?I47EzSw7F#tZat939bp!m=L{f50T|wl77?3>q(J4d{~xNI5f7fAgPpq zr=q5%?z&n6^H pvu2= v{N8`{H`>!Poe4E>-oYNNvKMT$mH*_##Mj9aZ=UKT zLg5+xv2n-FyF)slq2;#r4Jm({>3MND&-CBnLP-hlGa}8#P`vw;QPyWYWsg1dBjh#4 z$9GUy!7>SOyCP4XL-4da{LC(E?}$~IcjSH9*w~onMzvp_C9Smlj*bio(-r1>Bs~|z z{9}18EAn!vU2AV|uSxzL0}MUmg5+w%{+9IJ8R#x_yJ1A!c#-Prja|03bAdyk@qkRm z!=L=zz}nBM%7m)XG5&VtX14$sxP3dvB)GotqI2f*5$_Wv;gON>SiSn|yJrkW2F*%U zULwS8i`SX7#=H*oR7@-V(6@9Z(_E%i+1cq%!&?_rS683tpzq_Rh(tf09N53@MqfaT zS`^lVTGi%#Z_;w-XrgxN5HT#!+WPX;)YNz`K$A2q)(p`#s-{jxjmuwVel1QjGgcGQ z&J6 !?5gMk=dO$`%^6zxPwADFms=XO z=x)-=kJU^~Yjb`6c4E2IFwGPA-t!dJ*0+RVOegC#c&qgtc25VV2~AV&!U#`~oy~^w z^0G3|2Ryj%UBVF`66>ZxBy;;e?>G|(KdB9Qye%B~%e9=Hj8@9z`C32Tm#7WXqIS;* zs}#52_3HM}dcP}K86HuMDsEWVt|QAmDwoSyF)@=C-a$-8!p|`b-=mI}kFGuy+Sx7` z`B+c5&3@^U+UCl+!5A%F7GE>ntnpVp0*Pc_&7=N!`n19KwY3|XM>cDxSbssv$ z>% diff --git a/resources/library/interactivities/Contraste.wgt/images/toolbar-edit.png b/resources/library/interactivities/Contraste.wgt/images/toolbar-edit.png new file mode 100644 index 0000000000000000000000000000000000000000..daa338cd9bad28014559c72dab05555471ed402b GIT binary patch literal 732 zcmV<20wev2P) hPu2Ds07A#D z+(`)m10Mn0JJUZ@+pnq%MBp|%ES8NwDOLk#-~e!sr^msc6xo3pa5tZ@SZX^c-ho6o z06e&ZB7qF}i)0IA!gl~p>L5#?0N!D-JQN8?!jlC`;HvFkz>@@Oz-J58g3l7D2|p`P z8~&=mCE!tkOTnW827U+NPfd7GfZKJ0>63S=?e7451Mpk}9uxr30C=|7DAo1@fG#3Y z1b h} z^05>ix)tAeWB=B=!&DC&0NNI&WPE`=rmvk=Z9huGLQ(H8r|$x9UZ75YfIRIFC>8Aw zfaLK{3Qkh 7L*3U0(z`UC0k;6t*GAaUDm zv{_eH15)rT0ZDkWKndKe&lf0#7YRtfvjwE!Spt&qWC3Y-l0Xf3s(>bWAi0-<&lceH zYekZc8Lx~?5j;iUE6Ibmu!%^_hNlP&B*(zwRS7&rz!u*o@PK_TJVn6G##wBSAqzfB zfMgdq=g~R;Y @Ro3;YFgD1q% &8O?(WPGBdSVDd`TL85dhqT2qH4N*IktZ1@II2I(YR4)WAlv zvU%qR&X@!VPJr&J6|ez*ghT^dppdL=FCxGNZ-6^P@E)%~&i!NSBU#Tt9T^ *vt~(P|%gu7`!?=FJha~9{6Sqo?DucISV8!Tj0q^e|G$^U+W6=&|TFs{tr0D zn`GtcogeTY{2@7k0{HHEzmIV?MZg+=cl?8)4fjZ138$>U6Oen}H~&I_Zwqq#0!Ns# z1)=mZrC*QeGz8FHb<620w~?$ojJO|=hS2?H{W|fyC9-)1SKy z?OFd_PpxdkuIiRjt*AT2)sj{}ur*_}&=2$KKgpL_iZ6yhk%zfT|V~ zgZC(W{*%uKEY0W=-Rf*QTz?%{1n|Gl2dst2T7r*J2mKobq%Fk*5r>%ImKC `8@Lh^BEZML#?@q@t?dBCZ7*{$}PBp`GD#z=jH< W1u002ovPDHLkV1mUGDkT5_ literal 0 HcmV?d00001 diff --git a/resources/library/interactivities/Contraste.wgt/images/toolbar-reload.png b/resources/library/interactivities/Contraste.wgt/images/toolbar-reload.png new file mode 100644 index 0000000000000000000000000000000000000000..340d7371f204e07c5e1e7202160cbd20eb2bbaff GIT binary patch literal 999 zcmV 8xO?{jC#X3A z<^ rQ6j=F< ){f31acLnk3NI;JEztL3;=ED0r;h&G?5}pfEjSuu_%CNV5XvU@m_!&_+lvS zGi=KfkeD6`29P2<1@1bOm((tAl*iOtGP3^n3d9XW5P%ffNGo=&I0vp(l;$ofDY6sl zZJM|sY _F!dOJ2EO@>1E?rnsVF@H=Em>=u+$6d29P2f16LmXhZ?R|RFqxl`C@$SI(F}sZF#_Sdu2ZG0hGq|spmg$1$YVp_`N9r9sNul zc?iJ5xIUC33yOXonNo*hm+sDNcu$?-z{+T$V$>6jtT;Xojsw@m^#PD;g`vh{+U~A! z 2ULe;Mro_5gc;{{Dc-445mWDr2m>KcG}_e*h6_{j6sbsb!(>6A>w;UrG^4d;l$b zJpj3-bf`RPZ+QXy6_Lnh`vZDgg0?_JMjb1@7m?UUB_byx@?g!W8czgmfr!jJ#!C@d z`^NWx{BX_f1rU+3$9N;N5C9D^wdaNaEPDV%M8*Rk?u>br?S;-$unBQ^G%@Xce1AZx zl6`-mqd(vTu=XteK(Kv(U<>_$I&ymZ1HMokTkpY}`vbBb*2h7CNb00xMzG*db3@0Z zZCjRW_BsG;FARdv^DATii@o|z0FV1BJ?71bQpb8%Hcj;Nu!6);xS9TdQi}$_Hqe`l zMC8J;q7Zozt2P|81=hrgv|r3VxfMs+9=rt(1!F?`19cX3&2QW5TJ<($=U+y9fPeFJ V^_8`m{=5JH002ovPDHLkV1m - + @@ -51,27 +51,33 @@ - - - + - + + ++ + ++- +- + diff --git a/resources/library/interactivities/Contraste.wgt/locales/fr/index.html b/resources/library/interactivities/Contraste.wgt/locales/fr/index.html index f2cecf06..5c74529e 100644 --- a/resources/library/interactivities/Contraste.wgt/locales/fr/index.html +++ b/resources/library/interactivities/Contraste.wgt/locales/fr/index.html @@ -9,7 +9,7 @@ and open the template in the editor. - + @@ -31,27 +31,33 @@ and open the template in the editor. - - - + + ++ + ++- +@@ -45,6 +39,18 @@ and open the template in the editor. diff --git a/resources/library/interactivities/Contraste.wgt/locales/fr/scripts/blackYellow.js b/resources/library/interactivities/Contraste.wgt/locales/fr/scripts/blackYellow.js index 634dde99..aa40e63e 100644 --- a/resources/library/interactivities/Contraste.wgt/locales/fr/scripts/blackYellow.js +++ b/resources/library/interactivities/Contraste.wgt/locales/fr/scripts/blackYellow.js @@ -14,7 +14,7 @@ */ var sankoreLang = { - display: "Afficher", + display: "Fermer", edit: "Modifier", add: "Ajouter", enter_data: "Saisir la donnée:", @@ -28,24 +28,25 @@ var sankoreLang = { none: "aucun", help: "Aide", help_content: " Contraste
"+ -"Jeu de couleurs.
"+ + "Jeu de couleurs.
"+ -"Cette activité permet de masquer et d’afficher du texte en jouant sur la couleur de fond (jaune ou noir). Le but est de pouvoir faire apparaître des données en passant d’une couleur à l’autre.
"+ + "Cette activité permet de masquer et d’afficher du texte en jouant sur la couleur de fond (jaune ou noir). Le but est de pouvoir faire apparaître des données en passant d’une couleur à l’autre.
"+ -"Le bouton “Recharger” réinitialise les exercices.
"+ + "Le bouton “Recharger” réinitialise les exercices.
"+ -"Le bouton “Modifier” vous permet :
"+ -""+ + "
- de choisir le thème de l’interactivité : tablette, ardoise ou aucun (par défaut aucun),
"+ -"- de modifier un exercice ou d’en créer de nouveaux dans la même activité.
Le bouton “Modifier” vous permet :
"+ + ""+ -"
- de choisir le thème de l’interactivité : tablette, ardoise ou aucun (par défaut aucun),
"+ + "- de modifier un exercice ou d’en créer de nouveaux dans la même activité.
En mode édition, pour créer un nouvel exercice, cliquez sur “+ Ajouter” en haut, puis
"+ -""+ -"
- saisissez la donnée par exemple “3x15”,
"+ -"- saisissez le résultat, par exemple “15” et cliquez sur “OK”.
Pour modifier les données ou les résultats, cliquez directement sur l’exercice.
"+ -"Pour supprimer un exercice, cliquez sur la croix en haut à droite de l’exercice.
"+ + "En mode édition, pour créer un nouvel exercice, cliquez sur “+ Ajouter” en haut, puis
"+ + ""+ + "
- saisissez la donnée par exemple “3x15”,
"+ + "- saisissez le résultat, par exemple “15” et cliquez sur “OK”.
Pour modifier les données ou les résultats, cliquez directement sur l’exercice.
"+ + "Pour supprimer un exercice, cliquez sur la croix en haut à droite de l’exercice.
"+ -"Le bouton “Afficher” vous permet d’utiliser l’activité.
" + "Le bouton “Afficher” vous permet d’utiliser l’activité.
", + theme: "Thème" }; function init(){ @@ -61,6 +62,8 @@ function init(){ var flagForSelect = false; var dragElement = null; //the element that must be dragging var lang = ""; //locale language + var resizeFlag = true; + var coords = { left:0, top:0 @@ -82,9 +85,11 @@ function init(){ $("#wgt_reload").text(sankoreLang.reload); $("#wgt_help").text(sankoreLang.help); $("#help").html(sankoreLang.help_content); - $(".style_select option[value='1']").text(sankoreLang.slate); - $(".style_select option[value='2']").text(sankoreLang.pad); - $(".style_select option[value='3']").text(sankoreLang.none); + $("#style_select option[value='1']").text(sankoreLang.slate); + $("#style_select option[value='2']").text(sankoreLang.pad); + $("#style_select option[value='3']").text(sankoreLang.none); + var tmpl = $("div.inline label").html(); + $("div.inline label").html(sankoreLang.theme + tmpl) if(window.sankore){ if(sankore.preference("blackYellowData","")){ @@ -109,7 +114,7 @@ function init(){ if(window.sankore){ if(sankore.preference("by_style","")){ changeStyle(sankore.preference("by_style","")); - $(".style_select").val(sankore.preference("by_style","")); + $("#style_select").val(sankore.preference("by_style","")); } else changeStyle("3") } else @@ -120,9 +125,15 @@ function init(){ if(!$(this).hasClass("selected")){ $(this).addClass("selected"); $("#wgt_edit").removeClass("selected"); - $(".style_select").css("display","none"); + $("#parameters").css("display","none"); + var tmpwh = $(window).height(); + var tmpww = $(window).width(); + resizeFlag = true; + window.resizeTo(tmpww, tmpwh - 44) + $("#data").css("padding-bottom",""); + $("#leftDiv").css("border-top-left-radius","7px"); + $("#rightDiv").css("border-top-right-radius","7px"); $(this).css("display", "none"); - $("#wgt_add").css("display", "none"); $("#wgt_edit").css("display", "block"); mode = false; $(".leftDiv, .rightDiv").animate({ @@ -135,7 +146,7 @@ function init(){ tmpReadyTask.width($(domElem).width()) .height($(domElem).height()) .css("position","absolute") - .css("top",$(domElem).position().top) + .css("top",$(domElem).position().top - 40) .css("left",$(domElem).position().left) .find(".taskContainer").removeAttr("contenteditable"); @@ -146,15 +157,22 @@ function init(){ opacityChanged = false; } }); + $(document).disableTextSelect(); } } else { if(!$(this).hasClass("selected")){ $(this).addClass("selected"); $("#wgt_display").removeClass("selected"); - $(".style_select").css("display","block"); + $("#parameters").css("display","block"); + tmpwh = $(window).height(); + tmpww = $(window).width(); + resizeFlag = true; + window.resizeTo(tmpww, tmpwh + 44) + $("#data").css("padding-bottom","42px"); + $("#leftDiv").css("border-top-left-radius","0px"); + $("#rightDiv").css("border-top-right-radius","0px"); $(this).css("display", "none"); - $("#wgt_add").css("display", "block"); $("#wgt_display").css("display", "block"); mode = true; $(document).enableTextSelect(); @@ -189,12 +207,15 @@ function init(){ $("#wgt_help").click(function(){ var tmp = $(this); if($(this).hasClass("open")){ + $(this).removeClass("help_pad").removeClass("help_wood") $("#help").slideUp("100", function(){ tmp.removeClass("open"); $("#data").show(); + ($("#wgt_edit").hasClass("selected"))?$("#parameters").show():''; }); } else { - $("#data").hide(); + ($("#style_select").val() == 1)?$(this).removeClass("help_pad").addClass("help_wood"):$(this).removeClass("help_wood").addClass("help_pad"); + $("#data, #parameters").hide(); $("#help").slideDown("100", function(){ tmp.addClass("open"); }); @@ -218,10 +239,10 @@ function init(){ $(document).disableTextSelect(); }); - $(".style_select option[value='1']").text(sankoreLang.slate); - $(".style_select option[value='2']").text(sankoreLang.pad); + $("#style_select option[value='1']").text(sankoreLang.slate); + $("#style_select option[value='2']").text(sankoreLang.pad); - $(".style_select").change(function (event){ + $("#style_select").change(function (event){ changeStyle($(this).find("option:selected").val()); }) @@ -372,12 +393,12 @@ function init(){ if((prevBottom + 15 + curHeight) < ($(window).height() - 54)) curr.css("top", prevBottom + 15 + "px"); else - curr.css("top", "60px").css("left", prevLeft + 255 + "px"); + curr.css("top", "100px").css("left", prevLeft + 255 + "px"); } else { if((prevBottom + 15 + curHeight) < ($(window).height() - 54)) curr.css("top", prevBottom + 15 + "px").css("left", prevLeft + "px"); else - curr.css("top", "60px").css("left", prevLeft + 255 + "px"); + curr.css("top", "100px").css("left", prevLeft + 255 + "px"); } prevBottom = curr.position().top + curr.height(), prevLeft = curr.position().left; @@ -390,28 +411,31 @@ function init(){ popupBack.css("left", ($(window).width() - 360)*50/$(window).width() + "%"); $(window).resize(function(){ - if($("#wgt_edit").hasClass("selected")){ - if($(".editContainer").size() > 1){ - var prev = $(".editContainer:first"), - prevBottom = prev.position().top + prev.height(), - prevLeft = prev.position().left; - recursionCall(prevBottom, prevLeft, prev.next()); + if(!resizeFlag){ + if($("#wgt_edit").hasClass("selected")){ + if($(".editContainer").size() > 1){ + var prev = $(".editContainer:first"), + prevBottom = prev.position().top + prev.height(), + prevLeft = prev.position().left; + recursionCall(prevBottom, prevLeft, prev.next()); + } + } else { + var tmp_array = []; + $(".readyTask").each(function(){ + tmp_array.push($(this)); + }); + orderItems(tmp_array); } - } else { - var tmp_array = []; - $(".readyTask").each(function(){ - tmp_array.push($(this)); - }); - orderItems(tmp_array); - } - popupBack.css("top", ($(window).height() - 138)*50/$(window).height() + "%"); - popupBack.css("left", ($(window).width() - 360)*50/$(window).width() + "%"); + popupBack.css("top", ($(window).height() - 138)*50/$(window).height() + "%"); + popupBack.css("left", ($(window).width() - 360)*50/$(window).width() + "%"); + } else + resizeFlag = false; }); if (window.widget) { window.widget.onleave = function(){ exportToSankore(); - sankore.setPreference("by_style", $(".style_select").find("option:selected").val()); + sankore.setPreference("by_style", $("#style_select").find("option:selected").val()); } } @@ -434,7 +458,7 @@ function init(){ objToExport.data2 = $(domElem).find(".readyTask").find(":last-child").text(); objToExport.width = $(domElem).width(); objToExport.height = $(domElem).height(); - objToExport.top = $(domElem).position().top; + objToExport.top = $(domElem).position().top - 40; objToExport.left = $(domElem).position().left; arrayToExport.push(objToExport); }); @@ -493,14 +517,14 @@ function reloadItems(){ //order items function orderItems(items){ - var bottom = 45, + var bottom = ($("#wgt_edit").hasClass("selected"))?85:45, lastItemLeft = 54; for (var i in items){ if((bottom + items[i].height()) < ($(window).height() - 54)){ items[i].css("top", bottom + 15 + "px").css("left", lastItemLeft + "px").appendTo("#data"); bottom += items[i].height() + 15; } else { - bottom = 60; + bottom = 100; lastItemLeft += 255; items[i].css("top", bottom + "px").css("left", lastItemLeft + "px").appendTo("#data"); bottom += items[i].height(); @@ -525,7 +549,7 @@ function shuffle( arr ) //adding a new task to the page function addTask(expression, result){ var lastItem = $(".editContainer:last"), - lastItemPos = lastItem.length ? lastItem.position().top : 45, + lastItemPos = lastItem.length ? lastItem.position().top : 85, lastItemHeight = lastItem.length ? lastItem.height() : 0, lastItemLeft = lastItem.length ? lastItem.position().left : 54; var bottom = lastItemPos + lastItemHeight + 85; @@ -537,7 +561,7 @@ function addTask(expression, result){ if(bottom < ($(window).height() - 54)){ editContent.css("top", lastItemPos + lastItemHeight + 15 + "px").css("left", lastItemLeft + "px").appendTo("#data"); } else { - lastItemPos = 45; + lastItemPos = 85; editContent.css("top", lastItemPos + 15 + "px").css("left", lastItemLeft + 255 + "px").appendTo("#data"); } main.appendTo(editContent); @@ -556,13 +580,12 @@ function changeStyle(val){ $(".b_bottom_left").removeClass("bbl_pad").removeClass("without_back"); $(".b_bottom_center").removeClass("bbc_pad").removeClass("without_back"); $("#wgt_reload").removeClass("pad_color").removeClass("pad_reload"); - $("#wgt_edit").removeClass("pad_color").removeClass("pad_edit"); $("#wgt_help").removeClass("pad_color").removeClass("pad_help"); - $("#wgt_display").removeClass("pad_color").removeClass("pad_edit"); - $("#wgt_add").removeClass("pad_color").removeClass("pad_add"); + $("#wgt_edit").removeClass("pad_color").removeClass("pad_edit"); $("#wgt_name").removeClass("pad_color"); - $(".style_select").removeClass("pad_select").removeClass("none_select").val(val); - $("body, html").removeClass("without_radius"); + $("#wgt_display").addClass("display_wood"); + $("#style_select").val(val); + $("body, html").removeClass("without_radius").addClass("radius_ft"); break; case "2": $(".b_top_left").addClass("btl_pad").removeClass("without_back"); @@ -574,13 +597,12 @@ function changeStyle(val){ $(".b_bottom_left").addClass("bbl_pad").removeClass("without_back"); $(".b_bottom_center").addClass("bbc_pad").removeClass("without_back"); $("#wgt_reload").addClass("pad_color").addClass("pad_reload"); - $("#wgt_edit").addClass("pad_color").addClass("pad_edit"); $("#wgt_help").addClass("pad_color").addClass("pad_help"); - $("#wgt_display").addClass("pad_color").addClass("pad_edit"); - $("#wgt_add").addClass("pad_color").addClass("pad_add"); + $("#wgt_edit").addClass("pad_color").addClass("pad_edit"); $("#wgt_name").addClass("pad_color"); - $(".style_select").addClass("pad_select").removeClass("none_select").val(val); - $("body, html").removeClass("without_radius"); + $("#wgt_display").removeClass("display_wood"); + $("#style_select").val(val); + $("body, html").removeClass("without_radius").removeClass("radius_ft"); break; case "3": $(".b_top_left").addClass("without_back").removeClass("btl_pad"); @@ -591,14 +613,13 @@ function changeStyle(val){ $(".b_bottom_right").addClass("without_back").removeClass("bbr_pad"); $(".b_bottom_left").addClass("without_back").removeClass("bbl_pad"); $(".b_bottom_center").addClass("without_back").removeClass("bbc_pad"); + $("#wgt_help").addClass("pad_color").addClass("pad_help"); $("#wgt_reload").addClass("pad_color").addClass("pad_reload"); $("#wgt_edit").addClass("pad_color").addClass("pad_edit"); - $("#wgt_help").addClass("pad_color").addClass("pad_help"); - $("#wgt_display").addClass("pad_color").addClass("pad_edit"); - $("#wgt_add").addClass("pad_color").addClass("pad_add"); $("#wgt_name").addClass("pad_color"); - $(".style_select").addClass("none_select").val(val); - $("body, html").addClass("without_radius"); + $("#wgt_display").removeClass("display_wood"); + $("#style_select").val(val); + $("body, html").addClass("without_radius").removeClass("radius_ft"); break; } if($("#wgt_edit").hasClass("selected")) diff --git a/resources/library/interactivities/Contraste.wgt/locales/ru/index.html b/resources/library/interactivities/Contraste.wgt/locales/ru/index.html index f2cecf06..f72a635b 100644 --- a/resources/library/interactivities/Contraste.wgt/locales/ru/index.html +++ b/resources/library/interactivities/Contraste.wgt/locales/ru/index.html @@ -31,12 +31,6 @@ and open the template in the editor. - -+ ++ + ++diff --git a/resources/library/interactivities/Contraste.wgt/locales/ru/scripts/blackYellow.js b/resources/library/interactivities/Contraste.wgt/locales/ru/scripts/blackYellow.js index fc0eb152..15d2aff3 100644 --- a/resources/library/interactivities/Contraste.wgt/locales/ru/scripts/blackYellow.js +++ b/resources/library/interactivities/Contraste.wgt/locales/ru/scripts/blackYellow.js @@ -14,7 +14,7 @@ */ var sankoreLang = { - display: "Показать", + display: "Закрыть", edit: "Изменить", add: "Добавить", enter_data: "Введите вопрос:", @@ -27,7 +27,8 @@ var sankoreLang = { pad: "планшет", none: "нет", help: "Помощь", - help_content: "Пример текста помощи ..." + help_content: "Пример текста помощи ...", + theme: "Тема" }; function init(){ @@ -43,6 +44,8 @@ function init(){ var flagForSelect = false; var dragElement = null; //the element that must be dragging var lang = ""; //locale language + var resizeFlag = true; + var coords = { left:0, top:0 @@ -64,9 +67,11 @@ function init(){ $("#wgt_reload").text(sankoreLang.reload); $("#wgt_help").text(sankoreLang.help); $("#help").html(sankoreLang.help_content); - $(".style_select option[value='1']").text(sankoreLang.slate); - $(".style_select option[value='2']").text(sankoreLang.pad); - $(".style_select option[value='3']").text(sankoreLang.none); + $("#style_select option[value='1']").text(sankoreLang.slate); + $("#style_select option[value='2']").text(sankoreLang.pad); + $("#style_select option[value='3']").text(sankoreLang.none); + var tmpl = $("div.inline label").html(); + $("div.inline label").html(sankoreLang.theme + tmpl) if(window.sankore){ if(sankore.preference("blackYellowData","")){ @@ -91,7 +96,7 @@ function init(){ if(window.sankore){ if(sankore.preference("by_style","")){ changeStyle(sankore.preference("by_style","")); - $(".style_select").val(sankore.preference("by_style","")); + $("#style_select").val(sankore.preference("by_style","")); } else changeStyle("3") } else @@ -102,9 +107,15 @@ function init(){ if(!$(this).hasClass("selected")){ $(this).addClass("selected"); $("#wgt_edit").removeClass("selected"); - $(".style_select").css("display","none"); + $("#parameters").css("display","none"); + var tmpwh = $(window).height(); + var tmpww = $(window).width(); + resizeFlag = true; + window.resizeTo(tmpww, tmpwh - 44) + $("#data").css("padding-bottom",""); + $("#leftDiv").css("border-top-left-radius","7px"); + $("#rightDiv").css("border-top-right-radius","7px"); $(this).css("display", "none"); - $("#wgt_add").css("display", "none"); $("#wgt_edit").css("display", "block"); mode = false; $(".leftDiv, .rightDiv").animate({ @@ -117,7 +128,7 @@ function init(){ tmpReadyTask.width($(domElem).width()) .height($(domElem).height()) .css("position","absolute") - .css("top",$(domElem).position().top) + .css("top",$(domElem).position().top - 40) .css("left",$(domElem).position().left) .find(".taskContainer").removeAttr("contenteditable"); @@ -128,15 +139,22 @@ function init(){ opacityChanged = false; } }); + $(document).disableTextSelect(); } } else { if(!$(this).hasClass("selected")){ $(this).addClass("selected"); $("#wgt_display").removeClass("selected"); - $(".style_select").css("display","block"); + $("#parameters").css("display","block"); + tmpwh = $(window).height(); + tmpww = $(window).width(); + resizeFlag = true; + window.resizeTo(tmpww, tmpwh + 44) + $("#data").css("padding-bottom","42px"); + $("#leftDiv").css("border-top-left-radius","0px"); + $("#rightDiv").css("border-top-right-radius","0px"); $(this).css("display", "none"); - $("#wgt_add").css("display", "block"); $("#wgt_display").css("display", "block"); mode = true; $(document).enableTextSelect(); @@ -171,12 +189,15 @@ function init(){ $("#wgt_help").click(function(){ var tmp = $(this); if($(this).hasClass("open")){ + $(this).removeClass("help_pad").removeClass("help_wood") $("#help").slideUp("100", function(){ tmp.removeClass("open"); $("#data").show(); + ($("#wgt_edit").hasClass("selected"))?$("#parameters").show():''; }); } else { - $("#data").hide(); + ($("#style_select").val() == 1)?$(this).removeClass("help_pad").addClass("help_wood"):$(this).removeClass("help_wood").addClass("help_pad"); + $("#data, #parameters").hide(); $("#help").slideDown("100", function(){ tmp.addClass("open"); }); @@ -200,10 +221,10 @@ function init(){ $(document).disableTextSelect(); }); - $(".style_select option[value='1']").text(sankoreLang.slate); - $(".style_select option[value='2']").text(sankoreLang.pad); + $("#style_select option[value='1']").text(sankoreLang.slate); + $("#style_select option[value='2']").text(sankoreLang.pad); - $(".style_select").change(function (event){ + $("#style_select").change(function (event){ changeStyle($(this).find("option:selected").val()); }) @@ -354,12 +375,12 @@ function init(){ if((prevBottom + 15 + curHeight) < ($(window).height() - 54)) curr.css("top", prevBottom + 15 + "px"); else - curr.css("top", "60px").css("left", prevLeft + 255 + "px"); + curr.css("top", "100px").css("left", prevLeft + 255 + "px"); } else { if((prevBottom + 15 + curHeight) < ($(window).height() - 54)) curr.css("top", prevBottom + 15 + "px").css("left", prevLeft + "px"); else - curr.css("top", "60px").css("left", prevLeft + 255 + "px"); + curr.css("top", "100px").css("left", prevLeft + 255 + "px"); } prevBottom = curr.position().top + curr.height(), prevLeft = curr.position().left; @@ -372,28 +393,31 @@ function init(){ popupBack.css("left", ($(window).width() - 360)*50/$(window).width() + "%"); $(window).resize(function(){ - if($("#wgt_edit").hasClass("selected")){ - if($(".editContainer").size() > 1){ - var prev = $(".editContainer:first"), - prevBottom = prev.position().top + prev.height(), - prevLeft = prev.position().left; - recursionCall(prevBottom, prevLeft, prev.next()); + if(!resizeFlag){ + if($("#wgt_edit").hasClass("selected")){ + if($(".editContainer").size() > 1){ + var prev = $(".editContainer:first"), + prevBottom = prev.position().top + prev.height(), + prevLeft = prev.position().left; + recursionCall(prevBottom, prevLeft, prev.next()); + } + } else { + var tmp_array = []; + $(".readyTask").each(function(){ + tmp_array.push($(this)); + }); + orderItems(tmp_array); } - } else { - var tmp_array = []; - $(".readyTask").each(function(){ - tmp_array.push($(this)); - }); - orderItems(tmp_array); - } - popupBack.css("top", ($(window).height() - 138)*50/$(window).height() + "%"); - popupBack.css("left", ($(window).width() - 360)*50/$(window).width() + "%"); + popupBack.css("top", ($(window).height() - 138)*50/$(window).height() + "%"); + popupBack.css("left", ($(window).width() - 360)*50/$(window).width() + "%"); + } else + resizeFlag = false; }); if (window.widget) { window.widget.onleave = function(){ exportToSankore(); - sankore.setPreference("by_style", $(".style_select").find("option:selected").val()); + sankore.setPreference("by_style", $("#style_select").find("option:selected").val()); } } @@ -416,7 +440,7 @@ function init(){ objToExport.data2 = $(domElem).find(".readyTask").find(":last-child").text(); objToExport.width = $(domElem).width(); objToExport.height = $(domElem).height(); - objToExport.top = $(domElem).position().top; + objToExport.top = $(domElem).position().top - 40; objToExport.left = $(domElem).position().left; arrayToExport.push(objToExport); }); @@ -475,14 +499,14 @@ function reloadItems(){ //order items function orderItems(items){ - var bottom = 45, + var bottom = ($("#wgt_edit").hasClass("selected"))?85:45, lastItemLeft = 54; for (var i in items){ if((bottom + items[i].height()) < ($(window).height() - 54)){ items[i].css("top", bottom + 15 + "px").css("left", lastItemLeft + "px").appendTo("#data"); bottom += items[i].height() + 15; } else { - bottom = 60; + bottom = 100; lastItemLeft += 255; items[i].css("top", bottom + "px").css("left", lastItemLeft + "px").appendTo("#data"); bottom += items[i].height(); @@ -507,7 +531,7 @@ function shuffle( arr ) //adding a new task to the page function addTask(expression, result){ var lastItem = $(".editContainer:last"), - lastItemPos = lastItem.length ? lastItem.position().top : 45, + lastItemPos = lastItem.length ? lastItem.position().top : 85, lastItemHeight = lastItem.length ? lastItem.height() : 0, lastItemLeft = lastItem.length ? lastItem.position().left : 54; var bottom = lastItemPos + lastItemHeight + 85; @@ -519,7 +543,7 @@ function addTask(expression, result){ if(bottom < ($(window).height() - 54)){ editContent.css("top", lastItemPos + lastItemHeight + 15 + "px").css("left", lastItemLeft + "px").appendTo("#data"); } else { - lastItemPos = 45; + lastItemPos = 85; editContent.css("top", lastItemPos + 15 + "px").css("left", lastItemLeft + 255 + "px").appendTo("#data"); } main.appendTo(editContent); @@ -538,13 +562,12 @@ function changeStyle(val){ $(".b_bottom_left").removeClass("bbl_pad").removeClass("without_back"); $(".b_bottom_center").removeClass("bbc_pad").removeClass("without_back"); $("#wgt_reload").removeClass("pad_color").removeClass("pad_reload"); - $("#wgt_edit").removeClass("pad_color").removeClass("pad_edit"); $("#wgt_help").removeClass("pad_color").removeClass("pad_help"); - $("#wgt_display").removeClass("pad_color").removeClass("pad_edit"); - $("#wgt_add").removeClass("pad_color").removeClass("pad_add"); + $("#wgt_edit").removeClass("pad_color").removeClass("pad_edit"); $("#wgt_name").removeClass("pad_color"); - $(".style_select").removeClass("pad_select").removeClass("none_select").val(val); - $("body, html").removeClass("without_radius"); + $("#wgt_display").addClass("display_wood"); + $("#style_select").val(val); + $("body, html").removeClass("without_radius").addClass("radius_ft"); break; case "2": $(".b_top_left").addClass("btl_pad").removeClass("without_back"); @@ -556,13 +579,12 @@ function changeStyle(val){ $(".b_bottom_left").addClass("bbl_pad").removeClass("without_back"); $(".b_bottom_center").addClass("bbc_pad").removeClass("without_back"); $("#wgt_reload").addClass("pad_color").addClass("pad_reload"); - $("#wgt_edit").addClass("pad_color").addClass("pad_edit"); $("#wgt_help").addClass("pad_color").addClass("pad_help"); - $("#wgt_display").addClass("pad_color").addClass("pad_edit"); - $("#wgt_add").addClass("pad_color").addClass("pad_add"); + $("#wgt_edit").addClass("pad_color").addClass("pad_edit"); $("#wgt_name").addClass("pad_color"); - $(".style_select").addClass("pad_select").removeClass("none_select").val(val); - $("body, html").removeClass("without_radius"); + $("#wgt_display").removeClass("display_wood"); + $("#style_select").val(val); + $("body, html").removeClass("without_radius").removeClass("radius_ft"); break; case "3": $(".b_top_left").addClass("without_back").removeClass("btl_pad"); @@ -573,14 +595,13 @@ function changeStyle(val){ $(".b_bottom_right").addClass("without_back").removeClass("bbr_pad"); $(".b_bottom_left").addClass("without_back").removeClass("bbl_pad"); $(".b_bottom_center").addClass("without_back").removeClass("bbc_pad"); + $("#wgt_help").addClass("pad_color").addClass("pad_help"); $("#wgt_reload").addClass("pad_color").addClass("pad_reload"); $("#wgt_edit").addClass("pad_color").addClass("pad_edit"); - $("#wgt_help").addClass("pad_color").addClass("pad_help"); - $("#wgt_display").addClass("pad_color").addClass("pad_edit"); - $("#wgt_add").addClass("pad_color").addClass("pad_add"); $("#wgt_name").addClass("pad_color"); - $(".style_select").addClass("none_select").val(val); - $("body, html").addClass("without_radius"); + $("#wgt_display").removeClass("display_wood"); + $("#style_select").val(val); + $("body, html").addClass("without_radius").removeClass("radius_ft"); break; } if($("#wgt_edit").hasClass("selected")) diff --git a/resources/library/interactivities/Contraste.wgt/scripts/blackYellow.js b/resources/library/interactivities/Contraste.wgt/scripts/blackYellow.js index 89e6df3f..d9b1e52f 100644 --- a/resources/library/interactivities/Contraste.wgt/scripts/blackYellow.js +++ b/resources/library/interactivities/Contraste.wgt/scripts/blackYellow.js @@ -14,7 +14,7 @@ */ var sankoreLang = { - display: "Display", + display: "Close", edit: "Edit", add: "Add", enter_data: "Enter data:", @@ -27,7 +27,8 @@ var sankoreLang = { pad: "pad", none: "none", help: "Help", - help_content: "This is an example of help content ..." + help_content: "This is an example of help content ...", + theme: "Theme" }; function init(){ @@ -43,6 +44,8 @@ function init(){ var flagForSelect = false; var dragElement = null; //the element that must be dragging var lang = ""; //locale language + var resizeFlag = true; + var coords = { left:0, top:0 @@ -64,9 +67,11 @@ function init(){ $("#wgt_reload").text(sankoreLang.reload); $("#wgt_help").text(sankoreLang.help); $("#help").html(sankoreLang.help_content); - $(".style_select option[value='1']").text(sankoreLang.slate); - $(".style_select option[value='2']").text(sankoreLang.pad); - $(".style_select option[value='3']").text(sankoreLang.none); + $("#style_select option[value='1']").text(sankoreLang.slate); + $("#style_select option[value='2']").text(sankoreLang.pad); + $("#style_select option[value='3']").text(sankoreLang.none); + var tmpl = $("div.inline label").html(); + $("div.inline label").html(sankoreLang.theme + tmpl) if(window.sankore){ if(sankore.preference("blackYellowData","")){ @@ -91,7 +96,7 @@ function init(){ if(window.sankore){ if(sankore.preference("by_style","")){ changeStyle(sankore.preference("by_style","")); - $(".style_select").val(sankore.preference("by_style","")); + $("#style_select").val(sankore.preference("by_style","")); } else changeStyle("3") } else @@ -102,9 +107,15 @@ function init(){ if(!$(this).hasClass("selected")){ $(this).addClass("selected"); $("#wgt_edit").removeClass("selected"); - $(".style_select").css("display","none"); + $("#parameters").css("display","none"); + var tmpwh = $(window).height(); + var tmpww = $(window).width(); + resizeFlag = true; + window.resizeTo(tmpww, tmpwh - 44) + $("#data").css("padding-bottom",""); + $("#leftDiv").css("border-top-left-radius","7px"); + $("#rightDiv").css("border-top-right-radius","7px"); $(this).css("display", "none"); - $("#wgt_add").css("display", "none"); $("#wgt_edit").css("display", "block"); mode = false; $(".leftDiv, .rightDiv").animate({ @@ -117,7 +128,7 @@ function init(){ tmpReadyTask.width($(domElem).width()) .height($(domElem).height()) .css("position","absolute") - .css("top",$(domElem).position().top) + .css("top",$(domElem).position().top - 40) .css("left",$(domElem).position().left) .find(".taskContainer").removeAttr("contenteditable"); @@ -128,15 +139,22 @@ function init(){ opacityChanged = false; } }); + $(document).disableTextSelect(); } } else { if(!$(this).hasClass("selected")){ $(this).addClass("selected"); $("#wgt_display").removeClass("selected"); - $(".style_select").css("display","block"); + $("#parameters").css("display","block"); + tmpwh = $(window).height(); + tmpww = $(window).width(); + resizeFlag = true; + window.resizeTo(tmpww, tmpwh + 44) + $("#data").css("padding-bottom","42px"); + $("#leftDiv").css("border-top-left-radius","0px"); + $("#rightDiv").css("border-top-right-radius","0px"); $(this).css("display", "none"); - $("#wgt_add").css("display", "block"); $("#wgt_display").css("display", "block"); mode = true; $(document).enableTextSelect(); @@ -171,12 +189,15 @@ function init(){ $("#wgt_help").click(function(){ var tmp = $(this); if($(this).hasClass("open")){ + $(this).removeClass("help_pad").removeClass("help_wood") $("#help").slideUp("100", function(){ tmp.removeClass("open"); $("#data").show(); + ($("#wgt_edit").hasClass("selected"))?$("#parameters").show():''; }); } else { - $("#data").hide(); + ($("#style_select").val() == 1)?$(this).removeClass("help_pad").addClass("help_wood"):$(this).removeClass("help_wood").addClass("help_pad"); + $("#data, #parameters").hide(); $("#help").slideDown("100", function(){ tmp.addClass("open"); }); @@ -200,10 +221,10 @@ function init(){ $(document).disableTextSelect(); }); - $(".style_select option[value='1']").text(sankoreLang.slate); - $(".style_select option[value='2']").text(sankoreLang.pad); + $("#style_select option[value='1']").text(sankoreLang.slate); + $("#style_select option[value='2']").text(sankoreLang.pad); - $(".style_select").change(function (event){ + $("#style_select").change(function (event){ changeStyle($(this).find("option:selected").val()); }) @@ -354,12 +375,12 @@ function init(){ if((prevBottom + 15 + curHeight) < ($(window).height() - 54)) curr.css("top", prevBottom + 15 + "px"); else - curr.css("top", "60px").css("left", prevLeft + 255 + "px"); + curr.css("top", "100px").css("left", prevLeft + 255 + "px"); } else { if((prevBottom + 15 + curHeight) < ($(window).height() - 54)) curr.css("top", prevBottom + 15 + "px").css("left", prevLeft + "px"); else - curr.css("top", "60px").css("left", prevLeft + 255 + "px"); + curr.css("top", "100px").css("left", prevLeft + 255 + "px"); } prevBottom = curr.position().top + curr.height(), prevLeft = curr.position().left; @@ -372,28 +393,31 @@ function init(){ popupBack.css("left", ($(window).width() - 360)*50/$(window).width() + "%"); $(window).resize(function(){ - if($("#wgt_edit").hasClass("selected")){ - if($(".editContainer").size() > 1){ - var prev = $(".editContainer:first"), - prevBottom = prev.position().top + prev.height(), - prevLeft = prev.position().left; - recursionCall(prevBottom, prevLeft, prev.next()); + if(!resizeFlag){ + if($("#wgt_edit").hasClass("selected")){ + if($(".editContainer").size() > 1){ + var prev = $(".editContainer:first"), + prevBottom = prev.position().top + prev.height(), + prevLeft = prev.position().left; + recursionCall(prevBottom, prevLeft, prev.next()); + } + } else { + var tmp_array = []; + $(".readyTask").each(function(){ + tmp_array.push($(this)); + }); + orderItems(tmp_array); } - } else { - var tmp_array = []; - $(".readyTask").each(function(){ - tmp_array.push($(this)); - }); - orderItems(tmp_array); - } - popupBack.css("top", ($(window).height() - 138)*50/$(window).height() + "%"); - popupBack.css("left", ($(window).width() - 360)*50/$(window).width() + "%"); + popupBack.css("top", ($(window).height() - 138)*50/$(window).height() + "%"); + popupBack.css("left", ($(window).width() - 360)*50/$(window).width() + "%"); + } else + resizeFlag = false; }); if (window.widget) { window.widget.onleave = function(){ exportToSankore(); - sankore.setPreference("by_style", $(".style_select").find("option:selected").val()); + sankore.setPreference("by_style", $("#style_select").find("option:selected").val()); } } @@ -416,7 +440,7 @@ function init(){ objToExport.data2 = $(domElem).find(".readyTask").find(":last-child").text(); objToExport.width = $(domElem).width(); objToExport.height = $(domElem).height(); - objToExport.top = $(domElem).position().top; + objToExport.top = $(domElem).position().top - 40; objToExport.left = $(domElem).position().left; arrayToExport.push(objToExport); }); @@ -475,14 +499,14 @@ function reloadItems(){ //order items function orderItems(items){ - var bottom = 45, + var bottom = ($("#wgt_edit").hasClass("selected"))?85:45, lastItemLeft = 54; for (var i in items){ if((bottom + items[i].height()) < ($(window).height() - 54)){ items[i].css("top", bottom + 15 + "px").css("left", lastItemLeft + "px").appendTo("#data"); bottom += items[i].height() + 15; } else { - bottom = 60; + bottom = 100; lastItemLeft += 255; items[i].css("top", bottom + "px").css("left", lastItemLeft + "px").appendTo("#data"); bottom += items[i].height(); @@ -507,7 +531,7 @@ function shuffle( arr ) //adding a new task to the page function addTask(expression, result){ var lastItem = $(".editContainer:last"), - lastItemPos = lastItem.length ? lastItem.position().top : 45, + lastItemPos = lastItem.length ? lastItem.position().top : 85, lastItemHeight = lastItem.length ? lastItem.height() : 0, lastItemLeft = lastItem.length ? lastItem.position().left : 54; var bottom = lastItemPos + lastItemHeight + 85; @@ -519,7 +543,7 @@ function addTask(expression, result){ if(bottom < ($(window).height() - 54)){ editContent.css("top", lastItemPos + lastItemHeight + 15 + "px").css("left", lastItemLeft + "px").appendTo("#data"); } else { - lastItemPos = 45; + lastItemPos = 85; editContent.css("top", lastItemPos + 15 + "px").css("left", lastItemLeft + 255 + "px").appendTo("#data"); } main.appendTo(editContent); @@ -538,13 +562,12 @@ function changeStyle(val){ $(".b_bottom_left").removeClass("bbl_pad").removeClass("without_back"); $(".b_bottom_center").removeClass("bbc_pad").removeClass("without_back"); $("#wgt_reload").removeClass("pad_color").removeClass("pad_reload"); - $("#wgt_edit").removeClass("pad_color").removeClass("pad_edit"); $("#wgt_help").removeClass("pad_color").removeClass("pad_help"); - $("#wgt_display").removeClass("pad_color").removeClass("pad_edit"); - $("#wgt_add").removeClass("pad_color").removeClass("pad_add"); + $("#wgt_edit").removeClass("pad_color").removeClass("pad_edit"); $("#wgt_name").removeClass("pad_color"); - $(".style_select").removeClass("pad_select").removeClass("none_select").val(val); - $("body, html").removeClass("without_radius"); + $("#wgt_display").addClass("display_wood"); + $("#style_select").val(val); + $("body, html").removeClass("without_radius").addClass("radius_ft"); break; case "2": $(".b_top_left").addClass("btl_pad").removeClass("without_back"); @@ -556,13 +579,12 @@ function changeStyle(val){ $(".b_bottom_left").addClass("bbl_pad").removeClass("without_back"); $(".b_bottom_center").addClass("bbc_pad").removeClass("without_back"); $("#wgt_reload").addClass("pad_color").addClass("pad_reload"); - $("#wgt_edit").addClass("pad_color").addClass("pad_edit"); $("#wgt_help").addClass("pad_color").addClass("pad_help"); - $("#wgt_display").addClass("pad_color").addClass("pad_edit"); - $("#wgt_add").addClass("pad_color").addClass("pad_add"); + $("#wgt_edit").addClass("pad_color").addClass("pad_edit"); $("#wgt_name").addClass("pad_color"); - $(".style_select").addClass("pad_select").removeClass("none_select").val(val); - $("body, html").removeClass("without_radius"); + $("#wgt_display").removeClass("display_wood"); + $("#style_select").val(val); + $("body, html").removeClass("without_radius").removeClass("radius_ft"); break; case "3": $(".b_top_left").addClass("without_back").removeClass("btl_pad"); @@ -573,14 +595,13 @@ function changeStyle(val){ $(".b_bottom_right").addClass("without_back").removeClass("bbr_pad"); $(".b_bottom_left").addClass("without_back").removeClass("bbl_pad"); $(".b_bottom_center").addClass("without_back").removeClass("bbc_pad"); + $("#wgt_help").addClass("pad_color").addClass("pad_help"); $("#wgt_reload").addClass("pad_color").addClass("pad_reload"); $("#wgt_edit").addClass("pad_color").addClass("pad_edit"); - $("#wgt_help").addClass("pad_color").addClass("pad_help"); - $("#wgt_display").addClass("pad_color").addClass("pad_edit"); - $("#wgt_add").addClass("pad_color").addClass("pad_add"); $("#wgt_name").addClass("pad_color"); - $(".style_select").addClass("none_select").val(val); - $("body, html").addClass("without_radius"); + $("#wgt_display").removeClass("display_wood"); + $("#style_select").val(val); + $("body, html").addClass("without_radius").removeClass("radius_ft"); break; } if($("#wgt_edit").hasClass("selected"))