'.__('Agent icon').': '.ui_print_help_tip(__('Agent icon for GIS Maps.'), true).'
';
if ($icon_path == '') {
$display_icons = 'none';
- // Hack to show no icon. Use any given image to fix not found image errors
+ // Hack to show no icon. Use any given image to fix not found image errors.
$path_without = 'images/spinner.png';
$path_default = 'images/spinner.png';
$path_ok = 'images/spinner.png';
diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php
index a1fd3f18bf..fb1c60bdd1 100755
--- a/pandora_console/include/functions_ui.php
+++ b/pandora_console/include/functions_ui.php
@@ -2458,6 +2458,51 @@ function ui_print_status_image($type, $title='', $return=false, $options=false,
}
+/**
+ * Generates a progress bar CSS based.
+ * Requires css progress.css
+ *
+ * @param integer $progress Progress.
+ * @param string $width Width.
+ * @param string $height Height.
+ * @param string $color Color.
+ * @param boolean $return Return or paint (if false).
+ *
+ * @return string HTML code.
+ */
+function ui_progress(
+ $progress,
+ $width='100%',
+ $height='2em',
+ $color='#80ba27',
+ $return=true
+) {
+ if (!$progress) {
+ $progress = 0;
+ }
+
+ if ($progress > 100) {
+ $progress = 100;
+ }
+
+ if ($progress < 0) {
+ $progress = 0;
+ }
+
+ ui_require_css_file('progress');
+ $output .= '
';
+ $output .= '
'.$progress.'%';
+ $output .= '
';
+ $output .= '
';
+
+ if (!$return) {
+ echo $output;
+ }
+
+ return $output;
+}
+
+
/**
* Print a code into a DIV and enable a toggle to show and hide it
*
diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css
index 4a771b3017..f132c0db94 100644
--- a/pandora_console/include/styles/pandora.css
+++ b/pandora_console/include/styles/pandora.css
@@ -5945,6 +5945,43 @@ a#qr_code_agent_view {
* ---------------------------------------------------------------------
*/
+.bullet_modules {
+ width: 15px;
+ height: 15px;
+ border-radius: 50%;
+ margin-right: 5px;
+ margin-top: -2px;
+}
+
+div#bullets_modules {
+ display: inline-block;
+ margin-left: 2em;
+}
+
+div#bullets_modules div {
+ display: inline-block;
+ margin: 0 0.5em;
+}
+
+.orange_background {
+ background: #ffa631;
+}
+.red_background {
+ background: #fc4444;
+}
+.yellow_background {
+ background: #fad403;
+}
+.grey_background {
+ background: #b2b2b2;
+}
+.blue_background {
+ background: #3ba0ff;
+}
+.green_background {
+ background: #80ba27;
+}
+
/* First row in agent view */
#agent_details_first_row {
display: flex;
@@ -5960,12 +5997,19 @@ a#qr_code_agent_view {
}
.agent_details_col_left {
- width: 38%;
+ width: 40%;
+ min-width: 500px;
+}
+
+.agent_details_content .agent_details_bullets {
+ position: relative;
+ left: -20%;
}
.agent_details_col_right {
width: 62%;
margin-left: 20px;
+ min-width: 670px;
}
.buttons_agent_view {
@@ -5985,7 +6029,7 @@ a#qr_code_agent_view {
/* Agent details in agent view */
.agent_details_header {
display: flex;
- justify-content: space-between;
+ justify-content: flex-end;
align-items: center;
border-bottom: 1px solid #e2e2e2;
padding: 6px 20px;
@@ -6005,6 +6049,7 @@ a#qr_code_agent_view {
.agent_details_graph {
width: 205px;
text-align: center;
+ margin: 0 auto;
}
.agent_details_info {
diff --git a/pandora_console/include/styles/progress.css b/pandora_console/include/styles/progress.css
new file mode 100644
index 0000000000..0919269d37
--- /dev/null
+++ b/pandora_console/include/styles/progress.css
@@ -0,0 +1,18 @@
+span.progress_text {
+ position: absolute;
+ font-family: "lato-bolder", "Open Sans", sans-serif;
+ font-size: 2em;
+}
+
+div.progress_main {
+ text-align: center;
+ height: 2.5em;
+ border: 1px solid #80ba27;
+}
+
+div.progress {
+ width: 0%;
+ background: #80ba27;
+ height: 100%;
+ float: left;
+}
diff --git a/pandora_console/operation/agentes/estado_generalagente.php b/pandora_console/operation/agentes/estado_generalagente.php
index d51057833f..c578259e60 100755
--- a/pandora_console/operation/agentes/estado_generalagente.php
+++ b/pandora_console/operation/agentes/estado_generalagente.php
@@ -1,17 +1,32 @@
'.' '.ui_print_help_tip(__('Agent in planned downtime'), true, 'images/minireloj-16.png').'';
-} else if (($in_planned_downtime && !$agent['disabled']) || ($in_planned_downtime && !$agent['quiet'])) {
- $agent_name .= ' '.ui_print_help_tip(__('Agent in planned downtime'), true, 'images/minireloj-16.png').'';
+ $agent_name .= '
'.ui_print_help_tip(
+ __('Agent in planned downtime'),
+ true,
+ 'images/minireloj-16.png'
+ ).'';
+} else if (($in_planned_downtime && !$agent['disabled'])
+ || ($in_planned_downtime && !$agent['quiet'])
+) {
+ $agent_name .= ' '.ui_print_help_tip(
+ __('Agent in planned downtime'),
+ true,
+ 'images/minireloj-16.png'
+ ).'';
}
$table_agent_header = '
';
if (!$config['show_group_name']) {
- $table_agent_header .= ui_print_group_icon($agent['id_grupo'], true, 'groups_small', 'padding-right: 6px;');
+ $table_agent_header .= ui_print_group_icon(
+ $agent['id_grupo'],
+ true,
+ 'groups_small',
+ 'padding-right: 6px;'
+ );
}
-$table_agent_header .= $agent_name;
$table_agent_header .= '
';
$status_img = agents_detail_view_status_img(
@@ -109,16 +155,33 @@ $status_img = agents_detail_view_status_img(
$table_agent_header .= '
'.$status_img.'
';
-// Fixed width non interactive charts
+// Fixed width non interactive charts.
$status_chart_width = 180;
$graph_width = 180;
$table_agent_graph = '
';
-$table_agent_graph .= graph_agent_status($id_agente, $graph_width, $graph_width, true, false, false, true);
+$table_agent_graph .= graph_agent_status(
+ $id_agente,
+ $graph_width,
+ $graph_width,
+ true,
+ false,
+ false,
+ true
+);
$table_agent_graph .= '
';
-$table_agent_os = '
'.ui_print_os_icon($agent['id_os'], false, true, true, false, false, false, ['title' => __('OS').': '.get_os_name($agent['id_os'])]);
-$table_agent_os .= empty($agent['os_version']) ? get_os_name((int) $agent['id_os']) : $agent['os_version'].'
';
+$table_agent_os = '
'.ui_print_os_icon(
+ $agent['id_os'],
+ false,
+ true,
+ true,
+ false,
+ false,
+ false,
+ ['title' => __('OS').': '.get_os_name($agent['id_os'])]
+);
+$table_agent_os .= (empty($agent['os_version'])) ? get_os_name((int) $agent['id_os']) : $agent['os_version'].'
';
$addresses = agents_get_addresses($id_agente);
$address = agents_get_address($id_agente);
@@ -158,8 +221,15 @@ $table_agent = '
'.$table_agent_count_modules.'
'.$table_agent_os.$table_agent_ip.$table_agent_version.$table_agent_description.'
';
-// END: TABLE AGENT BUILD
-// START: TABLE CONTACT BUILD
+
+/*
+ * END: TABLE AGENT BUILD.
+ */
+
+/*
+ *START: TABLE CONTACT BUILD.
+ */
+
$table_contact = new stdClass();
$table_contact->id = 'agent_contact_main';
$table_contact->width = '100%';
@@ -168,7 +238,7 @@ $table_contact->cellpadding = 0;
$table_contact->class = 'white_table white_table_no_border';
$table_contact->style[0] = 'width: 30%;';
$table_contact->style[1] = 'width: 70%;';
-$table_contact->headstyle[1] = 'padding-top:6px; padding-bottom:6px';
+$table_contact->headstyle[1] = 'padding-top:6px; padding-bottom:6px;padding-right: 10px;';
$table_contact->head[0] = ' '.graphic_agentaccess(
+ $id_agente,
+ '95%',
+ 100,
+ SECONDS_1DAY,
+ true
+ ).'
+';
}
-// END: ACCESS RATE GRAPH
-// START: TABLE INCIDENTS
+/*
+ * END: ACCESS RATE GRAPH
+ */
+
+/*
+ * START: TABLE INCIDENTS
+ */
+
$last_incident = db_get_row_sql(
- "
- SELECT * FROM tincidencia
- WHERE estado IN (0,1)
- AND id_agent = $id_agente
- ORDER BY actualizacion DESC"
+ sprintf(
+ 'SELECT * FROM tincidencia
+ WHERE estado IN (0,1)
+ AND id_agent = %d
+ ORDER BY actualizacion DESC',
+ $id_agente
+ )
);
if ($last_incident != false) {
@@ -424,7 +533,7 @@ if ($last_incident != false) {
$table_incident->class = 'white_table';
$table_incident->style = array_fill(0, 3, 'width: 25%;');
- $table_incident->head[0] = ' '.graph_graphic_agentevents(
+ $id_agente,
+ 100,
+ 45,
+ SECONDS_1DAY,
+ '',
+ true,
+ true
+).'
+ ';
- $agent_contact = html_print_table($table_contact, true);
+/*
+ * EVENTS TABLE END.
+ */
- $agent_info = empty($table_data->data) ? '' : html_print_table($table_data, true);
+$agent_contact = html_print_table($table_contact, true);
- $agent_incidents = !isset($table_incident) ? '' : html_print_table($table_incident, true);
+$agent_info = empty($table_data->data) ? '' : html_print_table($table_data, true);
- echo '