mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-15 19:14:09 +02:00
Code Issues Releases Wiki Activity

Issue #3559, Fixes #3589, Issue #2982, Issue #2927 Replace all glyphicons with FontAwesome.

Browse Source
This commit is contained in:
Cameron
2019-02-22 14:56:47 -08:00
parent 9e6c2a79f0
commit 5dc45298f6
16 changed files with 45 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
e107_core/shortcodes/batch/news_shortcodes.php
View File

@@ -572,7 +572,7 @@ class news_shortcodes extends e_shortcode
{
//TODO - discuss - a pref for 'new browser window' loading, or a parm or leave 'new browser window' as default?
$default = (deftrue('BOOTSTRAP')) ? $tp->toGlyph('icon-edit',false) : "<img src='".e_IMAGE_ABS."admin_images/edit_16.png' alt=\"".LAN_EDIT."\" class='icon' />";
$default = (deftrue('BOOTSTRAP')) ? $tp->toGlyph('fa-edit',false) : "<img src='".e_IMAGE_ABS."admin_images/edit_16.png' alt=\"".LAN_EDIT."\" class='icon' />";
$adop_icon = (file_exists(THEME."images/newsedit.png") ? "<img src='".THEME_ABS."images/newsedit.png' alt=\"".LAN_EDIT."\" class='icon' />" : $default);

22
e107_core/shortcodes/batch/user_shortcodes.php
View File

@@ -302,41 +302,41 @@ function sc_user_email($parm='')
switch ($parm)
{
case 'email':
return ($boot) ? $tp->toGlyph('envelope') : $this->sc_user_email_icon();
return ($boot) ? $tp->toGlyph('fa-envelope') : $this->sc_user_email_icon();
break;
case 'lastvisit':
return ($boot) ? $tp->toGlyph('time') : '';
return ($boot) ? $tp->toGlyph('fa fa-clock-o') : '';
break;
case 'birthday':
return ($boot) ? $tp->toGlyph('calendar') : $this->sc_user_birthday_icon();
return ($boot) ? $tp->toGlyph('fa-calendar') : $this->sc_user_birthday_icon();
break;
case 'level':
return ($boot) ? $tp->toGlyph('signal') : '';
return ($boot) ? $tp->toGlyph('fa-signal') : '';
break;
case 'website':
return ($boot) ? $tp->toGlyph('home') : '';
return ($boot) ? $tp->toGlyph('fa-home') : '';
break;
case 'location':
return ($boot) ? $tp->toGlyph('map-marker') : '';
return ($boot) ? $tp->toGlyph('fa-map-marker') : '';
break;
case 'icq':
return ($boot) ? $tp->toGlyph('comment') : '';
return ($boot) ? $tp->toGlyph('fa-comment') : '';
break;
case 'msn':
return ($boot) ? $tp->toGlyph('comment') : '';
return ($boot) ? $tp->toGlyph('fa-comment') : '';
break;
default:
case 'realname':
case 'user':
return ($boot) ? $tp->toGlyph('user') : $this->sc_user_realname_icon();
return ($boot) ? $tp->toGlyph('fa-user') : $this->sc_user_realname_icon();
break;
}
@@ -593,7 +593,7 @@ function sc_user_email($parm='')
if($parm == 'prev')
{
$icon = (deftrue('BOOTSTRAP')) ? $tp->toGlyph('chevron-left') : '&lt;&lt;';
$icon = (deftrue('BOOTSTRAP')) ? $tp->toGlyph('fa-chevron-left') : '&lt;&lt;';
return isset($userjump['prev']['id']) ? "<a class='e-tip' href='".$url->create('user/profile/view', $userjump['prev']) ."' title=\"".$userjump['prev']['name']."\">".$icon." ".LAN_USER_40."</a>\n" : "&nbsp;";
// return isset($userjump['prev']['id']) ? "&lt;&lt; ".LAN_USER_40." [ <a href='".$url->create('user/profile/view', $userjump['prev'])."'>".$userjump['prev']['name']."</a> ]" : "&nbsp;";
@@ -601,7 +601,7 @@ function sc_user_email($parm='')
}
else
{
$icon = (deftrue('BOOTSTRAP')) ? $tp->toGlyph('chevron-right') : '&gt;&gt;';
$icon = (deftrue('BOOTSTRAP')) ? $tp->toGlyph('fa-chevron-right') : '&gt;&gt;';
return isset($userjump['next']['id']) ? "<a class='e-tip' href='".$url->create('user/profile/view', $userjump['next'])."' title=\"".$userjump['next']['name']."\">".LAN_USER_41." ".$icon."</a>\n" : "&nbsp;";
// return isset($userjump['next']['id']) ? "[ <a href='".$url->create('user/profile/view', $userjump['next'])."'>".$userjump['next']['name']."</a> ] ".LAN_USER_41." &gt;&gt;" : "&nbsp;";
}