Merge remote-tracking branch 'upstream/2021.09-rc' into user-contact

[friendica.git] / view / templates / sub / delivery_count.tpl

diff --git a/view/templates/sub/delivery_count.tpl b/view/templates/sub/delivery_count.tpl
index d10eda639b7fce42bf28cd0bf936b2dba18d952c..997a0e7d6bcd0a8f459f5ad5d566d57ab6c71a54 100644 (file)
--- a/view/templates/sub/delivery_count.tpl
+++ b/view/templates/sub/delivery_count.tpl
@@ -2,12 +2,19 @@
        Please don't use this template as is, this is a placeholder that needs to be\r
        overriden with specific icons to avoid taking too much visual space\r
 *}}\r
-{{if $delivery.queue_count == 0}}\r
-       {{$delivery.notifier_pending|escape}}\r
-{{elseif $delivery.queue_done == 0}}\r
-       {{$delivery.delivery_pending|escape}} {{$item.delivery.queue_done}}/{{$item.delivery.queue_count}}\r
-{{elseif $delivery.queue_done / $delivery.queue_count < 0.75}}\r
-       {{$delivery.delivery_underway|escape}} {{$item.delivery.queue_done}}/{{$item.delivery.queue_count}}\r
-{{else}}\r
-       {{$delivery.delivery_almost|escape}} {{$item.delivery.queue_done}}/{{$item.delivery.queue_count}}\r
+{{if $delivery.queue_count >= -1 && $delivery.queue_count !== '' && $delivery.queue_count !== null}}\r
+<span class="delivery">\r
+       &bull;\r
+       {{if $delivery.queue_count == 0}}\r
+               {{$delivery.notifier_pending}}\r
+       {{elseif $delivery.queue_done == 0}}\r
+               {{$delivery.delivery_pending}} {{$item.delivery.queue_done}}/{{$item.delivery.queue_count}}\r
+       {{elseif $delivery.queue_done / $delivery.queue_count < 0.75}}\r
+               {{$delivery.delivery_underway}} {{$item.delivery.queue_done}}/{{$item.delivery.queue_count}}\r
+       {{elseif $delivery.queue_done < $delivery.queue_count}}\r
+               {{$delivery.delivery_almost}} {{$item.delivery.queue_done}}/{{$item.delivery.queue_count}}\r
+       {{else}}\r
+               {{$delivery.delivery_done}} {{$item.delivery.queue_done}}/{{$item.delivery.queue_count}}\r
+       {{/if}}\r
+</span>\r
 {{/if}}\r