From 1c48aaf1d035f2f41b860bb95b7c56497e150ea8 Mon Sep 17 00:00:00 2001
From: Ramon Novoa <rnovoa@artica.es>
Date: Fri, 12 Dec 2014 12:55:46 +0100
Subject: [PATCH] Small changes to support the Z/OS extension.

---
 .../extras/pandoradb_migrate_5.1_to_6.0.mysql.sql  |  6 ++++++
 pandora_console/include/functions.php              | 11 +++++++++++
 pandora_console/include/styles/pandora.css         | 14 +++++++++++++-
 pandora_console/pandoradb.data.oracle.sql          |  1 +
 pandora_console/pandoradb.data.postgreSQL.sql      |  3 ++-
 pandora_console/pandoradb_data.sql                 |  1 +
 6 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/pandora_console/extras/pandoradb_migrate_5.1_to_6.0.mysql.sql b/pandora_console/extras/pandoradb_migrate_5.1_to_6.0.mysql.sql
index b5a8ca7aa3..cbf910a51b 100755
--- a/pandora_console/extras/pandoradb_migrate_5.1_to_6.0.mysql.sql
+++ b/pandora_console/extras/pandoradb_migrate_5.1_to_6.0.mysql.sql
@@ -14,3 +14,9 @@ ALTER TABLE tlayout_data ADD COLUMN `border_width` INTEGER UNSIGNED NOT NULL def
 ALTER TABLE tlayout_data ADD COLUMN `border_color` varchar(200) DEFAULT "";
 ALTER TABLE tlayout_data ADD COLUMN `fill_color` varchar(200) DEFAULT "";
 
+-- ---------------------------------------------------------------------
+-- Table `tconfig_os`
+-- ---------------------------------------------------------------------
+
+INSERT INTO `tconfig_os` (`name`, `description`, `icon_name`) VALUES ('Mainframe', 'Mainframe agent', 'so_mainframe.png');
+
diff --git a/pandora_console/include/functions.php b/pandora_console/include/functions.php
index 0b28d59cee..bd2479ae65 100644
--- a/pandora_console/include/functions.php
+++ b/pandora_console/include/functions.php
@@ -1895,6 +1895,17 @@ function dame_nombre_pluginid ($id_plugin) {
 	return (string) db_get_value ('name', 'tplugin', 'id', (int) $id_plugin);
 }
 
+/**
+ * Get the operating system id.
+ *
+ * @param string Operating system name.
+ *
+ * @return id Id of the given operating system.
+ */
+function get_os_id ($os_name) {
+	return (string) db_get_value ('id_os', 'tconfig_os', 'name', $os_name);
+}
+
 /**
  * Get the operating system name.
  *
diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css
index 599c6c32f9..3bff4851e5 100755
--- a/pandora_console/include/styles/pandora.css
+++ b/pandora_console/include/styles/pandora.css
@@ -2548,6 +2548,18 @@ div.nodata_container {
 	#padding: 10px;
 }
 
+#rmf_data {
+	width: 40%; 
+	height: 80%; 
+	position: absolute; 
+	top:0; 
+	right:20px;
+	overflow: auto;
+	
+	#background-color: #fff;
+	#padding: 10px;
+}
+
 /* Subtab styles */
 
 ul.subsubmenu {
@@ -2807,4 +2819,4 @@ table#policy_modules td * {
 	margin-bottom: 10px;
 	border-top-left-radius: 2px;
 	border-top-right-radius: 2px;
-}
\ No newline at end of file
+}
diff --git a/pandora_console/pandoradb.data.oracle.sql b/pandora_console/pandoradb.data.oracle.sql
index 208222dec2..6db0aa3574 100644
--- a/pandora_console/pandoradb.data.oracle.sql
+++ b/pandora_console/pandoradb.data.oracle.sql
@@ -150,6 +150,7 @@ INSERT INTO tconfig_os VALUES (16, 'VMware', 'VMware Architecture', 'so_vmware.p
 INSERT INTO tconfig_os VALUES (17, 'Router', 'Generic router', 'so_router.png');
 INSERT INTO tconfig_os VALUES (18, 'Switch', 'Generic switch', 'so_switch.png');
 INSERT INTO tconfig_os VALUES (19, 'Satellite', 'Satellite agent', 'satellite.png');
+INSERT INTO tconfig_os VALUES (20, 'Mainframe', 'Mainframe agent', 'so_mainframe.png');
 COMMIT;
 END;;
 
diff --git a/pandora_console/pandoradb.data.postgreSQL.sql b/pandora_console/pandoradb.data.postgreSQL.sql
index 142d2556f2..7935d0b911 100644
--- a/pandora_console/pandoradb.data.postgreSQL.sql
+++ b/pandora_console/pandoradb.data.postgreSQL.sql
@@ -148,7 +148,8 @@ INSERT INTO "tconfig_os" VALUES
 (16, 'VMware', 'VMware Architecture', 'so_vmware.png'),
 (17, 'Router', 'Generic router', 'so_router.png'),
 (18, 'Switch', 'Generic switch', 'so_switch.png'),
-(19, 'Satellite', 'Satellite agent', 'satellite.png');
+(19, 'Satellite', 'Satellite agent', 'satellite.png'),
+(20, 'Mainframe', 'Mainframe agent', 'so_mainframe.png');
 COMMIT WORK;
 SELECT setval('tconfig_os_id_os_seq', (SELECT (SELECT MAX(id_os) FROM tconfig_os)));
 
diff --git a/pandora_console/pandoradb_data.sql b/pandora_console/pandoradb_data.sql
index 9a52aa11ca..25fbdbbe68 100644
--- a/pandora_console/pandoradb_data.sql
+++ b/pandora_console/pandoradb_data.sql
@@ -134,6 +134,7 @@ INSERT INTO `tconfig_os` (`id_os`, `name`, `description`, `icon_name`) VALUES
 (17, 'Router', 'Generic router', 'so_router.png'),
 (18, 'Switch', 'Generic switch', 'so_switch.png'),
 (19, 'Satellite', 'Satellite agent', 'satellite.png');
+(20, 'Mainframe', 'Mainframe agent', 'so_mainframe.png');
 UNLOCK TABLES;