Skip to content

Commit 15ab473

Browse files
MauricioFauthMauricioFauth
authored
Merge pull request #18439 from MauricioFauth/stmt-message-box
Redesign the SQL message card
2 parents 59131b5 + 1102858 commit 15ab473

11 files changed

Lines changed: 242 additions & 400 deletions

File tree

‎js/src/modules/functions.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1095,9 +1095,9 @@ function onloadSqlQueryEditEvents () {
10951095
return false;
10961096
}
10971097

1098-
var $form = $(this).prev('form');
1098+
var $form = $('.result_query form');
10991099
var sqlQuery = ($form.find('input[name=\'sql_query\']').val() as string).trim();
1100-
var $innerSql = $(this).parent().prev().find('code.sql');
1100+
var $innerSql = $('.result_query').find('code.sql');
11011101

11021102
var newContent = '<textarea name="sql_query_edit" id="sql_query_edit">' + escapeHtml(sqlQuery) + '</textarea>\n';
11031103
newContent += Functions.getForeignKeyCheckboxLoader();

‎libraries/classes/Html/Generator.php‎

Lines changed: 195 additions & 183 deletions
Large diffs are not rendered by default.

‎psalm-baseline.xml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7399,15 +7399,13 @@
73997399
<code><![CDATA[$GLOBALS['cfg']['SQLQuery']]]></code>
74007400
<code><![CDATA[$GLOBALS['show_as_php']]]></code>
74017401
<code><![CDATA[$GLOBALS['special_message']]]></code>
7402-
<code><![CDATA[$GLOBALS['special_message']]]></code>
74037402
<code><![CDATA[$GLOBALS['using_bookmark_message']]]></code>
74047403
<code><![CDATA[$server['socket']]]></code>
74057404
<code><![CDATA[$server['ssl']]]></code>
74067405
<code><![CDATA[$server['ssl_ca']]]></code>
74077406
<code><![CDATA[$server['ssl_verify']]]></code>
74087407
</InvalidArrayOffset>
74097408
<MixedArgument>
7410-
<code><![CDATA[$GLOBALS['special_message']]]></code>
74117409
<code><![CDATA[$GLOBALS['special_message']]]></code>
74127410
<code>$alt</code>
74137411
<code>$defaultFunction</code>

‎public/themes/bootstrap/scss/_common.scss‎

Lines changed: 0 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -71,23 +71,6 @@ textarea {
7171
text-shadow: 0 1px 0 $black;
7272
}
7373

74-
div.tools {
75-
padding: 0.2em;
76-
77-
a {
78-
color: #3a7ead !important;
79-
}
80-
81-
margin-top: 0;
82-
margin-bottom: 0.5em;
83-
// avoid a thick line since this should be used under another fieldset
84-
border-top: 0;
85-
text-align: right;
86-
float: none;
87-
clear: both;
88-
border-radius: 0 0 4px 4px;
89-
}
90-
9174
.pma-fieldset.tblFooters {
9275
margin-top: 0;
9376
margin-bottom: 0.5em;
@@ -267,7 +250,6 @@ td .icon {
267250
background: #d3dce3;
268251
}
269252

270-
div.tools,
271253
.tblFooters {
272254
font-weight: normal;
273255
color: $black;
@@ -282,14 +264,6 @@ div.tools,
282264
}
283265
}
284266

285-
div.tools a {
286-
&:link,
287-
&:visited,
288-
&:active {
289-
color: #00f;
290-
}
291-
}
292-
293267
.tblFooters a {
294268
&:link,
295269
&:active,
@@ -299,7 +273,6 @@ div.tools a {
299273
}
300274

301275
.tblHeaders a:hover,
302-
div.tools a:hover,
303276
.tblFooters a:hover {
304277
color: #f00;
305278
}
@@ -829,30 +802,6 @@ textarea {
829802
float: left;
830803
}
831804

832-
code {
833-
font-size: 1em;
834-
835-
&.php {
836-
display: block;
837-
padding-left: 1em;
838-
margin-top: 0;
839-
margin-bottom: 0;
840-
max-height: 10em;
841-
overflow: auto;
842-
direction: ltr;
843-
}
844-
845-
&.sql {
846-
display: block;
847-
padding: 1em;
848-
margin-top: 0;
849-
margin-bottom: 0;
850-
max-height: 10em;
851-
overflow: auto;
852-
direction: ltr;
853-
}
854-
}
855-
856805
div.sqlvalidate {
857806
display: block;
858807
padding: 1em;
@@ -863,13 +812,6 @@ div.sqlvalidate {
863812
direction: ltr;
864813
}
865814

866-
.result_query {
867-
div.sqlOuter {
868-
background: #e5e5e5;
869-
text-align: left;
870-
}
871-
}
872-
873815
#PMA_slidingMessage code.sql,
874816
div.sqlvalidate {
875817
background: #e5e5e5;
@@ -2715,10 +2657,6 @@ body .ui-dialog {
27152657

27162658
// Extra large devices (large desktops, 1200px and up)
27172659
@include media-breakpoint-up(xl) {
2718-
div.tools {
2719-
text-align: left;
2720-
}
2721-
27222660
.pma-fieldset.tblFooters,
27232661
.tblFooters {
27242662
text-align: left;

‎public/themes/bootstrap/scss/_print.scss‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -63,11 +63,6 @@
6363
float: none;
6464
}
6565

66-
.sqlOuter {
67-
color: black;
68-
background-color: #000;
69-
}
70-
7166
// For hiding 'Open a New phpMyAdmin Window' button
7267
// Hide extra menu on /table/structure
7368
.cDrop,

‎public/themes/metro/scss/_common.scss‎

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -382,20 +382,6 @@ select {
382382
margin-bottom: 20px;
383383
}
384384

385-
div.tools {
386-
padding: 10px;
387-
text-align: right;
388-
389-
span {
390-
float: right;
391-
margin: 6px 2px;
392-
}
393-
394-
a {
395-
color: var(--blue-header) !important;
396-
}
397-
}
398-
399385
.pma-fieldset.tblFooters {
400386
margin-top: -1px;
401387
border-top: 0;
@@ -589,15 +575,13 @@ img.lightbulb {
589575
font-weight: normal;
590576
}
591577

592-
div.tools,
593578
.tblFooters {
594579
font-weight: normal;
595580
color: $th-color;
596581
background: $th-background;
597582
}
598583

599584
.tblHeaders,
600-
div.tools,
601585
.tblFooters {
602586
a {
603587
&:link,
@@ -1089,7 +1073,6 @@ code {
10891073
}
10901074
}
10911075

1092-
.sqlOuter code.sql,
10931076
div.sqlvalidate,
10941077
#inline_editor_outer {
10951078
display: block;
@@ -2869,10 +2852,6 @@ body {
28692852

28702853
// Extra large devices (large desktops, 1200px and up)
28712854
@include media-breakpoint-up(xl) {
2872-
div.tools {
2873-
text-align: left;
2874-
}
2875-
28762855
.pma-fieldset.tblFooters,
28772856
.tblFooters {
28782857
text-align: left;

‎public/themes/original/scss/_common.scss‎

Lines changed: 0 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -101,19 +101,6 @@ button {
101101
padding-top: 1em;
102102
}
103103

104-
div.tools {
105-
border: 1px solid #000;
106-
padding: 0.2em;
107-
margin-top: 0;
108-
margin-bottom: 0.5em;
109-
110-
/* avoid a thick line since this should be used under another fieldset */
111-
border-top: 0;
112-
text-align: right;
113-
float: none;
114-
clear: both;
115-
}
116-
117104
.pma-fieldset.tblFooters {
118105
margin-top: 0;
119106
margin-bottom: 0.5em;
@@ -297,7 +284,6 @@ label.error {
297284
background: $th-background;
298285
}
299286

300-
div.tools,
301287
.tblFooters {
302288
font-weight: normal;
303289
color: $th-color;
@@ -316,18 +302,6 @@ div.tools,
316302
}
317303
}
318304

319-
div.tools a {
320-
&:link,
321-
&:visited,
322-
&:active {
323-
color: #00f;
324-
}
325-
326-
&:hover {
327-
color: #f00;
328-
}
329-
}
330-
331305
.tblFooters a {
332306
&:link,
333307
&:active,
@@ -821,31 +795,6 @@ kbd {
821795
box-shadow: none;
822796
}
823797

824-
code {
825-
font-size: 1em;
826-
color: $main-color;
827-
828-
&.php {
829-
display: block;
830-
padding-left: 0.3em;
831-
margin-top: 0;
832-
margin-bottom: 0;
833-
max-height: 10em;
834-
overflow: auto;
835-
direction: ltr;
836-
}
837-
838-
&.sql {
839-
display: block;
840-
padding: 0.3em;
841-
margin-top: 0;
842-
margin-bottom: 0;
843-
max-height: 10em;
844-
overflow: auto;
845-
direction: ltr;
846-
}
847-
}
848-
849798
div.sqlvalidate {
850799
display: block;
851800
padding: 0.3em;
@@ -864,10 +813,6 @@ div.sqlvalidate {
864813
background: $bg-one;
865814
}
866815

867-
.result_query div.sqlOuter {
868-
text-align: left;
869-
}
870-
871816
#PMA_slidingMessage code.sql {
872817
border: $main-color solid 1px;
873818
border-top: 0;
@@ -2715,10 +2660,6 @@ body {
27152660

27162661
// Extra large devices (large desktops, 1200px and up)
27172662
@include media-breakpoint-up(xl) {
2718-
div.tools {
2719-
text-align: left;
2720-
}
2721-
27222663
.pma-fieldset.tblFooters,
27232664
.tblFooters {
27242665
text-align: left;

0 commit comments

Comments
 (0)