1
0
mirror of https://github.com/e107inc/e107.git synced 2025-08-09 08:06:38 +02:00

toGlyph() additional tests, Media-Manager includes bootstrap5 when detected and backward compatibility.

This commit is contained in:
Cameron
2021-01-31 13:09:53 -08:00
parent 2dedc8719f
commit 0b1a84068f
10 changed files with 362 additions and 172 deletions

View File

@@ -2106,33 +2106,46 @@ class media_admin_ui extends e_admin_ui
'saveValue' => 'fas-'.$val.'.glyph',
'thumbUrl' => 'fas-'.$val,
'title' => 'FA5 fa-'.$val,
'slideCaption' => 'Font-Awesome 5 (free)',
'slideCaption' => 'Font-Awesome 5 (solid)',
'slideCategory' => 'font-awesome'
);
}
}
else
{
$far = e107::getMedia()->getGlyphs('far');
$fa4 = e107::getMedia()->getGlyphs('fa4');
foreach($fa4 as $val)
foreach($far as $val)
{
$items[] = array(
'previewHtml' => $md->previewTag('fa-'.$val,array('type'=>'glyph')),
'previewUrl' => 'fa fa-'.$val,
'saveValue' => 'fa-'.$val.'.glyph',
'thumbUrl' => 'fa-'.$val,
'title' => 'FA4 '.$val,
'slideCaption' => 'Font-Awesome 4',
'previewHtml' => $md->previewTag('far-'.$val, array('type'=>'glyph')),
'previewUrl' => 'far fa-'.$val,
'saveValue' => 'far-'.$val.'.glyph',
'thumbUrl' => 'far-'.$val,
'title' => 'FA5 far-'.$val,
'slideCaption' => 'Font-Awesome 5 (regular)',
'slideCategory' => 'font-awesome'
);
}
}
$fa4 = e107::getMedia()->getGlyphs('fa4');
foreach($fa4 as $val)
{
$items[] = array(
'previewHtml' => $md->previewTag('fa-'.$val,array('type'=>'glyph')),
'previewUrl' => 'fa fa-'.$val,
'saveValue' => 'fa-'.$val.'.glyph',
'thumbUrl' => 'fa-'.$val,
'title' => 'FA4 '.$val,
'slideCaption' => 'Font-Awesome 4',
'slideCategory' => 'font-awesome'
);
}
if($this->fontawesome === false || ($this->fontawesome < 4))
{