mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-20 13:21:54 +02:00
Code Issues Releases Wiki Activity

GUI Glyph fixes and Bbcode button styling fixes.

Browse Source
This commit is contained in:
Cameron
2014-01-17 06:49:55 -08:00
parent 325c3f3f60
commit 58d2aa8ad3
14 changed files with 206 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
e107_handlers/e_parse_class.php
View File

@@ -2692,6 +2692,17 @@ class e_parser
return false;
}
if(is_array($space))
{
$parm = $space;
$space = varset($parm['space'],'');
}
else
{
$parm = array();
}
// Bootstrap 3 Glyph names.
$bs3 = e107::getMedia()->getGlyphs('bs3','');
@@ -2718,10 +2729,10 @@ class e_parser
if($type == 'fa')
{
$cls = str_replace('fa-', 'fa fa-', $cls);
$cls = str_replace('fa-', 'fa fa-', $cls);
$cls .= (vartrue($parm['size'])) ? ' fa-'.$parm['size'] : '';
}
// $text = (deftrue('BOOTSTRAP') === 3) ? "<span class='".$cls."'></span>" : "<i class='".$cls."'></i>"; // retain space.
$text = "<span class='".$cls."'></span>" ;
@@ -2756,7 +2767,7 @@ class e_parser
if(substr($icon,-6) == '.glyph') // Bootstrap or Font-Awesome.
{
return $this->toGlyph($icon);
return $this->toGlyph($icon,$parm);
}
if(strpos($icon,'e_MEDIA')!==FALSE)