' . "\n";
}// end if else
@@ -360,6 +360,20 @@ $alter_select =
+
+
+
+
+
+
+
+
+
+
+
+
+
+
').hide();
+
+ /** Hide the browse and deleted results in the new search criteria */
+ $('#buttonGo').click(function(){
+ $("#table-info").hide();
+ $('#browse-results').hide();
+ $('#sqlqueryform').hide();
+ $('#togglequerybox').hide();
+ });
/**
- * Prepare a div containing a link, otherwise it's incorrectly displayed
+ * Prepare a div containing a link for toggle the search form, otherwise it's incorrectly displayed
* after a couple of clicks
*/
$('
')
.insertAfter('#db_search_form')
- // don't show it until we have results on-screen
+ /** don't show it until we have results on-screen */
.hide();
+ /** Changing the displayed text according to the hide/show criteria in search form*/
+ $("#togglequerybox").hide();
+ $("#togglequerybox").bind('click', function() {
+ var $link = $(this)
+ $('#sqlqueryform').slideToggle("medium");
+ if ($link.text() == PMA_messages['strHideQueryBox']) {
+ $link.text(PMA_messages['strShowQueryBox']);
+ } else {
+ $link.text(PMA_messages['strHideQueryBox']);
+ }
+ /** avoid default click action */
+ return false;
+ })
+
+ /** don't show it until we have results on-screen */
+
+ /** Changing the displayed text according to the hide/show criteria in search criteria form*/
$('#togglesearchformlink')
.html(PMA_messages['strShowSearchCriteria'])
.bind('click', function() {
@@ -43,7 +125,7 @@ $(document).ready(function() {
} else {
$link.text(PMA_messages['strHideSearchCriteria']);
}
- // avoid default click action
+ /** avoid default click action */
return false;
});
/**
@@ -59,8 +141,8 @@ $(document).ready(function() {
PMA_ajaxShowMessage(PMA_messages['strSearching']);
// jQuery object to reuse
$form = $(this);
-
- // add this hidden field just once
+
+ // add this hidden field just once
if (! $form.find('input:hidden').is('#ajax_request_hidden')) {
$form.append('');
}
@@ -78,12 +160,12 @@ $(document).ready(function() {
// always start with the Show message
.text(PMA_messages['strShowSearchCriteria'])
$('#togglesearchformdiv')
- // now it's time to show the div containing the link
+ // now it's time to show the div containing the link
.show();
} else {
// error message (zero rows)
$("#sqlqueryresults").html(response['message']);
- }
+ }
})
})
}, 'top.frame_content'); // end $(document).ready()
diff --git a/js/messages.php b/js/messages.php
index fa28771ea..fc28b2ed0 100644
--- a/js/messages.php
+++ b/js/messages.php
@@ -79,6 +79,8 @@ $js_messages['strNo'] = __('No');
/* For db_search.js */
$js_messages['strSearching'] = __('Searching');
+//$js_messages['strBrowsing'] = __('Browsing');
+//$js_messages['strDeleting'] = __('Deleting');
/* For sql.js */
$js_messages['strHideQueryBox'] = __('Hide query box');
diff --git a/libraries/common.lib.php b/libraries/common.lib.php
index c30d7d0e0..4f8427b0a 100644
--- a/libraries/common.lib.php
+++ b/libraries/common.lib.php
@@ -1009,7 +1009,7 @@ function PMA_showMessage($message, $sql_query = null, $type = 'notice', $is_view
// In an Ajax request, $GLOBALS['cell_align_left'] may not be defined. Hence,
// check for it's presence before using it
- echo '
' . "\n";
+ echo '
' . "\n";
if ($message instanceof PMA_Message) {
if (isset($GLOBALS['special_message'])) {