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

2013-07-04 Miguel de Dios <miguel.dedios@artica.es> 

* include/functions_graph.php: fixed include javascript in the
	static image for boolean module graph.
	
	* mobile/operation/module_graph.php,
	mobile/operation/modules.php,
	mobile/include/style/main.css: a lot of fixes in mobile.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8472 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2013-07-04 13:41:47 +00:00
parent 78efe6244f
commit fb217cc7a0
5 changed files with 70 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pandora_console/ChangeLog
View File

@ -1,3 +1,12 @@
2013-07-04 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_graph.php: fixed include javascript in the
static image for boolean module graph.
* mobile/operation/module_graph.php,
mobile/operation/modules.php,
mobile/include/style/main.css: a lot of fixes in mobile.
2013-07-03 Miguel de Dios <miguel.dedios@artica.es>
* mobile/operation/events.php, mobile/operation/module_graph.php,

1
pandora_console/include/functions_graph.php
View File

@ -2486,6 +2486,7 @@ function grafico_modulo_boolean_data ($agent_module_id, $period, $show_events,
global $series_type;
global $chart_extra_data;
$chart = array();
$color = array();
$legend = array();

51
pandora_console/mobile/include/style/main.css
View File

@ -538,6 +538,56 @@ table#list_events th {
color: #000000 !important;
}
@media screen and (max-width: 35em) {
#list_Modules_Embedded .cell_1 .ui-table-cell-label,
#list_Modules_Embedded .cell_4 .ui-table-cell-label {
min-width: auto !important;
}
#list_Modules_Embedded .cell_4 .ui-table-cell-label {
padding-left: 10px;
}
#list_Modules_Embedded .cell_3,
#list_Modules_Embedded .cell_4 {
display: inline !important;
float: none !important;
}
#list_Modules_Embedded .cell_0 .ui-table-cell-label,
#list_Modules_Embedded .cell_1 .ui-table-cell-label,
#list_Modules_Embedded .cell_3 .ui-table-cell-label,
#list_Modules_Embedded .cell_4 .ui-table-cell-label {
display: none;
}
#list_Modules_Embedded .show_collapside {
display: inline !important;
}
#list_Modules_Embedded .data {
/*
white-space: nowrap;
*/
}
#list_Modules_Embedded .cell_2 {
display: none !important;
}
#list_Modules_Embedded .show_collapside > img {
display: none !important;
}
#list_Modules_Embedded .cell_3 .show_collapside {
display: none !important;
}
}
#list_Modules_Embedded .cell_4 a {
color: #000000 !important;
}
/*
@media screen and (max-width: 320px) {
#list_Modules_Embedded .cell_1 .ui-table-cell-label,
#list_Modules_Embedded .cell_6 .ui-table-cell-label {
@ -577,6 +627,7 @@ table#list_events th {
#list_Modules_Embedded .cell_4 a {
color: #000000 !important;
}
*/
/*END------------Modules styles---------------------------------------*/

6
pandora_console/mobile/operation/module_graph.php
View File

@ -87,6 +87,11 @@ class ModuleGraph {
$this->height -= 80; //Correct the height
//For to avoid fucking IPHONES when they are in horizontal.
if ($this->height < 140) {
$this->height = 140;
}
}
public function ajax($parameter2 = false) {
@ -127,6 +132,7 @@ class ModuleGraph {
}
ob_start();
switch ($this->graph_type) {
case 'boolean':

5
pandora_console/mobile/operation/modules.php
View File

@ -435,7 +435,7 @@ class Modules {
$row[4] = $row[__('Interval')] =
($module['module_interval'] == 0) ? human_time_description_raw($module['agent_interval']) : human_time_description_raw($module['module_interval']);
$row[4] = $row[__('Interval')] = '<span class="data"><span class="show_collapside" style="display: none; font-weight: bolder;">' . __('Interval.') . ' </span>' .
$row[__('Interval')] .
'</span>';
@ -490,7 +490,8 @@ class Modules {
$row[7] = $row[__('Data')] =
'<span style="white-space: nowrap;">' .
'<span style="display: none;" class="show_collapside">' . $row[__('Status')] . '&nbsp;&nbsp;</span>' .
'<a data-ajax="false" class="ui-link" href="index.php?page=module_graph&id=' . $module['id_agente_modulo'] . '">' .
'<a data-ajax="false" class="ui-link" ' .
'href="index.php?page=module_graph&id=' . $module['id_agente_modulo'] . '&id_agent=' . $this->id_agent . '">' .
'<span style="vertical-align: 30%;">' . html_print_image('images/chart_curve.png', true, array ("style" => 'vertical-align: middle;')) . '</span>' .
'&nbsp;' . $output . '</a>' . '</span>';