From ee10bf2c01f906a5ac96b9e1de73c99f6fb5ed94 Mon Sep 17 00:00:00 2001 From: Daniel Valenzuela Date: Wed, 23 Oct 2024 00:22:02 -0300 Subject: [PATCH 1/3] feat: itembank green button --- cms/djangoapps/contentstore/helpers.py | 2 ++ cms/djangoapps/contentstore/views/component.py | 5 ++++- cms/static/images/large-itembank-icon.png | Bin 0 -> 4283 bytes cms/static/sass/assets/_graphics.scss | 7 +++++++ 4 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 cms/static/images/large-itembank-icon.png diff --git a/cms/djangoapps/contentstore/helpers.py b/cms/djangoapps/contentstore/helpers.py index 4366f11d81ac..5a4f3c652347 100644 --- a/cms/djangoapps/contentstore/helpers.py +++ b/cms/djangoapps/contentstore/helpers.py @@ -192,6 +192,8 @@ def xblock_type_display_name(xblock, default_display_name=None): return _('Problem') elif category == 'library_v2': return _('Library Content') + elif category == 'itembank': + return _('Problem Bank') component_class = XBlock.load_class(category) if hasattr(component_class, 'display_name') and component_class.display_name.default: return _(component_class.display_name.default) # lint-amnesty, pylint: disable=translation-of-non-string diff --git a/cms/djangoapps/contentstore/views/component.py b/cms/djangoapps/contentstore/views/component.py index b89bef0f6709..544dbc224409 100644 --- a/cms/djangoapps/contentstore/views/component.py +++ b/cms/djangoapps/contentstore/views/component.py @@ -47,6 +47,7 @@ 'discussion', 'library', 'library_v2', # Not an XBlock + 'itembank', 'html', 'openassessment', 'problem', @@ -107,7 +108,7 @@ def _load_mixed_class(category): Load an XBlock by category name, and apply all defined mixins """ # Libraries v2 content doesn't have an XBlock. - if category == 'library_v2': + if category in ('library_v2', 'itembank'): return None component_class = XBlock.load_class(category) @@ -262,6 +263,7 @@ def create_support_legend_dict(): 'openassessment': _("Open Response"), 'library': _("Legacy Library"), 'library_v2': _("Library Content"), + 'itembank': _("Problem Bank"), 'drag-and-drop-v2': _("Drag and Drop"), } @@ -488,6 +490,7 @@ def _filter_disabled_blocks(all_blocks): disabled_block_names = [block.name for block in disabled_xblocks()] if not libraries_v2_enabled(): disabled_block_names.append('library_v2') + disabled_block_names.append('itembank') return [block_name for block_name in all_blocks if block_name not in disabled_block_names] diff --git a/cms/static/images/large-itembank-icon.png b/cms/static/images/large-itembank-icon.png new file mode 100644 index 0000000000000000000000000000000000000000..d2104f0851d81c2d99027af9cd5e40c90985bc94 GIT binary patch literal 4283 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 Y!9;jr+SV!W4q-L8u5v@UK*=)rZwR6F&;S4c literal 0 HcmV?d00001 diff --git a/cms/static/sass/assets/_graphics.scss b/cms/static/sass/assets/_graphics.scss index 13d6d83ec235..afb830d5dd71 100644 --- a/cms/static/sass/assets/_graphics.scss +++ b/cms/static/sass/assets/_graphics.scss @@ -73,3 +73,10 @@ height: ($baseline*3); background: url('#{$static-path}/images/large-library_v2-icon.png') center no-repeat; } + +.large-itembank-icon { + display: inline-block; + width: ($baseline*3); + height: ($baseline*3); + background: url('#{$static-path}/images/large-itembank-icon.png') center no-repeat; +} From 7127d436553bdd67fdf89ca1752777524329ccb8 Mon Sep 17 00:00:00 2001 From: Jillian Vogel Date: Wed, 23 Oct 2024 15:58:44 +1030 Subject: [PATCH 2/3] fix: revert change to _load_mixed_class (itembank is a real XBlock) --- cms/djangoapps/contentstore/views/component.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cms/djangoapps/contentstore/views/component.py b/cms/djangoapps/contentstore/views/component.py index 544dbc224409..2405af2479ec 100644 --- a/cms/djangoapps/contentstore/views/component.py +++ b/cms/djangoapps/contentstore/views/component.py @@ -108,7 +108,7 @@ def _load_mixed_class(category): Load an XBlock by category name, and apply all defined mixins """ # Libraries v2 content doesn't have an XBlock. - if category in ('library_v2', 'itembank'): + if category == 'library_v2': return None component_class = XBlock.load_class(category) From aa1a2f062bbd6e4dd65aee910165b9c5c0694324 Mon Sep 17 00:00:00 2001 From: Jillian Vogel Date: Wed, 23 Oct 2024 15:59:06 +1030 Subject: [PATCH 3/3] fix: problem bank icon resized --- cms/static/images/large-itembank-icon.png | Bin 4283 -> 811 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/cms/static/images/large-itembank-icon.png b/cms/static/images/large-itembank-icon.png index d2104f0851d81c2d99027af9cd5e40c90985bc94..655ef1531336c851f9a20d4527f584496dc341b6 100644 GIT binary patch literal 811 zcmV+`1JwM9P)eo1NO!(I z?C7N5dRTI@gMm{vaQzPy0JVUDBcLuYa0AdFs4n2+0?Xy{Sk^K6MDr}m=5+#lS%3g= zDU6=$m?buUBLF%A%K?DGHiQQ^KxYVnIH`bL~=A&7_ zj|e&H2mq%N0&Wrjp!^5nUAUG@W zg&%GO2sVo50)+r5|0Dxp5%5&TWlQA?-c)sO<_Bf@m5kh>JX6sDsF5f7v;v_0fP@<& z#0w5M9CP`OUq5*G^)`N#tP7wpC&zNeAaH&L1R+@fCZhbbYAXYGo{|N?RX5a~@Atw5 z1`mMC1=vg7AL;@oSpe9nRT?B18pTnXnxXD^yB9HF8ztJTP1*w5 zDCYaD0uZ|vSTBe1<)R$+-7(iX+F~Cv7A8pg^cbUB0D{rD;Pa16Yuwef@d4*wU(hpS zLiy zB?^NKpb{i2sa0}pa)x~m<{WqT*Z$aZcK7VBcTd&5RdsJwef7P^=o_l^v~08h0Q&1{ z%DMm`pd|tvrG`Fc?s!`On1Zh>U(xrmm`m2eBkfLxE|}wQKZ*bB78_E}Y4+Id)X;<3 zjC0mwd`yi`Cq;u3(}Ga?X39rOAJa));y=QDl+RY2>(@yoeJ14PBbOsWpIlSxczFVO z$yKI_w7Rf1wVYfy?WsWDXsx+!WbRtCI_h_0q_C+;8V#sA1;tW`?zE~1W>!iN52#KG z0dP_(wNnQG5`tOnH2`XZSanqdz|o+&iYWk>+p+)$6#!>ZLGNh+?tN>HCo=#(|GftX z5#%a{uQ&=5Bx~O{lPX7dA$H(HOdTAC(h)#GUgO&2KtgG#`y7z9W(X~SE90{f9XLVk zbE*!m&{e_z*`_B9U{9!&-2j`rVX+wg{aQOJuxEcyrP#O_Q>?yt-qqutaNzk>8nB44 zyjpAEhHl-`ex9y-UEFh+t&w<^HNospnRdgpt}RMjKiDu%+0oZ3+22~Zzk(vCi|*hT z!Yk^SC#&}W7awqG!3y;x>G6)Ed24g;F$mel7+GrLz8 z-#nY~x=YZ9j2eTDIBJKN2}@mK)EciuJ1Wm31JC}s#bGR-3>k%DCm=8dp-G(MT)Bf| zn0?d67q`Yw*O%)}GlK7cL@Dv3lr1Fl+1vo)H`XM6FZEpn>NqfqW?{)Y%_xW<@s4fg zSb06g@Ts@N>WsUW#odPqW;z~UUMAjll#05+m-V!yn1nE+W1u>VYORL!uSqM+*)$z#mM~MAqv}g}+#TraF(3(VJle zI|y=U0y((}wGyDU5&u(KWTDkRagj;ze&$lZe6$?8t$T|S1Oj%QQ^TvQM`QM$E)}da zbMV_81~YHZYN5k}ao+Cniqa=Kvu!0>ISfe1x|<)Wog#X3Pi#9fy!bGjhV^$GKb|CX z_^t)^(iVhOd7OGmHr5D9OqOoyH-?@TN=84Ei>~-ucl@=OY879v?q&%k8Qp{A)e*BW z>7hwy#yjwXePw%YjVphb**e>CyGC7!M#&uE0KERdiH)*9hPmG_mQhSWezfuH`Xh5RC_A!#P#DwN!gx+J~R8t=LZW z=ff&?H&aSe(Fc970enVP{l&>fVHcR=kZ-!H^J{LsVO$lSUA?&=V0KnyURqW*R}rvs z08eZ!fBRJ!edMvKZCvokV0s@m82XR`TKQ~5Bwc~f7H~a6R?ssZKoglmCWIdnp_qi+ z&zyz#lfKEhQ$z3#a9oC?lJfBWx(4sj;~CHbTzTE>>;vz|JzQu$tqeN~HjW-3qhTfE zNVNDP*wK+?X66U&|a7FEPEvs?niQ@b{X^ zC%2nn-(uF`3hYaSu#iiMb9v%Zi~X^-1AdnAD{MFJhlDY;V zLhlCNM7C|(2##cHRrC3>>r__ErM_Ig^V(h!n3e1{nb+|WUn+LC_uz}9DK=>atThgk z_oX*;TielzP7Qkg#gA)-9%V+sfistMHrUMm&i2tdFI8Q1>yAjdL(tx4RxnEv^GR0d z(n^MGrE!j;ap`Sw7_!L>-u&b0#E4+_adGX~awr1+u~kOv>~?jLwTye+m$todjMQ|G z=%L3&oOx>gnVZfgn}+w7L?`<4S>EK^uCp%{;J{d*i3w1TPy61yCX2R8&vwK+C*GSc z$e!>RE`=wHWyhDIg$=tFwRIYEeCkXOQATz@+p0QsM%p_Aj`_IksfX6w{@6EL>AlHl zUH?@XRSo#X@7O0Rikb?Yk_hlvOlvv&&Vo>ybHqE=Ond+XpPJt6v*F%$sfA9}WM--6 zou5Z5L2~NyW%-x*NxeWVS2coZhDW=kLh5n~JlJqoCaly6h5IShI^}HvQl!2sbj?@= zND;CXn62q)*P-&&tgyG{^^D7#ide_JLP!Hb+JY6pN<&(BS%n3`G;2n*98!V0t5nt* zBNrP`wAJSTR;q(miY!3Ck!5mi921b7&S>ARjiTE_!EPX4do& zhowf_()Jz$+aHB{oRA31khZ~rS*JF?6p9@rWcWpVgd=9O2h&c8x9NJZkoO1i)C4OE zE-LDx_6HhLEt>v^SuGLST9!0#hMG8& z68r;_*p{$Z_lL5DBlD5@%xlxa5$?2}x)7>z0?AQRBu$U-fPr1-k7AK>;%c4PltdEQ zj7pXOfi^uZ(&nRfPnO|@;n^V4Rl?#4%3<}OHfXR}QIKM1D|K6CdOi@f&9Y98baQeT zeiAIU2$txagjfKAWaYXMC@gbFuuF2VjK#5k;GT3!AxaPedtuN|ClQ+~ph$mP$zYm- z;ICUxCz&F0R~FK-gZ_^aarx&a9$wsu?A5RMxY~Yz9qmU8lHq`904M%*Y7Z-WjME4M zxt^q4408@EKnkmVi*EHn9|IQzB5R86{(bDC+{o4LH{F9#USz0sXJ>ry+4H>4If43Q z-ahvF@^a_W9re&3Cc9S(mnZ7u$-?wehkx>FjS^Ix(jyjQ9ZC%tCw z>gvdI%GaH9-jo4zla^8L4utVt+pzs;q;b!}{S@Fx$F&fu$_foR9>nKARJ zpR{AJORPHMTG`jN{5h^%r-92WQjOh2N6*p9!&v*-33@zheeC=(HCHy*djBG5Fs19d zTaB6V1u^nkn+1YSa&8gD#bpqEWCca%2D5Bub1yy>^bKE{#Ya0naL?-I1n&_z=j-K4 z^fFSP(se2d?RS5KO*MQH4|dEsRJML<4}0Yh=6u6s2c1jgA>036qw?s7Jyquvlw?Gm zuKE(Fb{-d@=1rs??kALktBm>QH4c0!h8KQ*{FlZ7)w!W}kFEgo9ztj>}L$ z@jxu`s|R8LS=EzO)ryr{6poR+8feA2VRCmR2Sp1No*9rY$)6jpGI;7x?TB_I_f1x6 zGka_=E7&QfqjCtyEkZ{u^1&KL?gYgNpj??iv0l-Jr!626~ri)1cW0z_tICpWlD|KRsw4 Y!9;jr+SV!W4q-L8u5v@UK*=)rZwR6F&;S4c