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

Admin theme upgrade fix

Browse Source
This commit is contained in:
Cameron
2013-03-16 14:30:53 -07:00
parent 204fb65b4b
commit 4f6b639ee9
4 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
e107_admin/auth.php
View File

@@ -24,7 +24,7 @@ if($core->get('admintheme') != 'bootstrap')
{ {
$core->update('admintheme','bootstrap'); $core->update('admintheme','bootstrap');
$core->update('adminstyle','infopanel'); $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->set('e_jslib_core',array('prototype' => 'none', 'jquery'=> 'auto'));
$core->save(); $core->save();
e107::getRedirect()->redirect(e_SELF); e107::getRedirect()->redirect(e_SELF);

2
e107_handlers/core_functions.php
View File

@@ -280,7 +280,7 @@ if (!function_exists('multiarray_sort'))
$order = strtolower($order); $order = strtolower($order);
foreach ($array as $i => $arr) foreach ($array as $i => $arr)
{ {
$sort_values[$i] = $arr[$key]; $sort_values[$i] = varset($arr[$key]);
} }
if(!$natsort) if(!$natsort)

7
e107_languages/English/admin/help/admin.php
View File

@@ -11,5 +11,10 @@
if (!defined('e107_INIT')) { exit; } if (!defined('e107_INIT')) { exit; }
$caption = "Dashboard"; $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); $ns -> tablerender($caption, $text);

9
e107_web/js/core/admin.jquery.js
View File

@@ -20,7 +20,14 @@ $(document).ready(function()
// $(this).css( 'cursor', 'pointer' ) // $(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({ $('div.e-container').editable({