From d7ae1a92b1260864ddad815089508d8e29f94753 Mon Sep 17 00:00:00 2001 From: Jun Pataleta Date: Tue, 19 Jun 2018 15:26:36 +0800 Subject: [PATCH] MDL-62746 tag: Make forms in tag modals use proper BS classes --- lib/amd/build/tag.min.js | Bin 8092 -> 8366 bytes lib/amd/src/tag.js | 52 +++++++++++++++++++++++++-------------- 2 files changed, 34 insertions(+), 18 deletions(-) diff --git a/lib/amd/build/tag.min.js b/lib/amd/build/tag.min.js index fd51f0b4eeffdb7a0c0fb3a5707bf872e142949e..ba255210c2a42f4e967c56abfcdbc8ccf10d1a4a 100644 GIT binary patch delta 722 zcmbPZzs_-kGiRcmO-g2&LUK-Gaj~sZN@{U(QD#9&W`3TMosB+F21Pn8zbIEXy(qu5 zKp`Kjs2IO0B|8NLg~{_d-Izi2c`4(`5?tcUKvOpxaA`26=%m=HBijx(J~<;bIUB6e zCNr;~v_zq#vLMw~sVFfeGhYejPJ~Kbup%Xeyu@6fs@%lPypqIpC7^X+keM?10JqHK zW!wTFA)B1Uq|_WNW`M<&Chy_a7Y6%T$vRapv7jI|FGV9!BW3e@ZWq?c?t-0CNFjv? z3Wz5!32K5p`CCxM9U7PrN9O016y@i@90+t=aZYA&iIP6v;DrU8;p8eIL1^Gv3KYjD zC*~!m=D;*>z9h7dO$J8{L5%n>DL#3>Bp=v_bCMb^sGf(qO&=Idcq1DT+#pjYp930N zCCxqAS4v3^)j&|(L1P4DsKVs`l1k24lt2O;7zAJjkwLLrN(34do}e@|*?>!8aGd~X~tY3g6 zl@AszMiWDN_=v)l%N1u2QX})PE?p&BO}cP eGzIKnJCHgTX_y+Ak*Lma1v
' + - '

' + - '

' + - '

' + + var el = $('
' + + '
' + + '
' + + ' ' + + ' ' + + '
' + '
'); el.find('.description').html(s[1]); el.find('#combinetags_submit').attr('value', s[2]); @@ -160,8 +162,12 @@ define(['jquery', 'core/ajax', 'core/templates', 'core/notification', 'core/str' tags.each(function() { var tagid = $(this).val(), tagname = $('.inplaceeditable[data-itemtype=tagname][data-itemid=' + tagid + ']').attr('data-value'); - fldset.append($('
')); + var option = '
' + + ' ' + + ' ' + + '
'; + fldset.append($(option)); }); // TODO: MDL-57778 Convert to core/modal. Y.use('moodle-core-notification-dialogue', function() { @@ -218,13 +224,17 @@ define(['jquery', 'core/ajax', 'core/templates', 'core/notification', 'core/str' {key: 'continue'}, {key: 'cancel'}, ]).done(function(s) { - var el = $('
' + + var el = $('
' + '' + '' + - '

' + - '

' + - '

' + - '

' + + '
' + + ' ' + + ' ' + + '
' + + '
' + + ' ' + + ' ' + + '
' + '
'); el.find('#addtags_form').attr('action', window.location.href); el.find('#addtags_submit').attr('value', s[2]); @@ -290,13 +300,19 @@ define(['jquery', 'core/ajax', 'core/templates', 'core/notification', 'core/str' {key: 'create'}, {key: 'cancel'}, ]).done(function(s) { - var el = $('
' + - '

: ' + - '

' + - '

: ' + - '

' + - '

' + - '

' + + var el = $('
' + + '
' + + ' ' + + ' ' + + '
' + + '
' + + ' ' + + ' ' + + '
' + + '
' + + ' ' + + ' ' + + '
' + '
'); el.find('label[for="addtagcoll_name"]').html(s[1]); el.find('label[for="addtagcoll_searchable"]').html(s[2]); -- 2.43.0