diff --git a/pandora_console/godmode/agentes/agent_conf_gis.php b/pandora_console/godmode/agentes/agent_conf_gis.php index 66538fe33a..7ab1aa17a8 100644 --- a/pandora_console/godmode/agentes/agent_conf_gis.php +++ b/pandora_console/godmode/agentes/agent_conf_gis.php @@ -34,7 +34,7 @@ $agent_name = agents_get_name($id_agente); $agent_name = md5($agent_name); /* Map with the current position */ -echo "
"; +echo "
"; if (!gis_get_agent_map($id_agente, "500px", "98%", false)) { ui_print_error_message(__("There is no default map. Please go to the setup for to set a default map.")); @@ -51,27 +51,30 @@ if ($agentData === false) { echo "
" . __("Warning: When you change the Agent position, the agent automatically activates the 'Ignore new GIS data' option") . "
"; -$table->width = '85%'; +$table->width = '100%'; +$table->class = 'databox filters'; $table->data = array(); - +$table->cellpadding = 0; +$table->cellspacing = 0; $table->head[0] =__('Agent position'); -$table->head_colspan[0] = 2; +$table->head_colspan[0] = 4; +$table->headstyle[0] = "text-align:center"; $table->data[1][0] = __('Latitude: '); $table->data[1][1] = html_print_input_text_extended ('latitude', $agentData['stored_latitude'], 'text-latitude', '', 20, 20, false, '', array('onchange' => "setIgnoreGISDataEnabled()", 'onkeyup' => "setIgnoreGISDataEnabled()"), true); -$table->data[2][0] = __('Longitude: '); -$table->data[2][1] = html_print_input_text_extended ('longitude', $agentData['stored_longitude'], 'text-longitude', '', 20, 20, false, '', +$table->data[1][2] = __('Longitude: '); +$table->data[1][3] = html_print_input_text_extended ('longitude', $agentData['stored_longitude'], 'text-longitude', '', 20, 20, false, '', array('onchange' => "setIgnoreGISDataEnabled()", 'onkeyup' => "setIgnoreGISDataEnabled()"), true); -$table->data[3][0] = __('Altitude: '); -$table->data[3][1] = html_print_input_text_extended ('altitude', $agentData['stored_altitude'], 'text-altitude', '', 10, 10, false, '', +$table->data[2][0] = __('Altitude: '); +$table->data[2][1] = html_print_input_text_extended ('altitude', $agentData['stored_altitude'], 'text-altitude', '', 10, 10, false, '', array('onchange' => "setIgnoreGISDataEnabled()", 'onkeyup' => "setIgnoreGISDataEnabled()"), true); -$table->data[4][0] = __('Ignore new GIS data:'); -$table->data[4][1] = __('Yes').' '.html_print_radio_button_extended ("update_gis_data", 0, '', $updateGisData, false, '', 'style="margin-right: 40px;"', true); -$table->data[4][1] .= __('No').' '.html_print_radio_button_extended ("update_gis_data", 1, '', $updateGisData, false, '', 'style="margin-right: 40px;"', true); +$table->data[2][2] = __('Ignore new GIS data:'); +$table->data[2][3] = __('Yes').' '.html_print_radio_button_extended ("update_gis_data", 0, '', $updateGisData, false, '', 'style="margin-right: 40px;"', true); +$table->data[2][3] .= __('No').' '.html_print_radio_button_extended ("update_gis_data", 1, '', $updateGisData, false, '', 'style="margin-right: 40px;"', true); $url = 'index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&tab=gis&id_agente='.$id_agente; echo "
"; diff --git a/pandora_console/godmode/agentes/agent_template.php b/pandora_console/godmode/agentes/agent_template.php index 651d5efe7f..686e5facf8 100644 --- a/pandora_console/godmode/agentes/agent_template.php +++ b/pandora_console/godmode/agentes/agent_template.php @@ -164,7 +164,6 @@ if (isset ($_POST["template_id"])) { // TEMPLATE ASSIGMENT FORM // ========================== -echo "
"; echo ''; $nps = db_get_all_fields_in_table ("tnetwork_profile", "name"); @@ -177,7 +176,7 @@ foreach ($nps as $row) { $select[$row["id_np"]] = $row["name"]; } -echo ''; +echo '
'; echo "'; @@ -213,10 +212,10 @@ if ($result === false) { $result = array (); } -$table->width = '98%'; +$table->width = '100%'; $table->cellpadding = 4; $table->cellspacing = 4; -$table->class = "databox"; +$table->class = "databox data"; $table->head = array (); $table->data = array (); $table->align = array (); diff --git a/pandora_console/godmode/agentes/modificar_agente.php b/pandora_console/godmode/agentes/modificar_agente.php index e79a653d6b..eeee10e6bf 100644 --- a/pandora_console/godmode/agentes/modificar_agente.php +++ b/pandora_console/godmode/agentes/modificar_agente.php @@ -125,7 +125,7 @@ if ($disable_agent) { __('Successfully disabled'), __('Could not be disabled')); } -echo "
"; html_print_select ($select, "template_id", '', '', '', 0, false, false, true, '', false, 'max-width: 200px !important'); echo '
+echo "
"; echo ""; @@ -164,14 +164,6 @@ echo ""; echo "
"; echo "
"; -echo '
'; -echo '
'; - html_print_input_hidden ('new_agent', 1); - html_print_submit_button (__('Create agent'), 'crt-1', false, 'class="sub next"'); -echo "
"; -echo "
"; - - $order_collation = ""; switch ($config["dbtype"]) { case "mysql": @@ -420,7 +412,7 @@ ui_pagination ($total_agents, "index.php?sec=gagente&sec2=godmode/agentes/modifi if ($agents !== false) { - echo ""; + echo "
"; echo "
".__('Agent name') . ' ' . '' . html_print_image("images/sort_up.png", true, array("style" => $selectNameUp)) . '' . '' . html_print_image("images/sort_down.png", true, array("style" => $selectNameDown)) . ''; @@ -570,7 +562,7 @@ if ($agents !== false) { } echo "
"; ui_pagination ($total_agents, "index.php?sec=gagente&sec2=godmode/agentes/modificar_agente&group_id=$ag_group&search=$search&sort_field=$sortField&sort=$sort&disabled=$disabled", $offset); - echo "
"; + echo "
"; } else { echo "
" . __('There are no defined agents') . "
"; @@ -579,7 +571,7 @@ else { if (check_acl ($config["id_user"], 0, "AW")) { // Create agent button - echo '
'; + echo '
'; echo '
'; html_print_input_hidden ('new_agent', 1); html_print_submit_button (__('Create agent'), 'crt-2', false, diff --git a/pandora_console/godmode/agentes/module_manager.php b/pandora_console/godmode/agentes/module_manager.php index 3f270ec5e6..3c3a40ae6d 100644 --- a/pandora_console/godmode/agentes/module_manager.php +++ b/pandora_console/godmode/agentes/module_manager.php @@ -32,7 +32,7 @@ $search_string = io_safe_output(urldecode(trim(get_parameter ("search_string", " // Search string filter form //echo ''; echo ''; -echo ''; +echo '
'; echo ""; echo ""; -echo ""; +//echo ''; // Check if there is at least one server of each type available to assign that // kind of modules. If not, do not show server type in combo @@ -110,7 +110,8 @@ if (($policy_page) || (isset($agent))) { if ($show_creation) { // Create module/type combo - echo ''; + //echo ''; + echo ''; @@ -118,13 +119,14 @@ if (($policy_page) || (isset($agent))) { echo ''; echo ''; echo ''; - echo ""; + //echo ""; } } echo "
"; echo __('Search') . ' ' . html_print_input_text ('search_string', $search_string, '', 15, 255, true); @@ -40,8 +40,8 @@ echo ""; html_print_submit_button (__('Filter'), 'filter', false, 'class="sub search"'); echo ""; -echo ''; +echo "
'; html_print_select ($modules, 'moduletype', '', '', '', '', false, false, false, '', false, 'max-width:300px;' ); html_print_input_hidden ('edit_module', 1); echo '
"; +echo ""; -echo '
'; +echo '
'; echo ""; echo "".__("Get more modules in Pandora FMS Library").""; echo ""; @@ -494,7 +496,8 @@ if ($paginate_module) { ui_pagination($total_modules, $url); } -$table->width = '98%'; +$table->width = '100%'; +$table->class = 'databox data'; $table->head = array (); $table->head[0] = __('Name') . ' ' . '' . html_print_image("images/sort_up.png", true, array("style" => $selectNameUp)) . '' . diff --git a/pandora_console/godmode/alerts/alert_list.builder.php b/pandora_console/godmode/alerts/alert_list.builder.php index 9aa19cf753..6333c52976 100644 --- a/pandora_console/godmode/alerts/alert_list.builder.php +++ b/pandora_console/godmode/alerts/alert_list.builder.php @@ -31,14 +31,14 @@ include_once($config['homedir'] . '/include/functions_users.php'); $pure = get_parameter('pure', 0); $table->id = 'add_alert_table'; -$table->class = 'databox'; -$table->width = '98%'; +$table->class = 'databox filters'; +$table->width = '100%'; $table->head = array (); $table->data = array (); $table->size = array (); $table->size = array (); $table->size[0] = '20%'; -$table->size[1] = '80%'; +$table->size[1] = '30%'; $table->style[0] = 'font-weight: bold; vertical-align: top;'; $table->align[0] = 'left'; $table->align[1] = 'left'; @@ -76,7 +76,7 @@ $table->data[0][1] .= ' '; $table->data[0][1] .= ' '; -$table->data[1][0] = __('Template'); +$table->data[0][2] = __('Template'); $own_info = get_user_info ($config['id_user']); if ($own_info['is_admin'] || check_acl ($config['id_user'], 0, "PM")) $templates = alerts_get_alert_templates (false, array ('id', 'name')); @@ -87,18 +87,18 @@ else { $templates = alerts_get_alert_templates (array ('id_group IN (' . $filter_groups . ')'), array ('id', 'name')); } -$table->data[1][1] = html_print_select (index_array ($templates, 'id', 'name'), +$table->data[0][3] = html_print_select (index_array ($templates, 'id', 'name'), 'template', '', '', __('Select'), 0, true, false, true, '', false, 'width: 250px;'); -$table->data[1][1] .= ' '; if (check_acl ($config['id_user'], 0, "LM")) { - $table->data[1][1] .= ''; - $table->data[1][1] .= html_print_image ('images/add.png', true); - $table->data[1][1] .= __('Create Template'); - $table->data[1][1] .= ''; + $table->data[0][3] .= ''; + $table->data[0][3] .= html_print_image ('images/add.png', true); + $table->data[0][3] .= __('Create Template'); + $table->data[0][3] .= ''; } -$table->data[2][0] = __('Actions'); +$table->data[1][0] = __('Actions'); $groups_user = users_get_groups($config["id_user"]); if (!empty($groups_user)) { @@ -106,28 +106,27 @@ if (!empty($groups_user)) { $sql = "SELECT id, name FROM talert_actions WHERE id_group IN ($groups)"; $actions = db_get_all_rows_sql($sql); } -$table->data[2][1] = '
'; -$table->data[2][1] .= html_print_select( + +$table->data[1][1] = html_print_select( index_array($actions, 'id', 'name'), 'action_select', '', '', __('Default action'), '0', true, '', true, '', false, 'width: 250px;'); -$table->data[2][1] .= '
'; +$table->data[1][1] .= ''; if (check_acl ($config['id_user'], 0, "LM")) { - $table->data[2][1] .= '
' . html_print_image ('images/add.png', true); - $table->data[2][1] .= ''; - $table->data[2][1] .= __('Create Action'); - $table->data[2][1] .= ''; + $table->data[1][1] .= '' . html_print_image ('images/add.png', true); + $table->data[1][1] .= ''; + $table->data[1][1] .= __('Create Action'); + $table->data[1][1] .= ''; } -$table->data[3][0] = __('Threshold'); -$table->data[3][1] = html_print_extended_select_for_time ('module_action_threshold', 0, '', 0, +$table->data[1][2] = __('Threshold'); +$table->data[1][3] = html_print_extended_select_for_time ('module_action_threshold', 0, '', 0, __('None'), false, true) . ui_print_help_icon ('action_threshold', true, ui_get_full_url(false, false, false, false)); echo '
'; diff --git a/pandora_console/godmode/alerts/alert_list.list.php b/pandora_console/godmode/alerts/alert_list.list.php index 6e289bc031..d1220ca3f6 100644 --- a/pandora_console/godmode/alerts/alert_list.list.php +++ b/pandora_console/godmode/alerts/alert_list.list.php @@ -50,7 +50,7 @@ else { // Table for filter controls $form_filter = ''; $form_filter .= "\n"; -$form_filter .= ''."\n"; +$form_filter .= '
'."\n"; $form_filter .= "\n"; $form_filter .= "
" . __('Template name') . ""; $form_filter .= html_print_input_text ('template_name', $templateName, '', 12, 255, true); @@ -325,7 +325,7 @@ else { } $table->class = 'alert_list databox'; -$table->width = '98%'; +$table->width = '100%'; $table->size = array (); $table->align[2] = 'left'; diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css index 3998e33ff2..9001d4fe0f 100755 --- a/pandora_console/include/styles/pandora.css +++ b/pandora_console/include/styles/pandora.css @@ -34,8 +34,7 @@ svg * { font-size: 11pt; } body { - text-align: center; - background-color: #fafafa; + background-color: #FFF; margin: 0 auto; } diff --git a/pandora_console/operation/agentes/custom_fields.php b/pandora_console/operation/agentes/custom_fields.php index b794e39730..c5dca3565f 100644 --- a/pandora_console/operation/agentes/custom_fields.php +++ b/pandora_console/operation/agentes/custom_fields.php @@ -52,7 +52,8 @@ if ($fields === false) { echo "
". __("No fields defined"). "
"; } else { - $table->width = '98%'; + $table->width = '100%'; + $table->class = 'databox data'; $table->head = array (); $table->head[0] = __('Field'); $table->head[1] = __('Display on front') . @@ -60,7 +61,7 @@ else { $table->head[2] = __('Description'); $table->align = array (); $table->align[1] = 'center'; - $table->align[2] = 'center'; + $table->align[2] = 'left'; $table->data = array (); foreach ($fields as $field) { diff --git a/pandora_console/operation/agentes/estado_agente.php b/pandora_console/operation/agentes/estado_agente.php index e5139eff79..4c98e215b0 100644 --- a/pandora_console/operation/agentes/estado_agente.php +++ b/pandora_console/operation/agentes/estado_agente.php @@ -155,10 +155,10 @@ if (isset($result_delete)) { ui_print_error_message(__("There was an error message deleting the agent")); } -echo ''; - echo ''; +echo '
'; + echo ''; +echo ''; -echo '
'; echo __('Group') . ' '; @@ -193,9 +193,9 @@ echo ''; html_print_submit_button (__('Search'), "srcbutton", '', array ("class" => "sub search")); -echo '  
'; +echo '
'; if (check_acl ($config['id_user'], 0, "AW") || check_acl ($config['id_user'], 0, "AM")) { echo '
'; @@ -432,8 +432,8 @@ ui_pagination ($total_agents, // Show data. $table->cellpadding = 4; $table->cellspacing = 4; -$table->width = "98%"; -$table->class = "databox"; +$table->width = "100%"; +$table->class = "databox data"; $table->head = array (); $table->head[0] = __('Agent'). ' ' . diff --git a/pandora_console/operation/agentes/estado_generalagente.php b/pandora_console/operation/agentes/estado_generalagente.php index 7ccc431211..e3b776deed 100755 --- a/pandora_console/operation/agentes/estado_generalagente.php +++ b/pandora_console/operation/agentes/estado_generalagente.php @@ -60,10 +60,10 @@ if (! check_acl ($config["id_user"], $agent["id_grupo"], "AR") && !$is_extra) { // START: TABLE AGENT BUILD $table_agent->id = 'agent_details_main'; -$table_agent->width = '100%'; +$table_agent->width = '450px'; $table_agent->cellspacing = 4; $table_agent->cellpadding = 4; -$table_agent->class = 'databox_frame'; +$table_agent->class = 'databox'; $table_agent->style[0] = 'width: 16px; text-align:center; padding: 0px;'; $table_agent->style[5] = 'width: 16px; text-align:center; padding: 0px;'; $table_agent->styleTable = 'padding:0px;'; @@ -186,7 +186,7 @@ $table_contact->id = 'agent_contact_main'; $table_contact->width = '100%'; $table_contact->cellspacing = 4; $table_contact->cellpadding = 4; -$table_contact->class = 'databox'; +$table_contact->class = 'databox data'; $table_contact->style[0] = 'width: 30%;'; $table_contact->style[1] = 'width: 70%;'; @@ -229,7 +229,7 @@ $table_data->id = 'agent_data_main'; $table_data->width = '100%'; $table_data->cellspacing = 4; $table_data->cellpadding = 4; -$table_data->class = 'databox'; +$table_data->class = 'databox data'; $table_data->style[0] = 'width: 30%;'; $table_data->style[1] = 'width: 70%;'; @@ -483,23 +483,23 @@ if (!empty($network_interfaces)) { $table = null; $table->id = 'agent_details'; -$table->width = '98%'; +$table->width = '100%'; $table->cellspacing = 4; $table->cellpadding = 4; -$table->class = 'databox'; +$table->class = 'agents'; $table->style = array_fill(0, 3, 'vertical-align: top;'); $data = array(); $data[0] = html_print_table($table_agent, true); $data[0] .= - '
- ' . + ' + ' . + '' . + '
' . __('Events (24h)') . - '' . - '
' . - graph_graphic_agentevents ($id_agente, 300, 15, SECONDS_1DAY, '', true) . - '
' . - ''; + '
' . + graph_graphic_agentevents ($id_agente, 450, 15, SECONDS_1DAY, '', true) . + '
'; // ACCESS RATE GRAPH $access_agent = db_get_value_sql("SELECT COUNT(id_agent) @@ -508,16 +508,16 @@ $access_agent = db_get_value_sql("SELECT COUNT(id_agent) if ($config["agentaccess"] && $access_agent > 0) { $data[0] .= - '
- ' . + ' + ' . + '' . + '
' . __('Agent access rate (24h)') . - '' . - '
' . + '
' . graphic_agentaccess($id_agente, 300, 100, SECONDS_1DAY, true) . - '' . - ''; + '
'; } - +$table->style[0] = 'width:40%;'; $data[1] = html_print_table($table_contact, true); $data[1] .= empty($table_data->data) ? '' : @@ -529,7 +529,7 @@ $data[1] .= !isset($table_interface) ? '' : '
' . html_print_table($table_interface, true); -$table->rowspan[0][1] = 2; +$table->rowspan[0][1] = 0; $data[2] = '
'; $data[2] .= '' . html_print_image("images/refresh.png", true, array("border" => '0', "title" => __('Refresh data'), "alt" => "")) . '
'; diff --git a/pandora_console/operation/agentes/estado_monitores.php b/pandora_console/operation/agentes/estado_monitores.php index f31317b604..a35480d001 100755 --- a/pandora_console/operation/agentes/estado_monitores.php +++ b/pandora_console/operation/agentes/estado_monitores.php @@ -416,7 +416,8 @@ function print_form_filter_monitors($id_agent, $status_filter_monitor = -1, $status_text_monitor = '', $status_module_group=-1) { $form_text = ''; - + $table->class = "databox filters"; + $table->width = "100%"; $table->data[0][0] = html_print_input_hidden('filter_monitors', 1, true); $table->data[0][0] .= html_print_input_hidden('monitors_change_filter', 1, true); $table->data[0][0] .= __('Status:'); diff --git a/pandora_console/operation/agentes/gis_view.php b/pandora_console/operation/agentes/gis_view.php index 09feccf68d..28c33cc5d7 100644 --- a/pandora_console/operation/agentes/gis_view.php +++ b/pandora_console/operation/agentes/gis_view.php @@ -51,7 +51,7 @@ echo "
"; /* Map with the current position */ echo "
"; -if (!gis_get_agent_map($id_agente, "500px", "98%", true, true, $period)) { +if (!gis_get_agent_map($id_agente, "500px", "100%", true, true, $period)) { ui_print_error_message(__("There is no default map. Please go to the setup for to set a default map.")); echo "