diff --git a/adminer/include/design.inc.php b/adminer/include/design.inc.php
index e921c0bd..95676457 100644
--- a/adminer/include/design.inc.php
+++ b/adminer/include/design.inc.php
@@ -35,9 +35,10 @@ function page_header($title, $error = "", $breadcrumb = array(), $title2 = "") {
';
if (isset($breadcrumb)) {
$link = substr(preg_replace('~(username|db|ns)=[^&]*&~', '', ME), 0, -1);
- echo '
' . $drivers[DRIVER] . ' » ';
+ echo '' . $drivers[DRIVER] . ' » ';
$link = substr(preg_replace('~(db|ns)=[^&]*&~', '', ME), 0, -1);
$server = (SERVER != "" ? h(SERVER) : lang('Server'));
if ($breadcrumb === false) {
@@ -61,6 +62,7 @@ function page_header($title, $error = "", $breadcrumb = array(), $title2 = "") {
echo "$title\n";
}
}
+ echo "\n";
echo "
$title_all
\n";
restart_session();
$uri = preg_replace('~^[^?]*~', '', $_SERVER["REQUEST_URI"]);
diff --git a/adminer/static/functions.js b/adminer/static/functions.js
index 5bf61526..3cf1c5fe 100644
--- a/adminer/static/functions.js
+++ b/adminer/static/functions.js
@@ -270,23 +270,19 @@ function ajaxSetHtml(url) {
});
}
-var ajaxState = 0, ajaxTimeout;
+var ajaxState = 0;
/** Safely load content to #content
* @param string
* @param [string]
+* @param [boolean]
* @return XMLHttpRequest or false in case of an error
*/
-function ajaxSend(url, data) {
+function ajaxSend(url, data, popState) {
var currentState = ++ajaxState;
- clearTimeout(ajaxTimeout);
- ajaxTimeout = setTimeout(function () {
- scrollTo(0, 0);
- setHtml('content', '
![](../adminer/static/loader.gif)
');
- }, 500); // defer displaying loader
+ setHtml('loader', '
![](../adminer/static/loader.gif)
');
return ajax(url, function (text) {
if (currentState == ajaxState) {
- clearTimeout(ajaxTimeout);
scrollTo(0, 0);
setHtml('content', text);
var content = document.getElementById('content');