From 87776269849415080c40f78bd5aad7d0595ff769 Mon Sep 17 00:00:00 2001
From: Cameron <e107inc@gmail.com>
Date: Mon, 2 Feb 2015 16:45:32 -0800
Subject: [PATCH] Preparations for a bootstrap3 admin area.

---
 e107_admin/includes/infopanel.php |  4 ++--
 e107_handlers/js_manager.php      | 19 ++++++++++++++++---
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/e107_admin/includes/infopanel.php b/e107_admin/includes/infopanel.php
index 176c4f842..d2bdc08d7 100644
--- a/e107_admin/includes/infopanel.php
+++ b/e107_admin/includes/infopanel.php
@@ -272,11 +272,11 @@ class adminstyle_infopanel
 			echo $mes->render().'
 
 			<!-- INFOPANEL -->
-			<div class="span6">
+			<div class="span6 col-md-6">
 			 <ul class="thumbnails">'.$text.'</ul>
 			 </div>
 			 
-			 <div class="span6">
+			 <div class="span6 col-md-6">
 			 <ul class="thumbnails">'.$text2.'</ul>
 			 </div>
 						 
diff --git a/e107_handlers/js_manager.php b/e107_handlers/js_manager.php
index 98a497813..155bddc7f 100644
--- a/e107_handlers/js_manager.php
+++ b/e107_handlers/js_manager.php
@@ -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. 
 		{
-			$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/jqueryui/1.10.1/jquery-ui.min.js",
 				"http://ajax.googleapis.com/ajax/libs/jqueryui/1.10.1/themes/base/jquery-ui.css",
-			);
-			
+				);
+			}
 			
 		}