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

Preparations for a bootstrap3 admin area.

Browse Source
This commit is contained in:
Cameron
2015-02-02 16:45:32 -08:00
parent 2ae018a496
commit 8777626984
2 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
e107_admin/includes/infopanel.php
View File

@@ -272,11 +272,11 @@ class adminstyle_infopanel
echo $mes->render().' echo $mes->render().'
<!-- INFOPANEL --> <!-- INFOPANEL -->
<div class="span6"> <div class="span6 col-md-6">
<ul class="thumbnails">'.$text.'</ul> <ul class="thumbnails">'.$text.'</ul>
</div> </div>
<div class="span6"> <div class="span6 col-md-6">
<ul class="thumbnails">'.$text2.'</ul> <ul class="thumbnails">'.$text2.'</ul>
</div> </div>

19
e107_handlers/js_manager.php
View File

@@ -232,12 +232,25 @@ 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.
{ {
$this->_libraries['jquery'] = array(
if(isset($_SERVER['E_B3_ADMIN']) && $_SERVER['E_B3_ADMIN'] === 'true') // Test with a Bootstrap 3 admin area.
{
$this->_libraries['jquery'] = array(
"http://ajax.googleapis.com/ajax/libs/jquery/2.1.1/jquery.min.js",
"https://ajax.googleapis.com/ajax/libs/jqueryui/1.11.2/jquery-ui.min.js",
"https://ajax.googleapis.com/ajax/libs/jqueryui/1.11.2/themes/smoothness/jquery-ui.css",
// "http://ajax.googleapis.com/ajax/libs/jqueryui/1.10.1/jquery-ui.min.js",
// "http://ajax.googleapis.com/ajax/libs/jqueryui/1.10.1/themes/base/jquery-ui.css",
);
}
else
{
$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",
"http://ajax.googleapis.com/ajax/libs/jqueryui/1.10.1/jquery-ui.min.js", "http://ajax.googleapis.com/ajax/libs/jqueryui/1.10.1/jquery-ui.min.js",
"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",
); );
}
} }