Commit Graph

753 Commits

Author SHA1 Message Date
mdtrooper f7deed5508 Uploaded lost changes. 2016-04-06 13:00:11 +02:00
mdtrooper 8a6d1509f0 Working in the update nodes. 2016-04-06 12:53:43 +02:00
mdtrooper e4a2c3c7fb Working in the update status of nodes. 2016-04-06 12:23:17 +02:00
Arturo Gonzalez 725a4925a7 New maps in progress... (Fixed error in nodes dialog) 2016-04-06 10:17:11 +02:00
mdtrooper 6b60d36094 Improve the colors. 2016-04-05 14:38:22 +02:00
mdtrooper 20a5b55977 Fixed the dragging. 2016-04-05 14:12:52 +02:00
mdtrooper 8bb0e5e194 Working in the networkmap nodes. 2016-04-05 13:19:02 +02:00
mdtrooper 7229b5ecd9 Working in the networkmap nodes. 2016-04-05 12:36:01 +02:00
mdtrooper e6fbb6d41d Starting to set the aspect to networkmap node. 2016-04-04 20:21:36 +02:00
mdtrooper fdfc46d827 Finish add fictional point. 2016-04-04 17:52:26 +02:00
mdtrooper 304928b2ec Working in the events for the fictional nodes. 2016-04-04 13:58:54 +02:00
mdtrooper a2cbc4d867 Organize the code. 2016-04-04 13:53:37 +02:00
mdtrooper 989cc2cc92 Fixed the unused param in the method init_events. 2016-04-04 13:45:13 +02:00
mdtrooper b9000bb285 Starting with the fictional point. 2016-04-04 13:43:05 +02:00
mdtrooper 48ac039334 Fixed the delete nodes. 2016-04-01 13:36:24 +02:00
mdtrooper 094c3d5cdb Fixed somethings in the selection box. 2016-04-01 12:52:46 +02:00
mdtrooper 408a68e6ab Fixed somethings in the selection box. 2016-04-01 12:21:40 +02:00
mdtrooper 651b405c42 Fixed somethings in the selection box. 2016-04-01 11:54:31 +02:00
mdtrooper 496313b2ec Merge branch 'feature/new_networkmap' of https://github.com/pandorafms/pandorafms into feature/new_networkmap 2016-04-01 11:36:45 +02:00
mdtrooper a879803322 Finish the relationship. 2016-04-01 11:36:22 +02:00
Arturo Gonzalez 6e6317cb8d New maps in progress... (Fixed returned data in a node status function) 2016-03-31 16:48:30 +02:00
mdtrooper ed3cb1b50c Working in the relationships. 2016-03-31 15:08:44 +02:00
mdtrooper 17dee83d57 Working in the relationships. 2016-03-31 12:35:10 +02:00
mdtrooper 415589ec95 Added several delete nodes. 2016-03-30 16:12:35 +02:00
mdtrooper 7d66ba2dde Working in the context menu and several nodes selected. 2016-03-30 15:49:17 +02:00
Arturo Gonzalez 3e399356d3 New maps in progress... (Fixed "delete arrows" with new data) 2016-03-30 12:45:47 +02:00
Arturo Gonzalez 07928af596 New maps in progress... (Document the code) 2016-03-30 10:38:41 +02:00
mdtrooper 090563a119 Working in the selected nodes and dragging. 2016-03-29 13:33:50 +02:00
mdtrooper ae53eea7ab Working in the selected nodes and dragging. 2016-03-29 13:26:55 +02:00
mdtrooper 86b084b2e4 Working in the selected nodes and zoom. 2016-03-29 12:35:49 +02:00
Arturo Gonzalez b10e11d2a9 New maps in progress... (AMA arrows) 2016-03-29 12:09:26 +02:00
mdtrooper 1ec80e5a71 Working in the select nodes. 2016-03-29 11:59:11 +02:00
mdtrooper b9d22ec356 Working in the select nodes. 2016-03-29 11:04:57 +02:00
Arturo Gonzalez 02c28e0148 New maps in progress... (Arrows type AMA = agent->module->agent) 2016-03-29 10:36:43 +02:00
mdtrooper 1b7c1efe4b Select box runs fine with any zoom level and or panning. 2016-03-29 09:30:20 +02:00
mdtrooper 44b7c30ac0 Some changes 2016-03-28 19:54:59 +02:00
mdtrooper 18902546c0 Some fixes in the reset zoom when the selection rectangle is running. 2016-03-28 19:42:21 +02:00
mdtrooper 2ae5eb6021 Another changes 2016-03-28 19:16:19 +02:00
mdtrooper 0d618e3dbd Some changes 2016-03-28 19:13:27 +02:00
mdtrooper f3f302eae2 Starting with the multiple selection. 2016-03-28 16:33:07 +02:00
mdtrooper f75348a387 Fixed the lost self vars. 2016-03-28 14:51:24 +02:00
mdtrooper 79d9467fdd Upload lost changes from the last week. 2016-03-28 14:49:13 +02:00
Arturo Gonzalez f0fafb27e9 New maps in progress... (Fixed error) 2016-03-28 12:04:55 +02:00
Arturo Gonzalez 38e7056df9 New maps in progress... (Init multiple selection) 2016-03-28 11:39:41 +02:00
mdtrooper e5b6cf40dc Fixed the bug in the re-rotate title intefaces into arrows. 2016-03-23 17:24:07 +01:00
mdtrooper c8a54582f8 Re rotate the title of interfaces into the arrows in some cases (it is buggy.) 2016-03-23 17:18:16 +01:00
mdtrooper ee431b369d Starting with the title of interfaces in the arrows. 2016-03-23 15:47:05 +01:00
mdtrooper 47501c8600 Working with the interfaces in the arrows 2016-03-23 14:49:22 +01:00
mdtrooper bb01f00e8a Fixed a position of interface in the arrow 2016-03-23 13:14:16 +01:00
mdtrooper 58a0f51f01 Working in the AMMA arrows. 2016-03-23 12:03:35 +01:00
mdtrooper 3d59f58453 Clean code. 2016-03-23 11:53:39 +01:00
mdtrooper c20f8ff465 Working in the drag and drop of arrows. 2016-03-23 11:35:21 +01:00
mdtrooper 37e99d9421 Working in the arrows. 2016-03-22 15:57:29 +01:00
mdtrooper 62a37ebbf8 Some changes 2016-03-22 14:39:56 +01:00
Arturo Gonzalez ddbc922fad New maps in progress... (Document the code) 2016-03-22 12:48:28 +01:00
Arturo Gonzalez 62f4c058f4 New maps in progress... (Fixed arrow status balls) 2016-03-22 12:36:48 +01:00
mdtrooper 848b8cf9a1 Added drag in the items of minimap. 2016-03-22 10:24:55 +01:00
mdtrooper 304d5b8cbc Fixed my last commit, sorry. 2016-03-22 09:56:19 +01:00
mdtrooper d017ace822 Merge branch 'feature/new_networkmap' of https://github.com/pandorafms/pandorafms into feature/new_networkmap
Conflicts:
	pandora_console/include/javascript/map/MapController.js
2016-03-22 09:51:24 +01:00
mdtrooper 6e0ddb5b18 Uploaded lost svg files from yesterday. 2016-03-22 09:48:44 +01:00
Arturo Gonzalez 2e26ac4bfc New maps in progress... (Fixed minimap relation) 2016-03-21 17:27:24 +01:00
mdtrooper 11c75259d3 Working in the paint arrows A-M-M-A 2016-03-21 17:03:14 +01:00
mdtrooper 800756b9ac Working in the arrows A-M-A 2016-03-21 15:34:33 +01:00
mdtrooper 92703f13c2 Some work in arrows. 2016-03-21 13:13:09 +01:00
mdtrooper 027a2977b6 Clean code. 2016-03-21 12:37:36 +01:00
mdtrooper 4bd2821c6b Some work in arrows. 2016-03-21 12:26:17 +01:00
mdtrooper 42ecb787cf Some work. 2016-03-21 10:25:41 +01:00
mdtrooper 4f4f8538a4 Some changes for arrows. 2016-03-18 16:58:50 +01:00
Arturo Gonzalez 3e313c8c43 New maps in progress... (Works in the fantastic arrows... thx mdtrooper) 2016-03-17 17:42:54 +01:00
mdtrooper 4678ef2d39 Clean code of the paint arrows. 2016-03-17 13:00:44 +01:00
mdtrooper 7fafc0e01e Working in the mass selection nodes with rectangle. 2016-03-17 12:39:28 +01:00
mdtrooper e8f6935fef Fixed the minimap. 2016-03-17 12:28:11 +01:00
mdtrooper 5cc89d968c Fixed the minimap. 2016-03-17 11:40:38 +01:00
Arturo Gonzalez 56cadb2037 New maps in progress... (Node details finished) 2016-03-17 10:44:43 +01:00
Arturo Gonzalez 9d2dff71e3 New maps in progress... (node details) 2016-03-17 10:31:18 +01:00
Arturo Gonzalez 12565ada17 New maps in progress... (Node detail) 2016-03-17 08:51:45 +01:00
mdtrooper 32d96a3099 Working in the minimap, paint nodes. 2016-03-16 15:59:44 +01:00
mdtrooper b69b20bedf Working in the minimap. 2016-03-16 15:34:54 +01:00
Arturo Gonzalez 5098f1a74f Revert "New maps in progress... (fixed resize error)"
This reverts commit 5fbf085fef.
2016-03-16 12:37:34 +01:00
Arturo Gonzalez 5fbf085fef New maps in progress... (fixed resize error) 2016-03-16 12:32:45 +01:00
Arturo Gonzalez e6d0982296 New maps in progress... (Fixed resize with negative numbers) 2016-03-16 12:10:14 +01:00
mdtrooper c21c710598 Start to code the minimap. 2016-03-15 17:05:37 +01:00
Arturo Gonzalez bd50ca25be New maps in progress... (Tooltips fixed) 2016-03-15 13:22:04 +01:00
Arturo Gonzalez dc171c45f2 New maps in progress... (Works in negative size when resize a element) 2016-03-15 10:08:57 +01:00
mdtrooper 3d52c3e842 Fixed the resizing element and arrows 2016-03-15 10:06:36 +01:00
mdtrooper 1a80e7c10c Fixed the drag a resized element 2016-03-15 09:49:49 +01:00
mdtrooper 0593e75476 Working in the minimap. 2016-03-15 09:46:15 +01:00
Arturo Gonzalez b87e5e6a87 New maps in progress... (document the code) 2016-03-15 08:50:57 +01:00
mdtrooper cb248b6a92 Some work in the resize 2016-03-14 14:26:19 +01:00
mdtrooper 1fc3b7497b Some work in the resize 2016-03-14 12:52:09 +01:00
mdtrooper 27e53d9576 Some work in the resize 2016-03-14 12:42:07 +01:00
mdtrooper 8f8a267e33 Some work in the resize 2016-03-14 12:35:33 +01:00
mdtrooper 21a1f1cc60 Some work in the resize 2016-03-14 11:32:00 +01:00
mdtrooper 2359b955db Working in the resize action. 2016-03-11 13:14:59 +01:00
mdtrooper fd0995af96 Working in the resize action. 2016-03-11 12:44:52 +01:00
Arturo Gonzalez 95b13bf3aa New maps in progress... (map editor dialog version 1.0) 2016-03-10 16:12:54 +01:00
Arturo Gonzalez 1a792c4d42 New maps in progress... (edit node dialog() 2016-03-10 14:54:31 +01:00
mdtrooper 9befc1c65e Uploaded some code about resize action 2016-03-10 12:42:25 +01:00
Arturo Gonzalez 9ceb3c15e4 New maps in progress... (Preliminar edit node table) 2016-03-10 11:06:52 +01:00
Arturo Gonzalez 1330fd5a5f New maps in progress... (Changed jquery each to javascript native each and more fixes) 2016-03-09 13:17:27 +01:00
Arturo Gonzalez ed3b3e7094 New maps in progress... (Delete node added!!) 2016-03-09 12:32:58 +01:00
mdtrooper d9c813969c Working in the selection. 2016-03-09 11:11:14 +01:00
mdtrooper 2a833fbc73 https://bugzilla.mozilla.org/show_bug.cgi?id=1254159 2016-03-09 11:07:30 +01:00
Arturo Gonzalez 73b16c177e New maps in progress... (test context menus) 2016-03-08 17:09:40 +01:00
Arturo Gonzalez 39a9ef4c28 New maps in progress... (contextual menus) 2016-03-08 17:04:09 +01:00
Arturo Gonzalez 92afe7614d New maps in progress... (Node context menu tests) 2016-03-08 15:40:11 +01:00
mdtrooper 1b60dbb7ad https://bugzilla.mozilla.org/show_bug.cgi?id=1254159 2016-03-08 15:37:20 +01:00
Arturo Gonzalez fd34c4198c New maps in progress (document the js file) 2016-03-08 13:21:53 +01:00
Arturo Gonzalez c990dac63b New maps in progress... (click control) 2016-03-08 13:02:51 +01:00
mdtrooper 3f6e8d15fb Fixed some things in the arrows. 2016-03-07 15:22:43 +01:00
mdtrooper b6aba10c9b Fixed some things in the arrows. 2016-03-07 14:51:58 +01:00
Arturo Gonzalez ab1d7f99fc New maps in progress... (Fixing arrow position) 2016-03-07 11:05:31 +01:00
Arturo Gonzalez c75929d840 New maps in progress... (Fixing arrow position) 2016-03-07 10:48:03 +01:00
Arturo Gonzalez b3e015740e New maps in progress... (Fixing arrow position) 2016-03-07 09:47:35 +01:00
mdtrooper 843d398c0b Fixed the arrow code. 2016-03-04 17:04:19 +01:00
mdtrooper aa8ce714d8 Fixed the cached svgs. 2016-03-04 15:20:27 +01:00
Arturo Gonzalez 5be789038e New maps in progress... (Fixed arrow body position) 2016-03-04 10:41:21 +01:00
mdtrooper ba17caf0ec Some fixes in the arrows. 2016-03-03 15:38:15 +01:00
mdtrooper c6f65455e7 Some fixes in the arrows. 2016-03-03 15:08:05 +01:00
mdtrooper ad134b7161 The first version of arrows but it is buggy. 2016-03-02 15:44:01 +01:00
mdtrooper 834d3c3e5b Some work in the new networkmaps 2016-03-01 16:37:10 +01:00
mdtrooper 78bf99e9f0 Some changes 2016-02-25 16:18:14 +01:00
Arturo Gonzalez 5404d9cff0 New maps in progress... (remove useless code) 2016-02-25 12:59:22 +01:00
mdtrooper 5c3aa3ce07 Some changes in the tooltips. 2016-02-25 12:55:30 +01:00
Arturo Gonzalez 6c35f5e64a New maps in progress... (fixed js error) 2016-02-24 16:58:09 +01:00
Arturo Gonzalez b7d4c97334 New maps in progress... (Tooltip buttons now have a function) 2016-02-24 16:44:37 +01:00
mdtrooper dce72cbca2 Link the tooltipster to d3 event. 2016-02-24 15:46:49 +01:00
Arturo Gonzalez 799730c48d New maps in progress... (tooltips data and click events) 2016-02-24 14:28:13 +01:00
mdtrooper 6d7286ec6f Fixed the last commit. 2016-02-24 14:12:07 +01:00
mdtrooper 6c037e0ef7 Merge branch 'feature/new_networkmap' of https://github.com/pandorafms/pandorafms into feature/new_networkmap
Conflicts:
	pandora_console/include/class/Map.class.php
	pandora_console/include/javascript/map/MapController.js
2016-02-24 14:06:24 +01:00
mdtrooper b345467fa0 Some work on the drag and drop 2016-02-24 13:59:39 +01:00
Arturo Gonzalez cccce11f79 New maps in progress... (get node data) 2016-02-24 13:04:38 +01:00
Arturo Gonzalez bd736ea598 New maps in progress... (get node data) 2016-02-24 11:45:08 +01:00
mdtrooper f203070e5e Some tiny changes. 2016-02-24 10:38:51 +01:00
mdtrooper d11448838f Added data attributes for the nodes. 2016-02-24 10:36:34 +01:00
Arturo Gonzalez fcc42ce5a3 New maps in progress... (new ajax and class files for nodes) 2016-02-24 10:00:01 +01:00
Arturo Gonzalez 2b89d5d7e0 New maps in progress... (node data by ajax, first contact) 2016-02-23 17:28:55 +01:00
Arturo Gonzalez f3de5c9aaa New maps in progress... (document js file) 2016-02-23 17:13:24 +01:00
mdtrooper 5f7eee5bc8 Fixed the zoom controller, thanks to R.Novoa 2016-02-23 16:48:58 +01:00
mdtrooper 2ee1e5c345 Finish the zoom controller (well it is not finish, it needs the plus and minor buttons...sorry) 2016-02-23 12:37:58 +01:00
mdtrooper e2b8870afe Working in the home zoom button 2016-02-23 09:33:49 +01:00
mdtrooper 967aac57ef Starting to working in the zoom bar controller. 2016-02-22 18:54:19 +01:00
mdtrooper 952dd081ab Restore the code before the testing svg. 2016-02-22 17:17:03 +01:00
mdtrooper c66445d3a5 Change the code for testing the svg bug. 2016-02-22 17:14:18 +01:00
Arturo Gonzalez d154a1a779 New maps in progress... (Fixed error when tooltips and zoom) 2016-02-22 15:51:20 +01:00
mdtrooper 83951266d0 An another change. 2016-02-22 15:03:59 +01:00
mdtrooper 3eddfb2c7f An another changes. 2016-02-22 13:33:26 +01:00
Arturo Gonzalez 9648affaaa New maps in progress... 2016-02-22 13:30:44 +01:00
Arturo Gonzalez 6fae17432a New maps in progress... 2016-02-22 13:28:33 +01:00
mdtrooper e7b664dd63 Some changes that we need. 2016-02-22 13:02:06 +01:00
mdtrooper 646a90211e Some changes needs for the zoom. 2016-02-22 12:05:28 +01:00
Arturo Gonzalez accac98aae New maps in progress... (node tooltips) 2016-02-22 10:20:46 +01:00
Arturo Gonzalez 2da733e8b5 New maps in progress... (tooltips) 2016-02-22 09:55:32 +01:00
Arturo Gonzalez 0afd6e3eb6 New maps in progress... (first version of nodes tooltip) 2016-02-19 13:43:23 +01:00
mdtrooper 3e8cb70d0b First version of tooltip with svg 2016-02-19 13:30:58 +01:00
mdtrooper 0b8ec4a89d Added another library (jquery.svg.js) for to fix jquery bug (the pretty jquery can not work with "svg dom"...I love it). 2016-02-19 13:17:18 +01:00
mdtrooper 1d936ad230 First version of scroll and pan of new networkmap but it is buggy. 2016-02-18 16:51:03 +01:00
Arturo Gonzalez a2d7f6bbf4 New map in progress... (Added a tooltipster js) 2016-02-18 11:21:26 +01:00
mdtrooper 8e7103e097 Merge branch 'feature/new_networkmap' of https://github.com/pandorafms/pandorafms into feature/new_networkmap 2016-02-18 11:07:13 +01:00
Arturo Gonzalez 42e962c5ed New maps in progress. Added tooltip plugin to test. 2016-02-18 10:51:33 +01:00
mdtrooper 6dbf6e18f2 Working in the new networkmap. 2016-02-17 18:31:46 +01:00
Arturo Gonzalez 625b4044e0 New maps in progress... (provisional dialog arrows) 2016-02-11 11:28:53 +01:00
Arturo Gonzalez 38f105f041 New maps in progress... (provisional arrows to nodes dialogs) 2016-02-11 10:53:33 +01:00
mdtrooper 9376e9aa6d Merge branch 'develop' into feature/new_networkmap 2016-02-10 14:54:08 +01:00
mdtrooper 211f2d0832 Merge branch 'feature/new_networkmap' of https://github.com/pandorafms/pandorafms into feature/new_networkmap
Conflicts:
	pandora_console/include/javascript/map/MapController.js
2016-02-10 14:02:43 +01:00
mdtrooper df25018631 Working in the code of new networkmap. 2016-02-10 14:01:10 +01:00
Arturo Gonzalez ce1779d2ff New maps in progress... (node dialog) 2016-02-10 13:49:31 +01:00
Arturo Gonzalez 717b91d9bf New maps in progress... (Added nodes to testing) 2016-02-10 10:14:53 +01:00
Arturo Gonzalez 3867dc11c7 New maps in progress... (dialog position when clicks a node) 2016-02-10 10:06:19 +01:00
mdtrooper 64e3488ea5 Added pair of nodes in the testing map. 2016-02-09 16:54:33 +01:00
Arturo Gonzalez ef1d7e22bc New maps in progress... (pop-up window to nodes) 2016-02-09 16:33:36 +01:00
mdtrooper 4c894fd04a Fixed the young javascript code. 2016-02-09 16:18:05 +01:00
mdtrooper 1d6b9dfc19 Working in the new networkmap. 2016-02-09 13:52:03 +01:00
Arturo Gonzalez 372dd1db1f New maps in progress... (js) 2016-02-08 17:03:43 +01:00
mdtrooper fe863f61df Working in the code of new networkmaps. 2016-02-08 13:47:46 +01:00
mdtrooper 87b07ee5ef Working the javascript objects for the new maps. 2016-02-05 16:16:41 +01:00
mdtrooper 9307a6e77e Starting with the javascript objects for the new maps. 2016-02-05 15:53:59 +01:00
mdtrooper ca19d447cb Working in the new features. 2016-02-04 16:59:40 +01:00
Arturo Gonzalez 2c7f0c423c Added map files 2016-02-04 13:11:14 +01:00
mdtrooper f0afd427bb Working in the new networkmap, the view and d3 2016-02-03 11:40:08 +01:00
Arturo Gonzalez afa06d2715 Fixed bug in tree when shows modules with tag configuration. Ticket#3307 2016-01-29 14:48:41 +01:00
Arturo Gonzalez 0984a06f25 Fixed agents count in tree view. Ticket#3248 2016-01-28 11:09:09 +01:00
m-lopez-f 670c30975d Fixed problems with snmp3 search. Tiquet: #2830 2016-01-19 14:20:27 +01:00
mdtrooper 110241ecc8 Change the rossete icon for long strig module values in the console for a dialog. TICKET: #3019 2016-01-18 16:58:24 +01:00
Arturo Gonzalez 54e0f25947 Fixed "agents with templates" box in bulk alert actions add. Ticket#3087 2015-12-23 16:20:58 +01:00
Alejandro Gallardo Escobar 702f008cbe Added a file with functions to encode/decode base64 with javascript 2015-12-18 13:06:09 +01:00
Alejandro Gallardo Escobar 5cdfb2fef2 Fixed the uri of the xhr calls 2015-10-15 16:21:52 +02:00
Arturo Gonzalez Diaz f432535f07 Fixed services in visual console. Ticket#2745 2015-10-01 09:11:12 +02:00
Arturo Gonzalez Diaz 9bb3ef098b Fixed view error with box item in visual console. Ticket #2744 2015-09-24 10:13:56 +02:00
Alejandro Gallardo Escobar bf287dd98b Adapted the tree view to show the elements detail info using the fixed-bottom-box module 2015-09-07 11:54:15 +02:00
Alejandro Gallardo Escobar a14c24aba0 Added a module to manage boxes prepared to show data in a useful way 2015-09-07 11:54:15 +02:00
m-lopez-f ada0f3b20c Fixed problems with selected a network component when create module and lost data in plugins. Tiquet: #2484 2015-09-02 13:02:00 +02:00
mdtrooper 819ad1da54 Fixed the javascript to load local components of type string and with empty strings in critical and warnings. TICKET: #2584
(cherry picked from commit a18484ffa2)
2015-08-18 16:03:27 +02:00
mdtrooper 6105ed453e Fixed the javascript bug in get list of modules. 2015-08-14 11:42:42 +02:00
mdtrooper 0a0d9fad25 Merge branch 'develop' into feature/ticket#2491-features-dashboard 2015-08-12 13:03:50 +02:00
Alejandro Gallardo Escobar 8fb71f8413 Fixes and improvements in the use of agents and monitors multiselects 2015-08-05 10:39:16 +02:00
Alejandro Gallardo Escobar 3eddf9dbdc Fixed another SQL injection point 2015-08-04 12:49:54 +02:00
Alejandro Gallardo Escobar a7586d0a90 Fixed a SQL injection point and improved the code 2015-08-03 16:46:49 +02:00
Alejandro Gallardo Escobar ada30b1f03 Fixed a SQL injection point 2015-08-03 13:32:46 +02:00
mdtrooper c003bf344a Working in the center labels into the items in a visualmap. (not finished) 2015-07-27 16:24:04 +02:00