Merge pull request #1741 from nisargjhaveri/debug_console

Group/Ungroup queries in console SQL debug

2 files changed, 34 insertions, 2 deletions

diff --git a/themes/original/css/common.css.php b/themes/original/css/common.css.php
index 88be6f331e..4fb44873bf 100644
--- a/themes/original/css/common.css.php
+++ b/themes/original/css/common.css.php
@@ -2928,9 +2928,21 @@ html.ie7 #pma_console .query_input {
     margin: 0;
     padding: 2px 4px;
 }
-#pma_console .button.debug.hide {
+#pma_console .button.hide,
+#pma_console .message span.text.hide {
     display: none;
 }
+#debug_console.grouped .ungroup_queries,
+#debug_console.ungrouped .group_queries {
+    display: inline-block;
+}
+#debug_console.ungrouped .ungroup_queries,
+#debug_console.grouped .group_queries {
+    display: none;
+}
+#debug_console .count {
+    margin-right: 8px;
+}
 #debug_console .show_trace .trace,
 #debug_console .show_args .args {
     display: block;
@@ -2945,6 +2957,7 @@ html.ie7 #pma_console .query_input {
 }
 
 #debug_console .traceStep:after,
+#debug_console .trace.welcome:after,
 #debug_console .debug>.welcome:after {
     content: "";
     display: table;
@@ -2953,6 +2966,9 @@ html.ie7 #pma_console .query_input {
 #debug_console .debug_summary {
     float: left;
 }
+#debug_console .trace.welcome .time {
+    float: right;
+}
 #debug_console .traceStep .file,
 #debug_console .script_name {
     float: right;
diff --git a/themes/pmahomme/css/common.css.php b/themes/pmahomme/css/common.css.php
index 2da9fd2d68..a21f66c7b4 100644
--- a/themes/pmahomme/css/common.css.php
+++ b/themes/pmahomme/css/common.css.php
@@ -3250,9 +3250,21 @@ html.ie7 #pma_console .query_input {
     margin: 0;
     padding: 2px 4px;
 }
-#pma_console .button.debug.hide {
+#pma_console .button.hide,
+#pma_console .message span.text.hide {
     display: none;
 }
+#debug_console.grouped .ungroup_queries,
+#debug_console.ungrouped .group_queries {
+    display: inline-block;
+}
+#debug_console.ungrouped .ungroup_queries,
+#debug_console.grouped .group_queries {
+    display: none;
+}
+#debug_console .count {
+    margin-right: 8px;
+}
 #debug_console .show_trace .trace,
 #debug_console .show_args .args {
     display: block;
@@ -3267,6 +3279,7 @@ html.ie7 #pma_console .query_input {
 }
 
 #debug_console .traceStep:after,
+#debug_console .trace.welcome:after,
 #debug_console .debug>.welcome:after {
     content: "";
     display: table;
@@ -3275,6 +3288,9 @@ html.ie7 #pma_console .query_input {
 #debug_console .debug_summary {
     float: left;
 }
+#debug_console .trace.welcome .time {
+    float: right;
+}
 #debug_console .traceStep .file,
 #debug_console .script_name {
     float: right;