Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

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

…a/moodle into MOODLE_23_STABLE
  • Loading branch information...
commit 824dfb24bdcb24bdf951266a0de42d193af8d361 2 parents 00cb41c + 1445fd1
Dan Poltawski danpoltawski authored
1  lang/en/notes.php
@@ -60,4 +60,5 @@
60 60 * Site - The note will be visible to teachers in all courses';
61 61 $string['site'] = 'site';
62 62 $string['sitenotes'] = 'Site notes';
  63 +$string['selectnotestate'] = "Select note state";
63 64 $string['unknown'] = 'unknown';
5 user/addnote.php
@@ -79,7 +79,6 @@
79 79 $PAGE->set_heading($course->fullname);
80 80
81 81 echo $OUTPUT->header();
82   -
83 82 // this will contain all available the based On select options, but we'll disable some on them on a per user basis
84 83
85 84 echo $OUTPUT->heading($straddnote);
@@ -104,12 +103,12 @@
104 103 }
105 104 }
106 105 }
107   -
108 106 foreach ($users as $k => $v) {
109 107 if(!$user = $DB->get_record('user', array('id'=>$v))) {
110 108 continue;
111 109 }
112   - $checkbox = html_writer::select($state_names, 'states[' . $k . ']', empty($states[$k]) ? NOTES_STATE_PUBLIC : $states[$k], false);
  110 + $checkbox = html_writer::label(get_string('selectnotestate', 'note'), 'menustates', false, array('class' => 'accesshide'));
  111 + $checkbox .= html_writer::select($state_names, 'states[' . $k . ']', empty($states[$k]) ? NOTES_STATE_PUBLIC : $states[$k], false, array('id' => 'menustates'));
113 112 $table->data[] = array(
114 113 '<input type="hidden" name="userid['.$k.']" value="'.$v.'" />'. fullname($user, true),
115 114 '<textarea name="contents['. $k . ']" rows="2" cols="40">' . strip_tags(@$contents[$k]) . '</textarea>',
2  user/groupaddnote.php
@@ -117,7 +117,7 @@
117 117 echo '<br /><textarea name="content" rows="5" cols="50">' . strip_tags(@$content) . '</textarea></p>';
118 118
119 119 echo '<p>';
120   -echo get_string('publishstate', 'notes');
  120 +echo html_writer::label(get_string('publishstate', 'notes'), 'menustate');
121 121 echo $OUTPUT->help_icon('publishstate', 'notes');
122 122 echo html_writer::select($state_names, 'state', empty($state) ? NOTES_STATE_PUBLIC : $state, false);
123 123 echo '</p>';
3  user/index.php
@@ -813,7 +813,8 @@
813 813
814 814 if (has_capability('moodle/site:viewparticipants', $context) && $totalcount > ($perpage*3)) {
815 815 echo '<form action="index.php" class="searchform"><div><input type="hidden" name="id" value="'.$course->id.'" />'.get_string('search').':&nbsp;'."\n";
816   - echo '<input type="text" name="search" value="'.s($search).'" />&nbsp;<input type="submit" value="'.get_string('search').'" /></div></form>'."\n";
  816 + echo '<label class="accesshide" for="search">' . get_string('search', 'search') . '</label>';
  817 + echo '<input type="text" id="search" name="search" value="'.s($search).'" />&nbsp;<input type="submit" value="'.get_string('search').'" /></div></form>'."\n";
817 818 }
818 819
819 820 $perpageurl = clone($baseurl);
2  user/message.html
@@ -14,7 +14,7 @@
14 14 </tr>
15 15
16 16 <tr valign="top">
17   - <td align="right"><b><?php print_string("formattexttype"); ?>:</b></td>
  17 + <td align="right"><label for="menuformat"><b><?php print_string("formattexttype"); ?>:</b></label></td>
18 18 <td>
19 19 <?php
20 20 if ($usehtmleditor) { /// Trying this out for a while

0 comments on commit 824dfb2

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