From 7b9529647e8cfd4243762599fac5dbd7ae9664d5 Mon Sep 17 00:00:00 2001 From: Rebecca Blundell Date: Thu, 9 May 2019 11:30:14 +1200 Subject: [PATCH] Bug 1811904: Fontawesome - Name changes new default for fontawesome is 'solid', where we are using a different class (regular or brand), we need to add these. also confirming that where the icon name has changed, we've picked that up. Where there's a choice of icon, I've kept it as close to what we currently have as possible. All free icons can be seen here: https://fontawesome.com/icons?d=gallery&m=free Name changes: icon-trash-alt -> icon-trash icon-pencil -> icon-pencil-alt icon-unlock-alt -> icon-unlock icon-files-o -> icon-regular icon-copy icon-pencil-square -> icon-regular icon-edit icon-file-text -> icon-file-alt || icon-regular icon-file-alt icon-image -> icon-regular icon-image behatnotneeded Change-Id: I34646a6857f6cf54dc39572f5a66c07da4f4c0e2 --- htdocs/admin/extensions/iframesites.php | 2 +- htdocs/admin/groups/groupcategories.php | 2 +- htdocs/admin/site/menu.php | 4 +- htdocs/admin/site/pages.php | 2 +- htdocs/admin/site/views.php | 2 +- htdocs/admin/users/edit.php | 2 +- htdocs/artefact/annotation/lib.php | 2 +- htdocs/artefact/blog/lib.php | 4 +- htdocs/artefact/comment/lib.php | 2 +- htdocs/artefact/file/sitefiles.php | 2 +- htdocs/artefact/internal/editnote.php | 2 +- htdocs/artefact/internal/notes.json.php | 2 +- htdocs/artefact/internal/notes.php | 4 +- htdocs/artefact/peerassessment/lib.php | 2 +- htdocs/artefact/resume/lib.php | 4 +- .../openbadgedisplayer/badgrtoken.php | 2 +- htdocs/js/customlayout.js | 2 +- htdocs/js/views.js | 2 +- .../pieforms/pieform/elements/calendar.php | 2 +- htdocs/lib/web.php | 2 +- htdocs/module/framework/frameworks.php | 2 +- htdocs/module/mobileapi/apps.php | 2 +- .../sendmessage.php | 2 +- .../annotation/templates/annotationlist.tpl | 2 +- .../artefact/blog/templates/bloglist.tpl | 2 +- .../artefact/blog/templates/posts.tpl | 2 +- .../comment/templates/commentlist.tpl | 2 +- .../artefact/file/templates/form/filelist.tpl | 6 +-- .../artefact/file/templates/profileicons.tpl | 2 +- .../internal/templates/noteresults.tpl | 2 +- .../internal/templates/socialprofiles.tpl | 4 +- .../peerassessment/templates/editlink.tpl | 2 +- .../blocktype/plans/templates/content.tpl | 4 +- .../artefact/plans/templates/planslist.tpl | 4 +- .../artefact/plans/templates/taskrows.tpl | 8 ++-- .../artefact/plans/templates/taskslist.tpl | 4 +- .../resume/templates/fragments/goals.tpl | 4 +- .../resume/templates/fragments/skills.tpl | 4 +- .../auth/saml/templates/idpdelete.tpl | 2 +- .../auth/webservice/templates/connections.tpl | 4 +- .../blocktype/wall/templates/inlineposts.tpl | 2 +- .../interaction/forum/templates/index.tpl | 4 +- .../interaction/forum/templates/post.tpl | 4 +- .../interaction/forum/templates/topic.tpl | 4 +- .../interaction/forum/templates/topics.tpl | 4 +- .../interaction/forum/templates/view.tpl | 2 +- htdocs/theme/raw/templates/account/index.tpl | 2 +- .../admin/extensions/iframesites.tpl | 2 +- .../templates/admin/groups/groupsresults.tpl | 2 +- htdocs/theme/raw/templates/admin/index.tpl | 2 +- .../raw/templates/admin/site/licenses.tpl | 4 +- .../raw/templates/admin/site/privacytable.tpl | 2 +- .../theme/raw/templates/admin/users/bulk.tpl | 2 +- .../templates/admin/users/institutions.tpl | 2 +- .../admin/users/institutionsresults.tpl | 2 +- .../templates/admin/users/institutiontags.tpl | 2 +- .../raw/templates/admin/users/search.tpl | 2 +- .../raw/templates/collection/actions.tpl | 2 +- .../collection/collectionresults.tpl | 4 +- htdocs/theme/raw/templates/edittags.tpl | 4 +- htdocs/theme/raw/templates/form/authlist.tpl | 4 +- htdocs/theme/raw/templates/form/emaillist.tpl | 6 +-- htdocs/theme/raw/templates/form/viewacl.tpl | 4 +- .../raw/templates/group/groupuserstatus.tpl | 4 +- .../raw/templates/header/pageactions.tpl | 6 +-- .../raw/templates/header/profileactions.tpl | 2 +- htdocs/theme/raw/templates/homeinfo.tpl | 2 +- htdocs/theme/raw/templates/index.tpl | 2 +- htdocs/theme/raw/templates/skin/index.tpl | 4 +- htdocs/theme/raw/templates/styleguide.tpl | 38 +++++++++---------- htdocs/theme/raw/templates/tags.tpl | 4 +- htdocs/theme/raw/templates/view/accessurl.tpl | 4 +- .../templates/view/blocktypecategorylist.tpl | 2 +- .../view/blocktypecontainerediting.tpl | 2 +- .../theme/raw/templates/view/editviewtabs.tpl | 4 +- htdocs/theme/raw/templates/view/index.tpl | 4 +- .../theme/raw/templates/view/indexresults.tpl | 8 ++-- htdocs/theme/raw/templates/view/urls.tpl | 4 +- htdocs/theme/raw/templates/view/view.tpl | 2 +- htdocs/view/accessurl.php | 2 +- htdocs/view/groupviews.php | 2 +- htdocs/view/index.php | 2 +- htdocs/view/urls.php | 2 +- htdocs/webservice/admin/index.php | 12 +++--- htdocs/webservice/admin/oauthv1sregister.php | 4 +- htdocs/webservice/apptokens.php | 2 +- 86 files changed, 149 insertions(+), 149 deletions(-) diff --git a/htdocs/admin/extensions/iframesites.php b/htdocs/admin/extensions/iframesites.php index adbc5d4e29..de29e56eec 100644 --- a/htdocs/admin/extensions/iframesites.php +++ b/htdocs/admin/extensions/iframesites.php @@ -101,7 +101,7 @@ foreach ($iframesources as $url => $name) { 'type' => 'button', 'class' => 'btn-secondary btn-sm', 'usebuttontag' => true, - 'value' => ''. get_string('delete') . '', + 'value' => ''. get_string('delete') . '', 'confirm' => get_string('confirmdeletemenuitem', 'admin'), ), diff --git a/htdocs/admin/groups/groupcategories.php b/htdocs/admin/groups/groupcategories.php index eb9bbe6122..6379432688 100644 --- a/htdocs/admin/groups/groupcategories.php +++ b/htdocs/admin/groups/groupcategories.php @@ -115,7 +115,7 @@ jQuery(function($) { 'title':{$getstring['delete']}, 'alt':{$getstring['deletespecific']}.replace('%s', item.name) }); - del.append($('', {'class':'icon icon-trash text-danger icon-lg', 'role':'presentation'})); + del.append($('', {'class':'icon icon-trash-alt text-danger icon-lg', 'role':'presentation'})); del.append($('' + {$getstring['deletespecific']}.replace('%s', item.name) + '')); del.on('click', function (e) { e.preventDefault(); delitem(item.id); }); diff --git a/htdocs/admin/site/menu.php b/htdocs/admin/site/menu.php index de4e24feb3..7ea7245fc4 100644 --- a/htdocs/admin/site/menu.php +++ b/htdocs/admin/site/menu.php @@ -87,10 +87,10 @@ jQuery(function($) { var type = eval(item.type); var linkedto = $('', {'href':item.linkedto, 'text': item.linktext}); var edit = $(''); + newrow.append(''); } $('#customrow_' + numrows).after(newrow); $('#' + pieformname + '_customlayoutnumrows').val(numrows + 1); diff --git a/htdocs/js/views.js b/htdocs/js/views.js index 6385fb000d..8b86b69c71 100644 --- a/htdocs/js/views.js +++ b/htdocs/js/views.js @@ -1053,7 +1053,7 @@ blockinstanceId = blockinstance.attr('data-id'), content = blockinstance.find('.js-blockinstance-content'), oldContent = content.html(), - loading = $('').attr('class', 'icon icon-spinner icon-spin block-loading'), + loading = $('').attr('class', 'icon icon-spinner icon-pulse block-loading'), pd = {'id': $('#viewid').val(), 'change': 1}; diff --git a/htdocs/lib/pieforms/pieform/elements/calendar.php b/htdocs/lib/pieforms/pieform/elements/calendar.php index 62d7ddf868..06d642da26 100644 --- a/htdocs/lib/pieforms/pieform/elements/calendar.php +++ b/htdocs/lib/pieforms/pieform/elements/calendar.php @@ -99,7 +99,7 @@ function pieform_element_calendar(Pieform $form, $element) { previous: "icon icon-chevron-left", next: "icon icon-chevron-right", close: "icon icon-times", - clear: "icon icon-trash", + clear: "icon icon-trash-alt", today: "icon icon-crosshairs", }, }); diff --git a/htdocs/lib/web.php b/htdocs/lib/web.php index 43dc3bacec..d2af93c742 100755 --- a/htdocs/lib/web.php +++ b/htdocs/lib/web.php @@ -2867,7 +2867,7 @@ function mahara_standard_nav() { 'url' => null, 'title' => get_string('share'), 'weight' => 30, - 'iconclass' => 'unlock-alt', + 'iconclass' => 'unlock', ), 'engage' => array( 'path' => 'engage', diff --git a/htdocs/module/framework/frameworks.php b/htdocs/module/framework/frameworks.php index 2498050573..51865f86d7 100644 --- a/htdocs/module/framework/frameworks.php +++ b/htdocs/module/framework/frameworks.php @@ -196,7 +196,7 @@ if ($frameworks) { 'type' => 'button', 'class' => 'btn-secondary btn-sm button', 'usebuttontag' => true, - 'value' => ''. get_string('delete') . '', + 'value' => ''. get_string('delete') . '', 'confirm' => get_string('confirmdeletemenuitem', 'admin'), ), 'framework' => array( diff --git a/htdocs/module/mobileapi/apps.php b/htdocs/module/mobileapi/apps.php index 4dc35a7b23..021e277bad 100644 --- a/htdocs/module/mobileapi/apps.php +++ b/htdocs/module/mobileapi/apps.php @@ -171,7 +171,7 @@ else { 'type' => 'button', 'usebuttontag' => true, 'class' => 'btn-secondary btn-sm', - 'value' => '' . get_string('delete'), + 'value' => '' . get_string('delete'), 'elementtitle' => get_string('deletespecific', 'mahara', $service->clientname), ), ), diff --git a/htdocs/module/multirecipientnotification/sendmessage.php b/htdocs/module/multirecipientnotification/sendmessage.php index a1d98e03fe..40a0c2aa9f 100644 --- a/htdocs/module/multirecipientnotification/sendmessage.php +++ b/htdocs/module/multirecipientnotification/sendmessage.php @@ -241,7 +241,7 @@ $form = pieform(array( )); $smarty = smarty(); -setpageicon($smarty, 'icon-pencil-square-o'); +setpageicon($smarty, 'icon-regular icon-edit'); $smarty->assign('form', $form); $smarty->assign('user', $USER); $smarty->assign('messages', $messages); diff --git a/htdocs/theme/raw/plugintype/artefact/annotation/templates/annotationlist.tpl b/htdocs/theme/raw/plugintype/artefact/annotation/templates/annotationlist.tpl index 5ee2f61d39..0e5103685b 100644 --- a/htdocs/theme/raw/plugintype/artefact/annotation/templates/annotationlist.tpl +++ b/htdocs/theme/raw/plugintype/artefact/annotation/templates/annotationlist.tpl @@ -29,7 +29,7 @@
{if $item->canedit} - + {str tag=edit} {/if} diff --git a/htdocs/theme/raw/plugintype/artefact/blog/templates/bloglist.tpl b/htdocs/theme/raw/plugintype/artefact/blog/templates/bloglist.tpl index 6315755a7b..7b35945443 100644 --- a/htdocs/theme/raw/plugintype/artefact/blog/templates/bloglist.tpl +++ b/htdocs/theme/raw/plugintype/artefact/blog/templates/bloglist.tpl @@ -35,7 +35,7 @@ {str tag=submittedforassessment section=view} {else} - + {str tag=editspecific arg1=$blog->title} {$blog->deleteform|safe} diff --git a/htdocs/theme/raw/plugintype/artefact/blog/templates/posts.tpl b/htdocs/theme/raw/plugintype/artefact/blog/templates/posts.tpl index e6cf267f4d..6792a9e230 100644 --- a/htdocs/theme/raw/plugintype/artefact/blog/templates/posts.tpl +++ b/htdocs/theme/raw/plugintype/artefact/blog/templates/posts.tpl @@ -31,7 +31,7 @@
diff --git a/htdocs/theme/raw/plugintype/artefact/comment/templates/commentlist.tpl b/htdocs/theme/raw/plugintype/artefact/comment/templates/commentlist.tpl index 40556cb753..5fa10f4d51 100644 --- a/htdocs/theme/raw/plugintype/artefact/comment/templates/commentlist.tpl +++ b/htdocs/theme/raw/plugintype/artefact/comment/templates/commentlist.tpl @@ -42,7 +42,7 @@ {if !$onview} {if $item->canedit} - + {str tag=edit} {/if} diff --git a/htdocs/theme/raw/plugintype/artefact/file/templates/form/filelist.tpl b/htdocs/theme/raw/plugintype/artefact/file/templates/form/filelist.tpl index cfa14ae340..022e1371ac 100644 --- a/htdocs/theme/raw/plugintype/artefact/file/templates/form/filelist.tpl +++ b/htdocs/theme/raw/plugintype/artefact/file/templates/form/filelist.tpl @@ -118,7 +118,7 @@ {elseif !$file->isparent} {if !isset($file->can_edit) || $file->can_edit !== 0}
diff --git a/htdocs/theme/raw/plugintype/artefact/file/templates/profileicons.tpl b/htdocs/theme/raw/plugintype/artefact/file/templates/profileicons.tpl index 9130ef070b..55d94f1353 100644 --- a/htdocs/theme/raw/plugintype/artefact/file/templates/profileicons.tpl +++ b/htdocs/theme/raw/plugintype/artefact/file/templates/profileicons.tpl @@ -20,7 +20,7 @@ {str tag="setdefault" section=artefact.file} diff --git a/htdocs/theme/raw/plugintype/artefact/internal/templates/noteresults.tpl b/htdocs/theme/raw/plugintype/artefact/internal/templates/noteresults.tpl index 47f89f0149..e1e952c47e 100755 --- a/htdocs/theme/raw/plugintype/artefact/internal/templates/noteresults.tpl +++ b/htdocs/theme/raw/plugintype/artefact/internal/templates/noteresults.tpl @@ -89,7 +89,7 @@ {else}
- + {str(tag=editspecific arg1=$n->title)|escape:html|safe} diff --git a/htdocs/theme/raw/plugintype/artefact/internal/templates/socialprofiles.tpl b/htdocs/theme/raw/plugintype/artefact/internal/templates/socialprofiles.tpl index 82bba49cdb..714f180bdf 100644 --- a/htdocs/theme/raw/plugintype/artefact/internal/templates/socialprofiles.tpl +++ b/htdocs/theme/raw/plugintype/artefact/internal/templates/socialprofiles.tpl @@ -38,12 +38,12 @@
- + {str tag='edit'} {if $candelete} - + {str tag='delete'} {/if} diff --git a/htdocs/theme/raw/plugintype/artefact/peerassessment/templates/editlink.tpl b/htdocs/theme/raw/plugintype/artefact/peerassessment/templates/editlink.tpl index 13f9265042..a5633bc523 100644 --- a/htdocs/theme/raw/plugintype/artefact/peerassessment/templates/editlink.tpl +++ b/htdocs/theme/raw/plugintype/artefact/peerassessment/templates/editlink.tpl @@ -1,4 +1,4 @@ diff --git a/htdocs/theme/raw/plugintype/artefact/plans/blocktype/plans/templates/content.tpl b/htdocs/theme/raw/plugintype/artefact/plans/blocktype/plans/templates/content.tpl index ea3bf04190..8aa19734f7 100644 --- a/htdocs/theme/raw/plugintype/artefact/plans/blocktype/plans/templates/content.tpl +++ b/htdocs/theme/raw/plugintype/artefact/plans/blocktype/plans/templates/content.tpl @@ -6,7 +6,7 @@ {if $editing}
- + {str tag='edit'} @@ -14,7 +14,7 @@ {str tag='addtask' section='artefact.plans'} - + {str tag='Delete'}
diff --git a/htdocs/theme/raw/plugintype/artefact/plans/templates/planslist.tpl b/htdocs/theme/raw/plugintype/artefact/plans/templates/planslist.tpl index 92886e941a..501e33ad2e 100644 --- a/htdocs/theme/raw/plugintype/artefact/plans/templates/planslist.tpl +++ b/htdocs/theme/raw/plugintype/artefact/plans/templates/planslist.tpl @@ -9,7 +9,7 @@
- + {str tag=edit} @@ -17,7 +17,7 @@ {str tag=managetasks section=artefact.plans} - + {str tag=delete}
diff --git a/htdocs/theme/raw/plugintype/artefact/plans/templates/taskrows.tpl b/htdocs/theme/raw/plugintype/artefact/plans/templates/taskrows.tpl index b8568286f3..58c14c7cb3 100644 --- a/htdocs/theme/raw/plugintype/artefact/plans/templates/taskrows.tpl +++ b/htdocs/theme/raw/plugintype/artefact/plans/templates/taskrows.tpl @@ -3,8 +3,8 @@
{if $editing}
- - + +
{/if} {if $task->description || $task->tags}
- + +
{/if} {if $task->description || $task->tags}
- + {str(tag=editspecific arg1=$task->title)|escape:html|safe} - + {str(tag=deletespecific arg1=$task->title)|escape:html|safe}
diff --git a/htdocs/theme/raw/plugintype/artefact/resume/templates/fragments/goals.tpl b/htdocs/theme/raw/plugintype/artefact/resume/templates/fragments/goals.tpl index b639cfa748..1929d64f48 100644 --- a/htdocs/theme/raw/plugintype/artefact/resume/templates/fragments/goals.tpl +++ b/htdocs/theme/raw/plugintype/artefact/resume/templates/fragments/goals.tpl @@ -13,13 +13,13 @@ {if $n->exists} {str tag=$n->artefacttype section='artefact.resume'} - + {str tag=edit} {else} {str tag=$n->artefacttype section='artefact.resume'} - + {str tag=edit} {/if} diff --git a/htdocs/theme/raw/plugintype/artefact/resume/templates/fragments/skills.tpl b/htdocs/theme/raw/plugintype/artefact/resume/templates/fragments/skills.tpl index 342fabe729..42c952e113 100644 --- a/htdocs/theme/raw/plugintype/artefact/resume/templates/fragments/skills.tpl +++ b/htdocs/theme/raw/plugintype/artefact/resume/templates/fragments/skills.tpl @@ -14,13 +14,13 @@ {if $n->exists} {str tag=$n->artefacttype section='artefact.resume'} - + {str tag=edit} {else} {str tag=$n->artefacttype section='artefact.resume'} - + {str tag=edit} {/if} diff --git a/htdocs/theme/raw/plugintype/auth/saml/templates/idpdelete.tpl b/htdocs/theme/raw/plugintype/auth/saml/templates/idpdelete.tpl index f4402307b0..e53e472191 100644 --- a/htdocs/theme/raw/plugintype/auth/saml/templates/idpdelete.tpl +++ b/htdocs/theme/raw/plugintype/auth/saml/templates/idpdelete.tpl @@ -1,6 +1,6 @@ {if $r.delete}
diff --git a/htdocs/theme/raw/templates/admin/site/privacytable.tpl b/htdocs/theme/raw/templates/admin/site/privacytable.tpl index 00f2bcf0dd..1f101446bd 100644 --- a/htdocs/theme/raw/templates/admin/site/privacytable.tpl +++ b/htdocs/theme/raw/templates/admin/site/privacytable.tpl @@ -14,7 +14,7 @@ {if $result->id == $result->current}
- +
{else} diff --git a/htdocs/theme/raw/templates/admin/users/bulk.tpl b/htdocs/theme/raw/templates/admin/users/bulk.tpl index e2df29bbcc..2b428f847d 100644 --- a/htdocs/theme/raw/templates/admin/users/bulk.tpl +++ b/htdocs/theme/raw/templates/admin/users/bulk.tpl @@ -25,7 +25,7 @@ {/if} diff --git a/htdocs/theme/raw/templates/admin/users/institutions.tpl b/htdocs/theme/raw/templates/admin/users/institutions.tpl index fc66662910..6c1b9f97e7 100644 --- a/htdocs/theme/raw/templates/admin/users/institutions.tpl +++ b/htdocs/theme/raw/templates/admin/users/institutions.tpl @@ -52,7 +52,7 @@ {if $countinstitutions > 1} diff --git a/htdocs/theme/raw/templates/admin/users/institutionsresults.tpl b/htdocs/theme/raw/templates/admin/users/institutionsresults.tpl index 94f45e8d1d..c6a8b4065a 100644 --- a/htdocs/theme/raw/templates/admin/users/institutionsresults.tpl +++ b/htdocs/theme/raw/templates/admin/users/institutionsresults.tpl @@ -48,7 +48,7 @@ {if $siteadmin && !$institution->members && $institution->name != 'mahara'} diff --git a/htdocs/theme/raw/templates/collection/actions.tpl b/htdocs/theme/raw/templates/collection/actions.tpl index 0dcf30b701..c13f24d9b2 100644 --- a/htdocs/theme/raw/templates/collection/actions.tpl +++ b/htdocs/theme/raw/templates/collection/actions.tpl @@ -4,7 +4,7 @@ {str section=collection tag=newcollection} - + {str section=collection tag=copyacollection}
diff --git a/htdocs/theme/raw/templates/collection/collectionresults.tpl b/htdocs/theme/raw/templates/collection/collectionresults.tpl index 61854e0268..b41d35dc46 100644 --- a/htdocs/theme/raw/templates/collection/collectionresults.tpl +++ b/htdocs/theme/raw/templates/collection/collectionresults.tpl @@ -38,11 +38,11 @@ {str(tag=manageviewsspecific section=collection arg1=$collection->name)|escape:html|safe} - + {str(tag=editspecific arg1=$collection->name)|escape:html|safe} - + {str(tag=deletespecific arg1=$collection->name)|escape:html|safe}
diff --git a/htdocs/theme/raw/templates/edittags.tpl b/htdocs/theme/raw/templates/edittags.tpl index d2cd87c75e..53fdfb0ee9 100644 --- a/htdocs/theme/raw/templates/edittags.tpl +++ b/htdocs/theme/raw/templates/edittags.tpl @@ -19,7 +19,7 @@ {if $tag}

- + {str tag=edittag arg1=$tagsearchurl arg2=$tag}

{str tag=edittagdescription arg1=$tag}
@@ -27,7 +27,7 @@

- + {str tag=deletetag arg1=$tagsearchurl arg2=$tag}

{str tag=deletetagdescription}
diff --git a/htdocs/theme/raw/templates/form/authlist.tpl b/htdocs/theme/raw/templates/form/authlist.tpl index ce2f82a1da..c859be4ab9 100644 --- a/htdocs/theme/raw/templates/form/authlist.tpl +++ b/htdocs/theme/raw/templates/form/authlist.tpl @@ -71,7 +71,7 @@ jQuery(displayArray[i]).find('span.authIcons').first() .append(''+"\n"); instanceListDiv.appendChild(displayArray[i]); @@ -210,7 +210,7 @@ IMPORTANT: do not introduce any new whitespace into the instanceList div. {{/if}} - + {{str tag=deleteitem}} diff --git a/htdocs/theme/raw/templates/form/emaillist.tpl b/htdocs/theme/raw/templates/form/emaillist.tpl index a002c88cdc..853ad10da1 100644 --- a/htdocs/theme/raw/templates/form/emaillist.tpl +++ b/htdocs/theme/raw/templates/form/emaillist.tpl @@ -38,7 +38,7 @@ ' ', jQuery('', {'class': 'pseudolabel'}).append(email),' ', jQuery(' {{/if}}
@@ -122,7 +122,7 @@ {{$email}}
{{str tag=validationemailsent section=artefact.internal}}
diff --git a/htdocs/theme/raw/templates/form/viewacl.tpl b/htdocs/theme/raw/templates/form/viewacl.tpl index ccd209646a..9826fd3a84 100644 --- a/htdocs/theme/raw/templates/form/viewacl.tpl +++ b/htdocs/theme/raw/templates/form/viewacl.tpl @@ -40,7 +40,7 @@ - + {%={{jstr tag=remove section=view}}%} @@ -182,7 +182,7 @@ jQuery(function($) { previous: "icon icon-chevron-left", next: "icon icon-chevron-right", close: "icon icon-times", - clear: "icon icon-trash", + clear: "icon icon-trash-alt", today: "icon icon-crosshairs", }, }); diff --git a/htdocs/theme/raw/templates/group/groupuserstatus.tpl b/htdocs/theme/raw/templates/group/groupuserstatus.tpl index 0354b30607..bdf88fa010 100644 --- a/htdocs/theme/raw/templates/group/groupuserstatus.tpl +++ b/htdocs/theme/raw/templates/group/groupuserstatus.tpl @@ -26,7 +26,7 @@
{if $viewid} - + {str tag=editthisview section='view'} {/if} @@ -44,7 +44,7 @@ {/if} - + {str tag=delete} {str(tag=deletespecific arg1=$group->name)|escape:html|safe} diff --git a/htdocs/theme/raw/templates/header/pageactions.tpl b/htdocs/theme/raw/templates/header/pageactions.tpl index 264561caa7..48553711f0 100644 --- a/htdocs/theme/raw/templates/header/pageactions.tpl +++ b/htdocs/theme/raw/templates/header/pageactions.tpl @@ -2,7 +2,7 @@
{if $editurl}{strip} - + {str tag=editthisview section=view} {/strip}{/if} @@ -27,7 +27,7 @@ {else} {/if} - + {str tag=copy section=mahara} @@ -78,7 +78,7 @@ {if $userisowner || $canremove}
  • - + {str tag=deletethisview section=view} {str(tag=deletespecific arg1=$maintitle)|escape:html|safe} diff --git a/htdocs/theme/raw/templates/header/profileactions.tpl b/htdocs/theme/raw/templates/header/profileactions.tpl index c80a4604f7..0c9dcde22d 100644 --- a/htdocs/theme/raw/templates/header/profileactions.tpl +++ b/htdocs/theme/raw/templates/header/profileactions.tpl @@ -2,7 +2,7 @@
    {if $ownprofile} - + {str tag=editthisview section=view} {/if} diff --git a/htdocs/theme/raw/templates/homeinfo.tpl b/htdocs/theme/raw/templates/homeinfo.tpl index 8cc14e1a62..98b6d055ce 100644 --- a/htdocs/theme/raw/templates/homeinfo.tpl +++ b/htdocs/theme/raw/templates/homeinfo.tpl @@ -35,7 +35,7 @@
    - +

    {str tag=share} diff --git a/htdocs/theme/raw/templates/index.tpl b/htdocs/theme/raw/templates/index.tpl index 79e01ca04a..45bbc0b3bc 100644 --- a/htdocs/theme/raw/templates/index.tpl +++ b/htdocs/theme/raw/templates/index.tpl @@ -6,7 +6,7 @@ {if $dashboardview}
    {include file="user/dashboard.tpl"} diff --git a/htdocs/theme/raw/templates/skin/index.tpl b/htdocs/theme/raw/templates/skin/index.tpl index 8c4940a276..679aaaec6d 100644 --- a/htdocs/theme/raw/templates/skin/index.tpl +++ b/htdocs/theme/raw/templates/skin/index.tpl @@ -46,7 +46,7 @@
    {if $skin.editable} - + {str tag=editspecific arg1=$skin.title} @@ -63,7 +63,7 @@ - + {str tag=deletespecific arg1=$skin.title} diff --git a/htdocs/theme/raw/templates/styleguide.tpl b/htdocs/theme/raw/templates/styleguide.tpl index afe98b64b7..669276b2c0 100644 --- a/htdocs/theme/raw/templates/styleguide.tpl +++ b/htdocs/theme/raw/templates/styleguide.tpl @@ -86,7 +86,7 @@ This pair of buttons is used for editing or deleting a block item on a page.
    @@ -748,7 +748,7 @@ This card is used to show a page.

    {if $not_institution_tag}
    - {str tag=editthistag} + {str tag=editthistag}
    {/if}
    diff --git a/htdocs/theme/raw/templates/view/accessurl.tpl b/htdocs/theme/raw/templates/view/accessurl.tpl index 44e2f4648c..20380268cd 100644 --- a/htdocs/theme/raw/templates/view/accessurl.tpl +++ b/htdocs/theme/raw/templates/view/accessurl.tpl @@ -44,11 +44,11 @@
    - + {str tag=copytoclipboard} - + {str tag=edit} diff --git a/htdocs/theme/raw/templates/view/blocktypecategorylist.tpl b/htdocs/theme/raw/templates/view/blocktypecategorylist.tpl index 5c88a81451..92ede97d4f 100644 --- a/htdocs/theme/raw/templates/view/blocktypecategorylist.tpl +++ b/htdocs/theme/raw/templates/view/blocktypecategorylist.tpl @@ -12,7 +12,7 @@ {else}
    - + {str tag=loading section=mahara}
    diff --git a/htdocs/theme/raw/templates/view/blocktypecontainerediting.tpl b/htdocs/theme/raw/templates/view/blocktypecontainerediting.tpl index 43bd66cfe8..369cc7c490 100644 --- a/htdocs/theme/raw/templates/view/blocktypecontainerediting.tpl +++ b/htdocs/theme/raw/templates/view/blocktypecontainerediting.tpl @@ -25,7 +25,7 @@ {/if} {if !$lockblocks} {/if} diff --git a/htdocs/theme/raw/templates/view/editviewtabs.tpl b/htdocs/theme/raw/templates/view/editviewtabs.tpl index f9b67af040..aa92b95293 100644 --- a/htdocs/theme/raw/templates/view/editviewtabs.tpl +++ b/htdocs/theme/raw/templates/view/editviewtabs.tpl @@ -6,13 +6,13 @@ {if ($edittitle || $canuseskins) }{str tag=settings section=view}{else}{str tag=editlayout section=view}{/if} - + {str tag=editcontent1 section=view} {if !$accesssuspended && ($edittitle || $viewtype == 'share')} - + {str tag=shareview1 section=view} {/if} diff --git a/htdocs/theme/raw/templates/view/index.tpl b/htdocs/theme/raw/templates/view/index.tpl index f5c10350de..7d612aa84a 100644 --- a/htdocs/theme/raw/templates/view/index.tpl +++ b/htdocs/theme/raw/templates/view/index.tpl @@ -6,7 +6,7 @@ {str section=mahara tag=add} - + {str section=mahara tag=copy}
    @@ -47,7 +47,7 @@

    {str tag=confirmadddesc section=view}

    - +
    diff --git a/htdocs/theme/raw/templates/view/indexresults.tpl b/htdocs/theme/raw/templates/view/indexresults.tpl index 10238e5491..a8333d7555 100644 --- a/htdocs/theme/raw/templates/view/indexresults.tpl +++ b/htdocs/theme/raw/templates/view/indexresults.tpl @@ -43,7 +43,7 @@ {if $view.accesslist || $view.manageaccess}