Module: nagvis Branch: master Commit: 4bb105bd69595c9c0c1ed8d5a810ff3eaa190164 URL: http://nagvis.git.sourceforge.net/git/gitweb.cgi?p=nagvis/nagvis/commit/?id=4bb105bd69595c9c0c1ed8d5a810ff3eaa190164
Author: Lars Michelsen <[email protected]> Date: Thu Jul 23 22:56:33 2009 +0200 Added [alias] macros to label_text var (Ticket #57) --- docs/en_US/map_config_format_description.html | 10 +++++----- share/nagvis/includes/js/NagVisStatefulObject.js | 1 + 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/docs/en_US/map_config_format_description.html b/docs/en_US/map_config_format_description.html index da6f567..c10ddcc 100644 --- a/docs/en_US/map_config_format_description.html +++ b/docs/en_US/map_config_format_description.html @@ -230,7 +230,7 @@ <td> label_show </td><td> inherited (<a href="#global">global</a>) </td><td> Enable/Disable label for this object </td> </tr> <tr> - <td> label_text </td><td> [name] </td><td> Text of the label. Available macros: [name], [output] </td> + <td> label_text </td><td> [name] </td><td> Text of the label. Available macros: [name], [alias], [output] </td> </tr> <tr> <td> label_x </td><td> inherited (<a href="#global">global</a>) </td><td> Label X-Position (with prefix + or - relative to the upper left corner of the icons, otherwise absolute position) </td> @@ -349,7 +349,7 @@ <td> label_show </td><td> inherited (<a href="#global">global</a>) </td><td> Enable/Disable label for this object </td> </tr> <tr> - <td> label_text </td><td> [name] [service_description] </td><td> Text of the label. Available macros: [name], [service_description], [output] </td> + <td> label_text </td><td> [name] [service_description] </td><td> Text of the label. Available macros: [name], [alias], [service_description], [output] </td> </tr> <tr> <td> label_x </td><td> inherited (<a href="#global">global</a>) </td><td> Label X-Position (with prefix + or - relative to the upper left corner of the icons, otherwise absolute position) </td> @@ -456,7 +456,7 @@ <td> label_show </td><td> inherited (<a href="#global">global</a>) </td><td> Enable/Disable label for this object </td> </tr> <tr> - <td> label_text </td><td> [name] </td><td> Text of the label. Available macros: [name], [output] </td> + <td> label_text </td><td> [name] </td><td> Text of the label. Available macros: [name], [alias], [output] </td> </tr> <tr> <td> label_x </td><td> inherited (<a href="#global">global</a>) </td><td> Label X-Position (with prefix + or - relative to the upper left corner of the icons, otherwise absolute position) </td> @@ -566,7 +566,7 @@ <td> label_show </td><td> inherited (<a href="#global">global</a>) </td><td> Enable/Disable label for this object </td> </tr> <tr> - <td> label_text </td><td> [name] </td><td> Text of the label. Available macros: [name], [output] </td> + <td> label_text </td><td> [name] </td><td> Text of the label. Available macros: [name], [alias], [output] </td> </tr> <tr> <td> label_x </td><td> inherited (<a href="#global">global</a>) </td><td> Label X-Position (with prefix + or - relative to the upper left corner of the icons, otherwise absolute position) </td> @@ -670,7 +670,7 @@ <td> label_show </td><td> inherited (<a href="#global">global</a>) </td><td> Enable/Disable label for this object </td> </tr> <tr> - <td> label_text </td><td> [name] </td><td> Text of the label. Available macros: [name], [output] </td> + <td> label_text </td><td> [name] </td><td> Text of the label. Available macros: [name], [alias], [output] </td> </tr> <tr> <td> label_x </td><td> inherited (<a href="#global">global</a>) </td><td> Label X-Position (with prefix + or - relative to the upper left corner of the icons, otherwise absolute position) </td> diff --git a/share/nagvis/includes/js/NagVisStatefulObject.js b/share/nagvis/includes/js/NagVisStatefulObject.js index 6952878..44e6ffb 100644 --- a/share/nagvis/includes/js/NagVisStatefulObject.js +++ b/share/nagvis/includes/js/NagVisStatefulObject.js @@ -314,6 +314,7 @@ var NagVisStatefulObject = NagVisObject.extend({ } this.conf.label_text = this.conf.label_text.replace(new RegExp('\\[name\\]', 'g'), objName); + this.conf.label_text = this.conf.label_text.replace(new RegExp('\\[alias\\]', 'g'), this.conf.alias); if(this.conf.type == 'service') { this.conf.label_text = this.conf.label_text.replace(new RegExp('\\[service_description\\]', 'g'), this.conf.service_description); ------------------------------------------------------------------------------ _______________________________________________ Nagvis-checkins mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/nagvis-checkins
