Auto-convert links in annotations

This commit is contained in:
Fabian Reinartz 2015-11-09 13:32:41 +01:00
parent 1918379668
commit b2351ef76c
4 changed files with 14 additions and 26 deletions

View File

@ -130,6 +130,14 @@ header #logo {
border: 1px solid #555 !important;
}
.annotations {
white-space: pre-wrap !important;
}
.table-normal.annotations td {
padding: .4em !important;
text-overflow: clip;
}
.list-item .container-right {
border-left: 650px solid #777;
padding: 1em;

View File

@ -5,6 +5,7 @@
<script src="/static/moment.min.js"></script>
<script src="/static/angular.min.js"></script>
<script src="/static/angular-sanitize.min.js"></script>
<script src="/static/angular-route.min.js"></script>
<script src="/static/angular-resource.min.js"></script>
<script src="/static/angular-moment.min.js"></script>

View File

@ -334,6 +334,7 @@ angular.module('am.controllers').controller('StatusCtrl',
angular.module('am', [
'ngRoute',
'ngSanitize',
'angularMoment',
'am.controllers',

View File

@ -19,33 +19,11 @@
</div>
<div class="detail group" ng-show="showDetails">
<table class="table-flat">
<table class="table-normal annotations">
<tbody>
<tr>
<td>active</td>
<td>
<span>{{ alert.startsAt | date:'yyyy-MM-dd HH:mm' }}</span>
<span ng-hide="a.endsAt == '0001-01-01T00:00:00Z'">
<span class="date">{{ alert.endsAt | date:'yyyy-MM-dd' }},</span> <span class="time">{{ alert.endsAt | date:'HH:mm' }}</span>
</span>
<span ng-show="alert.endsAt == '0001-01-01T00:00:00Z'">
<span class="time">now</span>
</span>
</td>
</tr>
<tr>
<td>annotations</td>
<td>
<table class="table-flat">
<tbody>
<tr ng-repeat="(name, val) in alert.annotations | orderBy:name">
<td style="padding-right: 3em"><em>{{ name }}</em></td>
<td style="white-space: pre-line;">{{ val }}</td>
</tr>
</tbody>
</table>
</td>
<tr ng-repeat="(name, val) in alert.annotations | orderBy:name">
<td><strong>{{ name }}</strong></td>
<td><span ng-bind-html="val | linky:'_blank'"></span></td>
</tr>
</tbody>
</table>