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-34573_accessibility_m23' of git://github.com/rwijay…

…a/moodle into MOODLE_23_STABLE
  • Loading branch information...
commit 678e90a08004365902ae2f87ca5e1bc949da6ef3 2 parents 1172c2b + 14d15f1
Sam Hemelryk samhemelryk authored
1  blocks/tags/lang/en/block_tags.php
@@ -82,6 +82,7 @@
82 82 $string['select'] = 'Select...';
83 83 $string['showcoursetags'] = 'Show course tags';
84 84 $string['showcoursetagsdef'] = 'Display the course tagging features in the tags block, allowing students to tag courses.';
  85 +$string['suggestedtagthisunit'] = 'Suggested tag to this course:';
85 86 $string['tags'] = 'tags';
86 87 $string['tagthisunit'] = 'Tag this course:';
87 88 $string['tagunits'] = 'to tag your favourite courses';
18 tag/coursetags_edit.php
@@ -147,6 +147,7 @@
147 147 // Print the add and delete form
148 148 coursetag_get_jscript();
149 149 $edittagthisunit = get_string('edittagthisunit', $tagslang);
  150 + $suggestedtagthisunit = get_string('suggestedtagthisunit', $tagslang);
150 151 $arrowtitle = get_string('arrowtitle', $tagslang);
151 152 $sesskey = sesskey();
152 153 $leftarrow = $OUTPUT->pix_url('t/arrow_left');
@@ -159,12 +160,19 @@
159 160 <div class="coursetag_edit_centered">
160 161 <div class="coursetag_edit_row">
161 162 <div class="coursetag_edit_left">
162   - $edittagthisunit
  163 + <label for="coursetag_sug_tag">$suggestedtagthisunit</label>
163 164 </div>
164 165 <div class="coursetag_edit_right">
165 166 <div class="coursetag_form_input1">
166   - <input type="text" name="coursetag_sug_keyword" class="coursetag_form_input1a" disabled="disabled" />
  167 + <input type="text" name="coursetag_sug_keyword" id="coursetag_sug_keyword" class="coursetag_form_input1a" disabled="disabled" />
167 168 </div>
  169 + </div>
  170 + </div>
  171 + <div class="coursetag_edit_row">
  172 + <div class="coursetag_edit_left">
  173 + <label for="coursetag_new_tag">$edittagthisunit</label>
  174 + </div>
  175 + <div class="coursetag_edit_right">
168 176 <div class="coursetag_form_input2">
169 177 <input type="text" name="coursetag_new_tag" id="coursetag_new_tag" class="coursetag_form_input2a"
170 178 onfocus="ctags_getKeywords()" onkeyup="ctags_getKeywords()" maxlength="50" />
@@ -182,10 +190,12 @@
182 190 $outstr .= <<<EOT1
183 191 <div class="coursetag_edit_row">
184 192 <div class="coursetag_edit_left">
185   - $editdeletemytag
  193 + <label for="del_tag">
  194 + $editdeletemytag
  195 + </label>
186 196 </div>
187 197 <div class="coursetag_edit_right">
188   - <select name="del_tag">
  198 + <select id="del_tag" name="del_tag">
189 199 $selectoptions
190 200 </select>
191 201 </div>
1  tag/locallib.php
@@ -233,6 +233,7 @@ function tag_print_search_box($return=false) {
233 233 $output = $OUTPUT->box_start('','tag-search-box');
234 234 $output .= '<form action="'.$CFG->wwwroot.'/tag/search.php" style="display:inline">';
235 235 $output .= '<div>';
  236 + $output .= '<label class="accesshide" for="searchform_search">'.get_string('searchtags', 'tag').'</label>';
236 237 $output .= '<input id="searchform_search" name="query" type="text" size="40" />';
237 238 $output .= '<button id="searchform_button" type="submit">'. get_string('search', 'tag') .'</button><br />';
238 239 $output .= '</div>';
7 tag/manage.php
@@ -260,8 +260,10 @@
260 260 $flag = $tag->flag;
261 261 $timemodified = format_time(time() - $tag->timemodified);
262 262 $checkbox = '<input type="checkbox" name="tagschecked[]" value="'.$tag->id.'" />';
263   - $text = '<input type="text" name="newname['.$tag->id.']" />';
264   - $tagtype = html_writer::select($existing_tagtypes, 'tagtypes['.$tag->id.']', $tag->tagtype, false);
  263 + $text = html_writer::label(get_string('newname', 'tag'), 'newname_' . $tag->id, false, array('class' => 'accesshide'));
  264 + $text .= '<input type="text" id="newname_' . $tag->id. '" name="newname['.$tag->id.']" />';
  265 + $tagtype = html_writer::label(get_string('tagtype', 'tag'), 'menutagtypes'. $tag->id, false, array('class' => 'accesshide'));
  266 + $tagtype .= html_writer::select($existing_tagtypes, 'tagtypes['.$tag->id.']', $tag->tagtype, false, array('id' => 'menutagtypes'. $tag->id));
265 267
266 268 //if the tag if flagged, highlight it
267 269 if ($tag->flag > 0) {
@@ -283,6 +285,7 @@
283 285 echo '<input type="button" onclick="checknone()" value="'.get_string('deselectall').'" /> ';
284 286 echo '<input type="hidden" name="sesskey" value="'.sesskey().'" /> ';
285 287 echo '<br/><br/>';
  288 + echo html_writer::label(get_string('withselectedtags', 'tag'), 'menuformaction', false, array('class' => 'accesshide'));
286 289 echo '<select id="menuformaction" name="action">
287 290 <option value="" selected="selected">'. get_string('withselectedtags', 'tag') .'</option>
288 291 <option value="reset">'. get_string('resetflag', 'tag') .'</option>

0 comments on commit 678e90a

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