From f567e5b3956649025b5f6d4cfb0c098c3414c08e Mon Sep 17 00:00:00 2001
From: Cameron <e107inc@gmail.com>
Date: Mon, 13 Jul 2015 19:49:25 -0700
Subject: [PATCH] Issue #1138 - x-editable interface now working correctly.
 Some admin-ui fixes, but plenty more to do.

---
 e107_handlers/admin_ui.php             | 8 ++++----
 e107_themes/bootstrap3/admin_theme.php | 5 +----
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/e107_handlers/admin_ui.php b/e107_handlers/admin_ui.php
index 19688d4f9..65cf760aa 100644
--- a/e107_handlers/admin_ui.php
+++ b/e107_handlers/admin_ui.php
@@ -6098,14 +6098,14 @@ class e_admin_form_ui extends e_form
 		// XXX Quick Fix for styling - correct. 
 		$text = "
 			<div class='navbar navbar-inner left' style='padding-left:15px; padding-top:8px;'>
-				<div class='span6'>";
+				<div class='span6 col-md-6'>";
 				
 		if(!$this->getController()->getTreeModel()->isEmpty())
 		{		
 			$text .= "
-					<div class='input-append'>
+					<div class='input-group input-group-btn input-append'>
 	         		<img src='".e_IMAGE_ABS."generic/branchbottom.gif' alt='' class='icon action' style='padding-top:5px' />
-						".$this->select_open('etrigger_batch', array('class' => 'tbox select batch e-autosubmit reset', 'id' => false))."
+						".$this->select_open('etrigger_batch', array('class' => 'tbox form-control select batch e-autosubmit reset', 'id' => false))."
 						".$this->option(LAN_BATCH_LABEL_SELECTED, '', false)."
 						".($allow_copy ? $this->option(LAN_COPY, 'copy', false, array('class' => 'ui-batch-option class', 'other' => 'style="padding-left: 15px"')) : '')."					
 						".($allow_delete ? $this->option(LAN_DELETE, 'delete', false, array('class' => 'ui-batch-option class', 'other' => 'style="padding-left: 15px"')) : '')."					
@@ -6133,7 +6133,7 @@ class e_admin_form_ui extends e_form
 		
 		$text .= "
 				</div>
-				<div class='span6 right' style='padding-top:5px'><span>".e107::getParser()->lanVars(LAN_UI_TOTAL_RECORDS,number_format($this->listTotal))."</span></div>
+				<div class='span6 col-md-6 right' style='padding-top:5px'><span>".e107::getParser()->lanVars(LAN_UI_TOTAL_RECORDS,number_format($this->listTotal))."</span></div>
 			</div>
 		";
 	
diff --git a/e107_themes/bootstrap3/admin_theme.php b/e107_themes/bootstrap3/admin_theme.php
index 954b9d800..5aee13177 100644
--- a/e107_themes/bootstrap3/admin_theme.php
+++ b/e107_themes/bootstrap3/admin_theme.php
@@ -12,11 +12,8 @@ e107::css('url', 		"http://netdna.bootstrapcdn.com/font-awesome/4.3.0/css/font-a
 // be107::css('url', 		"https://maxcdn.bootstrapcdn.com/bootswatch/3.3.5/slate/bootstrap.min.css");
 
 
-
-
 e107::css('url', 		"http://cdnjs.cloudflare.com/ajax/libs/x-editable/1.5.0/bootstrap3-editable/css/bootstrap-editable.css");
-e107::css('url', 		"http://cdnjs.cloudflare.com/ajax/libs/x-editable/1.5.0/bootstrap3-editable/js/bootstrap-editable.min.js");
-
+e107::js('url', 		"http://cdnjs.cloudflare.com/ajax/libs/x-editable/1.5.0/bootstrap3-editable/js/bootstrap-editable.min.js");
 
 
 e107::css('url', 'http://maxcdn.bootstrapcdn.com/bootswatch/3.3.5/slate/bootstrap.min.css');