gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Weblate 2016-02-19 09:29:23 +01:00
commit 7c2e371b70
3 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
db_search.php
View File

@ -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());

4
themes/original/css/common.css.php
View File

@ -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;
}

4
themes/pmahomme/css/common.css.php
View File

@ -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;
}