From d8bef64237369c12dd144f0f172689983ff44d38 Mon Sep 17 00:00:00 2001 From: zarzuelo Date: Mon, 10 Jun 2013 08:53:42 +0000 Subject: [PATCH] 2013-06-10 Sergio Martin * include/styles/datepicker.css include/styles/jquery-ui-1.10.0.custom.css include/styles/pandora.css operation/tree.php operation/reporting/reporting_viewer.php operation/reporting/graph_viewer.php operation/agentes/datos_agente.php operation/netflow/nf_live_view.php godmode/agentes/planned_downtime.editor.php: Change the datepicker of netflow view to datepicker used on the rest of Pandora. Fixed styles and regional language calls git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8280 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 14 +++++++++ .../agentes/planned_downtime.editor.php | 2 +- pandora_console/include/styles/datepicker.css | 4 +++ .../styles/jquery-ui-1.10.0.custom.css | 11 ++++++- pandora_console/include/styles/pandora.css | 4 +-- .../operation/agentes/datos_agente.php | 2 +- .../operation/netflow/nf_live_view.php | 31 +++++++++++++------ .../operation/reporting/graph_viewer.php | 2 +- .../operation/reporting/reporting_viewer.php | 6 ++-- pandora_console/operation/tree.php | 2 +- 10 files changed, 58 insertions(+), 20 deletions(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 9a9dac0f15..24f9757574 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,17 @@ +2013-06-10 Sergio Martin + + * include/styles/datepicker.css + include/styles/jquery-ui-1.10.0.custom.css + include/styles/pandora.css + operation/tree.php + operation/reporting/reporting_viewer.php + operation/reporting/graph_viewer.php + operation/agentes/datos_agente.php + operation/netflow/nf_live_view.php + godmode/agentes/planned_downtime.editor.php: Change the + datepicker of netflow view to datepicker used on the + rest of Pandora. Fixed styles and regional language calls + 2013-06-07 Ramon Novoa * include/functions_graph.php: Changed some translations from 'Data' diff --git a/pandora_console/godmode/agentes/planned_downtime.editor.php b/pandora_console/godmode/agentes/planned_downtime.editor.php index 8496d9182a..9f6eaf877b 100755 --- a/pandora_console/godmode/agentes/planned_downtime.editor.php +++ b/pandora_console/godmode/agentes/planned_downtime.editor.php @@ -929,7 +929,7 @@ ui_require_jquery_file ("ui-timepicker-addon"); currentText: '', closeText: ''}); $("#text-once_date_from, #text-once_date_to").datepicker (); - $.datepicker.regional[""]; + $.datepicker.regional[""]; $("#filter_group").click ( diff --git a/pandora_console/include/styles/datepicker.css b/pandora_console/include/styles/datepicker.css index e0d480c1bf..0242eef335 100644 --- a/pandora_console/include/styles/datepicker.css +++ b/pandora_console/include/styles/datepicker.css @@ -199,4 +199,8 @@ img.ui-datepicker-trigger { width: 193px; height: 200px; } + +.ui-datepicker-title * { + color: white; +} */ \ No newline at end of file diff --git a/pandora_console/include/styles/jquery-ui-1.10.0.custom.css b/pandora_console/include/styles/jquery-ui-1.10.0.custom.css index de188dbfed..04f7e78192 100644 --- a/pandora_console/include/styles/jquery-ui-1.10.0.custom.css +++ b/pandora_console/include/styles/jquery-ui-1.10.0.custom.css @@ -273,6 +273,12 @@ button.ui-button::-moz-focus-inner { font-size: 1em; margin: 1px 0; } +.ui-datepicker .ui-datepicker-title *, .ui-datepicker th * { + color: white; +} +.ui-datepicker .ui-datepicker-title select, .ui-datepicker .ui-datepicker-title option { + color: #111 !important; +} .ui-datepicker select.ui-datepicker-month-year { width: 100%; } @@ -1179,7 +1185,7 @@ body .ui-tooltip { } .ui-widget-header { - background: #B1B1B1; + background: #B1B1B1 !important; color: #ffffff !important; } @@ -1194,6 +1200,9 @@ body .ui-tooltip { .ui-timepicker-div dd { margin: 0px 15px 0px 15px ; } +.ui-timepicker-div .ui-datepicker-title { + color: white; +} .ui-datepicker-buttonpane button { border-color: #B1B1B1 !important; diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css index 4149b5820e..090a37b591 100644 --- a/pandora_console/include/styles/pandora.css +++ b/pandora_console/include/styles/pandora.css @@ -2135,7 +2135,7 @@ div#logo_text3 { /* Calendar background */ table.scw { - background-color: #daedae; + background-color: #3f3f3f; } /* Week number heading */ @@ -2163,7 +2163,7 @@ tfoot.scwFoot { } .scwFoot :hover{ - color: #FFA500 !important; + color: #3F3F3F !important; } /* Cells divs to set individual styles with the table objects */ diff --git a/pandora_console/operation/agentes/datos_agente.php b/pandora_console/operation/agentes/datos_agente.php index d9662d7437..caefc7f486 100755 --- a/pandora_console/operation/agentes/datos_agente.php +++ b/pandora_console/operation/agentes/datos_agente.php @@ -310,7 +310,7 @@ $(document).ready (function () { currentText: '', closeText: ''}); $("#text-date_from, #text-date_to").datepicker (); - $.datepicker.regional[""]; + $.datepicker.regional[""]; }); diff --git a/pandora_console/operation/netflow/nf_live_view.php b/pandora_console/operation/netflow/nf_live_view.php index 30b3f16958..5954c4a270 100644 --- a/pandora_console/operation/netflow/nf_live_view.php +++ b/pandora_console/operation/netflow/nf_live_view.php @@ -160,23 +160,17 @@ if (isset($config['netflow_disable_custom_lvfilters'])) { } echo '
'; - - if (defined ('METACONSOLE')) { - echo ""; - } - else { - echo "
"; - } + echo "
"; + echo ""; echo ""; echo ""; @@ -382,6 +376,8 @@ if ($draw != '') { $interval_length, $chart_type, $filter, $max_aggregates, $connection_name); } + +ui_require_jquery_file ("ui-timepicker-addon"); ?> diff --git a/pandora_console/operation/reporting/graph_viewer.php b/pandora_console/operation/reporting/graph_viewer.php index d78841ec26..b27e2e7d6d 100644 --- a/pandora_console/operation/reporting/graph_viewer.php +++ b/pandora_console/operation/reporting/graph_viewer.php @@ -208,7 +208,7 @@ if ($view_graph) { secondText: '', currentText: '', closeText: ''}); - $.datepicker.setDefaults($.datepicker.regional[ ""]); + $.datepicker.setDefaults($.datepicker.regional[ ""]); $("#text-date").datepicker ({changeMonth: true, changeYear: true, showAnim: "slideDown"}); }); diff --git a/pandora_console/operation/reporting/reporting_viewer.php b/pandora_console/operation/reporting/reporting_viewer.php index 8272ba765c..029e6a3820 100644 --- a/pandora_console/operation/reporting/reporting_viewer.php +++ b/pandora_console/operation/reporting/reporting_viewer.php @@ -160,11 +160,11 @@ $table->data[0][1] .= ''; $table->data[1][1] = '
' . __('From') . ':
'; $table->data[1][1] .= html_print_input_text ('date_init', $date_init, '', 12, 10, true). ' '; -$table->data[1][1] .= html_print_input_text ('time_init', $time_init, '', 7, 7, true). ' '; +$table->data[1][1] .= html_print_input_text ('time_init', $time_init, '', 10, 7, true). ' '; $table->data[1][2] = '
' . __('Items period before') . ':
'; $table->data[1][2] .= '
' . __('to') . ':
'; $table->data[1][2] .= html_print_input_text ('date', $date, '', 12, 10, true). ' '; -$table->data[1][2] .= html_print_input_text ('time', $time, '', 7, 7, true). ' '; +$table->data[1][2] .= html_print_input_text ('time', $time, '', 10, 7, true). ' '; $table->data[1][2] .= html_print_submit_button (__('Update'), 'date_submit', false, 'class="sub next"', true); echo ''; @@ -200,7 +200,7 @@ $(document).ready (function () { secondText: '', currentText: '', closeText: ''}); - $.datepicker.setDefaults($.datepicker.regional[ ""]); + $.datepicker.setDefaults($.datepicker.regional[ ""]); $("#text-date").datepicker ({changeMonth: true, changeYear: true, showAnim: "slideDown"}); diff --git a/pandora_console/operation/tree.php b/pandora_console/operation/tree.php index f0757093a0..2d5479302a 100644 --- a/pandora_console/operation/tree.php +++ b/pandora_console/operation/tree.php @@ -869,7 +869,7 @@ ui_require_jquery_file ("ui-timepicker-addon"); $("#text-date_from, #text-date_to").datepicker (); - $.datepicker.regional[""]; + $.datepicker.regional[""]; } datetime_picker_callback();
" . '' . __('Date') . '' . "" . - html_print_input_text ('date', $date, false, 10, 10, true) . + html_print_input_text ('date', $date, false, 13, 10, true) . html_print_image ("images/calendar_view_day.png", true, - array("alt" => "calendar", - "onclick" => "scwShow(scwID('text-date'),this);")) . + array("alt" => "calendar")) . html_print_input_text ('time', $time, false, 10, 5, true) . "