Module: nagvis Branch: master Commit: c4c8b7800799f9ccf923ab568eefd43d9a33b4b5 URL: http://nagvis.git.sourceforge.net/git/gitweb.cgi?p=nagvis/nagvis;a=commit;h=c4c8b7800799f9ccf923ab568eefd43d9a33b4b5
Author: LaMi <[email protected]> Date: Wed Dec 30 18:57:52 2009 +0100 Fixed line drawing --- .../frontend/nagvis-js/js/NagVisStatefulObject.js | 8 +++----- share/frontend/nagvis-js/js/lines.js | 10 ++++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/share/frontend/nagvis-js/js/NagVisStatefulObject.js b/share/frontend/nagvis-js/js/NagVisStatefulObject.js index a42cf82..9c6252e 100644 --- a/share/frontend/nagvis-js/js/NagVisStatefulObject.js +++ b/share/frontend/nagvis-js/js/NagVisStatefulObject.js @@ -436,9 +436,6 @@ var NagVisStatefulObject = NagVisObject.extend({ * @author Lars Michelsen <[email protected]> */ parseLine: function () { - var ret = ''; - var link = ''; - // Create container div var oContainerDiv = document.createElement('div'); oContainerDiv.setAttribute('id', this.conf.object_id+'-linediv'); @@ -457,9 +454,10 @@ var NagVisStatefulObject = NagVisObject.extend({ oLinkDiv.setAttribute('id', this.conf.object_id+'-linelinkdiv'); oLinkDiv.style.zIndex = (this.conf.z+1); + var sUrl = this.conf.url; var sUrlTarget = this.conf.url_target; - oLinkDiv.onclick = function() { window.open(sUrl, sUrlTarget, ""); }; + oLinkDiv.onclick = function() { window.open(sUrl, sUrlTarget, ""); sUrl = null; sUrlTarget = null; }; oContainerDiv.appendChild(oLinkDiv); oLinkDiv = null; @@ -494,7 +492,7 @@ var NagVisStatefulObject = NagVisObject.extend({ case 'UP': case 'OK': case 'PENDING': - colorFill = oStates[state].color; + colorFill = oStates[this.conf.summary_state].color; break; default: colorFill = '#FFCC66'; diff --git a/share/frontend/nagvis-js/js/lines.js b/share/frontend/nagvis-js/js/lines.js index 69cd3c4..66d573f 100644 --- a/share/frontend/nagvis-js/js/lines.js +++ b/share/frontend/nagvis-js/js/lines.js @@ -124,14 +124,16 @@ function drawPolygonBasedObject(objectId, xCoord, yCoord, z, w, colorFill, color // FIXME: Would be better to have a link allover the line // ------------------------------------------------------------------------- - if(bLinkArea) { + if(bLinkArea && bLinkArea === true) { var oLinkContainer = document.getElementById(objectId+'-linelinkdiv'); var oImg = document.createElement('img'); oImg.setAttribute('id', objectId+'-link'); - oImg.src = oGeneralProperties.path_images+'iconsets/20x20.gif'; + oImg.src = oGeneralProperties.path_iconsets+'20x20.gif'; oImg.style.position = 'absolute'; - oImg.style.left = (middle(x1, x2)-10)+"px"; - oImg.style.top = (middle(y1, y2)-10)+"px"; + oImg.style.left = (middle(xMin, xMax)-10)+"px"; + oImg.style.top = (middle(yMin, yMax)-10)+"px"; + oImg.style.width = 10; + oImg.style.height = 10; oImg.style.zIndex = z+1; oLinkContainer.appendChild(oImg); ------------------------------------------------------------------------------ This SF.Net email is sponsored by the Verizon Developer Community Take advantage of Verizon's best-in-class app development support A streamlined, 14 day to market process makes app distribution fast and easy Join now and get one step closer to millions of Verizon customers http://p.sf.net/sfu/verizon-dev2dev _______________________________________________ Nagvis-checkins mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/nagvis-checkins
