diff --git a/pandora_console/include/functions_html.php b/pandora_console/include/functions_html.php index a5b4eb4448..b566d376ec 100644 --- a/pandora_console/include/functions_html.php +++ b/pandora_console/include/functions_html.php @@ -905,7 +905,12 @@ function html_print_select( ); $output .= '"/>'; } else { - ui_require_css_file('select2.min'); + $select2 = 'select2.min'; + if ($config['style'] === 'pandora_black') { + $select2 = 'select2_dark.min'; + } + + ui_require_css_file($select2); ui_require_javascript_file('select2.min'); } @@ -5089,9 +5094,14 @@ function html_print_autocomplete_users_from_integria( ) { global $config; + $user_icon = 'images/user_green.png'; + if ($config['style'] === 'pandora_black') { + $user_icon = 'images/header_user.png'; + } + ob_start(); - $attrs = ['style' => 'background: url(images/user_green.png) no-repeat right;']; + $attrs = ['style' => 'background: url('.$user_icon.') no-repeat right;']; if ($required) { $attrs['required'] = 'required'; @@ -5284,9 +5294,17 @@ function html_print_select_search( $required=false, $dropdownAutoWidth=false ) { + global $config; + $output = ''; - ui_require_css_file('select2.min'); + $select2_css = 'select2.min'; + + if ($config['style'] === 'pandora_black') { + $select2_css = 'select2_dark.min'; + } + + ui_require_css_file($select2_css); ui_require_javascript_file('select2.min'); if ($name === null) { diff --git a/pandora_console/include/functions_integriaims.php b/pandora_console/include/functions_integriaims.php index 4c5f02c3ae..436e189a9d 100644 --- a/pandora_console/include/functions_integriaims.php +++ b/pandora_console/include/functions_integriaims.php @@ -69,8 +69,8 @@ function integriaims_tabs($active_tab, $view=false) } if ($view) { - $create_tab['text'] = ''.html_print_image('images/pencil.png', true, ['title' => __('Edit ticket')]).''; - $view_tab['text'] = ''.html_print_image('images/operation.png', true, ['title' => __('View ticket')]).''; + $create_tab['text'] = ''.html_print_image('images/pencil.png', true, ['title' => __('Edit ticket'), 'class' => 'invert_filter']).''; + $view_tab['text'] = ''.html_print_image('images/operation.png', true, ['title' => __('View ticket'), 'class' => 'invert_filter']).''; // When the current page is the View page. if (!$active_tab) { $view_tab['active'] = true; diff --git a/pandora_console/include/styles/integriaims.css b/pandora_console/include/styles/integriaims.css index 0c8440e739..7fca030734 100644 --- a/pandora_console/include/styles/integriaims.css +++ b/pandora_console/include/styles/integriaims.css @@ -53,6 +53,7 @@ div.integria_details_description textarea { width: 100%; background-color: #fbfbfb; resize: vertical; + color: #000; } .integriaims_details_box { diff --git a/pandora_console/include/styles/pandora_black.css b/pandora_console/include/styles/pandora_black.css index fa0e08cde9..e0cf8840bc 100644 --- a/pandora_console/include/styles/pandora_black.css +++ b/pandora_console/include/styles/pandora_black.css @@ -876,3 +876,19 @@ div#dashboard-controls { .tickLabel { color: #fff; } + +.integria_details_shadow { + background-color: #222; + border-bottom: 1px solid #e2e2e2; + border-left: 1px solid #e2e2e2; + border-top-left-radius: 5px; + border-right: 1px solid #e2e2e2; + border-top-right-radius: 5px; +} + +div.integria_details_description textarea { + width: 100%; + background-color: #111; + color: #fff; + resize: vertical; +} diff --git a/pandora_console/operation/incidents/configure_integriaims_incident.php b/pandora_console/operation/incidents/configure_integriaims_incident.php index 195ee7350f..50c3452fb5 100644 --- a/pandora_console/operation/incidents/configure_integriaims_incident.php +++ b/pandora_console/operation/incidents/configure_integriaims_incident.php @@ -205,7 +205,12 @@ $table->data[0][0] .= '
'.html_print_input_text( 'w100p' ).'
'; -$table->data[0][2] = html_print_image('images/integria_logo_gray.png', true, ['style' => 'width: 70%; float: right;'], false); +$integria_logo = 'images/integria_logo_gray.png'; +if ($config['style'] === 'pandora_black') { + $integria_logo = 'images/integria_logo.png'; +} + +$table->data[0][2] = html_print_image($integria_logo, true, ['style' => 'width: 70%; float: right;'], false); $table->data[1][0] = '

'.__('Type').':

'; $table->data[1][0] .= '
'.html_print_select( diff --git a/pandora_console/operation/incidents/dashboard_detail_integriaims_incident.php b/pandora_console/operation/incidents/dashboard_detail_integriaims_incident.php index 9b195342cc..be9c357331 100644 --- a/pandora_console/operation/incidents/dashboard_detail_integriaims_incident.php +++ b/pandora_console/operation/incidents/dashboard_detail_integriaims_incident.php @@ -376,11 +376,11 @@ $details_box .= '
'.__('Priority').'
'.__('Type').'
'; $details_box .= ' -
'.html_print_image('images/heart.png', true).'
-
'.html_print_image('images/builder.png', true).'
-
'.html_print_image('images/user_green.png', true).'
+
'.html_print_image('images/heart.png', true, ['class' => 'invert_filter']).'
+
'.html_print_image('images/builder.png', true, ['class' => 'invert_filter']).'
+
'.html_print_image('images/user_green.png', true, ['class' => 'invert_filter']).'
'.ui_print_integria_incident_priority($priority, $priority_text).'
-
'.html_print_image('images/incidents.png', true).'
'; +
'.html_print_image('images/incidents.png', true, ['class' => 'invert_filter']).'
'; $details_box .= '
'.$status_text.'
'.$resolution_text.'
@@ -410,9 +410,9 @@ $people_box .= '
'; // Dates box. $dates_box = '
'; $dates_box .= ' -
'.html_print_image('images/tick.png', true).'
-
'.html_print_image('images/update.png', true, ['width' => '21']).'
-
'.html_print_image('images/mul.png', true).'
'; +
'.html_print_image('images/tick.png', true, ['class' => 'invert_filter']).'
+
'.html_print_image('images/update.png', true, ['width' => '21', 'class' => 'invert_filter']).'
+
'.html_print_image('images/mul.png', true, ['class' => 'invert_filter']).'
'; $dates_box .= '
'.__('Created at').':
'.__('Updated at').':
diff --git a/pandora_console/operation/search_users.php b/pandora_console/operation/search_users.php index cea08e30ea..3f397129db 100755 --- a/pandora_console/operation/search_users.php +++ b/pandora_console/operation/search_users.php @@ -59,6 +59,7 @@ if (!$users || !$searchUsers) { [ 'alt' => __('User'), 'title' => __('Standard User'), + 'class' => 'invert_filter', ] ).' '; }