Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/phpmyadmin/phpmyadmin.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--db_search.php7
-rw-r--r--themes/original/css/common.css.php4
-rw-r--r--themes/pmahomme/css/common.css.php4
3 files changed, 3 insertions, 12 deletions
diff --git a/db_search.php b/db_search.php
index 4f15b9eaad..0a377cc2e1 100644
--- a/db_search.php
+++ b/db_search.php
@@ -55,8 +55,6 @@ if ($GLOBALS['is_ajax_request'] != true) {
// Main search form has been submitted, get results
if (isset($_REQUEST['submit_search'])) {
$response->addHTML($db_search->getSearchResults());
-} else {
- $response->addHTML('<div id="searchresults"></div>');
}
// If we are in an Ajax request, we need to exit after displaying all the HTML
@@ -65,9 +63,10 @@ if ($GLOBALS['is_ajax_request'] == true && empty($_REQUEST['ajax_page_request'])
}
// Display the search form
+$response->addHTML($db_search->getSelectionForm());
+$response->addHTML('<div id="searchresults"></div>');
$response->addHTML(
'<div id="togglesearchresultsdiv"><a id="togglesearchresultlink"></a></div>'
- . '<br class="clearfloat" />'
);
-$response->addHTML($db_search->getSelectionForm());
+$response->addHTML('<br class="clearfloat" />');
$response->addHTML($db_search->getResultDivs());
diff --git a/themes/original/css/common.css.php b/themes/original/css/common.css.php
index 42e7b48c1c..5d7cd29a4a 100644
--- a/themes/original/css/common.css.php
+++ b/themes/original/css/common.css.php
@@ -2649,10 +2649,6 @@ div#page_content div#tableslistcontainer table.data {
border-top: 0.1px solid #EEEEEE;
}
-div#page_content form#db_search_form.ajax fieldset {
- margin-top: -0.3em;
-}
-
div#page_content div#tableslistcontainer, div#page_content div.notice, div#page_content div.result_query {
margin-top: 1em;
}
diff --git a/themes/pmahomme/css/common.css.php b/themes/pmahomme/css/common.css.php
index 50f6d22a86..32d24ae1fd 100644
--- a/themes/pmahomme/css/common.css.php
+++ b/themes/pmahomme/css/common.css.php
@@ -2956,10 +2956,6 @@ div#page_content div#tableslistcontainer table.data {
border-top: 0.1px solid #EEEEEE;
}
-div#page_content form#db_search_form.ajax fieldset {
- margin-top: -0.3em;
-}
-
div#page_content div#tableslistcontainer, div#page_content div.notice, div#page_content div.result_query {
margin-top: 1em;
}