Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
b4434261c5
@ -3704,6 +3704,7 @@ $(document).ready(function() {
|
||||
$(document).ready(function () {
|
||||
if ($("#floating_menubar").length) {
|
||||
$("#floating_menubar")
|
||||
.css('z-index', 500)
|
||||
.append($('#serverinfo'))
|
||||
.append($('#topmenucontainer'));
|
||||
$('body').css(
|
||||
|
||||
@ -221,7 +221,9 @@ if ($abort == false) {
|
||||
* Displays top menu links
|
||||
*/
|
||||
$active_page = 'tbl_structure.php';
|
||||
include_once './libraries/tbl_links.inc.php';
|
||||
if ($GLOBALS['is_ajax_request'] != true) {
|
||||
include_once './libraries/tbl_links.inc.php';
|
||||
}
|
||||
/**
|
||||
* Display the form
|
||||
*/
|
||||
|
||||
@ -883,7 +883,6 @@ div#tablestatistics table {
|
||||
top: 0;
|
||||
left: 0;
|
||||
width: 100%';
|
||||
z-index: 500;
|
||||
}
|
||||
|
||||
#serverinfo {
|
||||
|
||||
@ -1094,7 +1094,6 @@ div#tablestatistics table {
|
||||
top: 0;
|
||||
left: 0;
|
||||
width: 100%';
|
||||
z-index: 500;
|
||||
}
|
||||
|
||||
#serverinfo {
|
||||
|
||||
Loading…
Reference in New Issue
Block a user