diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 8552a462eb..fb0a14b289 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,10 @@ +2013-11-22 Sergio Martin + + * mobile/operation/events.php + mobile/include/style/main.css + mobile/include/ui.class.php: Improve events view + of mobile console + 2013-11-22 Miguel de Dios * operation/gis_maps/ajax.php: fixed the get size of icons for diff --git a/pandora_console/mobile/include/style/main.css b/pandora_console/mobile/include/style/main.css index 3882f49777..66139886b9 100644 --- a/pandora_console/mobile/include/style/main.css +++ b/pandora_console/mobile/include/style/main.css @@ -414,10 +414,6 @@ table#list_events th { } */ -#list_events a { - color: #333333 !important; -} - @media screen and (max-width: 35em) { /* Hide the title of event name */ #list_events tbody tr.events td.cell_0 b.ui-table-cell-label { @@ -445,10 +441,6 @@ table#list_events th { font-weight: bold; } -.cell_0 a { - color: #000000 !important; -} - @media screen and (max-width: 25em) { #list_agents .cell_2 .ui-table-cell-label, #list_agents .cell_3 .ui-table-cell-label, @@ -697,7 +689,8 @@ li.ui-btn { @media screen and (max-width: 25em) { .ui-table th, .ui-table td { - padding: 0px !important; + padding: 3px !important; + padding-left: 3px; } } /*END----------Fix the tons of air between the rows in small table----*/ @@ -722,4 +715,21 @@ li.ui-btn { .ui-loading .ui-loader-background { display:block !important; } -/*END----------Fix to avoid clicks under loading message--------------*/ \ No newline at end of file +/*END----------Fix to avoid clicks under loading message--------------*/ + + +.button_layer { + position: relative; + float: right; + padding-right: 60px; + height: 30px; +} + +.ui-icon-big { + width: 28px !important; + height: 28px !important; +} + +.ui-icon-arrow-r-big { + background-position: -103px 4px !important; +} diff --git a/pandora_console/mobile/include/ui.class.php b/pandora_console/mobile/include/ui.class.php index 93e803405f..4620f29960 100755 --- a/pandora_console/mobile/include/ui.class.php +++ b/pandora_console/mobile/include/ui.class.php @@ -773,6 +773,25 @@ class Table { } } + public function importFromHashEvents($data) { + foreach ($data as $id => $row) { + $table_row = array(); + + foreach ($row as $key => $value) { + if (!in_array($key, $this->head)) { + //$this->head[] = $key; + } + + //$cell_key = array_search($key, $this->head); + + //$table_row[$cell_key] = $value; + $table_row[$key] = $value; + } + + $this->rows[$id] = $table_row; + } + } + public function setClass($class = '') { $this->class_table = $class; } @@ -833,7 +852,7 @@ class Table { $html .= "" . $key . "\n"; } else { - $html .= "\n"; + $html .= "\n"; } foreach ($row as $key_cell => $cell) { $html .= "" . $cell . "\n"; diff --git a/pandora_console/mobile/operation/events.php b/pandora_console/mobile/operation/events.php index faf126dab9..78e43838b2 100644 --- a/pandora_console/mobile/operation/events.php +++ b/pandora_console/mobile/operation/events.php @@ -70,7 +70,7 @@ class Events { $events = array(); $end = 1; - foreach ($events_db as $event) { + foreach ($events_db as $event) { $end = 0; $row = array(); $row[] = ' @@ -111,6 +111,7 @@ class Events { $row[] = '' . __('Agent') . '' . $agent_name; + /* $status = html_print_image ("mobile/images/" . get_priority_class($event['criticity']) . ".png", true); @@ -133,7 +134,16 @@ class Events { $row[] = '' . __('Status') . '' . $status; + */ + if (!$this->readOnly) { + $row[] = '' . + ' +   + ' . + ''; + } + $row[] = get_priority_class ($event["criticity"]); $events[$event['id_evento']] = $row; } @@ -736,11 +746,12 @@ class Events { $field_event_name = __('Event Name'); $field_timestamp = __('Timestamp'); $field_agent = __('Agent'); - $field_status = __('Status'); + $row_class = array(); foreach ($events_db as $event) { - $row_class[$event['id_evento']] = "events"; - // . get_priority_class($event['criticity']); + $myclass = get_priority_class ($event["criticity"]); + + $row_class[$event['id_evento']] = "events $myclass"; $row = array(); if ($this->readOnly) { @@ -774,26 +785,15 @@ class Events { (string) agents_get_name($event["id_agente"]) . ''; } - $row[$field_status] = - html_print_image ("mobile/images/" . - get_priority_class($event['criticity']) . ".png", true); - $row[$field_status] .= " "; - if ($event['estado'] == 1) { - $img_st = "images/tick.png"; - $title_st = __('Event validated'); - - $row[$field_status] .= html_print_image ($img_st, true, - array ("class" => "image_status", - "width" => 16, - "height" => 16, - "title" => $title_st, - "id" => 'status_img_' . $event["id_evento"])); + + if (!$this->readOnly) { + $row[' '] = '' . + ' +   + ' . + ''; + $row_class[' '] = "button_row"; } - else { - $row[$field_status] .= ''; - } - - $events[$event['id_evento']] = $row; } @@ -812,6 +812,7 @@ class Events { $table->id = 'list_events'; $table->setRowClass($row_class); $table->importFromHash($events); + if (!$return) { $ui->contentAddHtml($table->getHTML()); @@ -981,14 +982,14 @@ class Events { else { $.each(data.events, function(key, event) { $(\"table#list_events tbody\").append( - \"\" + + \"\" + \"\" + \"\" + event[0] + \"\" + \"\" + event[1] + \"\" + \"\" + event[2] + \"\" + - \"\" + event[3] + \"\" + + \"\" + event[3] + \"\" + \"\"); }); @@ -1057,11 +1058,17 @@ class Events { } else { $filters_to_serialize = array(); - - + + if($this->severity == -1) { + $severity = __('All'); + } + else { + $severity = get_priorities($this->severity); + } + if (!$this->default_filters['severity']) { $filters_to_serialize[] = sprintf(__("Severity: %s"), - get_priorities($this->severity)); + $severity); } if (!$this->default_filters['group']) { $groups = users_get_groups_for_select( @@ -1070,9 +1077,17 @@ class Events { $filters_to_serialize[] = sprintf(__("Group: %s"), $groups[$this->group]); } + + if($this->type == 'all') { + $type = __('All'); + } + else { + $type = get_event_types($this->type); + } + if (!$this->default_filters['type']) { $filters_to_serialize[] = sprintf(__("Type: %s"), - get_event_types($this->type)); + $type); } if (!$this->default_filters['status']) { $filters_to_serialize[] = sprintf(__("Status: %s"),