mirror/php-adminer
1
0
Fork 0
mirror of https://github.com/vrana/adminer.git synced 2025-08-12 09:34:10 +02:00
Code Issues Releases Wiki Activity

Refresh breadcrumb and title in AJAX

Browse Source
This commit is contained in:
Jakub Vrana
2010-11-18 12:17:06 +01:00
parent a97c45fc9b
commit 4c9044800d
2 changed files with 32 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
adminer/include/design.inc.php
View File

@@ -10,8 +10,8 @@ function page_header($title, $error = "", $breadcrumb = array(), $title2 = "") {
global $LANG, $HTTPS, $adminer, $connection, $drivers; global $LANG, $HTTPS, $adminer, $connection, $drivers;
header("Content-Type: text/html; charset=utf-8"); header("Content-Type: text/html; charset=utf-8");
$adminer->headers(); $adminer->headers();
$title_all = $title . ($title2 != "" ? ": " . h($title2) : "");
if (!is_ajax()) { if (!is_ajax()) {
$title_all = $title . ($title2 != "" ? ": " . h($title2) : "");
$protocol = ($HTTPS ? "https" : "http"); $protocol = ($HTTPS ? "https" : "http");
?> ?>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"> <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
@@ -32,35 +32,34 @@ function page_header($title, $error = "", $breadcrumb = array(), $title2 = "") {
<div id="content"> <div id="content">
<?php <?php
if (isset($breadcrumb)) {
$link = substr(preg_replace('~(username|db|ns)=[^&]*&~', '', ME), 0, -1);
echo '<p id="breadcrumb"><a href="' . ($link ? h($link) : ".") . '">' . $drivers[DRIVER] . '</a> &raquo; ';
$link = substr(preg_replace('~(db|ns)=[^&]*&~', '', ME), 0, -1);
$server = (SERVER != "" ? h(SERVER) : lang('Server'));
if ($breadcrumb === false) {
echo "$server\n";
} else {
echo "<a href='" . ($link ? h($link) : ".") . "'>$server</a> &raquo; ";
if ($_GET["ns"] != "" || (DB != "" && is_array($breadcrumb))) {
echo '<a href="' . h($link . "&db=" . urlencode(DB) . (support("scheme") ? "&ns=" : "")) . '">' . h(DB) . '</a> &raquo; ';
}
if (is_array($breadcrumb)) {
if ($_GET["ns"] != "") {
echo '<a href="' . h(substr(ME, 0, -1)) . '">' . h($_GET["ns"]) . '</a> &raquo; ';
}
foreach ($breadcrumb as $key => $val) {
$desc = (is_array($val) ? $val[1] : $val);
if ($desc != "") {
echo '<a href="' . h(ME . "$key=") . urlencode(is_array($val) ? $val[0] : $val) . '">' . h($desc) . '</a> &raquo; ';
}
}
}
echo "$title\n";
}
}
echo "<h2>$title_all</h2>\n";
echo "<div id='main'>\n";
} }
if (isset($breadcrumb)) {
$link = substr(preg_replace('~(username|db|ns)=[^&]*&~', '', ME), 0, -1);
echo '<p id="breadcrumb"><a href="' . ($link ? h($link) : ".") . '">' . $drivers[DRIVER] . '</a> &raquo; ';
$link = substr(preg_replace('~(db|ns)=[^&]*&~', '', ME), 0, -1);
$server = (SERVER != "" ? h(SERVER) : lang('Server'));
if ($breadcrumb === false) {
echo "$server\n";
} else {
echo "<a href='" . ($link ? h($link) : ".") . "'>$server</a> &raquo; ";
if ($_GET["ns"] != "" || (DB != "" && is_array($breadcrumb))) {
echo '<a href="' . h($link . "&db=" . urlencode(DB) . (support("scheme") ? "&ns=" : "")) . '">' . h(DB) . '</a> &raquo; ';
}
if (is_array($breadcrumb)) {
if ($_GET["ns"] != "") {
echo '<a href="' . h(substr(ME, 0, -1)) . '">' . h($_GET["ns"]) . '</a> &raquo; ';
}
foreach ($breadcrumb as $key => $val) {
$desc = (is_array($val) ? $val[1] : $val);
if ($desc != "") {
echo '<a href="' . h(ME . "$key=") . urlencode(is_array($val) ? $val[0] : $val) . '">' . h($desc) . '</a> &raquo; ';
}
}
}
echo "$title\n";
}
}
echo "<h2>$title_all</h2>\n";
restart_session(); restart_session();
if ($_SESSION["messages"]) { if ($_SESSION["messages"]) {
echo "<div class='message'>" . implode("</div>\n<div class='message'>", $_SESSION["messages"]) . "</div>\n"; echo "<div class='message'>" . implode("</div>\n<div class='message'>", $_SESSION["messages"]) . "</div>\n";
@@ -84,7 +83,6 @@ function page_footer($missing = "") {
if (!is_ajax()) { if (!is_ajax()) {
?> ?>
</div> </div>
</div>
<?php switch_lang(); ?> <?php switch_lang(); ?>
<div id="menu"> <div id="menu">

8
adminer/static/functions.js
View File

@@ -221,7 +221,7 @@ function ajaxSetHtml(url) {
var ajaxState = 0; var ajaxState = 0;
var ajaxTimeout; var ajaxTimeout;
/** Safely load content to #main /** Safely load content to #content
* @param string * @param string
* @param [string] * @param [string]
* @return XMLHttpRequest or false in case of an error * @return XMLHttpRequest or false in case of an error
@@ -230,12 +230,12 @@ function ajaxSend(url, data) {
var currentState = ++ajaxState; var currentState = ++ajaxState;
clearTimeout(ajaxTimeout); clearTimeout(ajaxTimeout);
ajaxTimeout = setTimeout(function () { ajaxTimeout = setTimeout(function () {
setHtml('main', '<img src="../adminer/static/loader.gif" alt="">'); setHtml('content', '<img src="../adminer/static/loader.gif" alt="">');
}, 500); // defer displaying loader }, 500); // defer displaying loader
return ajax(url, function (text) { return ajax(url, function (text) {
if (currentState == ajaxState) { if (currentState == ajaxState) {
clearTimeout(ajaxTimeout); clearTimeout(ajaxTimeout);
setHtml('main', text); setHtml('content', text);
if (window.jush) { if (window.jush) {
jush.highlight_tag('code', 0); jush.highlight_tag('code', 0);
} }
@@ -243,7 +243,7 @@ function ajaxSend(url, data) {
}, data); }, data);
} }
/** Load content to #main /** Load content to #content
* @param string * @param string
* @param [string] * @param [string]
* @param [MouseEvent] * @param [MouseEvent]