Skip to content
Browse files

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

…a/moodle into MOODLE_22_STABLE
  • Loading branch information...
2 parents d122b47 + 47ad6d6 commit 414568e1446cbc58a41f46f65fc84a6af73b53ed @samhemelryk samhemelryk committed
Showing with 21 additions and 6 deletions.
  1. +1 −0 blocks/tags/lang/en/block_tags.php
  2. +14 −4 tag/coursetags_edit.php
  3. +1 −0 tag/locallib.php
  4. +5 −2 tag/manage.php
View
1 blocks/tags/lang/en/block_tags.php
@@ -82,6 +82,7 @@
$string['select'] = 'Select...';
$string['showcoursetags'] = 'Show course tags';
$string['showcoursetagsdef'] = 'Display the course tagging features in the tags block, allowing students to tag courses.';
+$string['suggestedtagthisunit'] = 'Suggested tag to this course:';
$string['tags'] = 'tags';
$string['tagthisunit'] = 'Tag this course:';
$string['tagunits'] = 'to tag your favourite courses';
View
18 tag/coursetags_edit.php
@@ -129,6 +129,7 @@
// Print the add and delete form
coursetag_get_jscript();
$edittagthisunit = get_string('edittagthisunit', $tagslang);
+ $suggestedtagthisunit = get_string('suggestedtagthisunit', $tagslang);
$arrowtitle = get_string('arrowtitle', $tagslang);
$sesskey = sesskey();
$leftarrow = $OUTPUT->pix_url('t/arrow_left');
@@ -141,12 +142,19 @@
<div class="coursetag_edit_centered">
<div class="coursetag_edit_row">
<div class="coursetag_edit_left">
- $edittagthisunit
+ <label for="coursetag_sug_tag">$suggestedtagthisunit</label>
</div>
<div class="coursetag_edit_right">
<div class="coursetag_form_input1">
- <input type="text" name="coursetag_sug_keyword" class="coursetag_form_input1a" disabled="disabled" />
+ <input type="text" name="coursetag_sug_keyword" id="coursetag_sug_keyword" class="coursetag_form_input1a" disabled="disabled" />
</div>
+ </div>
+ </div>
+ <div class="coursetag_edit_row">
+ <div class="coursetag_edit_left">
+ <label for="coursetag_new_tag">$edittagthisunit</label>
+ </div>
+ <div class="coursetag_edit_right">
<div class="coursetag_form_input2">
<input type="text" name="coursetag_new_tag" id="coursetag_new_tag" class="coursetag_form_input2a"
onfocus="ctags_getKeywords()" onkeyup="ctags_getKeywords()" maxlength="50" />
@@ -164,10 +172,12 @@
$outstr .= <<<EOT1
<div class="coursetag_edit_row">
<div class="coursetag_edit_left">
- $editdeletemytag
+ <label for="del_tag">
+ $editdeletemytag
+ </label>
</div>
<div class="coursetag_edit_right">
- <select name="del_tag">
+ <select id="del_tag" name="del_tag">
$selectoptions
</select>
</div>
View
1 tag/locallib.php
@@ -200,6 +200,7 @@ function tag_print_search_box($return=false) {
$output = $OUTPUT->box_start('','tag-search-box');
$output .= '<form action="'.$CFG->wwwroot.'/tag/search.php" style="display:inline">';
$output .= '<div>';
+ $output .= '<label class="accesshide" for="searchform_search">'.get_string('searchtags', 'tag').'</label>';
$output .= '<input id="searchform_search" name="query" type="text" size="40" />';
$output .= '<button id="searchform_button" type="submit">'. get_string('search', 'tag') .'</button><br />';
$output .= '</div>';
View
7 tag/manage.php
@@ -260,8 +260,10 @@
$flag = $tag->flag;
$timemodified = format_time(time() - $tag->timemodified);
$checkbox = '<input type="checkbox" name="tagschecked[]" value="'.$tag->id.'" />';
- $text = '<input type="text" name="newname['.$tag->id.']" />';
- $tagtype = html_writer::select($existing_tagtypes, 'tagtypes['.$tag->id.']', $tag->tagtype, false);
+ $text = html_writer::label(get_string('newname', 'tag'), 'newname_' . $tag->id, false, array('class' => 'accesshide'));
+ $text .= '<input type="text" id="newname_' . $tag->id. '" name="newname['.$tag->id.']" />';
+ $tagtype = html_writer::label(get_string('tagtype', 'tag'), 'menutagtypes'. $tag->id, false, array('class' => 'accesshide'));
+ $tagtype .= html_writer::select($existing_tagtypes, 'tagtypes['.$tag->id.']', $tag->tagtype, false, array('id' => 'menutagtypes'. $tag->id));
//if the tag if flagged, highlight it
if ($tag->flag > 0) {
@@ -283,6 +285,7 @@
echo '<input type="button" onclick="checknone()" value="'.get_string('deselectall').'" /> ';
echo '<input type="hidden" name="sesskey" value="'.sesskey().'" /> ';
echo '<br/><br/>';
+ echo html_writer::label(get_string('withselectedtags', 'tag'), 'menuformaction', false, array('class' => 'accesshide'));
echo '<select id="menuformaction" name="action">
<option value="" selected="selected">'. get_string('withselectedtags', 'tag') .'</option>
<option value="reset">'. get_string('resetflag', 'tag') .'</option>

0 comments on commit 414568e

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