From a71b99096cca8e5e926ba1b333fdbea0fd3571d0 Mon Sep 17 00:00:00 2001 From: Jakub Vrana Date: Fri, 29 Jun 2012 18:38:24 -0700 Subject: [PATCH] Remove CodeMirror - uses other colors than JUSH - not used everywhere (triggers, routines, ...) - Ctrl+Left and similar works bad - missing autocomplete - blocking loader --- adminer/include/design.inc.php | 4 +--- adminer/include/editing.inc.php | 5 ++--- adminer/sql.inc.php | 20 +++----------------- adminer/static/default.css | 3 --- changes.txt | 1 - compile.php | 1 - 6 files changed, 6 insertions(+), 28 deletions(-) diff --git a/adminer/include/design.inc.php b/adminer/include/design.inc.php index 63a4c51d..4fb81df5 100644 --- a/adminer/include/design.inc.php +++ b/adminer/include/design.inc.php @@ -4,10 +4,9 @@ * @param string * @param mixed array("key" => "link=desc", "key2" => array("link", "desc")), null for nothing, false for driver only, true for driver and server * @param string used after colon in title and heading, will be HTML escaped -* @param string printed in * @return null */ -function page_header($title, $error = "", $breadcrumb = array(), $title2 = "", $head = "") { +function page_header($title, $error = "", $breadcrumb = array(), $title2 = "") { global $LANG, $adminer, $connection, $drivers; header("Content-Type: text/html; charset=utf-8"); if ($adminer->headers()) { @@ -32,7 +31,6 @@ function page_header($title, $error = "", $breadcrumb = array(), $title2 = "", $ - ');"> \n"); +textarea("query", $q, 20); +echo ($_POST ? "" : "\n"); echo "

" . (ini_bool("file_uploads") ? lang('File upload') . ': (< ' . ini_get("upload_max_filesize") . 'B)' // ignore post_max_size because it is for all form fields together and bytes computing would be necessary : lang('File uploads are disabled.') @@ -219,12 +214,3 @@ if ($history) { ?> - - - - diff --git a/adminer/static/default.css b/adminer/static/default.css index fe15451d..de9af70a 100644 --- a/adminer/static/default.css +++ b/adminer/static/default.css @@ -60,9 +60,6 @@ input[type=image] { vertical-align: middle; } .rtl #breadcrumb { left: auto; right: 21em; margin: 0 -18px 0 0; } .rtl #lang, .rtl #menu { left: auto; right: 0; } -.CodeMirror { border: 1px inset #777; } -.CodeMirror .error { background: #fee; } - @media print { #lang, #menu { display: none; } #content { margin-left: 1em; } diff --git a/changes.txt b/changes.txt index a4d16e16..d8217136 100644 --- a/changes.txt +++ b/changes.txt @@ -1,5 +1,4 @@ Adminer 3.4.0-dev: -Highlight code in SQL command by CodeMirror Link to descending order Shift+click on checkbox to select consecutive rows Print current time next to executed SQL queries diff --git a/compile.php b/compile.php index 3f736e0f..56e003a9 100755 --- a/compile.php +++ b/compile.php @@ -295,7 +295,6 @@ foreach (array("adminer", "editor") as $project) { $file = preg_replace('~\\.\\./adminer/static/(default\\.css|functions\\.js|favicon\\.ico)~', '', $file); $file = preg_replace('~\\.\\./adminer/static/([^\'"]*)~', '" . ' . $replace, $file); $file = str_replace("'../externals/jush/'", "location.protocol + '//www.adminer.org/static/'", $file); - $file = str_replace('"../externals/CodeMirror2"', '($_SERVER["HTTPS"] ? "https" : "http") . "://www.adminer.org/static/CodeMirror2"', $file); $file = preg_replace("~<\\?php\\s*\\?>\n?|\\?>\n?<\\?php~", '', $file); $file = php_shrink($file);