Add descriptive alt text to Edit and Delete buttons (Bug #1276397)

Edit and Delete buttons should now have consistent, descriptive alt text -
where possible this includes the title of the object to be edited or deleted

Change-Id: Ic10775c961a27c8e1ce1fcc011be1f6c46ee9c1f
Signed-off-by: Jono Mingard <jonom@catalyst.net.nz>

htdocs/admin/extensions/iframesites.php

@@ -103,6 +103,7 @@ foreach ($iframesources as $url => $name) {
                 'submit' => array(
                     'type'         => 'image',
                     'src'          => $THEME->get_url('images/btn_deleteremove.png'),
+                    'alt'          => get_string('deletespecific', 'mahara', $name),
                     'elementtitle' => get_string('delete'),
                     'confirm'      => get_string('confirmdeletemenuitem', 'admin'),
                 ),

htdocs/admin/groups/groupcategories.php

@@ -39,14 +39,18 @@ function groupcategories_submit(Pieform $form, $values) {
     redirect(get_config('wwwroot') . 'admin/groups/groupcategories.php');
 }
 
-$strings = array('edit','delete','update','cancel','add','name','unknownerror');
+$strings = array('edit', 'delete', 'update', 'cancel', 'add', 'name', 'unknownerror');
 $adminstrings = array('confirmdeletecategory', 'deletefailed');
+$argumentstrings = array('editspecific', 'deletespecific');
 foreach ($strings as $string) {
     $getstring[$string] = json_encode(get_string($string));
 }
 foreach ($adminstrings as $string) {
     $getstring[$string] = json_encode(get_string($string, 'admin'));
 }
+foreach ($argumentstrings as $string) {
+    $getstring[$string] = json_encode(get_string($string, 'mahara', '%s'));
+}
 
 $thead = array(json_encode(get_string('name', 'admin')), '""');
 $ijs = "var thead = TR(null,map(partial(TH,null),[" . implode($thead,",") . "]));\n";
@@ -71,9 +75,11 @@ function displaymenuitems(itemlist) {
 // Creates one table row
 function formatrow (item) {
     // item has id, type, name, link, linkedto
-    var edit = INPUT({'type':'image','src':config.theme['images/btn_edit.png'],'title':{$getstring['edit']}});
+    var edit = INPUT({'type':'image','src':config.theme['images/btn_edit.png'],
+        'title':{$getstring['edit']},'alt':{$getstring['editspecific']}.replace('%s', item.name)});
     connect(edit, 'onclick', function (e) { e.stop(); edititem(item); });
-    var del = INPUT({'type':'image','src':config.theme['images/btn_deleteremove.png'],'title':{$getstring['delete']}});
+    var del = INPUT({'type':'image','src':config.theme['images/btn_deleteremove.png'],
+        'title':{$getstring['delete']},'alt':{$getstring['deletespecific']}.replace('%s', item.name)});
     connect(del, 'onclick', function (e) { e.stop(); delitem(item.id); });
     var cells = map(
         partial(TD,null),

htdocs/artefact/blog/lang/en.utf8/artefact.blog.php

@@ -47,7 +47,6 @@ $string['createasdraftdesc'] = 'This will create the journal entry, but it will
 $string['createblog'] = 'Create journal';
 $string['dataimportedfrom'] = 'Data imported from %s';
 $string['defaultblogtitle'] = '%s\'s Journal';
-$string['delete'] = 'Delete';
 $string['deleteblog?'] = 'Are you sure you want to delete this journal?';
 $string['deletebloghaspost?'] = array(
     0 => 'This journal contains 1 entry. Are you sure you want to delete this journal?',

htdocs/artefact/blog/lib.php

@@ -284,7 +284,7 @@ class ArtefactTypeBlog extends ArtefactType {
 
         foreach ($result as &$r) {
             if (!$r->locked) {
-                $r->deleteform = ArtefactTypeBlog::delete_form($r->id);
+                $r->deleteform = ArtefactTypeBlog::delete_form($r->id, $r->title);
             }
         }
 
@@ -395,7 +395,7 @@ class ArtefactTypeBlog extends ArtefactType {
             AND bp.published = 1", array($this->get('id')));
     }
 
-    public static function delete_form($id) {
+    public static function delete_form($id, $title = '') {
         global $THEME;
 
         $confirm = get_string('deleteblog?', 'artefact.blog');
@@ -434,9 +434,10 @@ class ArtefactTypeBlog extends ArtefactType {
                 'submit' => array(
                     'type' => 'image',
                     'src' => $THEME->get_url('images/btn_deleteremove.png'),
-                    'elementtitle' => get_string('delete', 'artefact.blog'),
+                    'alt' => get_string('deletespecific', 'mahara', $title),
+                    'elementtitle' => get_string('delete'),
                     'confirm' => $confirm,
-                    'value' => get_string('delete', 'artefact.blog')
+                    'value' => get_string('delete'),
                 ),
             ),
         ));
@@ -770,7 +771,7 @@ class ArtefactTypeBlogPost extends ArtefactType {
             if (is_null($viewoptions)) {
                 // My Blogs area: create forms for changing post status & deleting posts.
                 $post->changepoststatus = ArtefactTypeBlogpost::changepoststatus_form($post->id, $post->published);
-                $post->delete = ArtefactTypeBlogpost::delete_form($post->id);
+                $post->delete = ArtefactTypeBlogpost::delete_form($post->id, $post->title);
             }
             else {
                 $by = $post->author ? display_default_name($post->author) : $post->authorname;
@@ -907,7 +908,7 @@ class ArtefactTypeBlogPost extends ArtefactType {
         ));
     }
 
-    public static function delete_form($id) {
+    public static function delete_form($id, $title) {
         global $THEME;
         return pieform(array(
             'name' => 'delete_' . $id,
@@ -924,9 +925,10 @@ class ArtefactTypeBlogPost extends ArtefactType {
                 'submit' => array(
                     'type' => 'image',
                     'src' => $THEME->get_url('images/btn_deleteremove.png'),
-                    'elementtitle' => get_string('delete', 'artefact.blog'),
+                    'alt' => get_string('deletespecific', 'mahara', $title),
+                    'elementtitle' => get_string('delete'),
                     'confirm' => get_string('deleteblogpost?', 'artefact.blog'),
-                    'value' => get_string('delete', 'artefact.blog'),
+                    'value' => get_string('delete'),
                 ),
             ),
         ));

htdocs/artefact/blog/theme/raw/bloglist.tpl

@@ -8,7 +8,7 @@
                     {if $blog->locked}
                         <span class="s dull">{str tag=submittedforassessment section=view}</span>
                     {else}
-                        <a href="{$WWWROOT}artefact/blog/settings/index.php?id={$blog->id}" title="{str tag=settings}"><img src="{theme_url filename='images/btn_configure.png'}" alt="{str tag=settings}"></a>
+                        <a href="{$WWWROOT}artefact/blog/settings/index.php?id={$blog->id}" title="{str tag=settings}"><img src="{theme_url filename='images/btn_configure.png'}" alt="{str(tag=settingsspecific arg1=$blog->title)|escape:html|safe}"></a>
                             {$blog->deleteform|safe}
                     {/if}
                 </span>

htdocs/artefact/blog/theme/raw/posts.tpl

@@ -19,7 +19,7 @@
                 {else}
                     <form name="edit_{$post->id}" action="{$WWWROOT}artefact/blog/post.php">
                       <input type="hidden" name="id" value="{$post->id}">
-                      <input type="image" src="{theme_url filename="images/btn_edit.png"}" title="{str tag=edit}">
+                      <input type="image" src="{theme_url filename="images/btn_edit.png"}" alt="{str(tag=editspecific arg1=$post->title)|escape:html|safe}" title="{str tag=edit}">
                     </form>
                     {$post->delete|safe}
                 {/if}

htdocs/artefact/file/lang/en.utf8/artefact.file.php

@@ -26,6 +26,8 @@ $string['cannotextractfileinfoldersubmitted'] = 'You cannot extract a file in a
 $string['changessaved'] = 'Changes saved';
 $string['clickanddragtomovefile'] = 'Move %s by clicking and dragging or by pressing Space';
 $string['moveto'] = 'Move to %s';
+$string['editfolderspecific'] = 'Edit folder "%s"';
+$string['deletefolderspecific'] = 'Delete folder "%s"';
 $string['foldercontents'] = 'Folder contents';
 $string['copyrightnotice'] = 'Copyright notice';
 $string['create'] = 'Create';
@@ -267,6 +269,7 @@ $string['wrongfiletypeforblock'] = 'The file you uploaded was not the correct ty
 $string['Contents'] = 'Contents';
 $string['Continue'] = 'Continue';
 $string['Decompress'] = 'Decompress';
+$string['decompressspecific'] = 'Decompress "%s"';
 $string['nfolders'] = array(
     '%s folder',
     '%s folders',

htdocs/artefact/file/theme/raw/form/filelist.tpl

@@ -73,9 +73,20 @@
       {if $file->locked}
         <span class="dull">{str tag=Submitted section=view}</span>
       {elseif !isset($file->can_edit) || $file->can_edit != 0}
-        {if $file->artefacttype == 'archive'}<a href="{$WWWROOT}artefact/file/extract.php?file={$file->id}"><img src="{theme_url filename="images/btn_extract.png"}" alt="{str tag=Unzip section=artefact.file}"/></a>{/if}
-        <input type="image" src="{theme_url filename="images/btn_edit.png"}" name="{$prefix}_edit[{$file->id}]" value="" title="{str tag=edit}" alt="{str tag=edit}" />
-        <input type="image" src="{theme_url filename="images/btn_deleteremove.png"}" name="{$prefix}_delete[{$file->id}]" value="" title="{str tag=delete}" alt="{str tag=delete}" />
+        {if $file->artefacttype == 'archive'}
+        <a href="{$WWWROOT}artefact/file/extract.php?file={$file->id}">
+            <img src="{theme_url filename="images/btn_extract.png"}" alt="{str(tag=decompressspecific section=artefact.file arg1=$displaytitle)|escape:html|safe}"/>
+        </a>
+        {/if}
+        {if $file->artefacttype == 'folder'}
+            {assign var=edittext value=str(tag=editfolderspecific section=artefact.file arg1=$displaytitle)}
+            {assign var=deletetext value=str(tag=deletefolderspecific section=artefact.file arg1=$displaytitle)}
+        {else}
+            {assign var=edittext value=str(tag=editspecific arg1=$displaytitle)}
+            {assign var=deletetext value=str(tag=deletespecific arg1=$displaytitle)}
+        {/if}
+        <input type="image" src="{theme_url filename="images/btn_edit.png"}" name="{$prefix}_edit[{$file->id}]" value="" title="{str tag=edit}" alt="{$edittext|escape:html|safe}" />
+        <input type="image" src="{theme_url filename="images/btn_deleteremove.png"}" name="{$prefix}_delete[{$file->id}]" value="" title="{str tag=delete}" alt="{$deletetext|escape:html|safe}" />
       {/if}
     {/if}
     {if $selectable && ($file->artefacttype != 'folder' || $selectfolders) && $publishable && !$file->isparent}

htdocs/artefact/internal/notes.php

@@ -215,6 +215,7 @@ function deletenote_form($id, $notedata) {
             'submit' => array(
                 'type'         => 'image',
                 'src'          => $THEME->get_url('images/btn_deleteremove.png'),
+                'alt' => get_string('deletespecific', 'mahara', $notedata->title),
                 'elementtitle' => get_string('delete'),
             ),
         ),

htdocs/artefact/internal/theme/raw/notes.tpl

@@ -69,7 +69,7 @@
       {if $n->locked}
         <span class="s dull">{str tag=Submitted section=view}</span>
       {else}
-        <a href="{$WWWROOT}artefact/internal/editnote.php?id={$n->id}" title="{str tag=edit}"><img src="{theme_url filename='images/btn_edit.png'}" alt="{str tag=edit}"></a>
+        <a href="{$WWWROOT}artefact/internal/editnote.php?id={$n->id}" title="{str tag=edit}"><img src="{theme_url filename='images/btn_edit.png'}" alt="{str(tag=editspecific arg1=$n->title)|escape:html|safe}"></a>
         {if $n->deleteform}{$n->deleteform|safe}{/if}
       {/if}
       </td>

htdocs/artefact/plans/lang/en.utf8/artefact.plans.php

@@ -20,6 +20,7 @@ $string['deletethisplan'] = 'Delete plan: \'%s\'';
 $string['editplan'] = 'Edit plan';
 $string['editingplan'] = 'Editing plan';
 $string['managetasks'] = 'Manage tasks';
+$string['managetasksspecific'] = 'Manage tasks in "%s"';
 $string['newplan'] = 'New plan';
 $string['noplansaddone'] = 'No plans yet. %sAdd one%s!';
 $string['noplans'] = 'No plans to display';

htdocs/artefact/plans/theme/raw/planslist.tpl

 {foreach from=$plans.data item=plan}
     <div class="{cycle values='r0,r1'} listrow">
             <div class="fr planstatus">
-                 <a href="{$WWWROOT}artefact/plans/edit/index.php?id={$plan->id}" title="{str tag="edit"}" ><img src="{theme_url filename='images/btn_edit.png'}" alt="{str tag=edit}"></a>
-                 <a href="{$WWWROOT}artefact/plans/plan.php?id={$plan->id}" title="{str tag=managetasks section=artefact.plans}"><img src="{theme_url filename='images/btn_configure.png'}" alt="{str tag=managetasks}"></a>
-                 <a href="{$WWWROOT}artefact/plans/delete/index.php?id={$plan->id}" title="{str tag="delete"}"><img src="{theme_url filename='images/btn_deleteremove.png'}" alt="{str tag=delete}"></a>
+                 <a href="{$WWWROOT}artefact/plans/edit/index.php?id={$plan->id}" title="{str tag=edit}" >
+                    <img src="{theme_url filename='images/btn_edit.png'}" alt="{str(tag=editspecific arg1=$plan->title)|escape:html|safe}">
+                 </a>
+                 <a href="{$WWWROOT}artefact/plans/plan.php?id={$plan->id}" title="{str tag=managetasks section=artefact.plans}">
+                    <img src="{theme_url filename='images/btn_configure.png'}" alt="{str(tag=managetasksspecific section=artefact.plans arg1=$plan->title)|escape:html|safe}">
+                 </a>
+                 <a href="{$WWWROOT}artefact/plans/delete/index.php?id={$plan->id}" title="{str tag=delete}">
+                    <img src="{theme_url filename='images/btn_deleteremove.png'}" alt="{str(tag=deletespecific arg1=$plan->title)|escape:html|safe}">
+                 </a>
             </div>
 
             <h3 class="title"><a href="{$WWWROOT}artefact/plans/plan.php?id={$plan->id}">{$plan->title}</a></h3>

htdocs/artefact/plans/theme/raw/taskslist.tpl

@@ -17,7 +17,13 @@
             {/if}
 
     {/if}
-            <td class="buttonscell btns2 planscontrols"><a href="{$WWWROOT}artefact/plans/edit/task.php?id={$task->task}" title="{str tag=edit}"><img src="{theme_url filename='images/btn_edit.png'}" alt="{str tag=edit}"></a>
-            <a href="{$WWWROOT}artefact/plans/delete/task.php?id={$task->task}" title="{str tag=delete}"><img src="{theme_url filename='images/btn_deleteremove.png'}" alt="{str tag=delete}"></a></td>
+            <td class="buttonscell btns2 planscontrols">
+                <a href="{$WWWROOT}artefact/plans/edit/task.php?id={$task->task}" title="{str tag=edit}">
+                    <img src="{theme_url filename='images/btn_edit.png'}" alt="{str(tag=editspecific arg1=$task->title)|escape:html|safe}">
+                </a>
+                <a href="{$WWWROOT}artefact/plans/delete/task.php?id={$task->task}" title="{str tag=delete}">
+                    <img src="{theme_url filename='images/btn_deleteremove.png'}" alt="{str(tag=deletespecific arg1=$task->title)|escape:html|safe}">
+                </a>
+            </td>
         </tr>
 {/foreach}

htdocs/artefact/resume/lib.php

@@ -1016,8 +1016,12 @@ EOF;
 
     static function get_artefacttype_js($compositetype) {
         global $THEME;
-        $editstr = get_string('edit');
-        $delstr = get_string('delete');
+        $titlestring = call_static_method(generate_artefact_class_name($compositetype), 'get_tablerenderer_title_js_string');
+        $editstr = json_encode(get_string('edit'));
+        $delstr = json_encode(get_string('delete'));
+        $editjsstr = json_encode(get_string('editspecific', 'mahara', '%s')) . ".replace('%s', {$titlestring})";
+        $deljsstr = json_encode(get_string('deletespecific', 'mahara', '%s')) . ".replace('%s', {$titlestring})";
+
         $imagemoveblockup   = json_encode($THEME->get_url('images/btn_moveup.png'));
         $imagemoveblockdown = json_encode($THEME->get_url('images/btn_movedown.png'));
         $upstr = get_string('moveup', 'artefact.resume');
@@ -1061,8 +1065,8 @@ EOF;
 
         $js .= <<<EOF
         function (r, d) {
-            var editlink = A({'href': 'editcomposite.php?id=' + r.id + '&artefact=' + r.artefact, 'title': '{$editstr}'}, IMG({'src': config.theme['images/btn_edit.png'], 'alt':'{$editstr}'}));
-            var dellink = A({'href': '', 'title': '{$delstr}'}, IMG({'src': config.theme['images/btn_deleteremove.png'], 'alt': '[x]'}));
+            var editlink = A({'href': 'editcomposite.php?id=' + r.id + '&artefact=' + r.artefact, 'title': {$editstr}}, IMG({'src': config.theme['images/btn_edit.png'], 'alt':{$editjsstr}}));
+            var dellink = A({'href': '', 'title': {$delstr}}, IMG({'src': config.theme['images/btn_deleteremove.png'], 'alt': {$deljsstr}}));
             connect(dellink, 'onclick', function (e) {
                 e.stop();
                 return deleteComposite(d.type, r.id, r.artefact);

htdocs/artefact/resume/theme/raw/fragments/goals.tpl

@@ -45,9 +45,13 @@
         <td align="center">{$n->count}</td>
         <td class="right buttonscell btns2">
         {if $n->exists}
-          <a id="goals_edit_{$n->artefacttype}" href="{$WWWROOT}artefact/resume/editgoalsandskills.php?id={$n->id}" title="{str tag=edit}"><img src="{theme_url filename='images/btn_edit.png'}" alt="{str tag=edit}"></a>
+        <a id="goals_edit_{$n->artefacttype}" href="{$WWWROOT}artefact/resume/editgoalsandskills.php?id={$n->id}" title="{str tag=edit}">
+            <img src="{theme_url filename='images/btn_edit.png'}" alt="{str tag=edit}">
+        </a>
         {else}
-          <a id="goals_edit_{$n->artefacttype}" href="{$WWWROOT}artefact/resume/editgoalsandskills.php?type={$n->artefacttype}" title="{str tag=edit}"><img src="{theme_url filename='images/btn_edit.png'}" alt="{str tag=edit}"></a>
+        <a id="goals_edit_{$n->artefacttype}" href="{$WWWROOT}artefact/resume/editgoalsandskills.php?type={$n->artefacttype}" title="{str tag=edit}">
+            <img src="{theme_url filename='images/btn_edit.png'}" alt="{str tag=edit}">
+        </a>
         {/if}
         </td>
     </tr>

htdocs/interaction/forum/deletetopic.php

@@ -60,7 +60,7 @@ if (!$moderator || ($topic->group && !group_within_edit_window($topic->group)))
     throw new AccessDeniedException(get_string('cantdeletetopic', 'interaction.forum'));
 }
 
-define('TITLE', $topic->title . ' - ' . get_string('deletetopicvariable', 'interaction.forum', $topic->subject));
+define('TITLE', $topic->title . ' - ' . get_string('deletetopicspecific', 'interaction.forum', $topic->subject));
 
 $form = pieform(array(
     'name'     => 'deletetopic',

htdocs/interaction/forum/lang/en.utf8/interaction.forum.php

@@ -46,14 +46,16 @@ $string['deletepost'] = 'Delete post';
 $string['deletepostsuccess'] = 'Post deleted successfully';
 $string['deletepostsure'] = 'Are you sure you want to do this? It cannot be undone.';
 $string['deletetopic'] = 'Delete topic';
-$string['deletetopicvariable'] = 'Delete topic \'%s\'';
+$string['deletetopicspecific'] = 'Delete topic "%s"';
 $string['deletetopicsuccess'] = 'Topic deleted successfully';
 $string['deletetopicsure'] = 'Are you sure you want to do this? It cannot be undone.';
 $string['editpost'] = 'Edit post';
+
 $string['editpostsuccess'] = 'Post edited successfully';
 $string['editstothispost'] = 'Edits to this post:';
 $string['edittitle'] = 'Edit forum';
 $string['edittopic'] = 'Edit topic';
+$string['edittopicspecific'] = 'Edit topic "%s"';
 $string['edittopicsuccess'] = 'Topic edited successfully';
 $string['forumname'] = 'Forum name';
 $string['forumposthtmltemplate'] = "<div style=\"padding: 0.5em 0; border-bottom: 1px solid #999;\"><strong>Forum: %s (%s)</strong></div>

htdocs/interaction/forum/theme/raw/index.tpl

@@ -36,8 +36,12 @@
         <td class="nowrap s subscribetd">{if $forum->subscribe}{$forum->subscribe|safe}{/if}</td>
         <td class="right btns2">
         {if $admin}
-                <a href="{$WWWROOT}interaction/edit.php?id={$forum->id}&amp;returnto=index" class="icon btn-big-edit" title="{str tag=edit}"></a>
-                <a href="{$WWWROOT}interaction/delete.php?id={$forum->id}&amp;returnto=index" class="icon btn-big-del" title="{str tag=delete}"></a>
+            <a href="{$WWWROOT}interaction/edit.php?id={$forum->id}&amp;returnto=index" class="icon btn-big-edit" title="{str tag=edit}">
+                {str tag=editspecific arg1=$forum->title}
+            </a>
+            <a href="{$WWWROOT}interaction/delete.php?id={$forum->id}&amp;returnto=index" class="icon btn-big-del" title="{str tag=delete}">
+                {str tag=deletespecific arg1=$forum->title}
+            </a>
         {/if}
         </td>
 	</tr>

htdocs/interaction/forum/theme/raw/topics.tpl

@@ -29,8 +29,12 @@
     </td>
     {if $moderator}
     <td class="right btns2">
-        <a href="{$WWWROOT}interaction/forum/edittopic.php?id={$topic->id}&amp;returnto=view" class="btn-big-edit" title="{str tag="edit"}"></a>
-        <a href="{$WWWROOT}interaction/forum/deletetopic.php?id={$topic->id}&amp;returnto=view" class="btn-big-del" title="{str tag="delete"}"></a>
+        <a href="{$WWWROOT}interaction/forum/edittopic.php?id={$topic->id}&amp;returnto=view" class="btn-big-edit" title="{str tag="edit"}">
+            {str tag=edittopicspecific section=interaction.forum arg1=$topic->subject}
+        </a>
+        <a href="{$WWWROOT}interaction/forum/deletetopic.php?id={$topic->id}&amp;returnto=view" class="btn-big-del" title="{str tag="delete"}">
+            {str tag=deletetopicspecific section=interaction.forum arg1=$topic->subject}
+        </a>
     </td>
     {/if}
 </tr>

htdocs/lang/en.utf8/admin.php

@@ -1041,6 +1041,7 @@ $string['groupadmins'] = 'Administrators';
 $string['grouptype'] = 'Group type';
 $string['groupvisible'] = 'Visibility';
 $string['groupmanage'] = 'Manage';
+$string['groupmanagespecific'] = 'Manage "%s"';
 $string['groupdelete'] = 'Delete';
 $string['managegroupquotadescription'] = 'Use the form below to change the group file quota for this group.';
 $string['managegroupdescription'] = 'Use the form below to promote and demote administrators for this group. If you remove a group administrator they will remain a group member.';

htdocs/lang/en.utf8/collection.php

@@ -67,6 +67,7 @@ $string['editaccess'] = 'Edit collection access';
 $string['emptycollectionnoeditaccess'] = 'You cannot edit access to empty collections. Add some pages first.';
 $string['emptycollection'] = 'Empty collection';
 $string['manageviews'] = 'Manage pages';
+$string['manageviewsspecific'] = 'Manage pages in "%s"';
 $string['name'] = 'Collection name';
 $string['newcollection'] = 'New collection';
 $string['nocollections'] = 'No collections yet.';

htdocs/lang/en.utf8/mahara.php

@@ -16,8 +16,11 @@ $string['add']     = 'Add';
 $string['addone']  = 'Add one';
 $string['cancel']  = 'Cancel';
 $string['delete']  = 'Delete';
+$string['deletespecific'] = 'Delete "%s"';
 $string['edit']    = 'Edit';
+$string['editspecific']    = 'Edit "%s"';
 $string['editing'] = 'Editing';
+$string['settingsspecific'] = 'Settings for "%s"';
 $string['move']    = 'Move';
 $string['save']    = 'Save';
 $string['submit']  = 'Submit';

htdocs/lang/en.utf8/skin.php

@@ -30,6 +30,7 @@ $string['validxmlfile'] = 'Valid XML file';
 $string['notvalidxmlfile'] = 'The uploaded file is not a valid XML file.';
 $string['import'] = 'Import';
 $string['exportthisskin'] = 'Export this skin';
+$string['exportspecific'] = 'Export "%s"';
 $string['exportskins'] = 'Export skin(s)';
 $string['createskin'] = 'Create skin';
 $string['editskin'] = 'Edit skin';
@@ -38,11 +39,14 @@ $string['skinimported'] = 'Skin imported successfully';
 $string['clicktoedit'] = 'Click to edit this skin';
 $string['clickimagetoedit'] = 'Click image to edit';
 $string['addtofavorites'] = 'Add to favourites';
+$string['addtofavoritesspecific'] = 'Add "%s" to favourites';
 $string['removefromfavorites'] = 'Remove from favourites';
+$string['removefromfavoritesspecific'] = 'Remove "%s" from favourites';
 $string['skinaddedtofavorites'] = 'Skin added to favourites';
 $string['skinremovedfromfavorites'] = 'Skin removed from favourites';
 $string['cantremoveskinfromfavorites'] = 'Can\'t remove skin from favourites';
 $string['viewmetadata'] = 'View skin information';
+$string['viewmetadataspecific'] = 'View information for "%s"';
 $string['closemetadata'] = 'Close skin information';
 $string['metatitle'] = 'Skin information';
 $string['title'] = 'Title';

htdocs/lib/pieforms/pieform/elements/image.php

@@ -41,7 +41,16 @@ function pieform_element_image(Pieform $form, $element) {/*{{{*/
     if (isset($element['confirm'])) {
         $element['onclick'] = 'return confirm(' . json_encode($element['confirm']) . ');';
     }
+    if (!isset($element['alt'])) {
+        if (isset($element['elementtitle'])) {
+            $element['alt'] = $element['elementtitle'];
+        }
+        else {
+            $element['alt'] = '';
+        }
+    }
     return '<input type="image" src="' . Pieform::hsc($element['src']) . '"'
+        . ' alt="' . Pieform::hsc($element['alt']) . '"'
         . $form->element_attributes($element)
         . ' value="' . Pieform::hsc($form->get_value($element)) . '">';
 }/*}}}*/

htdocs/theme/raw/static/style/style.css

@@ -2856,6 +2856,10 @@ form#search {
     border-radius: 5px;
     padding: 10px;
 }
+.skinthumb .skin-controls a.btn-addtofavourites,
+.skinthumb .skin-controls a.btn-removefromfavourites {
+    display: inline-block;
+}
 .skinthumb .skin-controls a.btn-addtofavourites {
     background: url(../images/rating_star.png) no-repeat 0 0;
     width: 19px;

htdocs/theme/raw/templates/admin/extensions/iframesites.tpl

@@ -18,7 +18,7 @@
       <td><img src="{$item.icon}" alt="{$item.name}" title="{$item.name}">&nbsp;{$item.name}</td>
       <td class="right buttonscell btns2">
         <a id="edit-{$item.id}" class="url-open-editform nojs-hidden-inline" title="{str tag=edit}" href="">
-          <img src="{theme_url filename="images/btn_edit.png"}">
+          <img src="{theme_url filename="images/btn_edit.png"}" alt="{str(tag=editspecific arg1=$item.name)|escape:html|safe}">
         </a>
         {$item.deleteform|safe}
       </td>

htdocs/theme/raw/templates/admin/groups/groupsresults.tpl

@@ -12,10 +12,13 @@
         <td>{$group->categorytitle}</td>
     {/if}
     <td>{$group->visibility}</td>
-    <td class="right"><a title="{str tag="groupmanage" section="admin"}" href="{$WWWROOT}admin/groups/manage.php?id={$group->id}"><img src="{theme_url filename="images/btn_configure.png"}" alt="{str tag="groupmanage" section="admin"}"></a>
-      <a title="{str tag="delete"}" href="{$WWWROOT}admin/groups/delete.php?id={$group->id}">
-        <img src="{theme_url filename="images/btn_deleteremove.png"}" alt="[x]">
-      </a>
+    <td class="right">
+        <a title="{str tag="groupmanage" section="admin"}" href="{$WWWROOT}admin/groups/manage.php?id={$group->id}">
+            <img src="{theme_url filename="images/btn_configure.png"}" alt="{str(tag=groupmanagespecific section=admin arg1=$group->name)|escape:html|safe}">
+        </a>
+        <a title="{str tag="delete"}" href="{$WWWROOT}admin/groups/delete.php?id={$group->id}">
+            <img src="{theme_url filename="images/btn_deleteremove.png"}" alt="{str(tag=deletespecific arg1=$group->name)|escape:html|safe}">
+        </a>
     </td>
 </tr>
 {/foreach}

htdocs/theme/raw/templates/admin/site/licenses.tpl

@@ -27,8 +27,11 @@
                 <td>{$l->shortname}</td>
                 <td><a href="{$l->name}">{$l->name}</a></td>
                 <td class="btns2">
-                <a href="license-edit.php?edit={$l->name|escape:url}"><img src="{$THEME->get_url('images/btn_edit.png')}"></a>
-                <input type="image" title="Delete" value="" name="license_delete[{$l->name}]" src="{$THEME->get_url('images/btn_deleteremove.png')}"></td>
+                    <a href="license-edit.php?edit={$l->name|escape:url}" title="{str tag=edit}">
+                        <img src="{$THEME->get_url('images/btn_edit.png')}" alt="{str(tag=editspecific arg1=$l->shortname)|escape:html|safe}">
+                    </a>
+                    <input type="image" title="{str tag=delete}" value="" name="license_delete[{$l->name}]" src="{$THEME->get_url('images/btn_deleteremove.png')}" alt="{str(tag=deletespecific arg1=$l->shortname)|escape:html|safe}">
+                </td>
             </tr>
         {/foreach}
         </tbody>

htdocs/theme/raw/templates/admin/users/institutionsresults.tpl

@@ -16,13 +16,13 @@
                         <form action="" method="post">
                                 <input type="hidden" name="i" value="{$institution->name}">
                                 <input type="hidden" name="edit" value=1>
-                                <input type="image" name="edit" title="{str tag="edit"}" src="{theme_url filename="images/btn_edit.png"}">
+                                <input type="image" name="edit" title="{str tag="edit"}" src="{theme_url filename="images/btn_edit.png"}" alt="{str(tag=editspecific arg1=$institution->displayname)|escape:html|safe}">
                         </form>
                         {if $siteadmin && !$institution->members && $institution->name != 'mahara'}
                         <form action="" method="post">
                                 <input type="hidden" name="i" value="{$institution->name}">
                                 <input type="hidden" name="delete" value="1">
-                                <input type="image" name="delete" title="{str tag="delete"}" src="{theme_url filename="images/btn_deleteremove.png"}">
+                                <input type="image" name="delete" title="{str tag="delete"}" src="{theme_url filename="images/btn_deleteremove.png"}" alt="{str(tag=deletespecific arg1=$institution->displayname)|escape:html|safe}">
                         </form>
                         {/if}
                 </td>

htdocs/theme/raw/templates/collection/index.tpl

@@ -17,9 +17,15 @@
                 <div class="listrow {cycle values='r0,r1'}">
                         {if !$collection->submitinfo && $canedit}
                         <div class="fr viewcontrolbuttons">
-                            <a href="{$WWWROOT}collection/views.php?id={$collection->id}" title="{str tag=manageviews section=collection}"><img src="{theme_url filename='images/btn_configure.png'}" alt="{str tag=manageviews section=collection}"></a>
-                            <a href="{$WWWROOT}collection/edit.php?id={$collection->id}" title="{str tag=edittitleanddescription section=view}"><img src="{theme_url filename='images/btn_edit.png'}" alt="{str tag=edit}"></a>
-                            <a href="{$WWWROOT}collection/delete.php?id={$collection->id}" title="{str tag=deletecollection section=collection}"><img src="{theme_url filename='images/btn_deleteremove.png'}" alt="{str tag=delete}"></a>
+                            <a href="{$WWWROOT}collection/views.php?id={$collection->id}" title="{str tag=manageviews section=collection}">
+                                <img src="{theme_url filename='images/btn_configure.png'}" alt="{str(tag=manageviewsspecific section=collection arg1=$collection->name)|escape:html|safe}">
+                            </a>
+                            <a href="{$WWWROOT}collection/edit.php?id={$collection->id}" title="{str tag=edittitleanddescription section=view}">
+                                <img src="{theme_url filename='images/btn_edit.png'}" alt="{str(tag=editspecific arg1=$collection->name)|escape:html|safe}">
+                            </a>
+                            <a href="{$WWWROOT}collection/delete.php?id={$collection->id}" title="{str tag=deletecollection section=collection}">
+                                <img src="{theme_url filename='images/btn_deleteremove.png'}" alt="{str(tag=deletespecific arg1=$collection->name)|escape:html|safe}">
+                            </a>
                         </div>
                         {/if}
 

htdocs/theme/raw/templates/group/groupuserstatus.tpl

 <ul class="groupuserstatus">
 {if $group->membershiptype == 'member'}
-	<li class="member">
+    <li class="member">
     {if $group->role == 'member' || $group->role == 'admin'}
-      {str tag="youaregroup$group->role" section="group"}
+        {str tag="youaregroup$group->role" section="group"}
     {else}
-      {str tag="youaregroup$group->role" section="grouptype.$group->grouptype"}
+        {str tag="youaregroup$group->role" section="grouptype.$group->grouptype"}
     {/if}
-        </li>
+    </li>
     <li class="leavegroup">
     {if $group->canleave}
-      <a href ="{$WWWROOT}group/leave.php?id={$group->id}&amp;returnto={$returnto}" class="btn"><span class="btn-leavegroup">{str tag="leavegroup" section="group"}</span></a>
+        <a href ="{$WWWROOT}group/leave.php?id={$group->id}&amp;returnto={$returnto}" class="btn"><span class="btn-leavegroup">{str tag="leavegroup" section="group"}</span></a>
     {/if}
     {if $group->invitefriends}
-      <a href ="{$WWWROOT}group/inviteusers.php?id={$group->id}&friends=1" class="btn"><span class="btn-friend">{str tag="invitefriends" section="group"}</span></a>
+        <a href ="{$WWWROOT}group/inviteusers.php?id={$group->id}&friends=1" class="btn"><span class="btn-friend">{str tag="invitefriends" section="group"}</span></a>
     {elseif $group->suggestfriends && ($group->request || $group->jointype == 'open')}
-      <a href ="{$WWWROOT}group/suggest.php?id={$group->id}" class="btn"><span class="btn-friend">{str tag="suggesttofriends" section="group"}</span></a>
+        <a href ="{$WWWROOT}group/suggest.php?id={$group->id}" class="btn"><span class="btn-friend">{str tag="suggesttofriends" section="group"}</span></a>
     {/if}
     </li>
 {elseif $group->membershiptype == 'admin'}
-	<li class="admincontrol"><a href="{$WWWROOT}group/edit.php?id={$group->id}" title="{str tag=edit