tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

2013-06-10 Sergio Martin <sergio.martin@artica.es> 

* 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
This commit is contained in:
zarzuelo 2013-06-10 08:53:42 +00:00
parent 5623edbb92
commit a40f68bdaf
10 changed files with 58 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pandora_console/ChangeLog
View File

@ -1,3 +1,17 @@
2013-06-10 Sergio Martin <sergio.martin@artica.es>
* 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 <rnovoa@artica.es>
* include/functions_graph.php: Changed some translations from 'Data'

2
pandora_console/godmode/agentes/planned_downtime.editor.php
View File

@ -929,7 +929,7 @@ ui_require_jquery_file ("ui-timepicker-addon");
currentText: '<?php echo __('Now');?>',
closeText: '<?php echo __('Close');?>'});
$("#text-once_date_from, #text-once_date_to").datepicker ();
$.datepicker.regional["<?php echo $config['language']; ?>"];
$.datepicker.regional["<?php echo get_user_language(); ?>"];
$("#filter_group").click (

4
pandora_console/include/styles/datepicker.css
View File

@ -199,4 +199,8 @@ img.ui-datepicker-trigger {
width: 193px;
height: 200px;
}
.ui-datepicker-title * {
color: white;
}
*/

11
pandora_console/include/styles/jquery-ui-1.10.0.custom.css vendored
View File

@ -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;

4
pandora_console/include/styles/pandora.css
View File

@ -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 */

2
pandora_console/operation/agentes/datos_agente.php
View File

@ -310,7 +310,7 @@ $(document).ready (function () {
currentText: '<?php echo __('Now');?>',
closeText: '<?php echo __('Close');?>'});
$("#text-date_from, #text-date_to").datepicker ();
$.datepicker.regional["<?php echo $config['language']; ?>"];
$.datepicker.regional["<?php echo get_user_language(); ?>"];
});
</script>

31
pandora_console/operation/netflow/nf_live_view.php
View File

@ -160,23 +160,17 @@ if (isset($config['netflow_disable_custom_lvfilters'])) {
}
echo '<form method="post" action="' . $config['homeurl'] . 'index.php?sec=netf&sec2=operation/netflow/nf_live_view&pure='.$pure.'">';
if (defined ('METACONSOLE')) {
echo "<table class='databox' width='800'>";
}
else {
echo "<table class='databox' width='90%'>";
}
echo "<table class='databox' width='99%'>";
echo "<tr>";
echo "<td>" .
'<b>' . __('Date') . '</b>' .
"</td>";
echo "<td>" .
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) .
"</td>";
@ -382,6 +376,8 @@ if ($draw != '') {
$interval_length, $chart_type, $filter,
$max_aggregates, $connection_name);
}
ui_require_jquery_file ("ui-timepicker-addon");
?>
<script type="text/javascript">
@ -555,4 +551,19 @@ if ($draw != '') {
}
});
});
$("#text-time").timepicker({
showSecond: true,
timeFormat: 'hh:mm:ss',
timeOnlyTitle: '<?php echo __('Choose time');?>',
timeText: '<?php echo __('Time');?>',
hourText: '<?php echo __('Hour');?>',
minuteText: '<?php echo __('Minute');?>',
secondText: '<?php echo __('Second');?>',
currentText: '<?php echo __('Now');?>',
closeText: '<?php echo __('Close');?>'});
$("#text-date").datepicker ();
$.datepicker.regional["<?php echo get_user_language(); ?>"];
</script>

2
pandora_console/operation/reporting/graph_viewer.php
View File

@ -208,7 +208,7 @@ if ($view_graph) {
secondText: '<?php echo __('Second');?>',
currentText: '<?php echo __('Now');?>',
closeText: '<?php echo __('Close');?>'});
$.datepicker.setDefaults($.datepicker.regional[ "<?php echo $config['language']; ?>"]);
$.datepicker.setDefaults($.datepicker.regional[ "<?php echo get_user_language(); ?>"]);
$("#text-date").datepicker ({changeMonth: true, changeYear: true, showAnim: "slideDown"});
});
</script>

6
pandora_console/operation/reporting/reporting_viewer.php
View File

@ -160,11 +160,11 @@ $table->data[0][1] .= '</div>';
$table->data[1][1] = '<div style="float:left;padding-top:3px;">' . __('From') . ': </div>';
$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] = '<div style="float:left;padding-top:3px;display:'.$display_item.'" id="string_items">' . __('Items period before') . ':</div>';
$table->data[1][2] .= '<div style="float:left;padding-top:3px;display:'.$display_to.'" id="string_to">' . __('to') . ':</div>';
$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 '<form method="post" action="'.$url.'&pure='.$config["pure"].'">';
@ -200,7 +200,7 @@ $(document).ready (function () {
secondText: '<?php echo __('Second');?>',
currentText: '<?php echo __('Now');?>',
closeText: '<?php echo __('Close');?>'});
$.datepicker.setDefaults($.datepicker.regional[ "<?php echo $config['language']; ?>"]);
$.datepicker.setDefaults($.datepicker.regional[ "<?php echo get_user_language(); ?>"]);
$("#text-date").datepicker ({changeMonth: true, changeYear: true, showAnim: "slideDown"});

2
pandora_console/operation/tree.php
View File

@ -869,7 +869,7 @@ ui_require_jquery_file ("ui-timepicker-addon");
$("#text-date_from, #text-date_to").datepicker ();
$.datepicker.regional["<?php echo $config['language']; ?>"];
$.datepicker.regional["<?php echo get_user_language(); ?>"];
}
datetime_picker_callback();