From 4f6b639ee94947b8f55a60d8e12f91714aa7e8ea Mon Sep 17 00:00:00 2001
From: Cameron <cameron@e107coders.org>
Date: Sat, 16 Mar 2013 14:30:53 -0700
Subject: [PATCH] Admin theme upgrade fix

---
 e107_admin/auth.php                         | 2 +-
 e107_handlers/core_functions.php            | 2 +-
 e107_languages/English/admin/help/admin.php | 7 ++++++-
 e107_web/js/core/admin.jquery.js            | 9 ++++++++-
 4 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/e107_admin/auth.php b/e107_admin/auth.php
index 18914b55b..a4043488e 100644
--- a/e107_admin/auth.php
+++ b/e107_admin/auth.php
@@ -24,7 +24,7 @@ if($core->get('admintheme') != 'bootstrap')
 {
 	$core->update('admintheme','bootstrap');
 	$core->update('adminstyle','infopanel');
-	$core->update('admincss','admin_style.css');
+	$core->update('admincss','admin_dark.css');
 	$core->set('e_jslib_core',array('prototype' => 'none', 'jquery'=> 'auto'));
 	$core->save();	
 	e107::getRedirect()->redirect(e_SELF);		
diff --git a/e107_handlers/core_functions.php b/e107_handlers/core_functions.php
index 03709cc73..2e55aa747 100644
--- a/e107_handlers/core_functions.php
+++ b/e107_handlers/core_functions.php
@@ -280,7 +280,7 @@ if (!function_exists('multiarray_sort'))
         $order = strtolower($order);
         foreach ($array as $i => $arr)
         {
-           $sort_values[$i] = $arr[$key];
+           $sort_values[$i] = varset($arr[$key]);
         }
 
         if(!$natsort) 
diff --git a/e107_languages/English/admin/help/admin.php b/e107_languages/English/admin/help/admin.php
index fe9da235a..257f9af65 100644
--- a/e107_languages/English/admin/help/admin.php
+++ b/e107_languages/English/admin/help/admin.php
@@ -11,5 +11,10 @@
 if (!defined('e107_INIT')) { exit; }
 
 $caption = "Dashboard";
-$text = "This page provides you with an overview of site activity";
+$text = "This page provides you with an overview of site activity.<br /><br />";
+if(e107::getPref('admincss')=='admin_dark.css')
+{
+	$text .= "<small>Theme too dark? <a class='btn btn-mini btn-inverse' href='".e_ADMIN."theme.php?mode=admin'>Change it here</a></small>";	
+	
+}
 $ns -> tablerender($caption, $text);
diff --git a/e107_web/js/core/admin.jquery.js b/e107_web/js/core/admin.jquery.js
index 71c762bed..924713521 100644
--- a/e107_web/js/core/admin.jquery.js
+++ b/e107_web/js/core/admin.jquery.js
@@ -20,7 +20,14 @@ $(document).ready(function()
 			// $(this).css( 'cursor', 'pointer' )
 		});
 		
-		$.fn.editable.defaults.mode = 'popup';
+		if($.fn.editable.defaults.mode)
+		{
+			$.fn.editable.defaults.mode = 'popup';
+		}
+		
+		$("#uiModal").draggable({
+   			 handle: ".modal-header"
+		}); 
 		
 	
 		$('div.e-container').editable({