Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'MDL-34560_accessibility_m22' of git://github.com/rwijay…

…a/moodle into MOODLE_22_STABLE
  • Loading branch information...
commit 24bcc1e5256472a2bb14b02281556238f1a8c5ed 2 parents 7733795 + 2b8d9b5
@nebgor nebgor authored
Showing with 6 additions and 3 deletions.
  1. +1 −0  lang/en/message.php
  2. +4 −3 message/lib.php
  3. +1 −0  message/search.html
View
1  lang/en/message.php
@@ -80,6 +80,7 @@
$string['message'] = 'Message';
$string['messagehistory'] = 'Message history';
$string['messagehistoryfull'] = 'All messages';
+$string['messagenavigation'] = 'Message navigation:';
$string['messages'] = 'Messages';
$string['messaging'] = 'Messaging';
$string['messagingblockednoncontact'] = '{$a} will not be able to reply as you have blocked non-contacts';
View
7 message/lib.php
@@ -509,9 +509,10 @@ function message_print_usergroup_selector($viewing, $courses, $coursecontexts, $
}
echo html_writer::start_tag('form', array('id' => 'usergroupform','method' => 'get','action' => ''));
- echo html_writer::start_tag('fieldset');
- echo html_writer::select($options, 'viewing', $viewing, false, array('id' => 'viewing','onchange' => 'this.form.submit()'));
- echo html_writer::end_tag('fieldset');
+ echo html_writer::start_tag('fieldset');
+ echo html_writer::label(get_string('messagenavigation', 'message'), 'viewing');
+ echo html_writer::select($options, 'viewing', $viewing, false, array('id' => 'viewing','onchange' => 'this.form.submit()'));
+ echo html_writer::end_tag('fieldset');
echo html_writer::end_tag('form');
}
View
1  message/search.html
@@ -4,6 +4,7 @@
<tr>
<td colspan="3" class="message_heading mdl-left">
<input type="hidden" name="sesskey" value="<?php p(sesskey()); ?>" />
+ <label for="combinedsearch" class="accesshide"><?php print_string('searchcombined', 'message'); ?></label>
<input type="text" name="combinedsearch" size="40" id="combinedsearch" value="<?php p($combinedsearchstring); ?>" />
<input type="submit" name="combinedsubmit" value="<?php print_string('searchcombined','message') ?>" />
<a href="index.php?usergroup=<?php echo MESSAGE_VIEW_SEARCH ?>&advanced=1" id="advancedcontactsearchlink"><?php print_string('advanced') ?></a>
Please sign in to comment.
Something went wrong with that request. Please try again.