Skip to content
Browse files

Merge branch 'MDL-28235-23' of git://github.com/FMCorz/moodle into MO…

…ODLE_23_STABLE
  • Loading branch information...
2 parents 59d01f9 + 80f497e commit 3b6796e0f41f1ec02b269c15b7d4fb70d34a0fe7 Sam Hemelryk committed Oct 30, 2012
Showing with 10 additions and 7 deletions.
  1. +1 −0 lang/en/form.php
  2. +5 −7 lib/javascript-static.js
  3. +2 −0 lib/outputrenderers.php
  4. +2 −0 theme/base/style/core.css
View
1 lang/en/form.php
@@ -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
12 lib/javascript-static.js
@@ -1424,16 +1424,17 @@ 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 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',
@@ -1442,7 +1443,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");
@@ -1458,9 +1459,6 @@ M.util.help_icon = {
this.overlay.hide();
}
}, this);
-
- Y.on("key", this.close, closebtn , "down:13", this);
- closebtn.on('click', this.close, this);
},
close : function(e) {
View
2 lib/outputrenderers.php
@@ -1737,6 +1737,7 @@ protected function render_old_help_icon(old_help_icon $helpicon) {
$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'));
@@ -1802,6 +1803,7 @@ protected function render_help_icon(help_icon $helpicon) {
$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
2 theme/base/style/core.css
@@ -477,6 +477,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;}
.dir-rtl #helppopupbox .yui3-widget-hd {float:left;margin:3px 0 0 3px;}

0 comments on commit 3b6796e

Please sign in to comment.
Something went wrong with that request. Please try again.