From d7ae1a92b1260864ddad815089508d8e29f94753 Mon Sep 17 00:00:00 2001
From: Jun Pataleta <jun@moodle.com>
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@|*?>!8a<VkY
Lf2^B*rTtj|!3XZ@

delta 412
zcmZ4IILCg2GiQuKa!z7#v8_^Ceo?M&W?oKaUaFFvO#w_eCAB!YD6^m>Gd~X~tY3g6
zl@AszMi<Ua$<a;B$xH{TpFCaKaPn17(aHCvjVCK`i8B^#w&K!Y<h4%KODrfz%}dcp
z)KH(?$Soq6mzbMstCX9VnOBmSuB4EeGFgI0MoghBF{czLuCAS=t*)eRXOokdl$tYH
zgh!txsmM-ga~O{cs}QF9C(jV<W-73oY%8QWIa5ew@**K&ab$<1y3l+ww=g%*g_eB9
z@yUsK$*DOYoAe7dCkgLklYoT-TJYFSwvke0w3>WDN_=v)l%N1u2QX})PE?p&BO}cP
eGzIKnJCHgTX_y+Ak*Lma1v<eK7(m)G%`5<u@r3RG

diff --git a/lib/amd/src/tag.js b/lib/amd/src/tag.js
index 16095641699..730e5cfb859 100644
--- a/lib/amd/src/tag.js
+++ b/lib/amd/src/tag.js
@@ -148,10 +148,12 @@ define(['jquery', 'core/ajax', 'core/templates', 'core/notification', 'core/str'
                     {key: 'continue'},
                     {key: 'cancel'},
                 ]).done(function(s) {
-                    var el = $('<div><form id="combinetags_form" class="form-inline">' +
-                        '<p class="description"></p><p class="options"></p>' +
-                        '<p class="mdl-align"><input type="submit" class="btn btn-primary" id="combinetags_submit"/>' +
-                        '<input type="button" class="btn btn-secondary" id="combinetags_cancel"/></p>' +
+                    var el = $('<div><form id="combinetags_form">' +
+                        '<div class="description"></div><div class="form-group options"></div>' +
+                        '<div class="form-group">' +
+                        '   <input type="submit" class="btn btn-primary" id="combinetags_submit"/>' +
+                        '   <input type="button" class="btn btn-secondary" id="combinetags_cancel"/>' +
+                        '</div>' +
                         '</form></div>');
                     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($('<input type="radio" name="maintag" id="combinetags_maintag_' + tagid + '" value="' +
-                            tagid + '"/><label for="combinetags_maintag_' + tagid + '">' + tagname + '</label><br>'));
+                        var option = '<div class="form-check">' +
+                            '   <input type="radio" class="form-check-input" name="maintag" ' +
+                            '       id="combinetags_maintag_' + tagid + '" value="' + tagid + '"/>' +
+                            '   <label class="form-check-label" for="combinetags_maintag_' + tagid + '">' + tagname + '</label>' +
+                            '</div>';
+                        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 = $('<div><form id="addtags_form" class="form-inline" method="POST">' +
+                    var el = $('<div><form id="addtags_form" method="POST">' +
                         '<input type="hidden" name="action" value="addstandardtag"/>' +
                         '<input type="hidden" name="sesskey" value="' + M.cfg.sesskey + '"/>' +
-                        '<p><label for="id_tagslist">' + s[1] + '</label>' +
-                        '<input type="text" id="id_tagslist" name="tagslist"/></p>' +
-                        '<p class="mdl-align"><input type="submit" class="btn btn-primary" id="addtags_submit"/>' +
-                        '<input type="button" class="btn btn-secondary" id="addtags_cancel"/></p>' +
+                        '<div class="form-group">' +
+                        '   <label for="id_tagslist">' + s[1] + '</label>' +
+                        '   <input type="text" id="id_tagslist" class="form-control" name="tagslist"/>' +
+                        '</div>' +
+                        '<div class="form-group">' +
+                        '   <input type="submit" class="btn btn-primary" id="addtags_submit"/>' +
+                        '   <input type="button" class="btn btn-secondary" id="addtags_cancel"/>' +
+                        '</div>' +
                         '</form></div>');
                     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 = $('<div><form id="addtagcoll_form" class="form-inline">' +
-                            '<p><label for="addtagcoll_name"></label>: ' +
-                            '<input id="addtagcoll_name" type="text"/></p>' +
-                            '<p><label for="addtagcoll_searchable"></label>: ' +
-                            '<input id="addtagcoll_searchable" type="checkbox" value="1" checked/></p>' +
-                            '<p class="mdl-align"><input type="submit" class="btn btn-primary" id="addtagcoll_submit"/>' +
-                            '<input type="button" class="btn btn-secondary" id="addtagcoll_cancel"/></p>' +
+                        var el = $('<div><form id="addtagcoll_form">' +
+                            '<div class="form-group">' +
+                            '   <label for="addtagcoll_name"></label> ' +
+                            '   <input id="addtagcoll_name" type="text" class="form-control"/>  ' +
+                            '</div>' +
+                            '<div class="form-group form-check">' +
+                            '   <input id="addtagcoll_searchable" type="checkbox" value="1" checked class="form-check-input"/>' +
+                            '   <label for="addtagcoll_searchable" class="form-check-label"></label>' +
+                            '</div>' +
+                            '<div class="form-group">' +
+                            '   <input type="submit" class="btn btn-primary" id="addtagcoll_submit"/>' +
+                            '   <input type="button" class="btn btn-secondary" id="addtagcoll_cancel"/>' +
+                            '</div>' +
                             '</form></div>');
                         el.find('label[for="addtagcoll_name"]').html(s[1]);
                         el.find('label[for="addtagcoll_searchable"]').html(s[2]);
-- 
2.17.1