mirror of
https://github.com/moodle/moodle.git
synced 2025-03-14 04:30:15 +01:00
Merge branch 'wip-MDL-26858' of git://github.com/samhemelryk/moodle
This commit is contained in:
commit
b76070db70
@ -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');
|
||||
|
||||
|
@ -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%;}
|
||||
|
@ -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);
|
||||
|
@ -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';
|
||||
|
Loading…
x
Reference in New Issue
Block a user