Misthios/grafana-zabbix
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Acknowledges: use tooltip instead inner table.

Browse Source
This commit is contained in:
Alexander Zobnin
2016-07-31 11:17:22 +03:00
parent 78ca95a8de
commit 24969cd560
5 changed files with 185 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
src/panel-triggers/module.html
View File

@@ -31,21 +31,25 @@
</thead>
<tbody>
<tr ng-repeat="trigger in ctrl.triggerList">
<td ng-if="ctrl.panel.hostField">
<div>
<span><strong>{{trigger.host}}</strong></span>
</div>
</td>
<td ng-if="ctrl.panel.statusField" style="background-color: {{trigger.color}}; color: white">
<div>
{{ctrl.triggerStatusMap[trigger.value]}}
</div>
</td>
<td ng-if="ctrl.panel.severityField" style="background-color: {{trigger.color}}; color: white">
<div>
{{trigger.severity}}
</div>
</td>
<td style="background-color: {{trigger.color}}; color: white">
<div>
{{trigger.description}}
@@ -68,52 +72,16 @@
<small>{{trigger.comments}}</small>
</div>
</div>
<!-- Trigger acknowledges -->
<div class="collapse"
id="acknowledges-{{trigger.triggerid}}"
ng-if="trigger.showAcknowledges">
<div style="padding-top: 12px;">
<table class="table table-condensed">
<thead>
<tr>
<th><small>Time</small></th>
<th><small>User</small></th>
<th><small>Comments</small></th>
</tr>
</thead>
<tbody>
<tr ng-repeat="ack in trigger.acknowledges">
<td>
<small>{{ack.time}}</small>
</td>
<td>
<small>{{ack.user}}</small>
</td>
<td>
<small>{{ack.message}}</small>
</td>
</tr>
<tr ng-if="trigger.newAct">
<td>
<small>{{trigger.newAct.time}}</small>
</td>
<td>
<small>{{trigger.newAct.user}}</small>
</td>
<td><input ng-model="trigger.newAct.message" size="80" ng-blur="ctrl.acknowledgeTrigger({keyCode:13},trigger,trigger.newAct)" ng-keyup="ctrl.acknowledgeTrigger($event,trigger,trigger.newAct)"/></td>
</tr>
</tbody>
</table>
</div>
</div>
</td>
<td ng-if="ctrl.panel.lastChangeField">
{{trigger.lastchange}}
</td>
<td ng-if="ctrl.panel.ageField">
{{trigger.age}}
</td>
<td ng-if="ctrl.panel.infoField">
<!-- Trigger Url -->
@@ -130,20 +98,12 @@
</span>
<!-- Trigger acknowledges -->
<a ng-if="trigger.acknowledges"
role="button"
ng-click="ctrl.switchAcknowledges(trigger)"
bs-tooltip="'Acknowledges ({{trigger.acknowledges.length}})'">
<i class="fa fa-comments"></i>
</a>
<!-- Acknowledge events -->
<a ng-if="trigger.acknowledges === undefined"
role="button"
ng-click="ctrl.addAcknowledgeMessage(trigger)"
bs-tooltip="'acknowledge this event'">
<i class="fa fa-comments-o"></i>
</a>
<ack-tooltip
ack="trigger.acknowledges"
trigger="trigger"
on-ack="ctrl.acknowledgeTrigger"
context="ctrl">
</ack-tooltip>
</td>
</tr>
</tbody>