From 4e0d1331fd008b82fa3e96005b9ac51084285067 Mon Sep 17 00:00:00 2001 From: Juvenildo Vaz Date: Mon, 25 Dec 2017 16:14:09 -0300 Subject: [PATCH 1/3] Remove inline styles from messages.php #12262 Signed-off-by: Juvenildo Vaz --- js/messages.php | 4 ++-- themes/original/css/common.css.php | 4 ++++ themes/pmahomme/css/common.css.php | 4 ++++ 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/js/messages.php b/js/messages.php index 820deecce2..c12aeb2cbe 100644 --- a/js/messages.php +++ b/js/messages.php @@ -697,10 +697,10 @@ $js_messages['phpErrorsFound'] = '
' . '
' . '' + . '" class="floatright message_errors_found">' . '' + . '" class="floatright message_errors_found">' . '
'; $js_messages['phpErrorsBeingSubmitted'] = '
' diff --git a/themes/original/css/common.css.php b/themes/original/css/common.css.php index 7c2c1fbfe0..bb028d8c84 100644 --- a/themes/original/css/common.css.php +++ b/themes/original/css/common.css.php @@ -636,6 +636,10 @@ form.login label { max-width:50% } +.message_errors_found{ + margin-top: 20px; +} + /******************************************************************************/ /* specific elements */ diff --git a/themes/pmahomme/css/common.css.php b/themes/pmahomme/css/common.css.php index 9630165c06..af11f181f7 100644 --- a/themes/pmahomme/css/common.css.php +++ b/themes/pmahomme/css/common.css.php @@ -917,6 +917,10 @@ form.login select { max-width:50% } +.message_errors_found{ + margin-top: 20px; +} + /******************************************************************************/ /* specific elements */ From 2173e5eb5a8a3888352400a3403ea269feee059c Mon Sep 17 00:00:00 2001 From: Juvenildo Vaz Date: Mon, 25 Dec 2017 17:01:13 -0300 Subject: [PATCH 2/3] Removed last inline style from rte.js #12262 Signed-off-by: Juvenildo Vaz --- js/rte.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/rte.js b/js/rte.js index b8f1b0b7d3..5f89835d54 100644 --- a/js/rte.js +++ b/js/rte.js @@ -169,7 +169,7 @@ RTE.COMMON = { /** * Display the dialog to the user */ - data.message = ''; + data.message = ''; var $ajaxDialog = $('
' + data.message + '
').dialog({ width: 500, buttons: button_options, From 3767d8343f685e65e92b4e3fa66522a8fda04bce Mon Sep 17 00:00:00 2001 From: Juvenildo Vaz Date: Mon, 25 Dec 2017 17:33:37 -0300 Subject: [PATCH 3/3] Removed all remaining inline styles from functions.js #12262 Signed-off-by: Juvenildo Vaz --- js/functions.js | 14 +++++++------- themes/original/css/common.css.php | 12 ++++++++++++ themes/pmahomme/css/common.css.php | 12 ++++++++++++ 3 files changed, 31 insertions(+), 7 deletions(-) diff --git a/js/functions.js b/js/functions.js index 10fc9c2ead..e1009bd875 100644 --- a/js/functions.js +++ b/js/functions.js @@ -3517,9 +3517,9 @@ AJAX.registerOnload('functions.js', function () { var list_size = central_column_list[db + '_' + table].length; var min = (list_size <= maxRows) ? list_size : maxRows; for (i = 0; i < min; i++) { - fields += '
' + + fields += '
' + escapeHtml(central_column_list[db + '_' + table][i].col_name) + - '
' + central_column_list[db + '_' + table][i].col_type; + '
' + central_column_list[db + '_' + table][i].col_type; if (central_column_list[db + '_' + table][i].col_attribute !== '') { fields += '(' + escapeHtml(central_column_list[db + '_' + table][i].col_attribute) + ') '; @@ -3530,7 +3530,7 @@ AJAX.registerOnload('functions.js', function () { fields += escapeHtml(central_column_list[db + '_' + table][i].col_extra) + '' + '
'; if (pick) { - fields += ''; } fields += ''; @@ -3579,9 +3579,9 @@ AJAX.registerOnload('functions.js', function () { fields = ''; min = (list_size <= maxRows + result_pointer) ? list_size : maxRows + result_pointer; for (i = result_pointer; i < min; i++) { - fields += '
' + + fields += '
' + central_column_list[db + '_' + table][i].col_name + - '
' + + '
' + central_column_list[db + '_' + table][i].col_type; if (central_column_list[db + '_' + table][i].col_attribute !== '') { @@ -3593,7 +3593,7 @@ AJAX.registerOnload('functions.js', function () { fields += central_column_list[db + '_' + table][i].col_extra + '' + '
'; if (pick) { - fields += ''; } fields += ''; @@ -4249,7 +4249,7 @@ function PMA_slidingMessage (msg, $obj) { if ($('#PMA_slidingMessage').length === 0) { $('#page_content').prepend( '' + 'class="pma_sliding_message">' ); } $obj = $('#PMA_slidingMessage'); diff --git a/themes/original/css/common.css.php b/themes/original/css/common.css.php index bb028d8c84..146e3fc632 100644 --- a/themes/original/css/common.css.php +++ b/themes/original/css/common.css.php @@ -640,6 +640,18 @@ form.login label { margin-top: 20px; } +.font_weight_bold{ + font-weight: bold; +} + +.color_gray{ + color: gray; +} + +.pma_sliding_message{ + display: inline-block; +} + /******************************************************************************/ /* specific elements */ diff --git a/themes/pmahomme/css/common.css.php b/themes/pmahomme/css/common.css.php index af11f181f7..6ad48a7aa3 100644 --- a/themes/pmahomme/css/common.css.php +++ b/themes/pmahomme/css/common.css.php @@ -921,6 +921,18 @@ form.login select { margin-top: 20px; } +.font_weight_bold{ + font-weight: bold; +} + +.color_gray{ + color: gray; +} + +.pma_sliding_message{ + display: inline-block; +} + /******************************************************************************/ /* specific elements */