Module: nagvis Branch: master Commit: 6dd72ccb9722a26db877546ce17478d4e11b4811 URL: http://nagvis.git.sourceforge.net/git/gitweb.cgi?p=nagvis/nagvis;a=commit;h=6dd72ccb9722a26db877546ce17478d4e11b4811
Author: Lars Michelsen <[email protected]> Date: Tue Oct 19 18:38:15 2010 +0200 #373 Fixed weathermap line label font color --- share/frontend/nagvis-js/js/NagVisLine.js | 2 ++ .../frontend/nagvis-js/js/NagVisStatefulObject.js | 2 ++ share/frontend/nagvis-js/js/lines.js | 4 ++-- share/frontend/nagvis-js/js/nagvis.js | 11 ++++------- share/userfiles/templates/default.css | 4 ++++ 5 files changed, 14 insertions(+), 9 deletions(-) diff --git a/share/frontend/nagvis-js/js/NagVisLine.js b/share/frontend/nagvis-js/js/NagVisLine.js index acd8bcb..145ec55 100644 --- a/share/frontend/nagvis-js/js/NagVisLine.js +++ b/share/frontend/nagvis-js/js/NagVisLine.js @@ -87,6 +87,8 @@ var NagVisLine = NagVisStatelessObject.extend({ if((this.conf.url && this.conf.url !== '') || (this.conf.hover_menu && this.conf.hover_menu !== '')) { var oLink = document.createElement('a'); oLink.setAttribute('id', this.conf.object_id+'-linelink'); + oLink.setAttribute('class', 'linelink'); + oLink.setAttribute('className', 'linelink'); oLink.href = this.conf.url; oLink.target = this.conf.url_target; diff --git a/share/frontend/nagvis-js/js/NagVisStatefulObject.js b/share/frontend/nagvis-js/js/NagVisStatefulObject.js index ca1a2ca..39e867d 100644 --- a/share/frontend/nagvis-js/js/NagVisStatefulObject.js +++ b/share/frontend/nagvis-js/js/NagVisStatefulObject.js @@ -455,6 +455,8 @@ var NagVisStatefulObject = NagVisObject.extend({ if((this.conf.url && this.conf.url !== '' && this.conf.url !== '#') || (this.conf.hover_menu && this.conf.hover_menu !== '')) { var oLink = document.createElement('a'); oLink.setAttribute('id', this.conf.object_id+'-linelink'); + oLink.setAttribute('class', 'linelink'); + oLink.setAttribute('className', 'linelink'); oLink.href = this.conf.url; oLink.target = this.conf.url_target; diff --git a/share/frontend/nagvis-js/js/lines.js b/share/frontend/nagvis-js/js/lines.js index 98826f9..93ae87e 100644 --- a/share/frontend/nagvis-js/js/lines.js +++ b/share/frontend/nagvis-js/js/lines.js @@ -286,7 +286,7 @@ function drawNagVisLine(objectId, lineType, cuts, x1, y1, x2, y2, z, width, colo if(perfdata[3] && perfdata[3][1] && perfdata[3][2]) perfdataB = perfdata[3][1] + perfdata[3][2]; drawArrow(objectId, x2, y2, xMid, yMid, z, width, colorFill2, colorBorder); - drawLinkOrLabel(objectId, lineType, x2, y2, xMid, yMid, z, perfdataA, perfdataB, cutIn, bLinkArea, bLabelShow); + drawLinkOrLabel(objectId, lineType, x2, y2, xMid, yMid, z, perfdataA, perfdataB, cutIn, bLinkArea, bLabelShow); break; default: // Unknown @@ -303,7 +303,7 @@ function drawLinkOrLabel(objectId, lineType, x1, y1, x2, y2, z, perfdataA, perfd if(bLabelShow && (lineType == 13 || lineType == 14)) drawLabel(objectId, lineType, middle(x1, x2, labelPosition), middle(y1, y2, labelPosition), z, perfdataA, perfdataB); else if(bLinkArea) - drawLinkArea(objectId, middle(x1, x2, labelPosition), middle(y1, y2, labelPosition), z); + drawLinkArea(objectId, middle(x1, x2, labelPosition), middle(y1, y2, labelPosition), z); } /** diff --git a/share/frontend/nagvis-js/js/nagvis.js b/share/frontend/nagvis-js/js/nagvis.js index 7005b39..49ecd6a 100644 --- a/share/frontend/nagvis-js/js/nagvis.js +++ b/share/frontend/nagvis-js/js/nagvis.js @@ -926,13 +926,11 @@ function drawNagVisTextbox(id, className, bgColor, borderColor, x, y, z, w, h, t oLabelDiv.style.left = x + 'px'; oLabelDiv.style.top = y + 'px'; - if(w && w !== '' && w !== 'auto') { + if(w && w !== '' && w !== 'auto') oLabelDiv.style.width = w+'px'; - } - if(h && h !== '' && h !== 'auto') { + if(h && h !== '' && h !== 'auto') oLabelDiv.style.height = h+'px'; - } oLabelDiv.style.zIndex = parseInt(z) + 1; oLabelDiv.style.overflow = 'visible'; @@ -941,11 +939,10 @@ function drawNagVisTextbox(id, className, bgColor, borderColor, x, y, z, w, h, t * IE workaround: The transparent for the color is not enough. The border * has really to be hidden. */ - if(borderColor == 'transparent') { + if(borderColor == 'transparent') oLabelDiv.style.borderStyle = 'none'; - } else { + else oLabelDiv.style.borderStyle = 'solid'; - } // Create span for text and add label text var oLabelSpan = document.createElement('span'); diff --git a/share/userfiles/templates/default.css b/share/userfiles/templates/default.css index 858064d..6d82b1d 100644 --- a/share/userfiles/templates/default.css +++ b/share/userfiles/templates/default.css @@ -99,6 +99,10 @@ div.welcome a:hover {color:#779D2A} border-color : black; } +a.linelink { + color: #000000; +} + /* textbox (object on map) */ .box { position : absolute; ------------------------------------------------------------------------------ Download new Adobe(R) Flash(R) Builder(TM) 4 The new Adobe(R) Flex(R) 4 and Flash(R) Builder(TM) 4 (formerly Flex(R) Builder(TM)) enable the development of rich applications that run across multiple browsers and platforms. Download your free trials today! http://p.sf.net/sfu/adobe-dev2dev _______________________________________________ Nagvis-checkins mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/nagvis-checkins
