From 74a00a110f6d15d24b5b40c02ec8a3916a6acd15 Mon Sep 17 00:00:00 2001
From: Piotr Przybylski <piotrprz@gmail.com>
Date: Thu, 21 Jul 2011 23:23:34 +0200
Subject: [PATCH] Drizzle has no usable query log, hide appropriate features in
 Server Status

---
 js/server_status.js | 25 +++++++++++++++----------
 server_status.php   |  7 +++++--
 2 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/js/server_status.js b/js/server_status.js
index 4a61bfe891..aa6499371a 100644
--- a/js/server_status.js
+++ b/js/server_status.js
@@ -1254,12 +1254,17 @@ $(function() {
                 events: {
                     selection: function(event) {
                         if(editMode) return false;
-                        
+
+                        var $logAnalyseDialog = $('#logAnalyseDialog');
+                        if ($logAnalyseDialog.length == 0) {
+                            return false;
+                        }
+
                         var extremesObject = event.xAxis[0], 
                             min = extremesObject.min,
                             max = extremesObject.max;
                         
-                        $('#logAnalyseDialog').html(
+                        $logAnalyseDialog.html(
                             '<p>' + PMA_messages['strSelectedTimeRange']
                             + '<input type="text" name="dateStart" class="datetimefield" value="' + Highcharts.dateFormat('%Y-%m-%d %H:%M:%S',new Date(min)) + '" /> - ' 
                             + '<input type="text" name="dateEnd" class="datetimefield" value="' + Highcharts.dateFormat('%Y-%m-%d %H:%M:%S',new Date(max)) + '" /></p>'
@@ -1268,7 +1273,7 @@ $(function() {
                             + PMA_messages['strLogAnalyseInfo']
                         );
                         
-                        PMA_addDatepicker($('#logAnalyseDialog').find('input[name="dateStart"],input[name="dateEnd"]'), { 
+                        PMA_addDatepicker($logAnalyseDialog.find('input[name="dateStart"],input[name="dateEnd"]'), {
                             showOn: 'focus',
                             beforeShow: function() {
                                 // Fix wrong timepicker z-index, doesn't work without timeout
@@ -1281,32 +1286,32 @@ $(function() {
                         var dlgBtns = { };
                         
                         dlgBtns[PMA_messages['strFromSlowLog']] = function() {
-                            var dateStart = Date.parse($('#logAnalyseDialog input[name="dateStart"]').attr('value')) || min;
-                            var dateEnd = Date.parse($('#logAnalyseDialog input[name="dateEnd"]').attr('value')) || max;
+                            var dateStart = Date.parse($logAnalyseDialog.find('input[name="dateStart"]').attr('value')) || min;
+                            var dateEnd = Date.parse($logAnalyseDialog.find('input[name="dateEnd"]').attr('value')) || max;
                             
                             loadLogStatistics(
                                 { src: 'slow', start: dateStart, end: dateEnd, groupInserts: $('input#groupInserts').attr('checked') } 
                             );
                                 
-                            $('#logAnalyseDialog').find('dateStart,dateEnd').datepicker('destroy');
+                            $logAnalyseDialog.find('dateStart,dateEnd').datepicker('destroy');
                             
                             $(this).dialog("close");
                         }
                         
                         dlgBtns[PMA_messages['strFromGeneralLog']] = function() {
-                            var dateStart = Date.parse($('#logAnalyseDialog input[name="dateStart"]').attr('value')) || min;
-                            var dateEnd = Date.parse($('#logAnalyseDialog input[name="dateEnd"]').attr('value')) || max;
+                            var dateStart = Date.parse($logAnalyseDialog.find('input[name="dateStart"]').attr('value')) || min;
+                            var dateEnd = Date.parse($logAnalyseDialog.find('input[name="dateEnd"]').attr('value')) || max;
                             
                             loadLogStatistics(
                                 { src: 'general', start: dateStart, end: dateEnd, groupInserts: $('input#groupInserts').attr('checked') }
                             );
                                 
-                            $('#logAnalyseDialog').find('dateStart,dateEnd').datepicker('destroy');
+                            $logAnalyseDialog.find('dateStart,dateEnd').datepicker('destroy');
                             
                             $(this).dialog("close");
                         }
                         
-                        $('#logAnalyseDialog').dialog({
+                        $logAnalyseDialog.dialog({
                             width: 'auto',
                             height: 'auto',
                             buttons: dlgBtns
diff --git a/server_status.php b/server_status.php
index 5d67e93608..b963a37829 100644
--- a/server_status.php
+++ b/server_status.php
@@ -1335,10 +1335,12 @@ function printMonitor() {
             <img src="themes/dot.gif" class="icon ic_s_cog" alt="" /> 
             <?php echo __('Settings'); ?>
         </a>
+        <?php if (!PMA_DRIZZLE) { ?>
         <a href="#monitorInstructionsDialog">
             <img src="themes/dot.gif" class="icon ic_b_help" alt="" /> 
             <?php echo __('Instructions/Setup'); ?>
         </a>
+        <?php } ?>
         <a href="#endChartEditMode" style="display:none;">
             <img src="themes/dot.gif" class="icon ic_s_okay" alt="" /> 
             <?php echo __('Done rearranging/editing charts'); ?>
@@ -1467,10 +1469,11 @@ function printMonitor() {
     
     <div id="loadingLogsDialog" title="<?php echo __('Loading logs'); ?>" style="display:none;">
     </div>
-    
+
+    <?php if (!PMA_DRIZZLE) { ?>
     <div id="logAnalyseDialog" title="<?php echo __('Log statistics'); ?>">
-        
     </div>
+    <?php } ?>
     
     <table border="0" class="clearfloat" id="chartGrid">