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

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(
));
$smarty = smarty();
setpageicon($smarty, 'icon-regular icon-envelope');
setpageicon($smarty, 'icon-bell');
$smarty->assign('pagedescription', get_string('prefsdescr', 'activity'));
$smarty->assign('form', $prefsform);
$dropdownmenu = get_config('dropdownmenu') && get_config('dropdownmenuenabled');
......
......@@ -35,7 +35,7 @@ $js = <<< EOF
EOF;
$smarty = smarty(array('privacy'));
setpageicon($smarty, 'icon-umbrella');
setpageicon($smarty, 'icon-gavel');
$smarty->assign('form', $form);
$smarty->assign('INLINEJAVASCRIPT', $js);
......
......@@ -42,7 +42,7 @@ foreach ($cleanurlconfigkeys as $k) {
}
$smarty = smarty();
setpageicon($smarty, 'icon-puzzle-piece');
setpageicon($smarty, 'icon-cog');
$smarty->assign('cleanurls', get_config('cleanurls'));
$smarty->assign('cleanurlconfig', $cleanurlconfig);
......
......@@ -48,7 +48,7 @@ function reloadfilters_submit(Pieform $form, $values) {
}
$smarty = smarty();
setpageicon($smarty, 'icon-puzzle-piece');
setpageicon($smarty, 'icon-filter');
$smarty->assign('reloadform', $reloadform);
$smarty->assign('newfiltersdescription', get_string('newfiltersdescription', 'admin', get_config('libroot') . 'htmlpurifiercustom'));
......
......@@ -261,7 +261,7 @@ jQuery(function($) {
EOF;
$smarty = smarty();
setpageicon($smarty, 'icon-puzzle-piece');
setpageicon($smarty, 'icon-regular icon-file-code');
$smarty->assign('INLINEJAVASCRIPT', $js);
$smarty->assign('editurls', $editurls);
......
......@@ -199,7 +199,7 @@ JAVASCRIPT;
$smarty = smarty();
setpageicon($smarty, 'icon-puzzle-piece');
setpageicon($smarty, 'icon-plug');
$smarty->assign('INLINEJAVASCRIPT', $javascript);
$smarty->assign('plugins', $plugins);
......
......@@ -56,7 +56,7 @@ jQuery(function() {
EOF;
$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('limit', $limit);
$smarty->assign('institutions', !empty($institutions) ? $institutions : array());
......
......@@ -232,7 +232,7 @@ jQuery(function($) {
EOJS;
$smarty = smarty();
setpageicon($smarty, 'icon-users');
setpageicon($smarty, 'icon-users-cog');
$smarty->assign('PAGEHEADING', hsc(get_string('groupcategories', 'admin')));
$smarty->assign('INLINEJAVASCRIPT', $ijs);
......
......@@ -87,7 +87,7 @@ jQuery(function() {
EOF;
$smarty = smarty(array('paginator'));
setpageicon($smarty, 'icon-users');
setpageicon($smarty, 'icon-users-cog');
$smarty->assign('INLINEJAVASCRIPT', $js);
$smarty->assign('searchform', $searchform);
......
......@@ -410,7 +410,7 @@ $form = pieform($form);
set_progress_done('uploadgroupscsv');
$smarty = smarty(array('adminuploadcsv'));
setpageicon($smarty, 'icon-users');
setpageicon($smarty, 'icon-users-cog');
$smarty->assign('uploadcsvpagedescription', $uploadcsvpagedescription);
$smarty->assign('uploadcsvform', $form);
$smarty->display('admin/groups/uploadcsv.tpl');
......@@ -248,7 +248,7 @@ $form = pieform($form);
set_progress_done('uploadgroupmemberscsv');
$smarty = smarty(array('adminuploadcsv'));
setpageicon($smarty, 'icon-users');
setpageicon($smarty, 'icon-users-cog');
$smarty->assign('uploadcsvpagedescription', $uploadcsvpagedescription);
$smarty->assign('uploadcsvform', $form);
......
......@@ -161,7 +161,7 @@ EOF;
$js .= '});';
$smarty = smarty(array('paginator'), $css, array(), array());
setpageicon($smarty, 'icon-text-width');
setpageicon($smarty, 'icon-paragraph');
$smarty->assign('INLINEJAVASCRIPT', $js);
$smarty->assign('query', $query);
$smarty->assign('sitefonts', $data->data);
......
......@@ -28,7 +28,7 @@ $xmlrpcext = extension_loaded('xmlrpc');
if (!$opensslext || !$curlext || !$xmlrpcext) {
$smarty = smarty();
setpageicon($smarty, 'icon-exchange-alt');
setpageicon($smarty, 'icon-network-wired');
$missingextensions = array();
!$opensslext && $missingextensions[] = 'openssl';
......@@ -169,6 +169,6 @@ function networkingform_submit(Pieform $form, $values) {
}
$smarty = smarty();
setpageicon($smarty, 'icon-exchange-alt');
setpageicon($smarty, 'icon-network-wired');
$smarty->assign('networkingform', $networkingform);
$smarty->display('admin/site/networking.tpl');
......@@ -370,7 +370,7 @@ $siteoptionform = array(
),
),
'accountsettings' => array(
'iconclass'=>'regular icon-clock',
'iconclass'=>'regular icon-user-cog',
'type' => 'fieldset',
'collapsible' => true,
'collapsed' => true,
......@@ -782,7 +782,7 @@ $siteoptionform = array(
),
),
'loggingsettings' => array(
'iconclass'=>'exclamation-triangle',
'iconclass'=>'truck-loading',
'class' => 'last',
'type' => 'fieldset',
'collapsible' => true,
......
......@@ -143,7 +143,7 @@ if ($versionid && $pageoptions) {
else {
$smarty = smarty(array('privacy'));
}
setpageicon($smarty, 'icon-umbrella');
setpageicon($smarty, 'icon-gavel');
$smarty->assign('INLINEJAVASCRIPT', $js);
$smarty->assign('results', $data);
$smarty->assign('selectedtab', $selectedtab);
......
......@@ -70,7 +70,7 @@ function adminusers_submit(Pieform $form, $values) {
}
$smarty = smarty();
setpageicon($smarty, 'icon-user');
setpageicon($smarty, 'icon-user-friends');
$smarty->assign('adminusersform', $form);
$smarty->display('admin/users/admin.tpl');
......@@ -1016,6 +1016,7 @@ $smarty->assign('institutionform', $institutionform);
$smarty->assign('loginas', $id != $USER->get('id') && is_null($USER->get('parentuser')));
$smarty->assign('PAGEHEADING', display_name($user));
$smarty->assign('SUBSECTIONHEADING', TITLE);
setpageicon($smarty, 'icon-user-cog');
# 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
......
......@@ -164,7 +164,7 @@ jQuery(function($) {
EOF;
$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('limit', $limit);
$smarty->assign('institutions', !empty($institutions) ? $institutions : array());
......
......@@ -49,6 +49,7 @@ else if (!empty($institutionelement['options']) && sizeof($institutionelement['o
else if (empty($institutionelement['options'])) {
// Only the 'no institution' institution exists so we need to display this fact
$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('noinstitutions', get_string('noinstitutionstaticpages', 'admin'));
$smarty->display('admin/site/pages.tpl');
......@@ -155,7 +156,7 @@ function editsitepage_submit(Pieform $form, $values) {
}
$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('pageeditform', $form);
......
......@@ -178,7 +178,7 @@ $(function() {
EOF;
$smarty = smarty(array('privacy'));
setpageicon($smarty, 'icon-umbrella');
setpageicon($smarty, 'icon-gavel');
$smarty->assign('INLINEJAVASCRIPT', $js);
$smarty->assign('href', $href);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment