From b9117aff2db45008805040d8635e53dce627a46d Mon Sep 17 00:00:00 2001 From: Ross Date: Sat, 16 Oct 2021 12:10:15 +0100 Subject: [PATCH] . --- anatomy/static/js/anatomy.js | 4 +- static/admin/js/actions.js | 11 +- static/js/anatomy.js | 4 +- static/mptt/arrow-move-black.png | Bin 0 -> 457 bytes static/mptt/arrow-move-white.png | Bin 0 -> 740 bytes static/mptt/disclosure-down-black.png | Bin 0 -> 496 bytes static/mptt/disclosure-down-white.png | Bin 0 -> 753 bytes static/mptt/disclosure-right-black.png | Bin 0 -> 464 bytes static/mptt/disclosure-right-white.png | Bin 0 -> 711 bytes static/mptt/draggable-admin.css | 17 +- static/sortedm2m/widget.js | 32 +- static/tagulous/adaptor/select2-4.js | 98 +- static/tagulous/lib/jquery.js | 4 +- static/tagulous/lib/select2-4/css/select2.css | 196 +-- .../lib/select2-4/css/select2.min.css | 2 +- static/tagulous/lib/select2-4/js/i18n/af.js | 2 +- static/tagulous/lib/select2-4/js/i18n/ar.js | 2 +- static/tagulous/lib/select2-4/js/i18n/az.js | 2 +- static/tagulous/lib/select2-4/js/i18n/bg.js | 2 +- static/tagulous/lib/select2-4/js/i18n/bn.js | 2 +- static/tagulous/lib/select2-4/js/i18n/bs.js | 2 +- static/tagulous/lib/select2-4/js/i18n/ca.js | 2 +- static/tagulous/lib/select2-4/js/i18n/cs.js | 2 +- static/tagulous/lib/select2-4/js/i18n/da.js | 2 +- static/tagulous/lib/select2-4/js/i18n/de.js | 2 +- static/tagulous/lib/select2-4/js/i18n/dsb.js | 2 +- static/tagulous/lib/select2-4/js/i18n/el.js | 2 +- static/tagulous/lib/select2-4/js/i18n/en.js | 4 +- static/tagulous/lib/select2-4/js/i18n/eo.js | 3 + static/tagulous/lib/select2-4/js/i18n/es.js | 2 +- static/tagulous/lib/select2-4/js/i18n/et.js | 2 +- static/tagulous/lib/select2-4/js/i18n/eu.js | 2 +- static/tagulous/lib/select2-4/js/i18n/fa.js | 2 +- static/tagulous/lib/select2-4/js/i18n/fi.js | 2 +- static/tagulous/lib/select2-4/js/i18n/fr.js | 4 +- static/tagulous/lib/select2-4/js/i18n/gl.js | 2 +- static/tagulous/lib/select2-4/js/i18n/he.js | 2 +- static/tagulous/lib/select2-4/js/i18n/hi.js | 2 +- static/tagulous/lib/select2-4/js/i18n/hr.js | 2 +- static/tagulous/lib/select2-4/js/i18n/hsb.js | 2 +- static/tagulous/lib/select2-4/js/i18n/hu.js | 4 +- static/tagulous/lib/select2-4/js/i18n/hy.js | 2 +- static/tagulous/lib/select2-4/js/i18n/id.js | 2 +- static/tagulous/lib/select2-4/js/i18n/is.js | 2 +- static/tagulous/lib/select2-4/js/i18n/it.js | 2 +- static/tagulous/lib/select2-4/js/i18n/ja.js | 2 +- static/tagulous/lib/select2-4/js/i18n/ka.js | 2 +- static/tagulous/lib/select2-4/js/i18n/km.js | 2 +- static/tagulous/lib/select2-4/js/i18n/ko.js | 2 +- static/tagulous/lib/select2-4/js/i18n/lt.js | 2 +- static/tagulous/lib/select2-4/js/i18n/lv.js | 2 +- static/tagulous/lib/select2-4/js/i18n/mk.js | 2 +- static/tagulous/lib/select2-4/js/i18n/ms.js | 2 +- static/tagulous/lib/select2-4/js/i18n/nb.js | 2 +- static/tagulous/lib/select2-4/js/i18n/ne.js | 2 +- static/tagulous/lib/select2-4/js/i18n/nl.js | 2 +- static/tagulous/lib/select2-4/js/i18n/pa.js | 3 + static/tagulous/lib/select2-4/js/i18n/pl.js | 2 +- static/tagulous/lib/select2-4/js/i18n/ps.js | 2 +- .../tagulous/lib/select2-4/js/i18n/pt-BR.js | 2 +- static/tagulous/lib/select2-4/js/i18n/pt.js | 2 +- static/tagulous/lib/select2-4/js/i18n/ro.js | 2 +- static/tagulous/lib/select2-4/js/i18n/ru.js | 2 +- static/tagulous/lib/select2-4/js/i18n/sk.js | 2 +- static/tagulous/lib/select2-4/js/i18n/sl.js | 2 +- static/tagulous/lib/select2-4/js/i18n/sq.js | 2 +- .../tagulous/lib/select2-4/js/i18n/sr-Cyrl.js | 2 +- static/tagulous/lib/select2-4/js/i18n/sr.js | 2 +- static/tagulous/lib/select2-4/js/i18n/sv.js | 2 +- static/tagulous/lib/select2-4/js/i18n/te.js | 3 + static/tagulous/lib/select2-4/js/i18n/th.js | 2 +- static/tagulous/lib/select2-4/js/i18n/tk.js | 2 +- static/tagulous/lib/select2-4/js/i18n/tr.js | 2 +- static/tagulous/lib/select2-4/js/i18n/uk.js | 2 +- static/tagulous/lib/select2-4/js/i18n/vi.js | 2 +- .../tagulous/lib/select2-4/js/i18n/zh-CN.js | 2 +- .../tagulous/lib/select2-4/js/i18n/zh-TW.js | 2 +- .../tagulous/lib/select2-4/js/select2.full.js | 1061 ++++++----------- .../lib/select2-4/js/select2.full.min.js | 4 +- static/tagulous/lib/select2-4/js/select2.js | 657 +++++----- .../tagulous/lib/select2-4/js/select2.min.js | 4 +- 81 files changed, 1111 insertions(+), 1116 deletions(-) create mode 100644 static/mptt/arrow-move-black.png create mode 100644 static/mptt/arrow-move-white.png create mode 100644 static/mptt/disclosure-down-black.png create mode 100644 static/mptt/disclosure-down-white.png create mode 100644 static/mptt/disclosure-right-black.png create mode 100644 static/mptt/disclosure-right-white.png create mode 100644 static/tagulous/lib/select2-4/js/i18n/eo.js create mode 100644 static/tagulous/lib/select2-4/js/i18n/pa.js create mode 100644 static/tagulous/lib/select2-4/js/i18n/te.js diff --git a/anatomy/static/js/anatomy.js b/anatomy/static/js/anatomy.js index 00932df8..a7d251dd 100644 --- a/anatomy/static/js/anatomy.js +++ b/anatomy/static/js/anatomy.js @@ -26,7 +26,9 @@ $(document).ready(function () { var classes = ['answer correct', 'answer half-correct', 'answer incorrect']; $(element).each(function () { - this.className = classes[($.inArray(this.className, classes) + 1) % classes.length]; + mark = classes[($.inArray(this.className, classes) + 1) % classes.length]; + this.className = mark + this.dataset.newmark = mark }); prepAnswerData(); diff --git a/static/admin/js/actions.js b/static/admin/js/actions.js index da1c3108..2830e911 100644 --- a/static/admin/js/actions.js +++ b/static/admin/js/actions.js @@ -36,7 +36,10 @@ function clearAcross(options) { reset(options); - document.querySelector(options.acrossInput).value = 0; + const acrossInputs = document.querySelectorAll(options.acrossInput); + acrossInputs.forEach(function(acrossInput) { + acrossInput.value = 0; + }); document.querySelector(options.actionContainer).classList.remove(options.selectedClass); } @@ -107,8 +110,10 @@ document.querySelectorAll(options.acrossQuestions + " a").forEach(function(el) { el.addEventListener('click', function(event) { event.preventDefault(); - const acrossInput = document.querySelector(options.acrossInput); - acrossInput.value = 1; + const acrossInputs = document.querySelectorAll(options.acrossInput); + acrossInputs.forEach(function(acrossInput) { + acrossInput.value = 1; + }); showClear(options); }); }); diff --git a/static/js/anatomy.js b/static/js/anatomy.js index 00932df8..a7d251dd 100644 --- a/static/js/anatomy.js +++ b/static/js/anatomy.js @@ -26,7 +26,9 @@ $(document).ready(function () { var classes = ['answer correct', 'answer half-correct', 'answer incorrect']; $(element).each(function () { - this.className = classes[($.inArray(this.className, classes) + 1) % classes.length]; + mark = classes[($.inArray(this.className, classes) + 1) % classes.length]; + this.className = mark + this.dataset.newmark = mark }); prepAnswerData(); diff --git a/static/mptt/arrow-move-black.png b/static/mptt/arrow-move-black.png new file mode 100644 index 0000000000000000000000000000000000000000..d528679eb0b0c32c77fc0f09ce53353c704a63f9 GIT binary patch literal 457 zcmeAS@N?(olHy`uVBq!ia0vp^B0$W?!2%>(&wi-}QY`6?zK#qG8~eHcB(ehe3dtTp zz6=aiY77hwEes65fIs?R*UjfiU*{F6M+fSAR$aX2X}51n*lx>P)*MaEdl%2X^=op4 zm~9N}-h&IoV{BcXZ~WqW?-j zfNYSkzLEl1NlCV?QiN}Sf^&XRs)DJWiJpOy9hZWFf=y9MnpKdC8&o@xXRDM^Qc_^0 zuU}qXu2*iXmtT~wZ)j<0sc&GUZ)BtkRH0j3nOBlnp_^B%3^4>|j!SBBa#3bMNoIbY z0?6FNr2NtnTO}osMQ{LdXGvxn!lt}psJDO~)CbAv8|oS8!_5Y2wE>A*`4?rT0&NDF zZ)a!&R*518wZ}#uWI2*!AU*|)0=;U-Wup%dHajk#L+X*hko@ZD;uvBfxOU1}&O;6Y zt+9eUPbPTpnXzS|=D}`r>yt-!hh~W0TYErDq@^K&xyk-xwMAFgO@YFP%9}smJCnD` zJ8JE$z-g&G-pcDX{!X3cvZ0}Sp~a{0%8)Mi4Xv9ORy@)C=qUb$Pqc^Y3%;y;?Uy&5p8u}xyr9ISFyJ}UwGo^9)9V? z`8!WJuY6aNf9=PuE2cR$8(;IKp6${uXiIupCttJM&Awe)#MX?(Byhq@P+IbI^>bP0 Hl+XkKs9FGQ literal 0 HcmV?d00001 diff --git a/static/mptt/disclosure-down-black.png b/static/mptt/disclosure-down-black.png new file mode 100644 index 0000000000000000000000000000000000000000..5f217577c72de9ef778a09a7eb12fac58a898c8f GIT binary patch literal 496 zcmeAS@N?(olHy`uVBq!ia0vp^B0$W?!2%>(&wi-}QY`6?zK#qG8~eHcB(ehe3dtTp zz6=aiY77hwEes65fI8e9I2ald^6+Mi;g=I<64-Tb3r&5p_fBp6q#eEP z=YIsmZlApR)ydi6`Zp@Ke_3hzD=h2d+^tjVq_1t>;qW}>h3UaF2QS|9xk99hFi9p9tp`^dzr;Kv!{{qnAb&?nVbtJG=(U(M9!Y! z#j$hZ#2AjN{WHv}y`JWO`;+)%zyA!AZ}%#@^c57s_b<5nP#NeG)e_f;l9a@fRIB8o zR3OD*WMF8jYiOivXcl5WooW%U}$Avuoc5!lIL8@MUQTpt6Hc~)E44$rjF6*2UngA9pv>*Tg literal 0 HcmV?d00001 diff --git a/static/mptt/disclosure-down-white.png b/static/mptt/disclosure-down-white.png new file mode 100644 index 0000000000000000000000000000000000000000..c55f6f62d3061fe5afcc7e98076579c3483a4f4e GIT binary patch literal 753 zcmeAS@N?(olHy`uVBq!ia0vp^B0$W?!3HGtkJx+wQY`6?zK#qG8~eHcB(ehe3dtTp zz6=aiY77hwEes65fIW?-j zfNYSkzLEl1NlCV?QiN}Sf^&XRs)DJWiJpOy9hZWFf=y9MnpKdC8&o@xXRDM^Qc_^0 zuU}qXu2*iXmtT~wZ)j<0sc&GUZ)BtkRH0j3nOBlnp_^B%3^4>|j!SBBa#3bMNoIbY z0?6FNr2NtnTO}osMQ{LdXGvxn!lt}psJDO~)CbAv8|oS8!_5Y2wE>A*`4?rT0&NDF zZ)a!&R*518wZ}#uWI2*!AU*|)0=;U-Wup%dHajk#L+X*hKxXoEaSX8#Tsy^#hcjwu(OCD2yeN;HDG~$5hr-k#dM>Z?q(-YpLw^l<7pp3l@! z-N~B0ICZb$@k<`FS!7L31T}9vUgw#0#dq~?Gi6tv+=CHb-MTv;uXiwA@jUrW`oW$c zebukpC!{l^SJira{t`5=M{w^gvt6|xCFbW!&ut8~&wsPOzRJ=0zs`+AT+Gv-a1 U6FS?B50tPxUHx3vIVCg!0Q6%4ssI20 literal 0 HcmV?d00001 diff --git a/static/mptt/disclosure-right-black.png b/static/mptt/disclosure-right-black.png new file mode 100644 index 0000000000000000000000000000000000000000..50741efcaf9804b7b1abb5b1faaf90ccc2688940 GIT binary patch literal 464 zcmeAS@N?(olHy`uVBq!ia0vp^B0$W?!2%>(&wi-}QY`6?zK#qG8~eHcB(ehe3dtTp zz6=aiY77hwEes65fI>o39N-kO@>(v?>9jUz;e_0j$$=L(9I3kN^KZ||Ju{E&mWr}C z8Grkv_f-?aYhrxU#Ln4iZ4TP8lVjnANwtSwJ#$K2m9N}l5U$^>ytBa6<+>lo&OpgI zwy|ZqUfkqP{MNVhn!iC#sX>9rwM*;)pSNrE{Y##C>f;}dJ)bxyPkKLn`3`37qR_&O zg<0)Dm#UVyMwFx^mZVxG7o`Fz1|tJQQ(Z$NT|=`FLt`rwV=Gg0Z39Cq1A|>hR9B*C z$jwj5OsmAL;q=V8qCgFjARB`7(@M${i&7cN%ggmL^RkPR6AM!H@{7`Ezq647Dq`?- L^>bP0l+XkKFrl9` literal 0 HcmV?d00001 diff --git a/static/mptt/disclosure-right-white.png b/static/mptt/disclosure-right-white.png new file mode 100644 index 0000000000000000000000000000000000000000..850380dc44fca42195a383d88e2e62ab427b4bfc GIT binary patch literal 711 zcmeAS@N?(olHy`uVBq!ia0vp^B0$W?!3HGtkJx+wQY`6?zK#qG8~eHcB(ehe3dtTp zz6=aiY77hwEes65fIW?-j zfNYSkzLEl1NlCV?QiN}Sf^&XRs)DJWiJpOy9hZWFf=y9MnpKdC8&o@xXRDM^Qc_^0 zuU}qXu2*iXmtT~wZ)j<0sc&GUZ)BtkRH0j3nOBlnp_^B%3^4>|j!SBBa#3bMNoIbY z0?6FNr2NtnTO}osMQ{LdXGvxn!lt}psJDO~)CbAv8|oS8!_5Y2wE>A*`4?rT0&NDF zZ)a!&R*518wZ}#uWI2*!AU*|)0=;U-Wup%dHajk#L+X*hki6mP;uvBfxOK`xzC#8A zZJKE(3m%A@)G;}4=-`xDe}wxDr+~!-8&*Zf1%bg03dSuOC71c@P5nH#RS@&3ZQAEPDgL3yiG_miPVEQuE zF^?noMnenF`b0MO56&i;%QY7X%b~DRoPw zu2x*c!sqw)sqj}9-{)7Resh`qV_EJ0NBXAaJ=;_727Phv{C(?1@V`Gv?*G3?@!st$ d_K5#0V;8)mKd{tPRTq?8JYD@<);T3K0RRa1@-6@X literal 0 HcmV?d00001 diff --git a/static/mptt/draggable-admin.css b/static/mptt/draggable-admin.css index 936daad2..16cb8538 100644 --- a/static/mptt/draggable-admin.css +++ b/static/mptt/draggable-admin.css @@ -13,14 +13,23 @@ } .tree-node { cursor: pointer; } -.tree-node.children { background-image: url(disclosure-down.png); } -.tree-node.closed { background-image: url(disclosure-right.png); } +.tree-node.children { background-image: url(disclosure-down-black.png); } +.tree-node.closed { background-image: url(disclosure-right-black.png); } -.drag-handle { background-image: url(arrow-move.png); cursor: move; } +.drag-handle { background-image: url(arrow-move-black.png); cursor: move; } /* focus */ #result_list tbody tr:focus { - background-color: #ffffcc !important; outline: 0px; } + background-color: var(--selected-row, #ffc) !important; outline: 0px; } + +@media (prefers-color-scheme: dark) { + .tree-node.children { background-image: url(disclosure-down-white.png); } + .tree-node.closed { background-image: url(disclosure-right-white.png); } + .drag-handle { background-image: url(arrow-move-white.png); } + + #result_list tbody tr:focus { + background-color: var(--selected-row, #00363A) !important; outline: 0px; } +} #drag-line { position: absolute; diff --git a/static/sortedm2m/widget.js b/static/sortedm2m/widget.js index 10fc3a56..aacbdf52 100644 --- a/static/sortedm2m/widget.js +++ b/static/sortedm2m/widget.js @@ -19,18 +19,31 @@ if (typeof jQuery === 'undefined') { var label, labelFor; var currentElement = ul; - while (!label || !label.length) { + // Look for a