Add new images to mobile version and fixed problems. Ticket internal: 79

pandora_console/mobile/include/style/main.css

@@ -989,8 +989,9 @@ li.ui-btn {
 	}
 	
 	.login_logo img {
-		width: 185px;
+		width: 220px;
 		margin-bottom: 10px;
+		padding-top: 5%;
 	}
 	
 	.untiny {
@@ -1033,6 +1034,7 @@ li.ui-btn {
 	.login_logo img {
 		width: 300px;
 		margin-bottom: 20px;
+		padding-top: 5%;
 	}
 	
 	.tiny {
@@ -1044,6 +1046,7 @@ li.ui-btn {
 	width: 60%;
 	margin: 0 auto;
 	max-width: 300px;
+	padding-top: 5%;
 }
 
 .event_name {
@@ -1089,35 +1092,35 @@ table.tactical_bars {
 /*INIT-----------Icons styles---------------------------------------*/
 
 .ui-icon-tactical_view {
-	background-image: url(../../../images/op_monitoring.png) !important;
+	background-image: url(../../../images/op_monitoring.menu.png) !important;
 }
 
 .ui-icon-events {
-	background-image: url(../../../images/op_events.png) !important;
+	background-image: url(../../../images/op_events.menu.png) !important;
 }
 
 .ui-icon-groups {
-	background-image: url(../../../images/group.png) !important;
+	background-image: url(../../../images/group.menu.png) !important;
 }
 
 .ui-icon-alerts {
-	background-image: url(../../../images/op_alerts.png) !important;
+	background-image: url(../../../images/op_alerts.menu.png) !important;
 }
 
 .ui-icon-agents {
-	background-image: url(../../../images/agent_mc.png) !important;
+	background-image: url(../../../images/agent_mc.menu.png) !important;
 }
 
 .ui-icon-modules {
-	background-image: url(../../../images/brick.png) !important;
+	background-image: url(../../../images/brick.menu.png) !important;
 }
 
 .ui-icon-network_maps {
-	background-image: url(../../../images/op_network.png) !important;
+	background-image: url(../../../images/op_network.menu.png) !important;
 }
 
 .ui-icon-visual_console {
-	background-image: url(../../../images/visual_console.png) !important;
+	background-image: url(../../../images/visual_console.menu.png) !important;
 }
 
 .ui-icon-tactical_view, .ui-icon-events,

pandora_console/mobile/include/user.class.php

@@ -202,6 +202,7 @@ class User {
 		global $pandora_version;
 		
 		$ui = Ui::getInstance();
+		$system = System::getInstance();
 		
 		$ui->createPage();
 		if ($this->errorLogin) {
@@ -224,36 +225,42 @@ class User {
 		$ui->createHeader();
 		$ui->showFooter(false);
 		$ui->beginContent();
-			$ui->contentAddHtml('<div style="text-align: center;" class="login_logo">' .
+		
-				html_print_image ("mobile/images/pandora_mobile_console.png",
+		if (!$system->getConfig('metaconsole'))
-					true, array ("alt" => "logo", "border" => 0)) .
+			$logo_image = html_print_image ("mobile/images/pandora_mobile_console.png",
-					'</div>');
+						true, array ("alt" => "logo", "border" => 0));
-			$ui->contentAddHtml('<div id="login_container">');
+		else
-			$ui->beginForm();
+			$logo_image = html_print_image ("mobile/images/metaconsole_mobile.png",
-			$ui->formAddHtml(html_print_input_hidden('action', 'login', true));
+						true, array ("alt" => "logo", "border" => 0),false, false, false, true);
-			$options = array(
+		
-				'name' => 'user',
+		$ui->contentAddHtml('<div style="text-align: center;" class="login_logo">' .
-				'value' => $this->user,
+			$logo_image . '</div>');
-				'placeholder' => __('user'),
+		$ui->contentAddHtml('<div id="login_container">');
-				'label' => __('User')
+		$ui->beginForm();
-				);
+		$ui->formAddHtml(html_print_input_hidden('action', 'login', true));
-			$ui->formAddInputText($options);
+		$options = array(
-			$options = array(
+			'name' => 'user',
-				'name' => 'password',
+			'value' => $this->user,
-				'value' => '',
+			'placeholder' => __('user'),
-				'placeholder' => __('password'),
+			'label' => __('User')
-				'label' => __('Password')
+			);
-				);
+		$ui->formAddInputText($options);
-			$ui->formAddInputPassword($options);
+		$options = array(
-			$options = array(
+			'name' => 'password',
-				'value' => __('Login'),
+			'value' => '',
-				'icon' => 'arrow-r',
+			'placeholder' => __('password'),
-				'icon_pos' => 'right',
+			'label' => __('Password')
-				'name' => 'login_btn'
+			);
-				);
+		$ui->formAddInputPassword($options);
-			$ui->formAddSubmitButton($options);
+		$options = array(
-			$ui->endForm();
+			'value' => __('Login'),
-			$ui->contentAddHtml('</div>');
+			'icon' => 'arrow-r',
+			'icon_pos' => 'right',
+			'name' => 'login_btn'
+			);
+		$ui->formAddSubmitButton($options);
+		$ui->endForm();
+		$ui->contentAddHtml('</div>');
 		$ui->endContent();
 		$ui->showPage();
 		

pandora_console/mobile/index.php

@@ -18,7 +18,7 @@ if (function_exists ('mb_internal_encoding')) {
 	mb_internal_encoding ("UTF-8");
 }
 
-$develop_bypass = 1;
+$develop_bypass = 0;
 
 require_once("include/ui.class.php");
 require_once("include/system.class.php");

pandora_console/mobile/operation/groups.php

@@ -183,35 +183,25 @@ class Groups {
 	private function getListGroups() {
 		$return = array();
 		
+		$system = System::getInstance();
 		$user = User::getInstance();
 		
-		// Get group list that user has access
+		$all_data = groupview_status_modules_agents ($system->getConfig('id_user'), false, 'AR', false);
-		$groups_full = users_get_groups($user->getIdUser(), "AR", true, true);
+		$result_groups = groupview_get_groups_list($system->getConfig('id_user'), false, 'AR', true, true);
-		$groups = array();
+		
-		foreach ($groups_full as $group) {
+		foreach ($all_data as $group_all_data) {
-			$groups[$group['id_grupo']]['name'] = $group['nombre'];
+			$result_groups[0]['_total_agents_'] += $group_all_data["_total_agents_"];
-			
+			$result_groups[0]['_monitors_ok_'] += $group_all_data["_monitors_ok_"];
-			if ($group['id_grupo'] != 0) {
+			$result_groups[0]['_monitors_warning_'] += $group_all_data["_monitors_warning_"];
-				$groups[$group['parent']]['childs'][] = $group['id_grupo'];
+			$result_groups[0]['_monitors_critical_'] += $group_all_data["_monitors_critical_"];
-				$groups[$group['id_grupo']]['prefix'] = $groups[$group['parent']]['prefix'].'   ';
+			$result_groups[0]['_monitors_unknown_'] += $group_all_data["_monitors_unknown_"];
-			}
+			$result_groups[0]['_monitors_not_init_'] += $group_all_data["_monitors_not_init_"];
-			else {
+			$result_groups[0]['_agents_unknown_'] += $group_all_data["_agents_unknown_"];
-				$groups[$group['id_grupo']]['prefix'] = '';
+			$result_groups[0]['_agents_not_init_'] += $group_all_data["_agents_not_init_"];
-			}
+			$result_groups[0]['_agents_critical_'] += $group_all_data["_agents_critical_"];
-			
+			$result_groups[0]['_monitors_alerts_fired_'] += $group_all_data["_monitors_alerts_fired_"];
-			if (!isset($groups[$group['id_grupo']]['childs'])) {
-				$groups[$group['id_grupo']]['childs'] = array();
-			}
 		}
 		
-		// For each valid group for this user, take data from agent and modules
+		return $result_groups;
-		foreach ($groups as $id_group => $group) {
-			$rows = groups_get_group_row_data($id_group, $groups, $group, $printed_groups);
-			
-			if (!empty($rows))
-				$return = array_merge($return, $rows);
-		}
-		
-		return $return;
 	}
 }

pandora_console/mobile/operation/modules.php

@@ -420,7 +420,7 @@ class Modules {
 					continue;
 				
 				$temp_modules = db_get_all_rows_sql($sql_select . $sql . $sql_limit);
-				html_debug($temp_modules, true);
+				
 				foreach ($temp_modules as $result_element_key => $result_element_value) {
 					array_push($modules_db, $result_element_value);
 				}