diff --git a/pandora_console/images/Iconset 14 Dec v2.zip b/pandora_console/images/Iconset 14 Dec v2.zip new file mode 100644 index 0000000000..3d6d6177b1 Binary files /dev/null and b/pandora_console/images/Iconset 14 Dec v2.zip differ diff --git a/pandora_console/images/agents@svg.svg b/pandora_console/images/agents@svg.svg index e2e001b4c3..881df52408 100644 --- a/pandora_console/images/agents@svg.svg +++ b/pandora_console/images/agents@svg.svg @@ -1,5 +1,5 @@ - + Dark / 20 / agents@svg Created with Sketch. diff --git a/pandora_console/images/alert-yellow@svg.svg b/pandora_console/images/alert-yellow@svg.svg new file mode 100644 index 0000000000..8f98ee8748 --- /dev/null +++ b/pandora_console/images/alert-yellow@svg.svg @@ -0,0 +1,9 @@ + + + + Dark / 20 / alert-yellow@svg + Created with Sketch. + + + + \ No newline at end of file diff --git a/pandora_console/images/arrow@svg.svg b/pandora_console/images/arrow@svg.svg new file mode 100644 index 0000000000..29c3fa37c9 --- /dev/null +++ b/pandora_console/images/arrow@svg.svg @@ -0,0 +1,9 @@ + + + + Dark / 20 / arrow@svg + Created with Sketch. + + + + \ No newline at end of file diff --git a/pandora_console/images/change-pause.svg b/pandora_console/images/change-pause.svg index b930ce091e..4564e03dab 100644 --- a/pandora_console/images/change-pause.svg +++ b/pandora_console/images/change-pause.svg @@ -1,12 +1,9 @@ - + Dark / 20 / change-pause@svg Created with Sketch. - - - - + \ No newline at end of file diff --git a/pandora_console/images/change-pause@svg.svg b/pandora_console/images/change-pause@svg.svg deleted file mode 100644 index 545280a1c1..0000000000 --- a/pandora_console/images/change-pause@svg.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - Dark / 20 / change-pause@svg - Created with Sketch. - - - - \ No newline at end of file diff --git a/pandora_console/images/close@svg.svg b/pandora_console/images/close@svg.svg new file mode 100644 index 0000000000..5edfda4101 --- /dev/null +++ b/pandora_console/images/close@svg.svg @@ -0,0 +1,9 @@ + + + + Dark / 20 / close@svg + Created with Sketch. + + + + \ No newline at end of file diff --git a/pandora_console/images/delete-v2@svg.svg b/pandora_console/images/delete-v2@svg.svg new file mode 100644 index 0000000000..7afbbfe985 --- /dev/null +++ b/pandora_console/images/delete-v2@svg.svg @@ -0,0 +1,12 @@ + + + + Dark / 20 / delete-v2@svg + Created with Sketch. + + + + + + + \ No newline at end of file diff --git a/pandora_console/images/go-back@svg.svg b/pandora_console/images/go-back@svg.svg new file mode 100644 index 0000000000..ad8dc1ac8e --- /dev/null +++ b/pandora_console/images/go-back@svg.svg @@ -0,0 +1,9 @@ + + + + Dark / 20 / go-back@svg + Created with Sketch. + + + + \ No newline at end of file diff --git a/pandora_console/images/house@svg.svg b/pandora_console/images/house@svg.svg new file mode 100644 index 0000000000..92c4feac72 --- /dev/null +++ b/pandora_console/images/house@svg.svg @@ -0,0 +1,9 @@ + + + + Dark / 20 / house@svg + Created with Sketch. + + + + \ No newline at end of file diff --git a/pandora_console/images/info@svg.svg b/pandora_console/images/info@svg.svg new file mode 100644 index 0000000000..96c0dcc14d --- /dev/null +++ b/pandora_console/images/info@svg.svg @@ -0,0 +1,11 @@ + + + + Dark / 14 / info@svg + Created with Sketch. + + + + + + \ No newline at end of file diff --git a/pandora_console/images/poi@svg.svg b/pandora_console/images/poi@svg.svg index 82713cbe05..2ba1df80dd 100644 --- a/pandora_console/images/poi@svg.svg +++ b/pandora_console/images/poi@svg.svg @@ -1,5 +1,5 @@ - + Dark / 20 / poi@svg Created with Sketch. diff --git a/pandora_console/images/sap@svg.svg b/pandora_console/images/sap@svg.svg new file mode 100644 index 0000000000..5dbc36a6cc --- /dev/null +++ b/pandora_console/images/sap@svg.svg @@ -0,0 +1,9 @@ + + + + Dark / 20 / sap@svg + Created with Sketch. + + + + \ No newline at end of file diff --git a/pandora_console/images/star@svg.svg b/pandora_console/images/star@svg.svg new file mode 100644 index 0000000000..8cb0babae1 --- /dev/null +++ b/pandora_console/images/star@svg.svg @@ -0,0 +1,9 @@ + + + + Dark / 20 / star@svg + Created with Sketch. + + + + \ No newline at end of file diff --git a/pandora_console/images/svg/add.svg b/pandora_console/images/svg/add.svg index b80fa3fb0d..3530cc8203 100644 --- a/pandora_console/images/svg/add.svg +++ b/pandora_console/images/svg/add.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/pandora_console/images/svg/cog.svg b/pandora_console/images/svg/cog.svg deleted file mode 100644 index 4fc3b6b6fb..0000000000 --- a/pandora_console/images/svg/cog.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/pandora_console/images/svg/iconos-19.svg b/pandora_console/images/svg/iconos-19.svg deleted file mode 100644 index 8471a06bea..0000000000 --- a/pandora_console/images/svg/iconos-19.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/pandora_console/images/ux@svg.svg b/pandora_console/images/ux@svg.svg new file mode 100644 index 0000000000..313b33e698 --- /dev/null +++ b/pandora_console/images/ux@svg.svg @@ -0,0 +1,9 @@ + + + + Dark / 20 / ux@svg + Created with Sketch. + + + + \ No newline at end of file diff --git a/pandora_console/images/wux@svg.svg b/pandora_console/images/wux@svg.svg new file mode 100644 index 0000000000..774249eb5f --- /dev/null +++ b/pandora_console/images/wux@svg.svg @@ -0,0 +1,9 @@ + + + + Dark / 20 / wux@svg + Created with Sketch. + + + + \ No newline at end of file diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css index dd27ab7655..48cdeb08d0 100644 --- a/pandora_console/include/styles/pandora.css +++ b/pandora_console/include/styles/pandora.css @@ -3296,7 +3296,7 @@ a.tip > img { * --------------------------------------------------------------------- */ input.search_input { - background-image: url("../../images/input_zoom_gray.png"); + background-image: url("../../images/details.svg"); background-position: center right 10px; background-repeat: no-repeat; background-size: 17px; @@ -3783,6 +3783,9 @@ div.div_groups_status { background: none; } +.tab_operation img { + width: 20px; +} .agents_modules_table { border: 1px solid #e2e2e2; border-spacing: 0px; @@ -9864,6 +9867,11 @@ button.submitButton.mini { border: 2px solid #14524f; } +button.buttonButton > div.mini, +button.submitButton > div.mini { + width: 1.5rem; + height: 1.5rem; +} button.buttonButton:not(.secondary):not(.link), button.submitButton:not(.secondary):not(.link) { background: linear-gradient( @@ -9912,8 +9920,8 @@ button.submitButton.onlyIcon.pending { button.buttonButton.onlyIcon.completed, button.submitButton.onlyIcon.completed { - mask: url(../../images/svg/success.svg) no-repeat right / contain; - -webkit-mask: url(../../images/svg/success.svg) no-repeat right / contain; + mask: url(../../images/validate.svg) no-repeat right / contain; + -webkit-mask: url(../../images/validate.svg) no-repeat right / contain; } /* Visual Consoles */ @@ -10022,14 +10030,14 @@ button.submitButton.onlyIcon.service_min { button.buttonButton.onlyIcon.delete_item, button.submitButton.onlyIcon.delete_item { - mask: url(../../images/svg/trash.svg) no-repeat right / contain; - -webkit-mask: url(../../images/svg/trash.svg) no-repeat right / contain; + mask: url(../../images/delete.svg) no-repeat right / contain; + -webkit-mask: url(../../images/delete.svg) no-repeat right / contain; } button.buttonButton.onlyIcon.copy_item, button.submitButton.onlyIcon.copy_item { - mask: url(../../images/svg/duplicate.svg) no-repeat right / contain; - -webkit-mask: url(../../images/svg/duplicate.svg) no-repeat right / contain; + mask: url(../../images/copy.svg) no-repeat right / contain; + -webkit-mask: url(../../images/copy.svg) no-repeat right / contain; } button.buttonButton.link-create-item, @@ -10127,15 +10135,15 @@ button div.next { } button div.search { - mask: url(../../images/svg/search.svg) no-repeat center / contain; - -webkit-mask: url(../../images/svg/search.svg) no-repeat center / contain; + mask: url(../../images/details.svg) no-repeat center / contain; + -webkit-mask: url(../../images/details.svg) no-repeat center / contain; } button div.wand, button div.update, button div.upd { - mask: url(../../images/svg/success.svg) no-repeat center / contain; - -webkit-mask: url(../../images/svg/success.svg) no-repeat center / contain; + mask: url(../../images/validate.svg) no-repeat center / contain; + -webkit-mask: url(../../images/validate.svg) no-repeat center / contain; } button div.add { @@ -10144,8 +10152,8 @@ button div.add { } button div.delete { - mask: url(../../images/svg/trash.svg) no-repeat center / contain; - -webkit-mask: url(../../images/svg/trash.svg) no-repeat center / contain; + mask: url(../../images/delete.svg) no-repeat center / contain; + -webkit-mask: url(../../images/delete.svg) no-repeat center / contain; } button div.cancel { @@ -10153,9 +10161,14 @@ button div.cancel { -webkit-mask: url(../../images/svg/left.svg) no-repeat center / contain; } +button div.back { + mask: url(../../images/go-back@svg.svg) no-repeat center / contain; + -webkit-mask: url(../../images/go-back@svg.svg) no-repeat center / contain; +} button div.cog { - mask: url(../../images/svg/cog.svg) no-repeat center / contain; - -webkit-mask: url(../../images/svg/cog.svg) no-repeat center / contain; + mask: url(../../images/configuration@svg.svg) no-repeat center / contain; + -webkit-mask: url(../../images/configuration@svg.svg) no-repeat center / + contain; } button div.fail { @@ -10520,6 +10533,9 @@ tr.bring_next_field { } /* FLOATING FORM */ +.floating_form { + padding: 12px; +} .floating_form td { font-size: 11pt; min-height: 32px; @@ -10733,3 +10749,12 @@ pre.external_tools_output { border-bottom-right-radius: 8px; border-left: 0; } + +.main_menu_icon { + width: 20px; +} + +.after_input_icon { + width: 32px; + margin-left: 10px; +} diff --git a/pandora_console/include/styles/tables.css b/pandora_console/include/styles/tables.css index 82a72ad703..6ae7bdbc0a 100644 --- a/pandora_console/include/styles/tables.css +++ b/pandora_console/include/styles/tables.css @@ -384,13 +384,13 @@ a.pandora_pagination.current:hover { /*border: 1px solid #dcdcdc !important;*/ padding: 1px !important; /*box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.1);*/ - width: 24px; - height: 24px; } /* This class is for only one icon to be a button type. */ .action_button_img { cursor: pointer; + width: 24px; + height: 24px; } .table_action_buttons a, diff --git a/pandora_console/pandoradb_data.sql b/pandora_console/pandoradb_data.sql index c6ce26594c..9d2b40bd21 100644 --- a/pandora_console/pandoradb_data.sql +++ b/pandora_console/pandoradb_data.sql @@ -266,35 +266,35 @@ INSERT INTO `torigen` VALUES -- Identifiers 30 and 31 are reserved for Enterprise data types INSERT INTO `ttipo_modulo` VALUES -(1,'generic_data',0,'Generic numeric','mod_data.png'), -(2,'generic_proc',1,'Generic boolean','mod_proc.png'), -(3,'generic_data_string',2,'Generic string','mod_string.png'), -(4,'generic_data_inc',0,'Generic numeric incremental','mod_data_inc.png'), -(5,'generic_data_inc_abs',0,'Generic numeric incremental (absolute)','mod_data_inc_abs.png'), -(6,'remote_icmp_proc',4,'Remote ICMP network agent, boolean data','mod_icmp_proc.png'), -(7,'remote_icmp',3,'Remote ICMP network agent (latency)','mod_icmp_data.png'), -(8,'remote_tcp',3,'Remote TCP network agent, numeric data','mod_tcp_data.png'), -(9,'remote_tcp_proc',4,'Remote TCP network agent, boolean data','mod_tcp_proc.png'), -(10,'remote_tcp_string',5,'Remote TCP network agent, alphanumeric data','mod_tcp_string.png'), -(11,'remote_tcp_inc',3,'Remote TCP network agent, incremental data','mod_tcp_inc.png'), -(15,'remote_snmp',3,'Remote SNMP network agent, numeric data','mod_snmp_data.png'), -(16,'remote_snmp_inc',3,'Remote SNMP network agent, incremental data','mod_snmp_inc.png'), -(17,'remote_snmp_string',5,'Remote SNMP network agent, alphanumeric data','mod_snmp_string.png'), -(18,'remote_snmp_proc',4,'Remote SNMP network agent, boolean data','mod_snmp_proc.png'), -(21,'async_proc', 7, 'Asyncronous proc data', 'mod_async_proc.png'), -(22,'async_data', 6, 'Asyncronous numeric data', 'mod_async_data.png'), -(23,'async_string', 8, 'Asyncronous string data', 'mod_async_string.png'), -(25,'web_analysis', 8, 'Web analysis data', 'module-wux.png'), -(30,'web_data',9,'Remote HTTP module to check latency','mod_web_data.png'), -(31,'web_proc',9,'Remote HTTP module to check server response','mod_web_proc.png'), -(32,'web_content_data',9,'Remote HTTP module to retrieve numeric data','mod_web_data.png'), -(33,'web_content_string',9,'Remote HTTP module to retrieve string data','mod_web_data.png'), -(34,'remote_cmd', 10, 'Remote execution, numeric data', 'mod_remote_cmd.png'), -(35,'remote_cmd_proc', 10, 'Remote execution, boolean data', 'mod_remote_cmd_proc.png'), -(36,'remote_cmd_string', 10, 'Remote execution, alphanumeric data', 'mod_remote_cmd_string.png'), -(37,'remote_cmd_inc', 10, 'Remote execution, incremental data', 'mod_remote_cmd_inc.png'), -(38,'web_server_status_code_string',9,'Remote HTTP module to check server status code','mod_web_data.png'), -(100,'keep_alive',-1,'KeepAlive','mod_keepalive.png'); +(1,'generic_data',0,'Generic numeric','data-server@svg.svg'), +(2,'generic_proc',1,'Generic boolean','generic-boolean@svg.svg'), +(3,'generic_data_string',2,'Generic string','generic-string@svg.svg'), +(4,'generic_data_inc',0,'Generic numeric incremental','data-server@svg.svg'), +(5,'generic_data_inc_abs',0,'Generic numeric incremental (absolute)','data-server@svg.svg'), +(6,'remote_icmp_proc',4,'Remote ICMP network agent, boolean data','ICMP-network-boolean-data@svg.svg'), +(7,'remote_icmp',3,'Remote ICMP network agent (latency)','ICMP-network-latency@svg.svg'), +(8,'remote_tcp',3,'Remote TCP network agent, numeric data','TCP-network-numeric-data@svg.svg'), +(9,'remote_tcp_proc',4,'Remote TCP network agent, boolean data','TCP-network-boolean-data@svg.svg'), +(10,'remote_tcp_string',5,'Remote TCP network agent, alphanumeric data','TCP-network-alphanumeric-data@svg.svg'), +(11,'remote_tcp_inc',3,'Remote TCP network agent, incremental data','TCP-network-incremental-data@svg.svg'), +(15,'remote_snmp',3,'Remote SNMP network agent, numeric data','SNMP-network-numeric-data@svg.svg'), +(16,'remote_snmp_inc',3,'Remote SNMP network agent, incremental data','SNMP-network-incremental-data@svg.svg'), +(17,'remote_snmp_string',5,'Remote SNMP network agent, alphanumeric data','SNMP-network-alphanumeric-data@svg.svg'), +(18,'remote_snmp_proc',4,'Remote SNMP network agent, boolean data','SNMP-network-incremental-data@svg.svg'), +(21,'async_proc', 7, 'Asyncronous proc data', 'asynchronus-data@svg.svg'), +(22,'async_data', 6, 'Asyncronous numeric data', 'asynchronus-data@svg.svg'), +(23,'async_string', 8, 'Asyncronous string data', 'asynchronus-data@svg.svg'), +(25,'web_analysis', 8, 'Web analysis data', 'wux@svg.svg'), +(30,'web_data',9,'Remote HTTP module to check latency','server-web@svg.svg'), +(31,'web_proc',9,'Remote HTTP module to check server response','web-analisys-data@svg.svg'), +(32,'web_content_data',9,'Remote HTTP module to retrieve numeric data','server-web@svg.svg'), +(33,'web_content_string',9,'Remote HTTP module to retrieve string data','server-web@svg.svg'), +(34,'remote_cmd', 10, 'Remote execution, numeric data', 'remote-execution-numeric-data@svg.svg'), +(35,'remote_cmd_proc', 10, 'Remote execution, boolean data', 'remote-execution-boolean-data@svg.svg'), +(36,'remote_cmd_string', 10, 'Remote execution, alphanumeric data', 'remote-execution-alphanumeric-data@svg.svg'), +(37,'remote_cmd_inc', 10, 'Remote execution, incremental data', 'remote-execution-incremental-data@svg.svg'), +(38,'web_server_status_code_string',9,'Remote HTTP module to check server status code','server-web@svg.svg'), +(100,'keep_alive',-1,'KeepAlive','keepalive@svg.svg'); -- -- Dumping data for table `tmodule_inventory`