Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'MDL-34565_accessibility_m23' of git://github.com/rwijay…

…a/moodle into MOODLE_23_STABLE
  • Loading branch information...
commit 37fbfb0dda6f9b3dee889c0e66ba7a7baaae2905 2 parents b92d962 + 33222ed
@nebgor nebgor authored
Showing with 14 additions and 2 deletions.
  1. +2 −0  mod/forum/lib.php
  2. +12 −2 mod/forum/search.php
View
2  mod/forum/lib.php
@@ -3834,9 +3834,11 @@ function forum_print_mode_form($id, $mode, $forumtype='') {
global $OUTPUT;
if ($forumtype == 'single') {
$select = new single_select(new moodle_url("/mod/forum/view.php", array('f'=>$id)), 'mode', forum_get_layout_modes(), $mode, null, "mode");
+ $select->set_label(get_string('displaymode', 'forum'), array('class' => 'accesshide'));
$select->class = "forummode";
} else {
$select = new single_select(new moodle_url("/mod/forum/discuss.php", array('d'=>$id)), 'mode', forum_get_layout_modes(), $mode, null, "mode");
+ $select->set_label(get_string('displaymode', 'forum'), array('class' => 'accesshide'));
}
echo $OUTPUT->render($select);
}
View
14 mod/forum/search.php
@@ -343,10 +343,15 @@ function forum_print_big_search_form($course) {
}
echo '<input name="timefromrestrict" type="checkbox" value="1" alt="'.get_string('searchdatefrom', 'forum').'" onclick="return lockoptions(\'searchform\', \'timefromrestrict\', timefromitems)" '. $datefromchecked . ' /> ';
- $selectors = html_writer::select_time('days', 'fromday', $datefrom)
+ $selectors = html_writer::label(get_string('days'), 'menufromday', false, array('class' => 'accesshide'))
+ . html_writer::select_time('days', 'fromday', $datefrom)
+ . html_writer::label(get_string('months'), 'menufrommonth', false, array('class' => 'accesshide'))
. html_writer::select_time('months', 'frommonth', $datefrom)
+ . html_writer::label(get_string('years'), 'menufromyear', false, array('class' => 'accesshide'))
. html_writer::select_time('years', 'fromyear', $datefrom)
+ . html_writer::label(get_string('hours'), 'menufromhour', false, array('class' => 'accesshide'))
. html_writer::select_time('hours', 'fromhour', $datefrom)
+ . html_writer::label(get_string('minutes'), 'menufromminute', false, array('class' => 'accesshide'))
. html_writer::select_time('minutes', 'fromminute', $datefrom);
echo $selectors;
echo '<input type="hidden" name="hfromday" value="0" />';
@@ -369,10 +374,15 @@ function forum_print_big_search_form($course) {
}
echo '<input name="timetorestrict" type="checkbox" value="1" alt="'.get_string('searchdateto', 'forum').'" onclick="return lockoptions(\'searchform\', \'timetorestrict\', timetoitems)" ' .$datetochecked. ' /> ';
- $selectors = html_writer::select_time('days', 'today', $dateto)
+ $selectors = html_writer::label(get_string('days'), 'menutoday', false, array('class' => 'accesshide'))
+ . html_writer::select_time('days', 'today', $dateto)
+ . html_writer::label(get_string('months'), 'menutomonth', false, array('class' => 'accesshide'))
. html_writer::select_time('months', 'tomonth', $dateto)
+ . html_writer::label(get_string('years'), 'menutoyear', false, array('class' => 'accesshide'))
. html_writer::select_time('years', 'toyear', $dateto)
+ . html_writer::label(get_string('hours'), 'menutohour', false, array('class' => 'accesshide'))
. html_writer::select_time('hours', 'tohour', $dateto)
+ . html_writer::label(get_string('minutes'), 'menutominute', false, array('class' => 'accesshide'))
. html_writer::select_time('minutes', 'tominute', $dateto);
echo $selectors;
Please sign in to comment.
Something went wrong with that request. Please try again.