Browse files

Merge branch 'MDL-35582_message_labels' of git://github.com/andyjdavi…

…s/moodle
  • Loading branch information...
2 parents e0567bc + 2ca1f89 commit 34bbe80617d9b16582f2a53cde80a93bd966081a @nebgor nebgor committed Mar 12, 2013
Showing with 6 additions and 3 deletions.
  1. +6 −3 message/renderer.php
View
9 message/renderer.php
@@ -351,12 +351,15 @@ public function manage_messagingoptions($processors, $providers, $preferences, $
$output .= html_writer::start_tag('fieldset', array('id' => 'messageprocessor_general', 'class' => 'clearfix'));
$output .= html_writer::nonempty_tag('legend', get_string('generalsettings','admin'), array('class' => 'ftoggler'));
+
$output .= html_writer::start_tag('div');
- $output .= get_string('blocknoncontacts', 'message').': ';
- $output .= html_writer::checkbox('blocknoncontacts', 1, $preferences->blocknoncontacts, '');
+ $output .= html_writer::checkbox('blocknoncontacts', 1, $preferences->blocknoncontacts, get_string('blocknoncontacts', 'message'));
$output .= html_writer::end_tag('div');
- $disableallcheckbox = $this->output->help_icon('disableall', 'message') . get_string('disableall', 'message') . html_writer::checkbox('disableall', 1, $notificationsdisabled, '', array('class'=>'disableallcheckbox'));
+
+ $disableallcheckbox = html_writer::checkbox('disableall', 1, $notificationsdisabled, get_string('disableall', 'message'), array('class'=>'disableallcheckbox'));
+ $disableallcheckbox .= $this->output->help_icon('disableall', 'message');
$output .= html_writer::nonempty_tag('div', $disableallcheckbox, array('class'=>'disableall'));
+
$output .= html_writer::end_tag('fieldset');
$output .= html_writer::start_tag('div', array('class' => 'mdl-align'));
$output .= html_writer::empty_tag('input', array('type' => 'submit', 'value' => get_string('updatemyprofile'), 'class' => 'form-submit'));

0 comments on commit 34bbe80

Please sign in to comment.