mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-22 17:02:03 +02:00
Code Issues Projects Releases Wiki Activity

MDL-46570 gradereport_history: Safer use of language strings

Browse Source 
Part of MDL-46191
This commit is contained in:
Frederic Massart 2014-08-01 13:47:54 +08:00 committed by Ankit Agarwal
parent 51abd213ba
commit b8908b0ac2
5 changed files with 56 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
grade/report/history/yui/build/moodle-gradereport_history-userselector/moodle-gradereport_history-userselector-debug.js vendored
View File

@ -1,5 +1,6 @@
YUI.add('moodle-gradereport_history-userselector', function (Y, NAME) {
var COMPONENT = 'gradereport_history';
var USP = {
NAME : 'User Selector Manager',
/** Properties **/
@ -68,7 +69,7 @@ Y.namespace('M.gradereport_history').UserSelector = Y.extend(USERSELECTOR, Y.Bas
.append(create('<div class="'+CSS.WRAP+'"></div>')
.append(create('<div class="'+CSS.HEADER+' header"></div>')
.append(create('<div class="'+CSS.CLOSE+'"></div>'))
.append(create('<h2>'+M.str.gradereport_history.selectuser+'</h2>')))
.append(create('<h2>'+M.util.get_string('selectuser', COMPONENT)+'</h2>')))
.append(create('<div class="'+CSS.CONTENT+'"></div>')
.append(create('<div class="'+CSS.AJAXCONTENT+'"></div>'))
.append(create('<div class="'+CSS.LIGHTBOX+' '+CSS.HIDDEN+'"></div>')
@ -76,12 +77,12 @@ Y.namespace('M.gradereport_history').UserSelector = Y.extend(USERSELECTOR, Y.Bas
.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.str.enrol.usersearch+'</label></div>')
.append(create('<div class="'+CSS.SEARCH+'"><label for="enrolusersearch" class="accesshide">'+Y.Escape.html(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.str.enrol.usersearch+'" />'))
.append(create('<input type="button" id="searchbtn" class="'+CSS.SEARCHBTN+'" value="'+Y.Escape.html(M.util.get_string('usersearch', 'enrol'))+'" />'))
)
.append(create('<div class="'+CSS.CLOSEBTN+'"></div>')
.append(create('<input type="button" value="'+M.str.gradereport_history.finishselectingusers+'" />'))
.append(create('<input type="button" value="'+Y.Escape.html(M.util.get_string('finishselectingusers', COMPONENT))+'" />'))
)
)
)
@ -214,7 +215,7 @@ Y.namespace('M.gradereport_history').UserSelector = Y.extend(USERSELECTOR, Y.Bas
new M.core.exception(e);
}
if (!result.success) {
this.setContent = M.str.enrol.errajaxsearch;
this.setContent = M.util.get_string('errajaxsearch', 'enrol');
}
if (!args.append) {
@ -236,9 +237,9 @@ Y.namespace('M.gradereport_history').UserSelector = Y.extend(USERSELECTOR, Y.Bas
}
if (selected === '') {
actionnode = create('<input type="button" class="'+CSS.SELECT+'" value="'+M.str.moodle.select+'" />');
actionnode = create('<input type="button" class="'+CSS.SELECT+'" value="'+Y.Escape.html(M.util.get_string('select', 'moodle'))+'" />');
} else {
actionnode = create('<input type="button" class="'+CSS.DESELECT+'" value="'+M.str.gradereport_history.deselect+'" />');
actionnode = create('<input type="button" class="'+CSS.DESELECT+'" value="'+Y.Escape.html(M.util.get_string('deselect', COMPONENT))+'" />');
}
node = create('<div class="'+CSS.USER+selected+' clearfix" rel="'+user.userid+'"></div>')
@ -255,12 +256,16 @@ Y.namespace('M.gradereport_history').UserSelector = Y.extend(USERSELECTOR, Y.Bas
}
this.set(USP.USERCOUNT, count);
if (!args.append) {
usersstr = (result.response.totalusers == '1')?M.str.enrol.ajaxoneuserfound:M.util.get_string('ajaxxusersfound','enrol', result.response.totalusers);
if (result.response.totalusers == '1') {
usersstr = M.util.get_string('ajaxoneuserfound', 'enrol');
} else {
usersstr = M.util.get_string('ajaxxusersfound','enrol', result.response.totalusers);
}
content = create('<div class="'+CSS.SEARCHRESULTS+'"></div>')
.append(create('<div class="'+CSS.TOTALUSERS+'">'+usersstr+'</div>'))
.append(users);
if (result.response.totalusers > (this.get(USP.PAGE)+1)*this.get(USP.PERPAGE)) {
fetchmore = create('<div class="'+CSS.MORERESULTS+'"><a href="#">'+M.str.enrol.ajaxnext25+'</a></div>');
fetchmore = create('<div class="'+CSS.MORERESULTS+'"><a href="#">'+M.util.get_string('ajaxnext25', 'enrol')+'</a></div>');
fetchmore.on('click', this.search, this, true);
content.append(fetchmore);
}
@ -292,7 +297,7 @@ Y.namespace('M.gradereport_history').UserSelector = Y.extend(USERSELECTOR, Y.Bas
user.removeClass(CSS.SELECTED);
user.one('.'+CSS.DESELECT).remove();
user.one('.'+CSS.OPTIONS).append(create('<input type="button" class="'+CSS.SELECT+'" value="'+M.str.moodle.select+'" />'));
user.one('.'+CSS.OPTIONS).append(create('<input type="button" class="'+CSS.SELECT+'" value="'+Y.Escape.html(M.util.get_string('select', 'moodle'))+'" />'));
},
selectUser : function(e, args) {
var user = e.currentTarget.ancestor('.'+CSS.USER);
@ -314,7 +319,7 @@ Y.namespace('M.gradereport_history').UserSelector = Y.extend(USERSELECTOR, Y.Bas
user.addClass(CSS.SELECTED);
user.one('.'+CSS.SELECT).remove();
user.one('.'+CSS.OPTIONS).append(create('<input type="button" class="'+CSS.DESELECT+'" value="'+M.str.gradereport_history.deselect+'" />'));
user.one('.'+CSS.OPTIONS).append(create('<input type="button" class="'+CSS.DESELECT+'" value="'+Y.Escape.html(M.util.get_string('deselect', COMPONENT))+'" />'));
},
setContent: function(content) {
this.get(USP.BASE).one('.'+CSS.CONTENT+' .'+CSS.AJAXCONTENT).setContent(content);
@ -413,11 +418,12 @@ Y.namespace('M.gradereport_history.UserSelector').init = function(cfg) {
}, '@VERSION@', {
"requires": [
"dd-plugin",
"escape",
"event-delegate",
"event-key",
"io-base",
"json-parse",
"moodle-core-notification",
"moodle-core-notification-dialogue",
"overlay"
]
});

4
grade/report/history/yui/build/moodle-gradereport_history-userselector/moodle-gradereport_history-userselector-min.js vendored
View File

File diff suppressed because one or more lines are too long

30
grade/report/history/yui/build/moodle-gradereport_history-userselector/moodle-gradereport_history-userselector.js vendored
View File

@ -1,5 +1,6 @@
YUI.add('moodle-gradereport_history-userselector', function (Y, NAME) {
var COMPONENT = 'gradereport_history';
var USP = {
NAME : 'User Selector Manager',
/** Properties **/
@ -68,7 +69,7 @@ Y.namespace('M.gradereport_history').UserSelector = Y.extend(USERSELECTOR, Y.Bas
.append(create('<div class="'+CSS.WRAP+'"></div>')
.append(create('<div class="'+CSS.HEADER+' header"></div>')
.append(create('<div class="'+CSS.CLOSE+'"></div>'))
.append(create('<h2>'+M.str.gradereport_history.selectuser+'</h2>')))
.append(create('<h2>'+M.util.get_string('selectuser', COMPONENT)+'</h2>')))
.append(create('<div class="'+CSS.CONTENT+'"></div>')
.append(create('<div class="'+CSS.AJAXCONTENT+'"></div>'))
.append(create('<div class="'+CSS.LIGHTBOX+' '+CSS.HIDDEN+'"></div>')
@ -76,12 +77,12 @@ Y.namespace('M.gradereport_history').UserSelector = Y.extend(USERSELECTOR, Y.Bas
.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.str.enrol.usersearch+'</label></div>')
.append(create('<div class="'+CSS.SEARCH+'"><label for="enrolusersearch" class="accesshide">'+Y.Escape.html(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.str.enrol.usersearch+'" />'))
.append(create('<input type="button" id="searchbtn" class="'+CSS.SEARCHBTN+'" value="'+Y.Escape.html(M.util.get_string('usersearch', 'enrol'))+'" />'))
)
.append(create('<div class="'+CSS.CLOSEBTN+'"></div>')
.append(create('<input type="button" value="'+M.str.gradereport_history.finishselectingusers+'" />'))
.append(create('<input type="button" value="'+Y.Escape.html(M.util.get_string('finishselectingusers', COMPONENT))+'" />'))
)
)
)
@ -214,7 +215,7 @@ Y.namespace('M.gradereport_history').UserSelector = Y.extend(USERSELECTOR, Y.Bas
new M.core.exception(e);
}
if (!result.success) {
this.setContent = M.str.enrol.errajaxsearch;
this.setContent = M.util.get_string('errajaxsearch', 'enrol');
}
if (!args.append) {
@ -236,9 +237,9 @@ Y.namespace('M.gradereport_history').UserSelector = Y.extend(USERSELECTOR, Y.Bas
}
if (selected === '') {
actionnode = create('<input type="button" class="'+CSS.SELECT+'" value="'+M.str.moodle.select+'" />');
actionnode = create('<input type="button" class="'+CSS.SELECT+'" value="'+Y.Escape.html(M.util.get_string('select', 'moodle'))+'" />');
} else {
actionnode = create('<input type="button" class="'+CSS.DESELECT+'" value="'+M.str.gradereport_history.deselect+'" />');
actionnode = create('<input type="button" class="'+CSS.DESELECT+'" value="'+Y.Escape.html(M.util.get_string('deselect', COMPONENT))+'" />');
}
node = create('<div class="'+CSS.USER+selected+' clearfix" rel="'+user.userid+'"></div>')
@ -255,12 +256,16 @@ Y.namespace('M.gradereport_history').UserSelector = Y.extend(USERSELECTOR, Y.Bas
}
this.set(USP.USERCOUNT, count);
if (!args.append) {
usersstr = (result.response.totalusers == '1')?M.str.enrol.ajaxoneuserfound:M.util.get_string('ajaxxusersfound','enrol', result.response.totalusers);
if (result.response.totalusers == '1') {
usersstr = M.util.get_string('ajaxoneuserfound', 'enrol');
} else {
usersstr = M.util.get_string('ajaxxusersfound','enrol', result.response.totalusers);
}
content = create('<div class="'+CSS.SEARCHRESULTS+'"></div>')
.append(create('<div class="'+CSS.TOTALUSERS+'">'+usersstr+'</div>'))
.append(users);
if (result.response.totalusers > (this.get(USP.PAGE)+1)*this.get(USP.PERPAGE)) {
fetchmore = create('<div class="'+CSS.MORERESULTS+'"><a href="#">'+M.str.enrol.ajaxnext25+'</a></div>');
fetchmore = create('<div class="'+CSS.MORERESULTS+'"><a href="#">'+M.util.get_string('ajaxnext25', 'enrol')+'</a></div>');
fetchmore.on('click', this.search, this, true);
content.append(fetchmore);
}
@ -292,7 +297,7 @@ Y.namespace('M.gradereport_history').UserSelector = Y.extend(USERSELECTOR, Y.Bas
user.removeClass(CSS.SELECTED);
user.one('.'+CSS.DESELECT).remove();
user.one('.'+CSS.OPTIONS).append(create('<input type="button" class="'+CSS.SELECT+'" value="'+M.str.moodle.select+'" />'));
user.one('.'+CSS.OPTIONS).append(create('<input type="button" class="'+CSS.SELECT+'" value="'+Y.Escape.html(M.util.get_string('select', 'moodle'))+'" />'));
},
selectUser : function(e, args) {
var user = e.currentTarget.ancestor('.'+CSS.USER);
@ -314,7 +319,7 @@ Y.namespace('M.gradereport_history').UserSelector = Y.extend(USERSELECTOR, Y.Bas
user.addClass(CSS.SELECTED);
user.one('.'+CSS.SELECT).remove();
user.one('.'+CSS.OPTIONS).append(create('<input type="button" class="'+CSS.DESELECT+'" value="'+M.str.gradereport_history.deselect+'" />'));
user.one('.'+CSS.OPTIONS).append(create('<input type="button" class="'+CSS.DESELECT+'" value="'+Y.Escape.html(M.util.get_string('deselect', COMPONENT))+'" />'));
},
setContent: function(content) {
this.get(USP.BASE).one('.'+CSS.CONTENT+' .'+CSS.AJAXCONTENT).setContent(content);
@ -413,11 +418,12 @@ Y.namespace('M.gradereport_history.UserSelector').init = function(cfg) {
}, '@VERSION@', {
"requires": [
"dd-plugin",
"escape",
"event-delegate",
"event-key",
"io-base",
"json-parse",
"moodle-core-notification",
"moodle-core-notification-dialogue",
"overlay"
]
});

27
grade/report/history/yui/src/userselector/js/userselector.js vendored
View File

@ -1,3 +1,4 @@
var COMPONENT = 'gradereport_history';
var USP = {
NAME : 'User Selector Manager',
/** Properties **/
@ -66,7 +67,7 @@ Y.namespace('M.gradereport_history').UserSelector = Y.extend(USERSELECTOR, Y.Bas
.append(create('<div class="'+CSS.WRAP+'"></div>')
.append(create('<div class="'+CSS.HEADER+' header"></div>')
.append(create('<div class="'+CSS.CLOSE+'"></div>'))
.append(create('<h2>'+M.str.gradereport_history.selectuser+'</h2>')))
.append(create('<h2>'+M.util.get_string('selectuser', COMPONENT)+'</h2>')))
.append(create('<div class="'+CSS.CONTENT+'"></div>')
.append(create('<div class="'+CSS.AJAXCONTENT+'"></div>'))
.append(create('<div class="'+CSS.LIGHTBOX+' '+CSS.HIDDEN+'"></div>')
@ -74,12 +75,12 @@ Y.namespace('M.gradereport_history').UserSelector = Y.extend(USERSELECTOR, Y.Bas
.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.str.enrol.usersearch+'</label></div>')
.append(create('<div class="'+CSS.SEARCH+'"><label for="enrolusersearch" class="accesshide">'+Y.Escape.html(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.str.enrol.usersearch+'" />'))
.append(create('<input type="button" id="searchbtn" class="'+CSS.SEARCHBTN+'" value="'+Y.Escape.html(M.util.get_string('usersearch', 'enrol'))+'" />'))
)
.append(create('<div class="'+CSS.CLOSEBTN+'"></div>')
.append(create('<input type="button" value="'+M.str.gradereport_history.finishselectingusers+'" />'))
.append(create('<input type="button" value="'+Y.Escape.html(M.util.get_string('finishselectingusers', COMPONENT))+'" />'))
)
)
)
@ -212,7 +213,7 @@ Y.namespace('M.gradereport_history').UserSelector = Y.extend(USERSELECTOR, Y.Bas
new M.core.exception(e);
}
if (!result.success) {
this.setContent = M.str.enrol.errajaxsearch;
this.setContent = M.util.get_string('errajaxsearch', 'enrol');
}
if (!args.append) {
@ -234,9 +235,9 @@ Y.namespace('M.gradereport_history').UserSelector = Y.extend(USERSELECTOR, Y.Bas
}
if (selected === '') {
actionnode = create('<input type="button" class="'+CSS.SELECT+'" value="'+M.str.moodle.select+'" />');
actionnode = create('<input type="button" class="'+CSS.SELECT+'" value="'+Y.Escape.html(M.util.get_string('select', 'moodle'))+'" />');
} else {
actionnode = create('<input type="button" class="'+CSS.DESELECT+'" value="'+M.str.gradereport_history.deselect+'" />');
actionnode = create('<input type="button" class="'+CSS.DESELECT+'" value="'+Y.Escape.html(M.util.get_string('deselect', COMPONENT))+'" />');
}
node = create('<div class="'+CSS.USER+selected+' clearfix" rel="'+user.userid+'"></div>')
@ -253,12 +254,16 @@ Y.namespace('M.gradereport_history').UserSelector = Y.extend(USERSELECTOR, Y.Bas
}
this.set(USP.USERCOUNT, count);
if (!args.append) {
usersstr = (result.response.totalusers == '1')?M.str.enrol.ajaxoneuserfound:M.util.get_string('ajaxxusersfound','enrol', result.response.totalusers);
if (result.response.totalusers == '1') {
usersstr = M.util.get_string('ajaxoneuserfound', 'enrol');
} else {
usersstr = M.util.get_string('ajaxxusersfound','enrol', result.response.totalusers);
}
content = create('<div class="'+CSS.SEARCHRESULTS+'"></div>')
.append(create('<div class="'+CSS.TOTALUSERS+'">'+usersstr+'</div>'))
.append(users);
if (result.response.totalusers > (this.get(USP.PAGE)+1)*this.get(USP.PERPAGE)) {
fetchmore = create('<div class="'+CSS.MORERESULTS+'"><a href="#">'+M.str.enrol.ajaxnext25+'</a></div>');
fetchmore = create('<div class="'+CSS.MORERESULTS+'"><a href="#">'+M.util.get_string('ajaxnext25', 'enrol')+'</a></div>');
fetchmore.on('click', this.search, this, true);
content.append(fetchmore);
}
@ -290,7 +295,7 @@ Y.namespace('M.gradereport_history').UserSelector = Y.extend(USERSELECTOR, Y.Bas
user.removeClass(CSS.SELECTED);
user.one('.'+CSS.DESELECT).remove();
user.one('.'+CSS.OPTIONS).append(create('<input type="button" class="'+CSS.SELECT+'" value="'+M.str.moodle.select+'" />'));
user.one('.'+CSS.OPTIONS).append(create('<input type="button" class="'+CSS.SELECT+'" value="'+Y.Escape.html(M.util.get_string('select', 'moodle'))+'" />'));
},
selectUser : function(e, args) {
var user = e.currentTarget.ancestor('.'+CSS.USER);
@ -312,7 +317,7 @@ Y.namespace('M.gradereport_history').UserSelector = Y.extend(USERSELECTOR, Y.Bas
user.addClass(CSS.SELECTED);
user.one('.'+CSS.SELECT).remove();
user.one('.'+CSS.OPTIONS).append(create('<input type="button" class="'+CSS.DESELECT+'" value="'+M.str.gradereport_history.deselect+'" />'));
user.one('.'+CSS.OPTIONS).append(create('<input type="button" class="'+CSS.DESELECT+'" value="'+Y.Escape.html(M.util.get_string('deselect', COMPONENT))+'" />'));
},
setContent: function(content) {
this.get(USP.BASE).one('.'+CSS.CONTENT+' .'+CSS.AJAXCONTENT).setContent(content);

3
grade/report/history/yui/src/userselector/meta/userselector.json
View File

@ -2,11 +2,12 @@
"moodle-gradereport_history-userselector": {
"requires": [
"dd-plugin",
"escape",
"event-delegate",
"event-key",
"io-base",
"json-parse",
"moodle-core-notification",
"moodle-core-notification-dialogue",
"overlay"
]
}