Skip to content

Commit

Permalink
Show startsAt time for pending silences (#778)
Browse files Browse the repository at this point in the history
  • Loading branch information
stuartnelson3 authored May 9, 2017
1 parent 75b951b commit a776bbc
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 28 deletions.
2 changes: 1 addition & 1 deletion template/internal/deftmpl/bindata.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions ui/app/partials/silence.html
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
</div>

<div class="right">
<button ng-show="sil.pending" type="black" disabled small>Starts {{ sil.endsAt | amCalendar }}</button>
<button ng-show="sil.pending" type="black" disabled small>Starts {{ sil.startsAt | amCalendar }}</button>
<button ng-show="sil.active" type="black" disabled small>Ends {{ sil.endsAt | amCalendar }}</button>
<button ng-show="sil.pending" class="delete-button" type="black" ng-click="delete(sil.id)" small upper>Delete</button>
<button ng-show="sil.active" class="delete-button" type="black" ng-click="delete(sil.id)" small upper>Expire</button>
Expand Down Expand Up @@ -40,7 +40,7 @@
<td>active</td>
<td>
<span>{{ sil.startsAt | date:'yyyy-MM-dd HH:mm' }}</span>
<span>{{ sil.endsAt | date:'yyyy-MM-dd HH:mm' }}</span>
</td>
</tr>
Expand Down
50 changes: 25 additions & 25 deletions ui/bindata.go

Large diffs are not rendered by default.

0 comments on commit a776bbc

Please sign in to comment.