diff --git a/adminer/file.inc.php b/adminer/file.inc.php index 202c0c9c..d2ab6db6 100644 --- a/adminer/file.inc.php +++ b/adminer/file.inc.php @@ -18,7 +18,6 @@ if ($_GET["file"] == "favicon.ico") { case "up.gif": echo base64_decode("compile_file('../adminer/static/up.gif', 'base64_encode');"); break; case "down.gif": echo base64_decode("compile_file('../adminer/static/down.gif', 'base64_encode');"); break; case "arrow.gif": echo base64_decode("compile_file('../adminer/static/arrow.gif', 'base64_encode');"); break; - case "loader.gif": echo base64_decode("compile_file('../adminer/static/loader.gif', 'base64_encode');"); break; } } exit; diff --git a/adminer/foreign.inc.php b/adminer/foreign.inc.php index b9d91480..081b6510 100644 --- a/adminer/foreign.inc.php +++ b/adminer/foreign.inc.php @@ -51,7 +51,7 @@ foreach (table_status() as $name => $table_status) {

: - +

diff --git a/adminer/include/design.inc.php b/adminer/include/design.inc.php index 7240bb8c..1eb52000 100644 --- a/adminer/include/design.inc.php +++ b/adminer/include/design.inc.php @@ -16,10 +16,7 @@ function page_header($title, $error = "", $breadcrumb = array(), $title2 = "", $ } $title_all = $title . ($title2 != "" ? ": " . h($title2) : ""); $title_page = strip_tags($title_all . (SERVER != "" && SERVER != "localhost" ? h(" - " . SERVER) : "") . " - " . $adminer->name()); - if (is_ajax()) { - header("X-AJAX-Title: " . rawurlencode($title_page)); - } else { - ?> + ?> @@ -27,10 +24,6 @@ function page_header($title, $error = "", $breadcrumb = array(), $title2 = "", $ <?php echo $title_page; ?> -head()) { ?> @@ -41,15 +34,13 @@ var noResponse = ''; - onkeydown="bodyKeydown(event);" onload="bodyLoad('server_info, 0, 3) : ""); ?>');"> +');"> -
' . $drivers[DRIVER] . ' » '; @@ -100,8 +91,7 @@ document.body.className = document.body.className.replace(/ nojs/, ' js'); */ function page_footer($missing = "") { global $adminer; - if (!is_ajax()) { - ?> + ?>
@@ -109,5 +99,4 @@ function page_footer($missing = "") { navigation($missing); ?> 'نسخ', 'Permanent link' => 'وصلة دائمة', 'Edit all' => 'تعديل الكل', - 'Resend POST data?' => 'هل تود إعادة إرسال بيانات POST ؟', 'HH:MM:SS' => 'HH:MM:SS', ); diff --git a/adminer/lang/ca.inc.php b/adminer/lang/ca.inc.php index 9e1becf9..603c4686 100644 --- a/adminer/lang/ca.inc.php +++ b/adminer/lang/ca.inc.php @@ -268,6 +268,5 @@ $translations = array( 'Copy' => 'Còpia', 'Permanent link' => 'Enllaç permanent', 'Edit all' => 'Edita-ho tot', - 'Resend POST data?' => 'Torna a enviar les dades POST?', 'HH:MM:SS' => 'HH:MM:SS', ); diff --git a/adminer/lang/cs.inc.php b/adminer/lang/cs.inc.php index f903913f..b9f6e956 100644 --- a/adminer/lang/cs.inc.php +++ b/adminer/lang/cs.inc.php @@ -278,10 +278,6 @@ $translations = array( 'Geometry' => 'Geometrie', 'Relations' => 'Vztahy', - // reload confirmation in AJAX - 'Resend POST data?' => 'Znovu odeslat POST data?', - 'No response from server.' => 'Server neodpověděl.', - 'Editor' => 'Editor', // date format in Editor: $1 yyyy, $2 yy, $3 mm, $4 m, $5 dd, $6 d '$1-$3-$5' => '$6.$4.$1', diff --git a/adminer/lang/de.inc.php b/adminer/lang/de.inc.php index c1b06e9d..3d205317 100644 --- a/adminer/lang/de.inc.php +++ b/adminer/lang/de.inc.php @@ -268,6 +268,5 @@ $translations = array( 'Copy' => 'Kopieren', 'Permanent link' => 'Dauerhafter Link', 'Edit all' => 'Alle ändern', - 'Resend POST data?' => 'POST data noch einmal senden ?', 'HH:MM:SS' => 'HH:MM:SS', ); diff --git a/adminer/lang/es.inc.php b/adminer/lang/es.inc.php index 47a8e600..20391407 100644 --- a/adminer/lang/es.inc.php +++ b/adminer/lang/es.inc.php @@ -268,6 +268,5 @@ $translations = array( 'Copy' => 'Copiar', 'Permanent link' => 'Enlace permanente', 'Edit all' => 'Editar todos', - 'Resend POST data?' => 'Volver a enviar POST data?', 'HH:MM:SS' => 'HH:MM:SS', ); diff --git a/adminer/lang/et.inc.php b/adminer/lang/et.inc.php index 9c06a4bc..eaca6809 100644 --- a/adminer/lang/et.inc.php +++ b/adminer/lang/et.inc.php @@ -268,6 +268,5 @@ $translations = array( 'Copy' => 'Kopeeri', 'Permanent link' => 'Püsilink', 'Edit all' => 'Muuda kõiki', - 'Resend POST data?' => 'Saada POST andmed uuesti?', 'HH:MM:SS' => 'HH:MM:SS', ); diff --git a/adminer/lang/fa.inc.php b/adminer/lang/fa.inc.php index f406c60e..73ac30b8 100644 --- a/adminer/lang/fa.inc.php +++ b/adminer/lang/fa.inc.php @@ -277,9 +277,6 @@ $translations = array( 'Geometry' => 'هندسه', 'Relations' => 'رابطه ها', - // reload confirmation in AJAX - 'Resend POST data?' => 'ارسال مجدد داده ها؟', - 'Editor' => 'ویرایشگر', // date format in Editor: $1 yyyy, $2 yy, $3 mm, $4 m, $5 dd, $6 d '$1-$3-$5' => '$1-$3-$5', diff --git a/adminer/lang/fr.inc.php b/adminer/lang/fr.inc.php index 625525ad..2d5cad10 100644 --- a/adminer/lang/fr.inc.php +++ b/adminer/lang/fr.inc.php @@ -268,6 +268,5 @@ $translations = array( 'Copy' => 'Copier', 'Permanent link' => 'Lien permanent', 'Edit all' => 'Tout modifier', - 'Resend POST data?' => 'Renvoyer les données POST ?', 'HH:MM:SS' => 'HH:MM:SS', ); diff --git a/adminer/lang/hu.inc.php b/adminer/lang/hu.inc.php index 1c8ee2f7..6aee97a3 100644 --- a/adminer/lang/hu.inc.php +++ b/adminer/lang/hu.inc.php @@ -268,6 +268,5 @@ $translations = array( 'Copy' => 'Másolás', 'Permanent link' => 'Hivatkozás', 'Edit all' => 'Összes szerkesztése', - 'Resend POST data?' => 'Újraküldi a POST adatokat?', 'HH:MM:SS' => 'óó:pp:mm', ); diff --git a/adminer/lang/it.inc.php b/adminer/lang/it.inc.php index 50b76c18..e8a2a6af 100644 --- a/adminer/lang/it.inc.php +++ b/adminer/lang/it.inc.php @@ -268,6 +268,5 @@ $translations = array( 'Copy' => 'Copia', 'Permanent link' => 'Link permanente', 'Edit all' => 'Modifica tutto', - 'Resend POST data?' => 'Reinvio i dati POST?', 'HH:MM:SS' => 'HH:MM:SS', ); diff --git a/adminer/lang/ja.inc.php b/adminer/lang/ja.inc.php index 68cbf126..6b204fee 100644 --- a/adminer/lang/ja.inc.php +++ b/adminer/lang/ja.inc.php @@ -268,6 +268,5 @@ $translations = array( 'Copy' => 'コピー', 'Permanent link' => 'パーマネントリンク', 'Edit all' => 'すべて編集', - 'Resend POST data?' => '再送信しますか？', 'HH:MM:SS' => '時:分:秒', ); diff --git a/adminer/lang/lt.inc.php b/adminer/lang/lt.inc.php index e054a663..b4288217 100644 --- a/adminer/lang/lt.inc.php +++ b/adminer/lang/lt.inc.php @@ -277,9 +277,6 @@ $translations = array( 'Geometry' => 'Geometrija', 'Relations' => 'Ryšiai', - // reload confirmation in AJAX - 'Resend POST data?' => 'Persiųsti POST duomenis?', - 'Editor' => 'Redaktorius', // date format in Editor: $1 yyyy, $2 yy, $3 mm, $4 m, $5 dd, $6 d '$1-$3-$5' => '$1-$3-$5', diff --git a/adminer/lang/nl.inc.php b/adminer/lang/nl.inc.php index 84b1323f..20442dc3 100644 --- a/adminer/lang/nl.inc.php +++ b/adminer/lang/nl.inc.php @@ -268,6 +268,5 @@ $translations = array( 'Copy' => 'Kopieren', 'Permanent link' => 'Permanente link', 'Edit all' => 'Alles bewerken', - 'Resend POST data?' => 'POST data opnieuw verzenden', 'HH:MM:SS' => 'HH:MM:SS', ); diff --git a/adminer/lang/pl.inc.php b/adminer/lang/pl.inc.php index da94896e..2fbae4ce 100644 --- a/adminer/lang/pl.inc.php +++ b/adminer/lang/pl.inc.php @@ -278,10 +278,6 @@ $translations = array( 'Geometry' => 'Geometria', 'Relations' => 'Relacje', - // reload confirmation in AJAX - 'Resend POST data?' => 'Wysłać dane ponownie?', - 'No response from server.' => 'Brak odpowiedzi od serwera.', - 'Editor' => 'Edytor', // date format in Editor: $1 yyyy, $2 yy, $3 mm, $4 m, $5 dd, $6 d '$1-$3-$5' => '$6.$4.$1', diff --git a/adminer/lang/ro.inc.php b/adminer/lang/ro.inc.php index 2ab23519..c721c437 100644 --- a/adminer/lang/ro.inc.php +++ b/adminer/lang/ro.inc.php @@ -268,6 +268,5 @@ $translations = array( 'Copy' => 'Copiază', 'Permanent link' => 'Adresă permanentă', 'Edit all' => 'Editează tot', - 'Resend POST data?' => 'Retrimite datele POST?', 'HH:MM:SS' => 'HH:MM:SS', ); diff --git a/adminer/lang/ru.inc.php b/adminer/lang/ru.inc.php index 217ef0f0..e595fc82 100644 --- a/adminer/lang/ru.inc.php +++ b/adminer/lang/ru.inc.php @@ -268,6 +268,5 @@ $translations = array( 'Copy' => 'Копировать', 'Permanent link' => 'Постоянная ссылка', 'Edit all' => 'Редактировать всё', - 'Resend POST data?' => 'Еще раз послать данные POST запроса?', 'HH:MM:SS' => 'ЧЧ:ММ:СС', ); diff --git a/adminer/lang/sk.inc.php b/adminer/lang/sk.inc.php index 24ed4271..c8ca8360 100644 --- a/adminer/lang/sk.inc.php +++ b/adminer/lang/sk.inc.php @@ -268,6 +268,5 @@ $translations = array( 'Copy' => 'Kopírovať', 'Permanent link' => 'Permanentný odkaz', 'Edit all' => 'Upraviť všetko', - 'Resend POST data?' => 'Znovu poslať POST data?', 'HH:MM:SS' => 'HH:MM:SS', ); diff --git a/adminer/lang/ta.inc.php b/adminer/lang/ta.inc.php index ed4752ea..522505fb 100644 --- a/adminer/lang/ta.inc.php +++ b/adminer/lang/ta.inc.php @@ -268,6 +268,5 @@ $translations = array( 'Copy' => 'நகல்', 'Permanent link' => 'நிரந்தர இணைப்பு', 'Edit all' => 'அனைத்தையும் தொகு', - 'Resend POST data?' => 'POST data வை மீண்டும் அனுப்பவா?', 'HH:MM:SS' => 'HH:MM:SS', ); diff --git a/adminer/lang/uk.inc.php b/adminer/lang/uk.inc.php index c9930319..0585fdf6 100644 --- a/adminer/lang/uk.inc.php +++ b/adminer/lang/uk.inc.php @@ -278,10 +278,6 @@ $translations = array( 'Geometry' => 'Геометрія', 'Relations' => 'Зв\'язки', - // reload confirmation in AJAX - 'Resend POST data?' => 'Ще раз надіслати POST-запит?', - 'No response from server.' => 'Нема відповіді від сервера.', - 'Editor' => 'Редактор', // date format in Editor: $1 yyyy, $2 yy, $3 mm, $4 m, $5 dd, $6 d '$1-$3-$5' => '$5.$3.$1', diff --git a/adminer/lang/xx.inc.php b/adminer/lang/xx.inc.php index cacdc136..15b795a7 100644 --- a/adminer/lang/xx.inc.php +++ b/adminer/lang/xx.inc.php @@ -278,10 +278,6 @@ $translations = array( 'Geometry' => 'xx', 'Relations' => 'xx', - // reload confirmation in AJAX - 'Resend POST data?' => 'xx', - 'No response from server.' => 'xx', - 'Editor' => 'xx', // date format in Editor: $1 yyyy, $2 yy, $3 mm, $4 m, $5 dd, $6 d '$1-$3-$5' => 'xx', diff --git a/adminer/lang/zh-tw.inc.php b/adminer/lang/zh-tw.inc.php index 0f4b8379..6e6938e7 100644 --- a/adminer/lang/zh-tw.inc.php +++ b/adminer/lang/zh-tw.inc.php @@ -268,6 +268,5 @@ $translations = array( 'Copy' => '複製', 'Permanent link' => '永久鏈接', 'Edit all' => '編輯全部', - 'Resend POST data?' => '重新發送表單資料?', 'HH:MM:SS' => 'HH:MM:SS', ); diff --git a/adminer/lang/zh.inc.php b/adminer/lang/zh.inc.php index ff75d22f..04d83ba7 100644 --- a/adminer/lang/zh.inc.php +++ b/adminer/lang/zh.inc.php @@ -268,6 +268,5 @@ $translations = array( 'Copy' => '复制', 'Permanent link' => '固定链接', 'Edit all' => '编辑全部', - 'Resend POST data?' => '重新发送 POST 数据？', 'HH:MM:SS' => 'HH:MM:SS', ); diff --git a/adminer/select.inc.php b/adminer/select.inc.php index 5854783f..ca020e16 100644 --- a/adminer/select.inc.php +++ b/adminer/select.inc.php @@ -377,7 +377,7 @@ if (!$columns) { $found_rows = found_rows($table_status, $where); if ($found_rows < max(1e4, 2 * ($page + 1) * $limit)) { // slow with big tables - ob_flush(); //! doesn't work with AJAX + ob_flush(); flush(); $found_rows = $connection->result("SELECT COUNT(*) FROM " . table($TABLE) . ($where ? " WHERE " . implode(" AND ", $where) : "")); } else { diff --git a/adminer/static/default.css b/adminer/static/default.css index a5c6f696..cd42bae0 100644 --- a/adminer/static/default.css +++ b/adminer/static/default.css @@ -20,8 +20,6 @@ code { background: #eee; } tbody tr:hover td, tbody tr:hover th { background: #eee; } pre { margin: 1em 0 0; } input[type=image] { vertical-align: middle; } -.loading, .loading input { cursor: progress; } -.loading #loader { display: inline; } .version { color: #777; font-size: 67%; } .js .hidden, .nojs .jsonly { display: none; } .nowrap td, .nowrap th, td.nowrap { white-space: pre; } @@ -49,7 +47,6 @@ input[type=image] { vertical-align: middle; } #content { margin: 2em 0 0 21em; padding: 10px 20px 20px 0; } #lang { position: absolute; top: 0; left: 0; line-height: 1.8em; padding: .3em 1em; } #breadcrumb { white-space: nowrap; position: absolute; top: 0; left: 21em; background: #eee; height: 2em; line-height: 1.8em; padding: 0 1em; margin: 0 0 0 -18px; } -#loader { display: none; position: fixed; top: 2px; right: 2px; z-index: 1; } #h1 { color: #777; text-decoration: none; font-style: italic; } #version { font-size: 67%; color: red; } #schema { margin-left: 60px; position: relative; -moz-user-select: none; -webkit-user-select: none; } diff --git a/adminer/static/editing.js b/adminer/static/editing.js index 49e7c422..c9a51cf2 100644 --- a/adminer/static/editing.js +++ b/adminer/static/editing.js @@ -6,9 +6,6 @@ var jushRoot = '../externals/jush/'; // global variable to allow simple customiz * @param string first three characters of database system version */ function bodyLoad(version) { - if (history.state !== undefined) { // copied from editor/static/editing.js - onpopstate(history); - } if (jushRoot) { var script = document.createElement('script'); script.src = jushRoot + 'jush.js'; diff --git a/adminer/static/functions.js b/adminer/static/functions.js index b0210f54..455b4989 100644 --- a/adminer/static/functions.js +++ b/adminer/static/functions.js @@ -157,9 +157,7 @@ function nodePosition(el) { function pageClick(href, page, event) { if (!isNaN(page) && page) { href += (page != 1 ? '&page=' + (page - 1) : ''); - if (!ajaxSend(href)) { - location.href = href; - } + location.href = href; } } @@ -187,16 +185,6 @@ function selectAddRow(field) { -/** Abort AJAX request -* @uses ajaxRequest -*/ -function ajaxAbort() { - ajaxRequest.onreadystatechange = null; - if (ajaxRequest.abort) { - ajaxRequest.abort(); - } -} - /** Send form by Ctrl+Enter on