Commit c3479dc6 authored by Rebecca Blundell's avatar Rebecca Blundell Committed by Robert Lyon

Bug 1811904: Fontawesome - final name changes

icon-clipboard      -> icon-clipboard-check
icon-eye            -> icon-regular icon-eye
icon-eye-slash      -> icon-regular icon-eye-slash
icon-file-archive-o -> icon-regular
icon-comments-o     -> icon-comments
icon-external-link  -> icon-external-link-alt
icon-tachometer     -> icon-tachometer-alt
icon-rotate-right   -> icon-redo
icon-file-archive-o -> icon-file-archive
icon-comments-o     -> icon-comments
icon-send           -> icon-paper-plane
icon-lightbulb-o    -> icon-regular icon-lightbulb
icon-code-fork      -> icon-code-branch  - changed versioning to
'history' icon
icon-file-o         -> icon-regular icon-file

also changed some icons to new ones
used text-align, width and margin-right to centre list items.

behatnotneeded

Change-Id: I4d27e450a281dc49716d97de309a3c99b89a0bc1
parent e84165b0
...@@ -40,7 +40,7 @@ $prefsform = pieform(array( ...@@ -40,7 +40,7 @@ $prefsform = pieform(array(
)); ));
$smarty = smarty(); $smarty = smarty();
setpageicon($smarty, 'icon-regular icon-envelope'); setpageicon($smarty, 'icon-bell');
$smarty->assign('pagedescription', get_string('prefsdescr', 'activity')); $smarty->assign('pagedescription', get_string('prefsdescr', 'activity'));
$smarty->assign('form', $prefsform); $smarty->assign('form', $prefsform);
$dropdownmenu = get_config('dropdownmenu') && get_config('dropdownmenuenabled'); $dropdownmenu = get_config('dropdownmenu') && get_config('dropdownmenuenabled');
......
...@@ -35,7 +35,7 @@ $js = <<< EOF ...@@ -35,7 +35,7 @@ $js = <<< EOF
EOF; EOF;
$smarty = smarty(array('privacy')); $smarty = smarty(array('privacy'));
setpageicon($smarty, 'icon-umbrella'); setpageicon($smarty, 'icon-gavel');
$smarty->assign('form', $form); $smarty->assign('form', $form);
$smarty->assign('INLINEJAVASCRIPT', $js); $smarty->assign('INLINEJAVASCRIPT', $js);
......
...@@ -42,7 +42,7 @@ foreach ($cleanurlconfigkeys as $k) { ...@@ -42,7 +42,7 @@ foreach ($cleanurlconfigkeys as $k) {
} }
$smarty = smarty(); $smarty = smarty();
setpageicon($smarty, 'icon-puzzle-piece'); setpageicon($smarty, 'icon-cog');
$smarty->assign('cleanurls', get_config('cleanurls')); $smarty->assign('cleanurls', get_config('cleanurls'));
$smarty->assign('cleanurlconfig', $cleanurlconfig); $smarty->assign('cleanurlconfig', $cleanurlconfig);
......
...@@ -48,7 +48,7 @@ function reloadfilters_submit(Pieform $form, $values) { ...@@ -48,7 +48,7 @@ function reloadfilters_submit(Pieform $form, $values) {
} }
$smarty = smarty(); $smarty = smarty();
setpageicon($smarty, 'icon-puzzle-piece'); setpageicon($smarty, 'icon-filter');
$smarty->assign('reloadform', $reloadform); $smarty->assign('reloadform', $reloadform);
$smarty->assign('newfiltersdescription', get_string('newfiltersdescription', 'admin', get_config('libroot') . 'htmlpurifiercustom')); $smarty->assign('newfiltersdescription', get_string('newfiltersdescription', 'admin', get_config('libroot') . 'htmlpurifiercustom'));
......
...@@ -261,7 +261,7 @@ jQuery(function($) { ...@@ -261,7 +261,7 @@ jQuery(function($) {
EOF; EOF;
$smarty = smarty(); $smarty = smarty();
setpageicon($smarty, 'icon-puzzle-piece'); setpageicon($smarty, 'icon-regular icon-file-code');
$smarty->assign('INLINEJAVASCRIPT', $js); $smarty->assign('INLINEJAVASCRIPT', $js);
$smarty->assign('editurls', $editurls); $smarty->assign('editurls', $editurls);
......
...@@ -199,7 +199,7 @@ JAVASCRIPT; ...@@ -199,7 +199,7 @@ JAVASCRIPT;
$smarty = smarty(); $smarty = smarty();
setpageicon($smarty, 'icon-puzzle-piece'); setpageicon($smarty, 'icon-plug');
$smarty->assign('INLINEJAVASCRIPT', $javascript); $smarty->assign('INLINEJAVASCRIPT', $javascript);
$smarty->assign('plugins', $plugins); $smarty->assign('plugins', $plugins);
......
...@@ -56,7 +56,7 @@ jQuery(function() { ...@@ -56,7 +56,7 @@ jQuery(function() {
EOF; EOF;
$smarty = smarty(array('adminusersearch', 'adminexportqueue','paginator'), array(), array('ascending' => 'mahara', 'descending' => 'mahara')); $smarty = smarty(array('adminusersearch', 'adminexportqueue','paginator'), array(), array('ascending' => 'mahara', 'descending' => 'mahara'));
setpageicon($smarty, 'icon-users'); setpageicon($smarty, 'icon-archive');
$smarty->assign('search', $search); $smarty->assign('search', $search);
$smarty->assign('limit', $limit); $smarty->assign('limit', $limit);
$smarty->assign('institutions', !empty($institutions) ? $institutions : array()); $smarty->assign('institutions', !empty($institutions) ? $institutions : array());
......
...@@ -232,7 +232,7 @@ jQuery(function($) { ...@@ -232,7 +232,7 @@ jQuery(function($) {
EOJS; EOJS;
$smarty = smarty(); $smarty = smarty();
setpageicon($smarty, 'icon-users'); setpageicon($smarty, 'icon-users-cog');
$smarty->assign('PAGEHEADING', hsc(get_string('groupcategories', 'admin'))); $smarty->assign('PAGEHEADING', hsc(get_string('groupcategories', 'admin')));
$smarty->assign('INLINEJAVASCRIPT', $ijs); $smarty->assign('INLINEJAVASCRIPT', $ijs);
......
...@@ -87,7 +87,7 @@ jQuery(function() { ...@@ -87,7 +87,7 @@ jQuery(function() {
EOF; EOF;
$smarty = smarty(array('paginator')); $smarty = smarty(array('paginator'));
setpageicon($smarty, 'icon-users'); setpageicon($smarty, 'icon-users-cog');
$smarty->assign('INLINEJAVASCRIPT', $js); $smarty->assign('INLINEJAVASCRIPT', $js);
$smarty->assign('searchform', $searchform); $smarty->assign('searchform', $searchform);
......
...@@ -410,7 +410,7 @@ $form = pieform($form); ...@@ -410,7 +410,7 @@ $form = pieform($form);
set_progress_done('uploadgroupscsv'); set_progress_done('uploadgroupscsv');
$smarty = smarty(array('adminuploadcsv')); $smarty = smarty(array('adminuploadcsv'));
setpageicon($smarty, 'icon-users'); setpageicon($smarty, 'icon-users-cog');
$smarty->assign('uploadcsvpagedescription', $uploadcsvpagedescription); $smarty->assign('uploadcsvpagedescription', $uploadcsvpagedescription);
$smarty->assign('uploadcsvform', $form); $smarty->assign('uploadcsvform', $form);
$smarty->display('admin/groups/uploadcsv.tpl'); $smarty->display('admin/groups/uploadcsv.tpl');
...@@ -248,7 +248,7 @@ $form = pieform($form); ...@@ -248,7 +248,7 @@ $form = pieform($form);
set_progress_done('uploadgroupmemberscsv'); set_progress_done('uploadgroupmemberscsv');
$smarty = smarty(array('adminuploadcsv')); $smarty = smarty(array('adminuploadcsv'));
setpageicon($smarty, 'icon-users'); setpageicon($smarty, 'icon-users-cog');
$smarty->assign('uploadcsvpagedescription', $uploadcsvpagedescription); $smarty->assign('uploadcsvpagedescription', $uploadcsvpagedescription);
$smarty->assign('uploadcsvform', $form); $smarty->assign('uploadcsvform', $form);
......
...@@ -161,7 +161,7 @@ EOF; ...@@ -161,7 +161,7 @@ EOF;
$js .= '});'; $js .= '});';
$smarty = smarty(array('paginator'), $css, array(), array()); $smarty = smarty(array('paginator'), $css, array(), array());
setpageicon($smarty, 'icon-text-width'); setpageicon($smarty, 'icon-paragraph');
$smarty->assign('INLINEJAVASCRIPT', $js); $smarty->assign('INLINEJAVASCRIPT', $js);
$smarty->assign('query', $query); $smarty->assign('query', $query);
$smarty->assign('sitefonts', $data->data); $smarty->assign('sitefonts', $data->data);
......
...@@ -28,7 +28,7 @@ $xmlrpcext = extension_loaded('xmlrpc'); ...@@ -28,7 +28,7 @@ $xmlrpcext = extension_loaded('xmlrpc');
if (!$opensslext || !$curlext || !$xmlrpcext) { if (!$opensslext || !$curlext || !$xmlrpcext) {
$smarty = smarty(); $smarty = smarty();
setpageicon($smarty, 'icon-exchange-alt'); setpageicon($smarty, 'icon-network-wired');
$missingextensions = array(); $missingextensions = array();
!$opensslext && $missingextensions[] = 'openssl'; !$opensslext && $missingextensions[] = 'openssl';
...@@ -169,6 +169,6 @@ function networkingform_submit(Pieform $form, $values) { ...@@ -169,6 +169,6 @@ function networkingform_submit(Pieform $form, $values) {
} }
$smarty = smarty(); $smarty = smarty();
setpageicon($smarty, 'icon-exchange-alt'); setpageicon($smarty, 'icon-network-wired');
$smarty->assign('networkingform', $networkingform); $smarty->assign('networkingform', $networkingform);
$smarty->display('admin/site/networking.tpl'); $smarty->display('admin/site/networking.tpl');
...@@ -370,7 +370,7 @@ $siteoptionform = array( ...@@ -370,7 +370,7 @@ $siteoptionform = array(
), ),
), ),
'accountsettings' => array( 'accountsettings' => array(
'iconclass'=>'regular icon-clock', 'iconclass'=>'regular icon-user-cog',
'type' => 'fieldset', 'type' => 'fieldset',
'collapsible' => true, 'collapsible' => true,
'collapsed' => true, 'collapsed' => true,
...@@ -782,7 +782,7 @@ $siteoptionform = array( ...@@ -782,7 +782,7 @@ $siteoptionform = array(
), ),
), ),
'loggingsettings' => array( 'loggingsettings' => array(
'iconclass'=>'exclamation-triangle', 'iconclass'=>'truck-loading',
'class' => 'last', 'class' => 'last',
'type' => 'fieldset', 'type' => 'fieldset',
'collapsible' => true, 'collapsible' => true,
......
...@@ -143,7 +143,7 @@ if ($versionid && $pageoptions) { ...@@ -143,7 +143,7 @@ if ($versionid && $pageoptions) {
else { else {
$smarty = smarty(array('privacy')); $smarty = smarty(array('privacy'));
} }
setpageicon($smarty, 'icon-umbrella'); setpageicon($smarty, 'icon-gavel');
$smarty->assign('INLINEJAVASCRIPT', $js); $smarty->assign('INLINEJAVASCRIPT', $js);
$smarty->assign('results', $data); $smarty->assign('results', $data);
$smarty->assign('selectedtab', $selectedtab); $smarty->assign('selectedtab', $selectedtab);
......
...@@ -70,7 +70,7 @@ function adminusers_submit(Pieform $form, $values) { ...@@ -70,7 +70,7 @@ function adminusers_submit(Pieform $form, $values) {
} }
$smarty = smarty(); $smarty = smarty();
setpageicon($smarty, 'icon-user'); setpageicon($smarty, 'icon-user-friends');
$smarty->assign('adminusersform', $form); $smarty->assign('adminusersform', $form);
$smarty->display('admin/users/admin.tpl'); $smarty->display('admin/users/admin.tpl');
...@@ -1016,6 +1016,7 @@ $smarty->assign('institutionform', $institutionform); ...@@ -1016,6 +1016,7 @@ $smarty->assign('institutionform', $institutionform);
$smarty->assign('loginas', $id != $USER->get('id') && is_null($USER->get('parentuser'))); $smarty->assign('loginas', $id != $USER->get('id') && is_null($USER->get('parentuser')));
$smarty->assign('PAGEHEADING', display_name($user)); $smarty->assign('PAGEHEADING', display_name($user));
$smarty->assign('SUBSECTIONHEADING', TITLE); $smarty->assign('SUBSECTIONHEADING', TITLE);
setpageicon($smarty, 'icon-user-cog');
# Only allow deletion and suspension of a user if the viewed user is not # Only allow deletion and suspension of a user if the viewed user is not
# the current user; or if they are the current user, they're not the only # the current user; or if they are the current user, they're not the only
......
...@@ -164,7 +164,7 @@ jQuery(function($) { ...@@ -164,7 +164,7 @@ jQuery(function($) {
EOF; EOF;
$smarty = smarty(array('adminexportqueue', 'paginator'), array(), array('ascending' => 'mahara', 'descending' => 'mahara')); $smarty = smarty(array('adminexportqueue', 'paginator'), array(), array('ascending' => 'mahara', 'descending' => 'mahara'));
setpageicon($smarty, 'icon-user'); setpageicon($smarty, 'icon-regular icon-clock');
$smarty->assign('search', $search); $smarty->assign('search', $search);
$smarty->assign('limit', $limit); $smarty->assign('limit', $limit);
$smarty->assign('institutions', !empty($institutions) ? $institutions : array()); $smarty->assign('institutions', !empty($institutions) ? $institutions : array());
......
...@@ -49,6 +49,7 @@ else if (!empty($institutionelement['options']) && sizeof($institutionelement['o ...@@ -49,6 +49,7 @@ else if (!empty($institutionelement['options']) && sizeof($institutionelement['o
else if (empty($institutionelement['options'])) { else if (empty($institutionelement['options'])) {
// Only the 'no institution' institution exists so we need to display this fact // Only the 'no institution' institution exists so we need to display this fact
$smarty = smarty(); $smarty = smarty();
setpageicon($smarty, 'icon-pencil-alt');
$smarty->assign('noinstitutionsadmin', (($USER->admin) ? get_string('noinstitutionstaticpagesadmin', 'admin', get_config('wwwroot') . 'admin/site/pages.php') : false)); $smarty->assign('noinstitutionsadmin', (($USER->admin) ? get_string('noinstitutionstaticpagesadmin', 'admin', get_config('wwwroot') . 'admin/site/pages.php') : false));
$smarty->assign('noinstitutions', get_string('noinstitutionstaticpages', 'admin')); $smarty->assign('noinstitutions', get_string('noinstitutionstaticpages', 'admin'));
$smarty->display('admin/site/pages.tpl'); $smarty->display('admin/site/pages.tpl');
...@@ -155,7 +156,7 @@ function editsitepage_submit(Pieform $form, $values) { ...@@ -155,7 +156,7 @@ function editsitepage_submit(Pieform $form, $values) {
} }
$smarty = smarty(array('adminsitepages'), array(), array('admin' => array('discardpageedits'))); $smarty = smarty(array('adminsitepages'), array(), array('admin' => array('discardpageedits')));
setpageicon($smarty, 'icon-university'); setpageicon($smarty, 'icon-pencil-alt');
$smarty->assign('noinstitutionsadmin', (($USER->admin) ? get_string('noinstitutionstaticpagesadmin', 'admin', get_config('wwwroot') . 'admin/site/pages.php') : false)); $smarty->assign('noinstitutionsadmin', (($USER->admin) ? get_string('noinstitutionstaticpagesadmin', 'admin', get_config('wwwroot') . 'admin/site/pages.php') : false));
$smarty->assign('pageeditform', $form); $smarty->assign('pageeditform', $form);
......
...@@ -178,7 +178,7 @@ $(function() { ...@@ -178,7 +178,7 @@ $(function() {
EOF; EOF;
$smarty = smarty(array('privacy')); $smarty = smarty(array('privacy'));
setpageicon($smarty, 'icon-umbrella'); setpageicon($smarty, 'icon-gavel');
$smarty->assign('INLINEJAVASCRIPT', $js); $smarty->assign('INLINEJAVASCRIPT', $js);
$smarty->assign('href', $href); $smarty->assign('href', $href);
......
...@@ -192,7 +192,7 @@ if (!$tags) { ...@@ -192,7 +192,7 @@ if (!$tags) {
} }
$smarty = smarty(array('paginator')); $smarty = smarty(array('paginator'));
setpageicon($smarty, 'icon-university'); setpageicon($smarty, 'icon-tags');
$smarty->assign('institutionselector', $institutionselector); $smarty->assign('institutionselector', $institutionselector);
$smarty->assign('INLINEJAVASCRIPT', $js); $smarty->assign('INLINEJAVASCRIPT', $js);
$smarty->assign('canedit', $canedit); $smarty->assign('canedit', $canedit);
......
...@@ -314,7 +314,7 @@ $institutionselector = pieform(array( ...@@ -314,7 +314,7 @@ $institutionselector = pieform(array(
)); ));
$smarty = smarty(); $smarty = smarty();
setpageicon($smarty, 'icon-university'); setpageicon($smarty, 'icon-user-friends');
$smarty->assign('INLINEJAVASCRIPT', $js); $smarty->assign('INLINEJAVASCRIPT', $js);
$smarty->assign('usertypeselector', $usertypeselector); $smarty->assign('usertypeselector', $usertypeselector);
$smarty->assign('instructions', get_string('institutionusersinstructions' . $usertype . '1', 'admin', $userlistelement['lefttitle'], $userlistelement['righttitle'])); $smarty->assign('instructions', get_string('institutionusersinstructions' . $usertype . '1', 'admin', $userlistelement['lefttitle'], $userlistelement['righttitle']));
......
...@@ -70,7 +70,7 @@ if ($userinstitutions) { ...@@ -70,7 +70,7 @@ if ($userinstitutions) {
} }
$smarty = smarty(); $smarty = smarty();
setpageicon($smarty, 'icon-university'); setpageicon($smarty, 'icon-bell');
$smarty->assign('users', $users); $smarty->assign('users', $users);
$smarty->assign('types', $types); $smarty->assign('types', $types);
......
...@@ -97,7 +97,7 @@ jQuery(function($) { ...@@ -97,7 +97,7 @@ jQuery(function($) {
EOF; EOF;
$smarty = smarty(); $smarty = smarty();
setpageicon($smarty, 'icon-university'); setpageicon($smarty, 'icon-user-times');
$smarty->assign('INLINEJAVASCRIPT', $js); $smarty->assign('INLINEJAVASCRIPT', $js);
$smarty->assign('data', $data); $smarty->assign('data', $data);
......
...@@ -104,7 +104,7 @@ jQuery(function($) { ...@@ -104,7 +104,7 @@ jQuery(function($) {
EOF; EOF;
$smarty = smarty(); $smarty = smarty();
setpageicon($smarty, 'icon-university'); setpageicon($smarty, 'icon-user-clock');
$smarty->assign('INLINEJAVASCRIPT', $js); $smarty->assign('INLINEJAVASCRIPT', $js);
$smarty->assign('data', $data); $smarty->assign('data', $data);
......
...@@ -235,7 +235,7 @@ jQuery(function($) { ...@@ -235,7 +235,7 @@ jQuery(function($) {
EOF; EOF;
$smarty = smarty(array(), array(), array(), array('sideblocks' => array(progressbar_sideblock(true)))); $smarty = smarty(array(), array(), array(), array('sideblocks' => array(progressbar_sideblock(true))));
setpageicon($smarty, 'icon-university'); setpageicon($smarty, 'icon-regular icon-id-badge');
$smarty->assign('progressbarform', $form); $smarty->assign('progressbarform', $form);
$smarty->assign('institution', $institution); $smarty->assign('institution', $institution);
......
...@@ -67,7 +67,7 @@ function staffusers_submit(Pieform $form, $values) { ...@@ -67,7 +67,7 @@ function staffusers_submit(Pieform $form, $values) {
} }
$smarty = smarty(); $smarty = smarty();
setpageicon($smarty, 'icon-user'); setpageicon($smarty, 'icon-user-friends');
$smarty->assign('staffusersform', $form); $smarty->assign('staffusersform', $form);
$smarty->display('admin/users/staff.tpl'); $smarty->display('admin/users/staff.tpl');
...@@ -678,7 +678,7 @@ $form = pieform($form); ...@@ -678,7 +678,7 @@ $form = pieform($form);
set_progress_done('uploaduserscsv'); set_progress_done('uploaduserscsv');
$smarty = smarty(array('adminuploadcsv')); $smarty = smarty(array('adminuploadcsv'));
setpageicon($smarty, 'icon-user'); setpageicon($smarty, 'icon-user-plus');
$smarty->assign('uploadcsvpagedescription', $uploadcsvpagedescription); $smarty->assign('uploadcsvpagedescription', $uploadcsvpagedescription);
$smarty->assign('uploadcsvform', $form); $smarty->assign('uploadcsvform', $form);
$smarty->display('admin/users/uploadcsv.tpl'); $smarty->display('admin/users/uploadcsv.tpl');
...@@ -100,6 +100,7 @@ ArtefactTypeBlog::build_blog_list_html($blogs); ...@@ -100,6 +100,7 @@ ArtefactTypeBlog::build_blog_list_html($blogs);
$smarty = smarty(array('paginator')); $smarty = smarty(array('paginator'));
$smarty->assign('blogs', $blogs); $smarty->assign('blogs', $blogs);
$smarty->assign('institutionname', $institutionname); $smarty->assign('institutionname', $institutionname);
setpageicon($smarty, 'icon-book');
$smarty->assign('group', $groupid); $smarty->assign('group', $groupid);
$smarty->assign('canedit', (!empty($group) ? $group->canedit : true)); $smarty->assign('canedit', (!empty($group) ? $group->canedit : true));
......
...@@ -1846,7 +1846,7 @@ function add_feedback_form_submit(Pieform $form, $values) { ...@@ -1846,7 +1846,7 @@ function add_feedback_form_submit(Pieform $form, $values) {
'view' => $view->get('id'), 'view' => $view->get('id'),
'ctime' => db_format_timestamp(time()), 'ctime' => db_format_timestamp(time()),
'unsubscribetoken' => get_random_key(24))); 'unsubscribetoken' => get_random_key(24)));
$updatelink = '<span class="icon icon-lg icon-eye-slash left" role="presentation" aria-hidden="true"></span>'; $updatelink = '<span class="icon icon-lg icon-regular icon-eye-slash left" role="presentation" aria-hidden="true"></span>';
$updatelink .= ($artefact) ? get_string('removefromwatchlistartefact', 'view', hsc($view->get('title'))) : get_string('removefromwatchlist', 'view'); $updatelink .= ($artefact) ? get_string('removefromwatchlistartefact', 'view', hsc($view->get('title'))) : get_string('removefromwatchlist', 'view');
} }
......
...@@ -35,7 +35,7 @@ $form = pieform(ArtefactTypeFileBase::files_form($pagebase, null, $institution)) ...@@ -35,7 +35,7 @@ $form = pieform(ArtefactTypeFileBase::files_form($pagebase, null, $institution))
$js = ArtefactTypeFileBase::files_js(); $js = ArtefactTypeFileBase::files_js();
$smarty = smarty(); $smarty = smarty();
setpageicon($smarty, 'icon-university'); setpageicon($smarty, 'icon-regular icon-file-image');
if ($institution === false) { if ($institution === false) {
$smarty->display('admin/users/noinstitutions.tpl'); $smarty->display('admin/users/noinstitutions.tpl');
......
...@@ -57,7 +57,7 @@ class PluginArtefactFile extends PluginArtefact { ...@@ -57,7 +57,7 @@ class PluginArtefactFile extends PluginArtefact {
'url' => 'artefact/file/profileicons.php', 'url' => 'artefact/file/profileicons.php',
'title' => get_string('profileicons', 'artefact.file'), 'title' => get_string('profileicons', 'artefact.file'),
'weight' => 15, 'weight' => 15,
'iconclass' => 'regular icon-id-badge', 'iconclass' => 'regular icon-portrait',
), ),
); );
} }
......
...@@ -323,7 +323,7 @@ function settings_submit_delete(Pieform $form, $values) { ...@@ -323,7 +323,7 @@ function settings_submit_delete(Pieform $form, $values) {
} }
$smarty = smarty(array('tablerenderer')); $smarty = smarty(array('tablerenderer'));
setpageicon($smarty, 'icon-regular icon-id-badge'); setpageicon($smarty, 'icon-regular icon-portrait');
$smarty->assign('INLINEJAVASCRIPT', $IJS); $smarty->assign('INLINEJAVASCRIPT', $IJS);
$smarty->assign('uploadform', $uploadform); $smarty->assign('uploadform', $uploadform);
// This is a rare case where we don't actually care about the form, because // This is a rare case where we don't actually care about the form, because
......
...@@ -39,7 +39,7 @@ jQuery(function () { ...@@ -39,7 +39,7 @@ jQuery(function () {
EOF; EOF;
$smarty = smarty(array('paginator')); $smarty = smarty(array('paginator'));
setpageicon($smarty, 'icon-plans'); setpageicon($smarty, 'icon-clipboard-list');
$smarty->assign('plans', $plans); $smarty->assign('plans', $plans);
$smarty->assign('strnoplansaddone', $smarty->assign('strnoplansaddone',
get_string('noplansaddone', 'artefact.plans', get_string('noplansaddone', 'artefact.plans',
......
...@@ -35,7 +35,7 @@ $inlinejs = ArtefactTypeResumeComposite::get_js($compositetypes); ...@@ -35,7 +35,7 @@ $inlinejs = ArtefactTypeResumeComposite::get_js($compositetypes);
$compositeforms = ArtefactTypeResumeComposite::get_forms($compositetypes); $compositeforms = ArtefactTypeResumeComposite::get_forms($compositetypes);
$smarty = smarty(array('tablerenderer')); $smarty = smarty(array('tablerenderer'));
setpageicon($smarty, 'icon-star'); setpageicon($smarty, 'icon-regular icon-address-book');
$smarty->assign('compositeforms', $compositeforms); $smarty->assign('compositeforms', $compositeforms);
$smarty->assign('INLINEJAVASCRIPT', $inlinejs); $smarty->assign('INLINEJAVASCRIPT', $inlinejs);
$smarty->assign('SUBPAGENAV', PluginArtefactResume::submenu_items()); $smarty->assign('SUBPAGENAV', PluginArtefactResume::submenu_items());
......
...@@ -30,7 +30,7 @@ $inlinejs = ArtefactTypeResumeComposite::get_js($compositetypes); ...@@ -30,7 +30,7 @@ $inlinejs = ArtefactTypeResumeComposite::get_js($compositetypes);
$compositeforms = ArtefactTypeResumeComposite::get_forms($compositetypes); $compositeforms = ArtefactTypeResumeComposite::get_forms($compositetypes);
$smarty = smarty(array('tablerenderer')); $smarty = smarty(array('tablerenderer'));
setpageicon($smarty, 'icon-star'); setpageicon($smarty, 'icon-regular icon-address-book');
$smarty->assign('compositeforms', $compositeforms);