From 6cd10f4fcd0103a8ef2a22bcd1e93f32a6c9e495 Mon Sep 17 00:00:00 2001 From: Alex Aragon Date: Thu, 19 May 2016 19:19:29 -0500 Subject: [PATCH 1/2] fix css div question review - refs CT#8246 --- app/Resources/public/css/base.css | 22 +++++++++++++++++----- main/exercice/exercise_reminder.php | 2 +- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/app/Resources/public/css/base.css b/app/Resources/public/css/base.css index 7d58ab707a..bfa680231d 100644 --- a/app/Resources/public/css/base.css +++ b/app/Resources/public/css/base.css @@ -2111,17 +2111,29 @@ div.admin_section h4 { .ribbon .success { color: green; } - .exercise_save_now_button img { position: relative; top: 4px; } - .exercise_save_now_button { - margin-top:10px; + padding-left: 25px; +} +.exercise_save_now_button .checkbox input[type="checkbox"]{ + margin-left: -25px; } -.exercise_save_now_button, .exercise_button{ - /* padding:5px; */ +.question-check-test{ + padding-left: 35px; + margin-bottom: 35px; +} +.question-check-test label{ + font-weight: normal; +} +.question-check-test .checkbox input[type="checkbox"]{ + margin-left: -25px; +} +.form-actions{ + margin-top: 20px; + margin-bottom: 25px; } /* Exercise clock*/ .count_down{ diff --git a/main/exercice/exercise_reminder.php b/main/exercice/exercise_reminder.php index 66606491d7..d626d60542 100755 --- a/main/exercice/exercise_reminder.php +++ b/main/exercice/exercise_reminder.php @@ -236,7 +236,7 @@ foreach ($question_list as $questionId) { $table .= Display::div($question_title, array('class'=>'exercise_reminder_item')); } // end foreach() block that loops over all questions -echo Display::div($table, array('class'=>'span10')); +echo Display::div($table, array('class'=>'question-check-test')); $exercise_actions = Display::url(get_lang('EndTest'), 'javascript://', array('onclick'=>'final_submit();', 'class'=>'btn btn-warning')); $exercise_actions .= ' '.Display::url(get_lang('ReviewQuestions'), 'javascript://', array('onclick'=>'review_questions();','class'=>'btn btn-success')); From 1f0b7589bf8c4b113c4cf1e827038a58c6d806a3 Mon Sep 17 00:00:00 2001 From: Alex Aragon Date: Thu, 19 May 2016 19:56:48 -0500 Subject: [PATCH 2/2] fix actions bar add class - refs CT#8247 --- app/Resources/public/css/base.css | 3 + main/img/icons/32/add-class.png | Bin 1777 -> 2054 bytes main/img/icons/svg/add-class.svg | 3538 ++++++++--------------------- main/user/class.php | 15 +- 4 files changed, 916 insertions(+), 2640 deletions(-) diff --git a/app/Resources/public/css/base.css b/app/Resources/public/css/base.css index bfa680231d..d3cf3ac48e 100644 --- a/app/Resources/public/css/base.css +++ b/app/Resources/public/css/base.css @@ -4156,6 +4156,9 @@ i.size-32.icon-new-work{ display:block; width: 100%; } +.actions #groups .bootstrap-select{ + width: 300px; +} ul.holder{ list-style: none; margin: 0; diff --git a/main/img/icons/32/add-class.png b/main/img/icons/32/add-class.png index 037dea5a1b6784332302066543a6f1b7ab13ed6a..12413632bf47e2e144fa93a1cbf12cc1fbcfc059 100644 GIT binary patch delta 2016 zcmV<62Os$H4TcaQiBL{Q4GJ0x0000DNk~Le0000W0000W2nGNE0CReJ^pPPO3U&Yh z19ky@)q>2CMkjv?^7=`a|!nd;9$tzEX6@*M2P!`t74ZH#Q;c@gb2p z*5!2X*nU9F5_r$XH7)&r{QZC%j|h8gP#8U(_QCtNz50~`IQfg8{?mzG5N;+Voba&7 zg-(b}_db8I@7{0zd?xqQuO2zzM8m?(q=bFpoUqP(Aky#cbzi+})5CLV$a5_g)>JPQ zMiMtMiJLVLITJ~i@ikQ4Jd^9I4YY~O6jx*ouuT+Al?v-CSI?!P&b64zC0sWd1z7<* zhsdT8W`>+=r)F|9X54iXQIO>+ZYG5=GdMWOxio*~%)o{I^Z&3T7jP31++-9t9VazB znmgHl;klXIbD^;}oLG38JBgc45E~vgPn;e5(_9*#+XdHszh}w)o9laT9e7sPbsgQK z5g#36KyT#8yw&HPeraFp=qo!6fSVucUb%h!!gp^uvrE+re0Wra*ysrTh0EwJT+#Rb z^XGrsJ3H6dv+2xUf=7hBxna1oBi^GoZrOsjx*j(fWkEc`yxzkodbs99TieTje}xU# zey>;i#;U;nrIB~krmgp(mQ^4UlT;)k_`AB$O07jFmW#j8$=2DVW-UQu*PhK)wWae) z)CoMr#Zv}!atPs2(%gX7e~|W$rnRL_+lqfuqXXY6t1R}F=NTwoeaa_J4qS)wwq~T@ zziIDizJqJ8)vh`NUXQarDQPH@gPV$hqC(C>WHVryXo^GDlcy|iQvRANm}rT+Dw^Wr zCS#x|V3`Q>BG<;$^EH2DMSF}R$FC}YWMtBF!BiMdS=1+^Aj#m^2-CndQVdf{G%J5- zZmQfom~;qR3PVYQ%H-rUH;2d?IH?3fYB|x2i)q9QX46t;dpJ*HaVmf5hE#q%*W^y) z)dV7IAdEPDA%kb+b)0;&n-z8EARFiOWGz{(f@RJbbk#*<4ct_m(*rr4lh^XW-nVRP zXwSoj5wWf+12(YcdVBkc*#T z<4w1c4U{u_@EED2g_T!FcIA!SJsBhQMwi`u!@`9xzZU#V2|m+?%j^CAW$U(nbi-Z0 zT+q=}NK1`GfvRFV5|#_D3y1qMyww$=DDr2L*?d~pJxs^Kd>R)B95c-``=5W}XmAgv zHHw6dQZ+N5M{%7n)caPG`qwALgp?WHMssEQZMPUE;1 zwRuU(O0o}heJuHbdtrtNuUoQsePipwpM=AuW1IE)3>Kns* z{!OA$2c>m6!@*4~stu#4Q(Y@5uwzp%x83*{CB+T&jlG1Tf>(Db^<{tC(^ZYZiKCGZ zKXnk5mX~i+6isaoM0xj#C+Y1OqA%6UnFP^jB)sdowPNL zqUv0_geoD+Isl5IUtaS<#r!O_Rf%6;EAdj zgsV=sun>5a6crVMrnY|qtm&p|Xgf@Pfr|iCB@b2h;>k(K(o}*~)kC4L1c00~U5-Gy zy5+kqEzq!!FJ%=*Y{B6 zZ~v69+N*A-y=oGG6C=CX7u-%+xrrmwdeMYiFp_{ECg9N75f*=!ct5p?5MriZ5kepk zRC-)gFXS>3vZQ~8cO_)mi>iaiD?mb5sasqr+2$%?STHRz?mCp1abR}QnJ7+cXgZ(> zUOe_AO7dzD0=9Jg41azlgOQ^g4DABI^c+R?f)UX`I72F0QCc;#V-9XWmT(aWM*=0^ z^Djk+_?(|JjnRKl;c8{Wc)jWc3ilER3_~Jq{t$nDC2998@xrGr@iky%tiY_UuI^O{ z9ZKAB&pl01)9q-fSzyVsET&Q=M;?Ft@$st(VA1u9mi2{v$68yGmrhn`#-P9QK9f=C z>nnPq_cxvP7ycJqEw1}Gk&6T9O8f_qfPWLV78g|j0000Crp@ delta 1737 zcmV;)1~&PI5b+HmiBL{Q4GJ0x0000DNk~Le0000V0000V2nGNE03WUvIgue73Ss~N z17ZQoJQWm?Mkjv;Zb?KzR7i>KmTPQO#}&tabKiG&z3aCzwimp+7#j=<22x5Y5=bl_ zLP3>65>;wMn<}9dsQr+(A0kDns;W{|5!w$GAtY2vD*;t0N`fdTig+XtyQ&3IX)v}i zb~eTjaQxcmef7f{+iM%zSpC-irK8cExpRMW=AJWi;QxR6Uz2#yz%hubu+9YhfC*#) z3veb4K%O*pvP}aiU;_G|g$rL9egu|80=|xA-`u783yZ+A!M1X(WlfpoI9Qg2Wm{O5 zjbmA4Z5zw7kadG|pR~O8Q~3FV;PUK_H$W}Z_13DQ;?moLaT>O4!xs!;`U99gKc?x! zG)#2eKvsV>Bt=C?3J3{LNVpz2u17kRran^pL?He}>lNsn4=&BKngg+5FnVotl!CBE z=lQb_+qs8oWO!ISy?WKj7a;s^;fG+?>VkrOL)k3VYbsd(@?%(uE{1!%7l;>R#>R{% zD=PlFHWwE2!{30)h^C!TWEl~Z`Nk{F$i;<3o_~Lo+bw6YvzZ0qT@NY)zJ_hGd|>vN zJPB5VlGGM6j8e`I0}vfj)UhoIRBxgQ)yN#4X-aA z9O}LT*YZ4<;ovG&jp&&Sv6r5}S6>6Fku%MpxOpu`WtRS~_62zlFc|L>+ZtEC^&MC- z1wVfT%}tW@1Jm;;bsYSUM5n=%CIv%OKeLHD@isEa#DW(v)ZMLYt*$z=9drOG3ES_1 zeaCgZ4o$=H`{%$>4YXK<*t6?s|NEr{!|^;!*A6$rFCllxNI*HD9o)j!{Re(~SW@Q% zW^Qge&7Gsiac-Jag`*^s3C2ghB$-T*Nhg1>?JO=fC=RkA&;kOpSivlj>FXO!{o#1e z`x&^~0_R%clmfUwKfu~BpQGxaYV*Q{YOv_}UG%;67Y5{ZFBqJ6efRI z78=9KOmOmQoOjy&Xj%#D1qw>RPO>iii5-~|Q0xoR+)D2XlI6We(E z_nqhGg=cITS22-QjkBY-=`dZ6_V$0^wx>8;zl%MMn?b1DzmIf7XVjLlTxk3B7=mL& z7pG@O3KeFGijuhMD++uV*cMbjij<;wA?xYz?jp9YQShx!4=ZL0}Dt% zG*t(qU#l;BdFAd6FFpQfeQ-rMhOO2hdw#5e7M!sj+Issq<2ylhRVr`tGI5aRl|STO zqKo6*vAnUX*9x7>m#cpY=bmuW^4j8Koo(^4AM-)it2RkYKj**Z`AkLkM$2VKUh4`Gkc2lZEYaHj fcKi73_x=T-S!fXmE^VGJ00000NkvXXu0mjfw1q@N diff --git a/main/img/icons/svg/add-class.svg b/main/img/icons/svg/add-class.svg index bb4c6e3d72..2cb871739d 100644 --- a/main/img/icons/svg/add-class.svg +++ b/main/img/icons/svg/add-class.svg @@ -2,7 +2,6 @@ @@ -39,2783 +38,1054 @@ viewBox="0 0 128 128" guidetolerance="10" inkscape:pageopacity="0" inkscape:pageshadow="2" - inkscape:window-width="1920" - inkscape:window-height="1051" + inkscape:window-width="1325" + inkscape:window-height="747" id="namedview114" showgrid="false" - inkscape:zoom="3.5781251" - inkscape:cx="97.248103" - inkscape:cy="55.316671" - inkscape:window-x="0" - inkscape:window-y="0" + inkscape:zoom="1.7890626" + inkscape:cx="-57.408957" + inkscape:cy="25.108718" + inkscape:window-x="41" + inkscape:window-y="21" inkscape:window-maximized="1" inkscape:current-layer="svg2" /> - - - - + inkscape:collect="always" + xlink:href="#linearGradient4161" + id="linearGradient4167" + x1="227.02383" + y1="130.94472" + x2="227.08005" + y2="109.8502" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.80011,0,0,1.80011,-313.07166,-137.6591)" /> + inkscape:collect="always" + id="linearGradient4161"> + style="stop-color:#97d600;stop-opacity:1" + offset="0" + id="stop4163" /> + style="stop-color:#6f8f00;stop-opacity:1" + offset="1" + id="stop4165" /> + + + - - - + inkscape:collect="always" + xlink:href="#linearGradient5305" + id="linearGradient5311" + x1="193.44794" + y1="1036.5698" + x2="193.26309" + y2="1014.7637" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(-109.70181,-7.7222804)" /> - + inkscape:collect="always" + id="linearGradient5305"> + style="stop-color:#2b2b2b;stop-opacity:1" + offset="0" + id="stop5307" /> - - + id="stop5313" + offset="0.18282785" + style="stop-color:#5d5d5d;stop-opacity:1" /> + style="stop-color:#686860;stop-opacity:1" + offset="0.32970434" + id="stop5315" /> + style="stop-color:#929483;stop-opacity:1" + offset="1" + id="stop5309" /> - + inkscape:collect="always" + xlink:href="#linearGradient5293" + id="linearGradient5299" + x1="171.13365" + y1="1031.8231" + x2="171.46634" + y2="1038.0062" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(-109.70181,-7.7222804)" /> + + style="stop-color:#004455;stop-opacity:1" + offset="0" + id="stop5295" /> + style="stop-color:#00222b;stop-opacity:1" + offset="1" + id="stop5297" /> + + gradientTransform="matrix(0.92690123,0,0,0.92690123,-421.47612,313.824)" + x1="517.02167" + y1="705.48438" + x2="517.02167" + y2="745.30084" /> + - + + + + + + + gradientTransform="matrix(0.92690123,0,0,0.92690123,32.712818,920.77688)" + x1="83.28125" + y1="123.09795" + x2="83.28125" + y2="66.310989" /> + - + gradientTransform="matrix(0,1.875847,-1.8149226,0,1291.2607,40.750567)" + cx="491.52231" + cy="670.92523" + fx="491.52231" + fy="670.92523" + r="36.426601" /> + + id="stop44084" + style="stop-color:#57aeff;stop-opacity:1" + offset="0.25" /> + + gradientTransform="matrix(0.92690123,0,0,0.92690123,-382.12054,330.40235)" + x1="517.02167" + y1="705.48438" + x2="517.02167" + y2="745.30084" /> + - + + gradientTransform="matrix(0.92690123,0,0,0.92690123,294.53788,102.60792)" + x1="-246.57739" + y1="958.07971" + x2="-248.7769" + y2="964.61743" /> + + gradientTransform="matrix(1.0923022,0,0,0.86351212,114.04292,924.64357)" + x1="-35.566662" + y1="76.562927" + x2="-35.566662" + y2="84.910484" /> + - - + gradientTransform="matrix(0.79353219,-0.05906808,0.10765754,1.4462923,-394.43436,-10.259638)" + cx="479.68311" + cy="709.6579" + fx="479.68311" + fy="709.6579" + r="5.0058851" /> + + id="stop44609" + style="stop-color:#d7f0ff;stop-opacity:1" + offset="0.5" /> - - - + + gradientTransform="matrix(0,2.2961363,-2.2730334,0,201.74668,831.00225)" + cx="53.60223" + cy="59.728882" + fx="53.60223" + fy="59.728882" + r="17.834057" /> + - - + gradientTransform="matrix(1.3866822,0,0,1.3866822,-9.2371007,876.65699)" + x1="60.126968" + y1="81.913818" + x2="60.126968" + y2="47.542713" /> + + - - - - - - - - - + + + + + + + + + gradientTransform="matrix(0,2.2961363,-2.2730334,0,201.74668,831.00225)" + cx="53.60223" + cy="59.728882" + fx="53.60223" + fy="59.728882" + r="17.834057" /> + gradientTransform="matrix(0.92690123,0,0,0.92690123,-421.47612,313.824)" + x1="517.02167" + y1="705.48438" + x2="517.02167" + y2="745.30084" /> + gradientTransform="matrix(0.92690123,0,0,0.92690123,32.712818,920.77688)" + x1="83.28125" + y1="123.09795" + x2="83.28125" + y2="66.310989" /> + gradientTransform="matrix(0.92690123,0,0,0.92690123,-382.12054,330.40235)" + x1="517.02167" + y1="705.48438" + x2="517.02167" + y2="745.30084" /> + gradientTransform="matrix(-0.92690123,0,0,0.92690123,529.43693,330.40235)" + x1="517.02167" + y1="705.48438" + x2="517.02167" + y2="745.30084" /> + gradientTransform="matrix(0.92690123,0,0,0.92690123,294.53788,102.60792)" + x1="-246.57739" + y1="958.07971" + x2="-248.7769" + y2="964.61743" /> + gradientTransform="matrix(1.0923022,0,0,0.86351212,114.04292,924.64357)" + x1="-35.566662" + y1="76.562927" + x2="-35.566662" + y2="84.910484" /> - - - + gradientTransform="matrix(-0.92690123,0,0,0.92690123,-147.53305,102.60792)" + x1="-246.57739" + y1="958.07971" + x2="-248.7769" + y2="964.61743" /> - - - + gradientTransform="matrix(1.3866822,0,0,1.3866822,-9.2371007,876.65699)" + x1="60.126968" + y1="81.913818" + x2="60.126968" + y2="47.542713" /> - - - + gradientTransform="matrix(0.92690123,0,0,0.92690123,-421.47612,313.824)" + x1="517.02167" + y1="705.48438" + x2="517.02167" + y2="745.30084" /> - - - - - - - + gradientTransform="matrix(0.92690123,0,0,0.92690123,32.712818,920.77688)" + x1="83.28125" + y1="123.09795" + x2="83.28125" + y2="66.310989" /> - - - - - - + gradientTransform="matrix(0.92690123,0,0,0.92690123,-382.12054,330.40235)" + x1="517.02167" + y1="705.48438" + x2="517.02167" + y2="745.30084" /> + gradientTransform="matrix(-0.92690123,0,0,0.92690123,529.43693,330.40235)" + x1="517.02167" + y1="705.48438" + x2="517.02167" + y2="745.30084" /> + gradientTransform="matrix(0.92690123,0,0,0.92690123,294.53788,102.60792)" + x1="-246.57739" + y1="958.07971" + x2="-248.7769" + y2="964.61743" /> - - - - - - - - - - - - - - - - - + gradientTransform="matrix(1.0923022,0,0,0.86351212,114.04292,924.64357)" + x1="-35.566662" + y1="76.562927" + x2="-35.566662" + y2="84.910484" /> - - - - - + gradientTransform="matrix(-0.92690123,0,0,0.92690123,-147.53305,102.60792)" + x1="-246.57739" + y1="958.07971" + x2="-248.7769" + y2="964.61743" /> + gradientTransform="matrix(1.3866822,0,0,1.3866822,-9.2371007,876.65699)" + x1="60.126968" + y1="81.913818" + x2="60.126968" + y2="47.542713" /> - - - - - - + gradientTransform="matrix(0.92690123,0,0,0.92690123,-421.47612,313.824)" + x1="517.02167" + y1="705.48438" + x2="517.02167" + y2="745.30084" /> - - - - - + gradientTransform="matrix(0.92690123,0,0,0.92690123,32.712818,920.77688)" + x1="83.28125" + y1="123.09795" + x2="83.28125" + y2="66.310989" /> + gradientTransform="matrix(0.92690123,0,0,0.92690123,-382.12054,330.40235)" + x1="517.02167" + y1="705.48438" + x2="517.02167" + y2="745.30084" /> - - - - - - + gradientTransform="matrix(-0.92690123,0,0,0.92690123,529.43693,330.40235)" + x1="517.02167" + y1="705.48438" + x2="517.02167" + y2="745.30084" /> + gradientTransform="matrix(0.92690123,0,0,0.92690123,294.53788,102.60792)" + x1="-246.57739" + y1="958.07971" + x2="-248.7769" + y2="964.61743" /> - - - - - - + gradientTransform="matrix(1.0923022,0,0,0.86351212,114.04292,924.64357)" + x1="-35.566662" + y1="76.562927" + x2="-35.566662" + y2="84.910484" /> + gradientTransform="matrix(-0.92690123,0,0,0.92690123,-147.53305,102.60792)" + x1="-246.57739" + y1="958.07971" + x2="-248.7769" + y2="964.61743" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + inkscape:collect="always" + xlink:href="#linearGradient44681" + id="linearGradient6740" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.3866822,0,0,1.3866822,-9.2371007,876.65699)" + x1="60.126968" + y1="81.913818" + x2="60.126968" + y2="47.542713" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + inkscape:export-xdpi="22.5" + inkscape:export-ydpi="22.5"> - - - - + transform="matrix(2.1299971,0,0,2.1299971,-116.03251,-2088.9824)" + id="g5532"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + inkscape:export-ydpi="22" + inkscape:export-xdpi="22" + inkscape:export-filename="/var/www/chamilo/main/img/icons/32/add-class.png" + id="g4323" + transform="matrix(0.96686447,0,0,0.96686447,6.2961636,12.236188)"> + + + + + + + + diff --git a/main/user/class.php b/main/user/class.php index 53e16b902f..0c2f8286f6 100755 --- a/main/user/class.php +++ b/main/user/class.php @@ -37,15 +37,16 @@ $(document).ready( function() { }); '; -$actions = ''; +$actionsLeft = ''; +$actionsRight = ''; $usergroup = new UserGroup(); if (api_is_allowed_to_edit()) { - $actions .= '
'; + if ($type == 'registered') { - $actions .= ''. + $actionsLeft .= ''. Display::return_icon('add-class.png', get_lang("AddClassesToACourse"), array(), ICON_SIZE_MEDIUM).''; } else { - $actions .= ''. + $actionsLeft .= ''. Display::return_icon('back.png', get_lang("Classes"), array(), ICON_SIZE_MEDIUM).''; $form = new FormValidator('groups', 'post', api_get_self(), '', '', FormValidator::LAYOUT_INLINE); @@ -56,9 +57,11 @@ if (api_is_allowed_to_edit()) { ]; $form->addSelect('group_filter', get_lang('Groups'), $options, ['id' => 'group_filter']); $form->setDefaults(['group_filter' => $groupFilter]); - $actions .= $form->returnForm(); + $actionsRight = $form->returnForm(); } - $actions .= '
'; + + + $actions .= Display::toolbarAction('actions-class', array(0=>$actionsLeft, 1=> $actionsRight)); } if (api_is_allowed_to_edit()) {