Bug 1915975: Replace .sr-only with .visually-hidden (fb2a2296) · Commits · mahara / mahara

htdocs/admin/groups/groupcategories.php

+2 −2

Original line number	Diff line number	Diff line
		@@ -103,7 +103,7 @@ jQuery(function($) {
		'alt':{$getstring['editspecific']}.replace('%s', item.name)
		});
		edit.append($('<span>', {'class':'icon icon-pencil-alt', 'role':'presentation'}));
		edit.append($('<span class="sr-only">' + {$getstring['editspecific']}.replace('%s', item.name) + '</span>'));
		edit.append($('<span class="visually-hidden">' + {$getstring['editspecific']}.replace('%s', item.name) + '</span>'));

		edit.on('click', function (e) { e.preventDefault(); edititem(item); });

		@@ -116,7 +116,7 @@ jQuery(function($) {
		'alt':{$getstring['deletespecific']}.replace('%s', item.name)
		});
		del.append($('<span>', {'class':'icon icon-trash-alt text-danger', 'role':'presentation'}));
		del.append($('<span class="sr-only">' + {$getstring['deletespecific']}.replace('%s', item.name) + '</span>'));
		del.append($('<span class="visually-hidden">' + {$getstring['deletespecific']}.replace('%s', item.name) + '</span>'));

		del.on('click', function (e) { e.preventDefault(); delitem(item.id); });

htdocs/admin/site/menu.php

+7 −7

Original line number	Diff line number	Diff line
		@@ -87,10 +87,10 @@ jQuery(function($) {
		var type = eval(item.type);
		var linkedto = $('<a>', {'href':item.linkedto, 'text': item.linktext});
		var edit = $('<button>', {'type':'button','class':'button btn btn-secondary btn-sm','title':{$getstring['edit']}})
		.append($('<span>', {'class':'icon icon-pencil-alt', 'role':'presentation'}), $('<span>', {'class':'sr-only','text': {$getstring['edit']}}));
		.append($('<span>', {'class':'icon icon-pencil-alt', 'role':'presentation'}), $('<span>', {'class':'visually-hidden','text': {$getstring['edit']}}));
		edit.on('click', function () { edititem(item); });
		var del = $('<button>', {'type':'button','class':'button btn btn-secondary btn-sm','title': {$getstring['delete']}})
		.append($('<span>', {'class':'icon icon-trash-alt text-danger', 'role':'presentation'}), $('<span>', {'class':'sr-only','text': {$getstring['delete']}}));
		.append($('<span>', {'class':'icon icon-trash-alt text-danger', 'role':'presentation'}), $('<span>', {'class':'visually-hidden','text': {$getstring['delete']}}));
		del.on('click', function() { delitem(item.id); });
		var buttonGroup = $('<span>', {'class':'btn-group'}).append(edit, del);

		@@ -118,7 +118,7 @@ jQuery(function($) {
		// Either a save, a cancel button, or both.
		var savecancel = [];
		var save = $('<button>', {'type':'button','class':'button btn btn-secondary','title': {$getstring['update']}})
		.append($('<span>', {'class':'icon icon-plus', 'role':'presentation'}), $('<span>', {'class':'sr-only','text': {$getstring['update']}}));
		.append($('<span>', {'class':'icon icon-plus', 'role':'presentation'}), $('<span>', {'class':'visually-hidden','text': {$getstring['update']}}));
		save.on('click', function () { saveitem(item.id); });

		// The link field will be a text box or a select in the case of an admin file.
		@@ -138,7 +138,7 @@ jQuery(function($) {
		// The save button says 'add', and there's no cancel button.
		save.prop('value',{$getstring['add']});
		save.prop('title',{$getstring['add']});
		var savesr = $(save).find('span.sr-only').first();
		var savesr = $(save).find('span.visually-hidden').first();
		savesr.innerHTML = {$getstring['add']};
		savecancel = [save];
		}
		@@ -155,7 +155,7 @@ jQuery(function($) {

		// A text field for the name
		var name = $('<span>')
		.append($('<label>', {'for':'name'+item.id,'class':'sr-only', 'text': $namelabel}),
		.append($('<label>', {'for':'name'+item.id,'class':'visually-hidden', 'text': $namelabel}),
		$('<input>', {'type':'text','class':'text form-control input-sm','id':'name'+item.id,'value':item.name}));

		if (item.type == 'sitefile') {
		@@ -167,7 +167,7 @@ jQuery(function($) {
		else {
		// Select the currently selected file.
		linkedtoselect = $('<select>', {'id':'linkedto'+item.id});
		linkedto = $('<span>').append($('<label>', {'for':'linkedto'+item.id,'class':'sr-only', 'text': $linkedtolabel}), linkedtoselect);
		linkedto = $('<span>').append($('<label>', {'for':'linkedto'+item.id,'class':'visually-hidden', 'text': $linkedtolabel}), linkedtoselect);
		for (var i = 0; i < adminfiles.length; i++) {
		if (item.file == adminfiles[i].id) {
		$(linkedtoselect).append($('<option>', {'value':adminfiles[i].id, 'selected':true, 'text': adminfiles[i].name }));
		@@ -181,7 +181,7 @@ jQuery(function($) {
		}
		else { // type = externallist
		linkedto = $('<span>').append(
		$('<label>', {'for':'linkedto'+item.id,'class':'sr-only', 'text': $linkedtolabel}),
		$('<label>', {'for':'linkedto'+item.id,'class':'visually-hidden', 'text': $linkedtolabel}),
		$('<input>', {'type':'text','class':'text form-control input-sm','id':'linkedto'+item.id,'value':item.linkedto})
		);
		elink.prop('checked',true);

htdocs/artefact/annotation/lib.php

+1 −1

Original line number	Diff line number	Diff line
		@@ -1422,7 +1422,7 @@ class ArtefactTypeAnnotationfeedback extends ArtefactType {
		'type' => 'button',
		'usebuttontag' => true,
		'class' => 'btn-secondary btn-sm',
		'value' => '<span class="icon icon-trash-alt text-danger" role="presentation" aria-hidden="true"></span><span class="sr-only">' . get_string('delete') . '</span>',
		'value' => '<span class="icon icon-trash-alt text-danger" role="presentation" aria-hidden="true"></span><span class="visually-hidden">' . get_string('delete') . '</span>',
		'elementtitle' => get_string('delete'),
		'confirm' => get_string('reallydeletethisannotationfeedback', 'artefact.annotation'),
		'name' => 'delete_annotation_feedback_submit',

htdocs/artefact/blog/blocktype/taggedposts/lib.php

+1 −1

Original line number	Diff line number	Diff line
		@@ -410,7 +410,7 @@ function (item, container) {
		if (item.id[0] == "-") {
		container.addClass("tagexcluded");
		if (!item.text.match(/sr\-only/)) {
		return '<span class="sr-only">{$excludetag}</span>' + jQuery('<div>').text(item.text).html();
		return '<span class="visually-hidden">{$excludetag}</span>' + jQuery('<div>').text(item.text).html();
		}
		}
		return item.text;

htdocs/artefact/blog/lib.php

+4 −4

Original line number	Diff line number	Diff line
		@@ -594,7 +594,7 @@ class ArtefactTypeBlog extends ArtefactType {
		'alt' => get_string('deletespecific', 'mahara', $title),
		'elementtitle' => get_string('delete'),
		'confirm' => $confirm,
		'value' => '<span class="icon icon-trash-alt text-danger" role="presentation" aria-hidden="true"></span><span class="sr-only">' . get_string('deletespecific', 'mahara', $title) . '</span>',
		'value' => '<span class="icon icon-trash-alt text-danger" role="presentation" aria-hidden="true"></span><span class="visually-hidden">' . get_string('deletespecific', 'mahara', $title) . '</span>',
		),
		'delete' => array(
		'type' => 'hidden',
		@@ -1205,10 +1205,10 @@ class ArtefactTypeBlogPost extends ArtefactType {
		}
		$title = hsc($title);
		if ($published) {
		$strchangepoststatus = '<span class="icon icon-times left text-danger" role="presentation" aria-hidden="true"></span><span class="sr-only">' . get_string('unpublishspecific', 'artefact.blog', $title) . '</span> ' . get_string('unpublish', 'artefact.blog');
		$strchangepoststatus = '<span class="icon icon-times left text-danger" role="presentation" aria-hidden="true"></span><span class="visually-hidden">' . get_string('unpublishspecific', 'artefact.blog', $title) . '</span> ' . get_string('unpublish', 'artefact.blog');
		}
		else {
		$strchangepoststatus = '<span class="icon icon-check left text-success" role="presentation" aria-hidden="true"></span><span class="sr-only"> ' . get_string('publishspecific', 'artefact.blog', $title) . '</span> ' . get_string('publish', 'artefact.blog');
		$strchangepoststatus = '<span class="icon icon-check left text-success" role="presentation" aria-hidden="true"></span><span class="visually-hidden"> ' . get_string('publishspecific', 'artefact.blog', $title) . '</span> ' . get_string('publish', 'artefact.blog');
		}
		return pieform(array(
		'name' => 'changepoststatus_' . $id,
		@@ -1256,7 +1256,7 @@ class ArtefactTypeBlogPost extends ArtefactType {
		'class' => 'btn-secondary btn-sm last',
		'elementtitle' => get_string('delete'),
		'confirm' => get_string('deleteblogpost?', 'artefact.blog'),
		'value' => '<span class="icon icon-trash-alt text-danger" role="presentation" aria-hidden="true"></span><span class="sr-only">' . get_string('deletespecific', 'mahara', $title) . '</span>',
		'value' => '<span class="icon icon-trash-alt text-danger" role="presentation" aria-hidden="true"></span><span class="visually-hidden">' . get_string('deletespecific', 'mahara', $title) . '</span>',
		),
		),
		));