From 2944a41c254f9fa7c1f335baba8d0fb54eb9075f Mon Sep 17 00:00:00 2001
From: Andrew Hancox <andrewdchancox@googlemail.com>
Date: Thu, 7 Apr 2016 16:43:05 +0100
Subject: [PATCH] MDL-53043 enrol_manual: Move search field on quickenrol modal

---
 .../quickenrolment/assets/skins/sam/quickenrolment.css    | 2 +-
 enrol/manual/yui/quickenrolment/quickenrolment.js         | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/enrol/manual/yui/quickenrolment/assets/skins/sam/quickenrolment.css b/enrol/manual/yui/quickenrolment/assets/skins/sam/quickenrolment.css
index d1ae18007b7..a9901ca011e 100644
--- a/enrol/manual/yui/quickenrolment/assets/skins/sam/quickenrolment.css
+++ b/enrol/manual/yui/quickenrolment/assets/skins/sam/quickenrolment.css
@@ -73,7 +73,7 @@ Structure of the user enroller panel
 .user-enroller-panel .uep-footer {padding:3px;background-color:#ddd;text-align:center;}
 .user-enroller-panel .uep-search {margin:3px;}
 .user-enroller-panel .uep-search label {padding-right:8px;}
-.user-enroller-panel .uep-search input {width:50%;}
+.user-enroller-panel .uep-search input {width:50%; margin: 0 0 10px 5px}
 .user-enroller-panel .uep-search input.uep-search-btn {width:20%;}
 .user-enroller-panel .uep-searchoptions {margin:3px;cursor:pointer;}
 .user-enroller-panel .uep-controls select {margin-left:1em;margin-bottom:0;}
diff --git a/enrol/manual/yui/quickenrolment/quickenrolment.js b/enrol/manual/yui/quickenrolment/quickenrolment.js
index 3c8517ffa95..b4132cc4ea4 100644
--- a/enrol/manual/yui/quickenrolment/quickenrolment.js
+++ b/enrol/manual/yui/quickenrolment/quickenrolment.js
@@ -114,6 +114,10 @@ YUI.add('moodle-enrol_manual-quickenrolment', function(Y) {
                                         .append(create('<select><option value="0" selected="selected">'+M.util.get_string('unlimitedduration', 'enrol')+'</option></select>')))
                                 )
                             )
+                            .append(create('<div class="'+CSS.SEARCH+'"><label for="enrolusersearch" class="accesshide">'+M.util.get_string('usersearch', 'enrol')+'</label></div>')
+                                .append(create('<input type="text" id="enrolusersearch" value="" />'))
+                                .append(create('<input type="button" id="searchbtn" class="'+CSS.SEARCHBTN+'" value="'+M.util.get_string('usersearch', 'enrol')+'" />'))
+                            )
                         )
                         .append(create('<div class="'+CSS.AJAXCONTENT+'"></div>'))
                         .append(create('<div class="'+CSS.LIGHTBOX+' '+CSS.HIDDEN+'"></div>')
@@ -121,10 +125,6 @@ YUI.add('moodle-enrol_manual-quickenrolment', function(Y) {
                                 .setAttribute('src', M.util.image_url('i/loading', 'moodle')))
                             .setStyle('opacity', 0.5)))
                     .append(create('<div class="'+CSS.FOOTER+'"></div>')
-                        .append(create('<div class="'+CSS.SEARCH+'"><label for="enrolusersearch" class="accesshide">'+M.util.get_string('usersearch', 'enrol')+'</label></div>')
-                            .append(create('<input type="text" id="enrolusersearch" value="" />'))
-                                .append(create('<input type="button" id="searchbtn" class="'+CSS.SEARCHBTN+'" value="'+M.util.get_string('usersearch', 'enrol')+'" />'))
-                        )
                         .append(create('<div class="'+CSS.CLOSEBTN+'"></div>')
                             .append(create('<input type="button" value="'+M.util.get_string('finishenrollingusers', 'enrol')+'" />'))
                         )