From b4dcf4a6f118165e3a1d1b236b09608796c9921c Mon Sep 17 00:00:00 2001 From: fbsanchez Date: Mon, 3 Jun 2019 11:55:56 +0200 Subject: [PATCH] style review --- pandora_console/general/login_page.php | 1 + .../reporting/visual_console_builder.editor.php | 1 + .../godmode/update_manager/update_manager.css | 17 ----------------- pandora_console/include/chart_generator.php | 1 + pandora_console/include/functions_ui.php | 1 + .../include/functions_update_manager.php | 2 +- .../include/styles/js/jquery-ui_custom.css | 12 +++++++++++- pandora_console/include/styles/register.css | 6 ++++-- pandora_console/operation/agentes/stat_win.php | 1 + 9 files changed, 21 insertions(+), 21 deletions(-) diff --git a/pandora_console/general/login_page.php b/pandora_console/general/login_page.php index 880f1531a1..541efa96f4 100755 --- a/pandora_console/general/login_page.php +++ b/pandora_console/general/login_page.php @@ -518,6 +518,7 @@ if ($login_screen == 'error_authconfig' || $login_screen == 'error_emptyconfig' ui_require_css_file('dialog'); ui_require_css_file('jquery-ui.min', 'include/styles/js/'); ui_require_jquery_file('jquery-ui.min'); +ui_require_jquery_file('jquery-ui_custom'); ?> button.ui-button.ui-corner-all.ui-widget { - background-color: #cecece; - border: none; - border-radius: 2px; - text-transform: uppercase; - font-weight: bold; -} - -.ui-dialog-buttonset > button.success_button.ui-button.ui-corner-all.ui-widget, -.update_manager_button { - background-color: #82b92e; - color: #fff; - border-radius: 2px; - text-transform: uppercase; - font-weight: bold; -} - a.update_manager_button { padding: 10px 12px; margin-top: 10px; diff --git a/pandora_console/include/chart_generator.php b/pandora_console/include/chart_generator.php index e7133fd79e..2ae768d4fe 100644 --- a/pandora_console/include/chart_generator.php +++ b/pandora_console/include/chart_generator.php @@ -62,6 +62,7 @@ if (file_exists('languages/'.$user_language.'.mo')) { + diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php index e2d5450759..066c9f947b 100755 --- a/pandora_console/include/functions_ui.php +++ b/pandora_console/include/functions_ui.php @@ -1738,6 +1738,7 @@ function ui_process_page_head($string, $bitfield) // Add the jquery UI styles CSS. $config['css']['jquery-UI'] = 'include/styles/js/jquery-ui.min.css'; + $config['css']['jquery-UI-custom'] = 'include/styles/js/jquery-ui_custom.css'; // Add the dialog styles CSS. $config['css']['dialog'] = 'include/styles/dialog.css'; // Add the dialog styles CSS. diff --git a/pandora_console/include/functions_update_manager.php b/pandora_console/include/functions_update_manager.php index cc148be7b9..73a654a50d 100755 --- a/pandora_console/include/functions_update_manager.php +++ b/pandora_console/include/functions_update_manager.php @@ -468,7 +468,7 @@ function registration_wiz_modal( __('Cancel'), 'cancel_registration', false, - 'class="ui-widget ui-state-default ui-corner-all ui-button-text-only sub upd submit-cancel" style="color: red; width:100px;"', + 'class="ui-widget ui-state-default ui-corner-all ui-button-text-only sub upd submit-cancel"', true ); $output .= ''; diff --git a/pandora_console/include/styles/js/jquery-ui_custom.css b/pandora_console/include/styles/js/jquery-ui_custom.css index 0dde42f6a8..a01f721aca 100644 --- a/pandora_console/include/styles/js/jquery-ui_custom.css +++ b/pandora_console/include/styles/js/jquery-ui_custom.css @@ -1,8 +1,19 @@ @import url(calendar.css); /* --- JQUERY-UI --- */ + +.ui-dialog .ui-corner-all .ui-widget { + border-radius: 0; + margin: 0; + padding: 0; + border: none; +} + .ui-dialog .ui-dialog-titlebar { background-color: #82b92e; + border-radius: 0; + margin: 0; + padding: 0; } /*center ui dialog center*/ @@ -38,7 +49,6 @@ text-overflow: ellipsis; font-size: 11pt; position: relative; - top: 5px; float: none; } .ui-dialog .ui-dialog-titlebar-close { diff --git a/pandora_console/include/styles/register.css b/pandora_console/include/styles/register.css index 798ef5e66e..ef0fdc6e1b 100644 --- a/pandora_console/include/styles/register.css +++ b/pandora_console/include/styles/register.css @@ -1,4 +1,5 @@ input[type="submit"].submit-cancel, +button.submit-cancel.ui-button.ui-corner-all.ui-widget, button.submit-cancel { color: #fb4444; border: 1px solid #fb4444; @@ -13,13 +14,14 @@ button.submit-cancel { } input[type="submit"].submit-cancel:hover, +button.submit-cancel.ui-button.ui-corner-all.ui-widget:hover, button.submit-cancel:hover { color: #fff; background: #fb4444; } input[type="submit"].submit-next, -button.submit-next, +button.submit-next.ui-button.ui-corner-all.ui-widget, input[type="button"].submit-next { color: #82b92e; border: 1px solid #82b92e; @@ -33,7 +35,7 @@ input[type="button"].submit-next { } input[type="submit"].submit-next:hover, -button.submit-next:hover, +button.submit-next.ui-button.ui-corner-all.ui-widget:hover, input[type="button"].submit-next:hover { color: #fff; background: #82b92e; diff --git a/pandora_console/operation/agentes/stat_win.php b/pandora_console/operation/agentes/stat_win.php index 70af429f6d..8a063f940c 100644 --- a/pandora_console/operation/agentes/stat_win.php +++ b/pandora_console/operation/agentes/stat_win.php @@ -72,6 +72,7 @@ $alias = db_get_value('alias', 'tagente', 'id_agente', $id_agent); <?php echo __('%s Graph', get_product_name()).' ('.$alias.' - '.$label; ?>) +