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

Issue #1138 - Remove e_BOOTSTRAP3_ADMIN requirement to use Bootstrap3.

Browse Source
This commit is contained in:
Cameron
2015-07-17 13:48:29 -07:00
parent 984f622149
commit 3dc4ac9d02
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
e107_handlers/js_manager.php
View File

@@ -241,7 +241,7 @@ class e_jsmanager
if($this->isInAdmin()) // Include jquery-ui in the admin-area only - Jquery-UI to eventually be removed from e107 completely if possible. if($this->isInAdmin()) // Include jquery-ui in the admin-area only - Jquery-UI to eventually be removed from e107 completely if possible.
{ {
if(deftrue('e_BOOTSTRAP3_ADMIN')) // Test with a Bootstrap 3 admin area. if(e107::getPref('admintheme')=='bootstrap3') // Bootstrap 3 admin area.
{ {
$this->_libraries['jquery'] = array( $this->_libraries['jquery'] = array(
"http://ajax.googleapis.com/ajax/libs/jquery/2.1.1/jquery.min.js", "http://ajax.googleapis.com/ajax/libs/jquery/2.1.1/jquery.min.js",
@@ -251,7 +251,7 @@ class e_jsmanager
// "http://ajax.googleapis.com/ajax/libs/jqueryui/1.10.1/themes/base/jquery-ui.css", // "http://ajax.googleapis.com/ajax/libs/jqueryui/1.10.1/themes/base/jquery-ui.css",
); );
} }
else else // Bootstrap 2 admin area.
{ {
$this->_libraries['jquery'] = array( $this->_libraries['jquery'] = array(
"http://ajax.googleapis.com/ajax/libs/jquery/1.8.3/jquery.min.js", "http://ajax.googleapis.com/ajax/libs/jquery/1.8.3/jquery.min.js",

6
e107_handlers/theme_handler.php
View File

@@ -27,7 +27,7 @@ class themeHandler
var $themeConfigObj = null; var $themeConfigObj = null;
var $noLog = FALSE; var $noLog = FALSE;
private $approvedAdminThemes = array('bootstrap'); private $approvedAdminThemes = array('bootstrap','bootstrap3');
public $allowedCategories = array('generic', public $allowedCategories = array('generic',
'adult', 'adult',
@@ -57,12 +57,12 @@ class themeHandler
global $e107cache,$pref; global $e107cache,$pref;
$mes = e107::getMessage(); $mes = e107::getMessage();
/*
if(deftrue('e_BOOTSTRAP3_ADMIN')) if(deftrue('e_BOOTSTRAP3_ADMIN'))
{ {
$this->approvedAdminThemes[] = 'bootstrap3'; $this->approvedAdminThemes[] = 'bootstrap3';
} }
*/
require_once (e_HANDLER."form_handler.php"); require_once (e_HANDLER."form_handler.php");