MDL-28235 form: Help button popup close accessibility improved

AMOS BEGIN
 CPY [close,editor],[close,form]
AMOS END
This commit is contained in:
Frederic Massart 2012-10-02 14:28:55 +08:00
parent 5d6285c220
commit edb3b7b473
4 changed files with 11 additions and 2 deletions

View File

@ -25,6 +25,7 @@
$string['addfields'] = 'Add {$a} fields to form';
$string['advancedelement'] = 'Advanced element';
$string['close'] = 'Close';
$string['day'] = 'Day';
$string['display'] = 'Display';
$string['err_alphanumeric'] = 'You must enter only letters or numbers here.';

View File

@ -1407,16 +1407,19 @@ M.util.help_icon = {
event.preventDefault();
if (M.util.help_icon.instance === null) {
var Y = M.util.help_icon.Y;
Y.use('overlay', 'io-base', 'event-mouseenter', 'node', 'event-key', function(Y) {
Y.use('overlay', 'io-base', 'event-mouseenter', 'node', 'event-key', 'escape', function(Y) {
var help_content_overlay = {
helplink : null,
overlay : null,
init : function() {
var closebtn = Y.Node.create('<a id="closehelpbox" href="#"><img src="'+M.util.image_url('t/delete', 'moodle')+'" /></a>');
var strclose = Y.Escape.html(M.str.form.close);
var closebtn = Y.Node.create('<a id="closehelpbox" href="#"><img src="'+M.util.image_url('t/delete', 'moodle')+'" alt="'+strclose+'" /></a>');
var footerbtn = Y.Node.create('<button class="closebtn">'+strclose+'</button>');
// Create an overlay from markup
this.overlay = new Y.Overlay({
headerContent: closebtn,
footerContent: footerbtn,
bodyContent: '',
id: 'helppopupbox',
width:'400px',
@ -1426,6 +1429,7 @@ M.util.help_icon = {
this.overlay.render(Y.one(document.body));
closebtn.on('click', this.overlay.hide, this.overlay);
footerbtn.on('click', this.overlay.hide, this.overlay);
var boundingBox = this.overlay.get("boundingBox");

View File

@ -1752,6 +1752,7 @@ class core_renderer extends renderer_base {
$output = html_writer::tag('a', $output, $attributes);
$this->page->requires->js_init_call('M.util.help_icon.add', array(array('id'=>$id, 'url'=>$url->out(false))));
$this->page->requires->string_for_js('close', 'form');
// and finally span
return html_writer::tag('span', $output, array('class' => 'helplink'));
@ -1817,6 +1818,7 @@ class core_renderer extends renderer_base {
$output = html_writer::tag('a', $output, $attributes);
$this->page->requires->js_init_call('M.util.help_icon.add', array(array('id'=>$id, 'url'=>$url->out(false))));
$this->page->requires->string_for_js('close', 'form');
// and finally span
return html_writer::tag('span', $output, array('class' => 'helplink'));

View File

@ -484,6 +484,8 @@ body.tag .managelink {padding: 5px;}
#helppopupbox {background-color: #eee; border: 1px solid #848484;z-index: 10000 !important;}
#helppopupbox .yui3-widget-hd {float:right;margin:3px 3px 0 0;}
#helppopupbox .yui3-widget-bd {margin:0 1em 1em 1em;border-top:1px solid #eee;}
#helppopupbox .yui3-widget-ft {text-align: center;}
#helppopupbox .yui3-widget-ft .closebtn {margin:0 1em 1em 1em;}
#helppopupbox .helpheading {font-size: 1em;}
#helppopupbox .spinner {margin:1em;}