Author: Lars Michelsen <[email protected]>
Date: Sun Apr 17 19:54:46 2011 +0200
Committer: Lars Michelsen <[email protected]>
Commit-Date: Sun Apr 17 19:54:46 2011 +0200
Even more compact hover template
---
share/frontend/nagvis-js/js/hover.js | 11 +++++++----
share/userfiles/templates/default.hover.html | 5 ++---
2 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/share/frontend/nagvis-js/js/hover.js
b/share/frontend/nagvis-js/js/hover.js
index 2857f1c..f277200 100644
--- a/share/frontend/nagvis-js/js/hover.js
+++ b/share/frontend/nagvis-js/js/hover.js
@@ -204,10 +204,13 @@ function replaceHoverTemplateStaticMacros(oObj,
sTemplateCode) {
// service_description
oMacros.obj_name = oObj.conf.name;
- if(oObj.conf.alias && oObj.conf.alias !== '')
- oMacros.obj_alias = oObj.conf.alias;
- else
- oMacros.obj_alias = '';
+ if(oObj.conf.alias && oObj.conf.alias !== '') {
+ oMacros.obj_alias = oObj.conf.alias;
+ oMacros.obj_alias_braces = ' (' +oObj.conf.alias + ')';
+ } else {
+ oMacros.obj_alias = '';
+ oMacros.obj_alias_braces = '';
+ }
if(oObj.conf.display_name && oObj.conf.display_name !== '')
oMacros.obj_display_name = oObj.conf.display_name;
diff --git a/share/userfiles/templates/default.hover.html
b/share/userfiles/templates/default.hover.html
index d61e6c9..9161e79 100644
--- a/share/userfiles/templates/default.hover.html
+++ b/share/userfiles/templates/default.hover.html
@@ -1,13 +1,12 @@
<table class="hover_table">
<tr><th colspan="2">[lang_obj_type] ([lang_last_status_refresh]:
[last_status_refresh])</th></tr>
- <tr><td
class="label"><label>[lang_name]</label></td><td>[obj_name]</td></tr>
+ <tr><td
class="label"><label>[lang_name]</label></td><td>[obj_name][obj_alias_braces]</td></tr>
<!-- BEGIN service -->
<tr><td
class="label"><label>[lang_service_description]</label></td><td>[service_description]</td></tr>
<!-- END service -->
- <tr><td
class="label"><label>[lang_alias]</label></td><td>[obj_alias]</td></tr>
<!-- BEGIN host -->
<tr><td class="spacer" colspan="2"></td></tr>
- <tr><td class="label[obj_state]"><label>[lang_state]</label></td><td
class="state[obj_state]">[obj_state]
([obj_state_type])[obj_in_downtime][obj_acknowledged] ([lang_state_type] -
[obj_current_check_attempt]/[obj_max_check_attempts])</td></tr>
+ <tr><td class="label[obj_state]"><label>[lang_state]</label></td><td
class="state[obj_state]">[obj_state] [obj_in_downtime][obj_acknowledged]
([obj_state_type] -
[obj_current_check_attempt]/[obj_max_check_attempts])</td></tr>
<tr><td
class="label"><label>[lang_output]</label></td><td>[obj_output]</td></tr>
<tr><td
class="label"><label>[lang_last_check]</label></td><td>[obj_last_check]</td></tr>
<tr><td
class="label"><label>[lang_next_check]</label></td><td>[obj_next_check]</td></tr>
------------------------------------------------------------------------------
Benefiting from Server Virtualization: Beyond Initial Workload
Consolidation -- Increasing the use of server virtualization is a top
priority.Virtualization can reduce costs, simplify management, and improve
application availability and disaster protection. Learn more about boosting
the value of server virtualization. http://p.sf.net/sfu/vmware-sfdev2dev
_______________________________________________
Nagvis-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/nagvis-checkins
