Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'wip-MDL-26858-MOODLE_20_STABLE' of git://github.com/sam…

…hemelryk/moodle into MOODLE_20_STABLE
  • Loading branch information...
commit 91fa7abf3deb95f81988be78429e97db1f840d18 2 parents b060e5b + 87b05ba
@stronk7 stronk7 authored
View
3  enrol/renderer.php
@@ -685,7 +685,8 @@ public function get_enrolment_selector() {
'unlimitedduration',
'startdatetoday',
'durationdays',
- 'enrolperiod'), 'enrol');
+ 'enrolperiod',
+ 'finishenrollingusers'), 'enrol');
$this->moodlepage->requires->string_for_js('assignroles', 'role');
$this->moodlepage->requires->string_for_js('startingfrom', 'moodle');
View
2  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%;}
View
7 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('<div class="'+CSS.SEARCH+'"><label>'+M.str.enrol.usersearch+'</label></div>')
.append(Y.Node.create('<input type="text" id="enrolusersearch" value="" />'))
)
+ .append(Y.Node.create('<div class="'+CSS.CLOSEBTN+'"></div>')
+ .append(Y.Node.create('<input type="button" value="'+M.str.enrol.finishenrollingusers+'" />'))
+ )
)
)
);
@@ -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);
View
1  lang/en/enrol.php
@@ -60,6 +60,7 @@
$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';
Please sign in to comment.
Something went wrong with that request. Please try again.