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

More files upgraded to FontAwesome 4.1

Browse Source
This commit is contained in:
Cameron
2014-06-12 16:30:26 -07:00
parent ba72b740c2
commit 19d6ab7354
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
e107_plugins/tinymce4/wysiwyg.php
View File

@@ -10,6 +10,7 @@
$_E107['no_online'] = true;
require_once("../../class2.php");
/*
$text = <<<TMPL
@@ -44,6 +45,8 @@ tinymce.init({
TMPL;
$output = str_replace("{e_PLUGIN_ABS}", e_PLUGIN_ABS, $text);
*/
$wy = new wysiwyg();
@@ -239,7 +242,7 @@ class wysiwyg
}
$this->config['convert_fonts_to_spans'] = false;
$this->config['content_css'] = 'http://netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.min.css';
$this->config['content_css'] = 'http://netdna.bootstrapcdn.com/font-awesome/4.1.0/css/font-awesome.min.css';
$this->config['relative_urls'] = false; //Media Manager prefers it like this.
$this->config['preformatted'] = true;

2
e107_themes/bootstrap3/theme.php
View File

@@ -10,7 +10,7 @@ define('VIEWPORT', "width=device-width, initial-scale=1.0");
e107::js("url", "//netdna.bootstrapcdn.com/bootstrap/3.1.0/js/bootstrap.min.js");
e107::css('url', '//netdna.bootstrapcdn.com/bootstrap/3.1.0/css/bootstrap.min.css');
e107::css('url', "//netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.min.css");
e107::css('url', "//netdna.bootstrapcdn.com/font-awesome/4.1.0/css/font-awesome.min.css");
e107::js("footer-inline", "$('.e-tip').tooltip({container: 'body'})"); // activate bootstrap tooltips.