jjkiers/cloudron-box
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

mail queue: fix details section

Browse Source
This commit is contained in:
Girish Ramakrishnan
2022-09-22 19:46:36 +02:00
parent 92f8f9e8e5
commit 1782a977a7
6 changed files with 37 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/views/emails-queue.html
View File

@@ -34,11 +34,11 @@
<table ng-hide="queue.busy" class="table table-hover" style="margin: 0; table-layout:fixed">
<thead>
<tr>
<th style="width: 15%">{{ 'emails.queue.time' | tr }}</th>
<th style="width: 15%">{{ 'emails.queue.queueTime' | tr }}</th>
<th style="width: 25%">{{ 'emails.queue.mailFrom' | tr }}</th>
<th style="width: 25%">{{ 'emails.queue.rcptTo' | tr }}</th>
<th style="width: 30%">{{ 'emails.queue.details' | tr }}</th>
<th class="text-right" style="width: 30%">{{ 'main.actions' | tr }}</th>
<th class="text-right" style="width: 5%">{{ 'main.actions' | tr }}</th>
</tr>
</thead>
<tbody ng-hide="queue.items.length">
@@ -54,13 +54,18 @@
</tbody>
<tbody ng-show="queue.items.length" ng-repeat="item in queue.items">
<tr ng-click="queue.showItemDetails(item)" class="hand">
<td class="no-wrap"><span uib-tooltip="{{ item.ts | prettyLongDate }}" class="arrow">{{ item.ts | prettyDate }}</span></td>
<td class="no-wrap"><span uib-tooltip="{{ item.queueTime | prettyLongDate }}" class="arrow">{{ item.queueTime | prettyDate }}</span></td>
<td class="elide-table-cell">{{ (item.mailFrom | prettyEmailAddresses) || '-' }}</td>
<td class="elide-table-cell">{{ (item.rcptTo | prettyEmailAddresses) || '-' }}</td>
<td class="elide-table-cell">{{ item.messageId }}</td>
<td class="elide-table-cell">
<span ng-show="item.queueType === 'delivery'">Delivering</span>
<span ng-show="item.queueType === 'tempfail'">Retrying in {{ item.nextAttemptTime | prettyFutureDate }}. {{ item.attempts+1 }} attempt(s) so far.</span>
<span ng-show="item.queueType === 'load'">Loading</span>
</td>
<td class="text-right no-wrap">
<button class="btn btn-xs btn-default" ng-click="queue.resend(item)" uib-tooltip="{{ 'emails.queue.resendTooltip' | tr }}"><i class="fa fa-retweet"></i></button>
<button class="btn btn-xs btn-default" ng-click="queue.discard(item)" uib-tooltip="{{ 'emails.queue.discardTooltip' | tr }}"><i class="fa fa-trash-alt"></i></button>
<!-- resend is broken in haraka -->
<!-- <button class="btn btn-xs btn-default" ng-click="queue.resend(item)" uib-tooltip="{{ 'emails.queue.resendTooltip' | tr }}"><i class="fa fa-retweet"></i></button> -->
<button class="btn btn-xs btn-default" ng-show="item.queueType === 'tempfail'" ng-click="queue.discard(item)" uib-tooltip="{{ 'emails.queue.discardTooltip' | tr }}"><i class="fa fa-trash-alt"></i></button>
</td>
</tr>
<tr ng-show="queue.activeItem === item">