From af8851282eb211614600d39f426f2f3ba98953c4 Mon Sep 17 00:00:00 2001 From: Sam Hemelryk Date: Mon, 4 Apr 2011 14:37:35 +0800 Subject: [PATCH] enrolments MDL-26858 Added finish user enrolments button to JS dialogue --- enrol/renderer.php | 3 ++- .../enrolmentmanager/assets/skins/sam/enrolmentmanager.css | 2 +- enrol/yui/enrolmentmanager/enrolmentmanager.js | 7 ++++++- lang/en/enrol.php | 1 + 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/enrol/renderer.php b/enrol/renderer.php index d7a9cb407ed..6e30ee118c0 100644 --- a/enrol/renderer.php +++ b/enrol/renderer.php @@ -685,7 +685,8 @@ class course_enrolment_users_table extends course_enrolment_table { 'unlimitedduration', 'startdatetoday', 'durationdays', - 'enrolperiod'), 'enrol'); + 'enrolperiod', + 'finishenrollingusers'), 'enrol'); $this->moodlepage->requires->string_for_js('assignroles', 'role'); $this->moodlepage->requires->string_for_js('startingfrom', 'moodle'); diff --git a/enrol/yui/enrolmentmanager/assets/skins/sam/enrolmentmanager.css b/enrol/yui/enrolmentmanager/assets/skins/sam/enrolmentmanager.css index ff047dc2531..72be3ff785e 100644 --- a/enrol/yui/enrolmentmanager/assets/skins/sam/enrolmentmanager.css +++ b/enrol/yui/enrolmentmanager/assets/skins/sam/enrolmentmanager.css @@ -60,7 +60,7 @@ Structure of the user enroller panel .user-enroller-panel .uep-loading-lightbox.hidden {display:none;} .user-enroller-panel .uep-loading-lightbox .loading-icon {margin:auto;vertical-align:middle;margin-top:125px;} -.user-enroller-panel .uep-footer {padding:3px;background-color:#ddd;} +.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:70%;} diff --git a/enrol/yui/enrolmentmanager/enrolmentmanager.js b/enrol/yui/enrolmentmanager/enrolmentmanager.js index 9cbfb39318b..864cd913222 100644 --- a/enrol/yui/enrolmentmanager/enrolmentmanager.js +++ b/enrol/yui/enrolmentmanager/enrolmentmanager.js @@ -58,7 +58,8 @@ YUI.add('moodle-enrol-enrolmentmanager', function(Y) { DURATION : 'duration', ACTIVE : 'active', SEARCH : 'uep-search', - CLOSE : 'close' + CLOSE : 'close', + CLOSEBTN : 'close-button' }; var USERENROLLER = function(config) { @@ -98,6 +99,9 @@ YUI.add('moodle-enrol-enrolmentmanager', function(Y) { .append(Y.Node.create('
') .append(Y.Node.create('')) ) + .append(Y.Node.create('
') + .append(Y.Node.create('')) + ) ) ) ); @@ -109,6 +113,7 @@ YUI.add('moodle-enrol-enrolmentmanager', function(Y) { } }, this); this.get(UEP.BASE).one('.'+CSS.HEADER+' .'+CSS.CLOSE).on('click', this.hide, this); + this.get(UEP.BASE).one('.'+CSS.FOOTER+' .'+CSS.CLOSEBTN+' input').on('click', this.hide, this); this._loadingNode = this.get(UEP.BASE).one('.'+CSS.CONTENT+' .'+CSS.LIGHTBOX); var params = this.get(UEP.PARAMS); params['id'] = this.get(UEP.COURSEID); diff --git a/lang/en/enrol.php b/lang/en/enrol.php index 228e1595f9d..5abd0cbe1ef 100644 --- a/lang/en/enrol.php +++ b/lang/en/enrol.php @@ -60,6 +60,7 @@ $string['errajaxfailedenrol'] = 'Failed to enrol user'; $string['errajaxsearch'] = 'Error when searching users'; $string['errorenrolcohort'] = 'Error creating cohort sync enrolment instance in this course.'; $string['errorenrolcohortusers'] = 'Error enrolling cohort members in this course.'; +$string['finishenrollingusers'] = 'Finish enrolling users'; $string['invalidenrolinstance'] = 'Invalid enrolment instance'; $string['invalidrole'] = 'Invalid role'; $string['manageenrols'] = 'Manage enrol plugins';