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

Use Font-Awesome4 for all Glyphs.

Browse Source
This commit is contained in:
Cameron
2014-01-16 02:42:26 -08:00
parent ee3ff4c781
commit 4081d7936b
5 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
e107_admin/header.php
View File

@@ -304,7 +304,7 @@ if(e_PAGE == 'menus.php' && vartrue($_GET['configure'])) // Quick fix for Menu M
} }
else else
{ {
$e_js->coreCSS('font-awesome/css/font-awesome.min.css'); // $e_js->coreCSS('font-awesome/css/font-awesome.min.css');
} }

12
e107_admin/image.php
View File

@@ -1237,6 +1237,7 @@ class media_admin_ui extends e_admin_ui
); );
//TODO FIXME Upgrade to bs3 when Bootstrap3 Admin is ready. //TODO FIXME Upgrade to bs3 when Bootstrap3 Admin is ready.
/*
$bs2 = e107::getMedia()->getGlyphs('bs2','icon-'); $bs2 = e107::getMedia()->getGlyphs('bs2','icon-');
foreach($bs2 as $val) foreach($bs2 as $val)
@@ -1250,20 +1251,15 @@ class media_admin_ui extends e_admin_ui
'slideCategory' => 'bootstrap' 'slideCategory' => 'bootstrap'
); );
$text .= "<a data-toggle='context' class='e-media-select e-dialog-close e-tip' data-id='{$im['media_id']}' data-width='32' data-height='32' data-src='{$val}' data-type='glyph' data-bbcode='{$data_bb}' data-target='".$this->getQuery('tagid')."' data-path='{$val}.glyph' data-preview='{$val}.glyph' title='".$val."' style='float:left' href='#' >";
$text .= "<span style='margin:7px;display:inline-block'><i class='".$val."' style='color:white' ></i></span>";
$text .= "</a>\n\n";
} }
*/
$fa4 = e107::getMedia()->getGlyphs('fa4'); $fa4 = e107::getMedia()->getGlyphs('fa4');
e107::css('url', "//netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.min.css");
foreach($fa4 as $val) foreach($fa4 as $val)
{ {
$items[] = array( $items[] = array(
'previewUrl' => $val, 'previewUrl' => 'fa '.$val,
'saveValue' => $val.'.glyph', 'saveValue' => $val.'.glyph',
'thumbUrl' => $val, 'thumbUrl' => $val,
'title' => $val, 'title' => $val,

4
e107_handlers/e_parse_class.php
View File

@@ -2722,7 +2722,9 @@ class e_parser
} }
$text = (deftrue('BOOTSTRAP') === 3) ? "<span class='".$cls."'></span>" : "<i class='".$cls."'></i>"; // retain space. // $text = (deftrue('BOOTSTRAP') === 3) ? "<span class='".$cls."'></span>" : "<i class='".$cls."'></i>"; // retain space.
$text = "<span class='".$cls."'></span>" ;
$text .= ($space !== false) ? $space : ""; $text .= ($space !== false) ? $space : "";
return $text; return $text;

4
e107_themes/bootstrap/admin_theme.php
View File

@@ -1,12 +1,14 @@
<?php <?php
if ( ! defined('e107_INIT')) { exit(); } if ( ! defined('e107_INIT')) { exit(); }
define("SEP"," <i class='icon-play e-breadcrumb'></i> "); define("SEP"," <span class='icon-play e-breadcrumb'></span> ");
// e107::lan('theme'); // e107::lan('theme');
e107::js('core','bootstrap/js/bootstrap.min.js'); e107::js('core','bootstrap/js/bootstrap.min.js');
e107::css('core','bootstrap/css/bootstrap.min.css'); e107::css('core','bootstrap/css/bootstrap.min.css');
e107::css('core','bootstrap/css/bootstrap-responsive.min.css'); e107::css('core','bootstrap/css/bootstrap-responsive.min.css');
//e107::css('core','font-awesome/css/font-awesome.min.css');
e107::css('url', "//netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.min.css");
// e107::css('core','bootstrap/css/jquery-ui.custom.css'); // e107::css('core','bootstrap/css/jquery-ui.custom.css');
e107::css('theme','admin_style.css'); e107::css('theme','admin_style.css');

2
e107_web/js/core/mediaManager.js
View File

@@ -201,7 +201,7 @@ $(document).ready(function()
if(type == 'glyph') if(type == 'glyph')
{ {
preview = "<i class='" + src + "'></i>"; preview = "<span class='" + src + "'></span>";
$('#html_holder').val(preview); $('#html_holder').val(preview);
$('#path').attr('value',path); $('#path').attr('value',path);
} }