mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-23 06:33:22 +02:00
Code Issues Releases Wiki Activity

Closes #4969, Fixes #5008, Fixes #4498 - FontAwesome6 support.

Browse Source
This commit is contained in:
camer0n
2023-11-17 11:18:23 -08:00
parent bf3ba04430
commit 34ba78023c
13 changed files with 216 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
e107_admin/image.php
View File

@@ -2211,10 +2211,10 @@ class media_admin_ui extends e_admin_ui
$md = e107::getMedia();
if($this->fontawesome === 5)
if($this->fontawesome > 4) // Fontawesome 5 and 6
{
// e107::getParser()->setFontAwesome(5);
$fab = e107::getMedia()->getGlyphs('fab');
$fab = e107::getMedia()->getGlyphs('fa'.$this->fontawesome.'-fab');
foreach($fab as $val)
{
@@ -2224,13 +2224,13 @@ class media_admin_ui extends e_admin_ui
'saveValue' => 'fab-'.$val.'.glyph',
'thumbUrl' => 'fab-'.$val,
'title' => 'FA5 fa-'.$val,
'slideCaption' => 'Font-Awesome 5 (brand)',
'slideCaption' => "Font-Awesome $this->fontawesome (brand)",
'slideCategory' => 'font-awesome'
);
}
$fas = e107::getMedia()->getGlyphs('fas');
$fas = e107::getMedia()->getGlyphs('fa'.$this->fontawesome.'-fas');
foreach($fas as $val)
{
@@ -2240,13 +2240,13 @@ class media_admin_ui extends e_admin_ui
'saveValue' => 'fas-'.$val.'.glyph',
'thumbUrl' => 'fas-'.$val,
'title' => 'FA5 fa-'.$val,
'slideCaption' => 'Font-Awesome 5 (solid)',
'slideCaption' => "Font-Awesome $this->fontawesome (solid)",
'slideCategory' => 'font-awesome'
);
}
$far = e107::getMedia()->getGlyphs('far');
$far = e107::getMedia()->getGlyphs('fa'.$this->fontawesome.'-far');
foreach($far as $val)
{
@@ -2256,7 +2256,7 @@ class media_admin_ui extends e_admin_ui
'saveValue' => 'far-'.$val.'.glyph',
'thumbUrl' => 'far-'.$val,
'title' => 'FA5 far-'.$val,
'slideCaption' => 'Font-Awesome 5 (regular)',
'slideCaption' => "Font-Awesome $this->fontawesome (regular)",
'slideCategory' => 'font-awesome'
);