friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Update delivery count display 

- Hide display when item is preceding the feature
- Wrap the display in its own span
- Remove delivery bullet from wall_thread.tpl
- [frio] Make delivery icon fainter
This commit is contained in:
Hypolite Petovan 2019-01-23 00:05:53 -05:00
parent 1ee1d7ef4e
commit e2d32caa78
6 changed files with 48 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
view/templates/sub/delivery_count.tpl
View File

@ -2,12 +2,17 @@
Please don't use this template as is, this is a placeholder that needs to be Please don't use this template as is, this is a placeholder that needs to be
overriden with specific icons to avoid taking too much visual space overriden with specific icons to avoid taking too much visual space
*}} *}}
{{if $delivery.queue_count == 0}} {{if $delivery.queue_count >= -1 && $delivery.queue_count !== '' && $delivery.queue_count !== null}}
{{$delivery.notifier_pending|escape}} <span class="delivery">
{{elseif $delivery.queue_done == 0}} &bullet;
{{$delivery.delivery_pending|escape}} {{$item.delivery.queue_done}}/{{$item.delivery.queue_count}} {{if $delivery.queue_count == 0}}
{{elseif $delivery.queue_done / $delivery.queue_count < 0.75}} {{$delivery.notifier_pending}}
{{$delivery.delivery_underway|escape}} {{$item.delivery.queue_done}}/{{$item.delivery.queue_count}} {{elseif $delivery.queue_done == 0}}
{{else}} {{$delivery.delivery_pending}} {{$item.delivery.queue_done}}/{{$item.delivery.queue_count}}
{{$delivery.delivery_almost|escape}} {{$item.delivery.queue_done}}/{{$item.delivery.queue_count}} {{elseif $delivery.queue_done / $delivery.queue_count < 0.75}}
{{$delivery.delivery_underway}} {{$item.delivery.queue_done}}/{{$item.delivery.queue_count}}
{{else}}
{{$delivery.delivery_almost}} {{$item.delivery.queue_done}}/{{$item.delivery.queue_count}}
{{/if}}
</span>
{{/if}} {{/if}}

1
view/theme/frio/css/style.css
View File

@ -2094,6 +2094,7 @@ ul.dropdown-menu li:hover {
/* Media Classes */ /* Media Classes */
.media .time, .media .time,
.media .shared-time, .media .shared-time,
.media .delivery,
.media .location, .media .location,
.media .location a { .media .location a {
font-size: 11px; font-size: 11px;

29
view/theme/frio/templates/sub/delivery_count.tpl
View File

@ -1,13 +1,18 @@
{{if $delivery.queue_count == 0}} {{if $delivery.queue_count >= -1 && $delivery.queue_count !== '' && $delivery.queue_count !== null}}
<i class="fa fa-hourglass-o" aria-hidden="true" title="{{$delivery.notifier_pending|escape}}"></i> <span class="delivery">
<span class="sr-only">{{$delivery.notifier_pending|escape}}</span> &bullet;
{{elseif $delivery.queue_done == 0}} {{if $delivery.queue_count == 0}}
<i class="fa fa-hourglass" aria-hidden="true" title="{{$delivery.delivery_pending|escape}} {{$item.delivery.queue_done}}/{{$item.delivery.queue_count}}"></i> <i class="fa fa-hourglass-o" aria-hidden="true" title="{{$delivery.notifier_pending}}"></i>
<span class="sr-only">{{$delivery.delivery_pending|escape}}</span> <span class="sr-only">{{$delivery.notifier_pending}}</span>
{{elseif $delivery.queue_done / $delivery.queue_count < 0.75}} {{elseif $delivery.queue_done == 0}}
<i class="fa fa-paper-plane-o" aria-hidden="true" title="{{$delivery.delivery_underway|escape}} {{$item.delivery.queue_done}}/{{$item.delivery.queue_count}}"></i> <i class="fa fa-hourglass" aria-hidden="true" title="{{$delivery.delivery_pending}} {{$item.delivery.queue_done}}/{{$item.delivery.queue_count}}"></i>
<span class="sr-only">{{$delivery.delivery_underway|escape}}</span> <span class="sr-only">{{$delivery.delivery_pending}}</span>
{{else}} {{elseif $delivery.queue_done / $delivery.queue_count < 0.75}}
<i class="fa fa-paper-plane" aria-hidden="true" title="{{$delivery.delivery_almost|escape}} {{$item.delivery.queue_done}}/{{$item.delivery.queue_count}}"></i> <i class="fa fa-paper-plane-o" aria-hidden="true" title="{{$delivery.delivery_underway}} {{$item.delivery.queue_done}}/{{$item.delivery.queue_count}}"></i>
<span class="sr-only">{{$delivery.delivery_almost|escape}}</span> <span class="sr-only">{{$delivery.delivery_underway}}</span>
{{else}}
<i class="fa fa-paper-plane" aria-hidden="true" title="{{$delivery.delivery_almost}} {{$item.delivery.queue_done}}/{{$item.delivery.queue_count}}"></i>
<span class="sr-only">{{$delivery.delivery_almost}}</span>
{{/if}}
</span>
{{/if}} {{/if}}

3
view/theme/frio/templates/wall_thread.tpl
View File

@ -209,7 +209,6 @@ as the value of $top_child_total (this is done at the end of this file)
</span> </span>
</a> </a>
{{if $item.owner_self}} {{if $item.owner_self}}
&bullet;
{{include file="sub/delivery_count.tpl" delivery=$item.delivery}} {{include file="sub/delivery_count.tpl" delivery=$item.delivery}}
{{/if}} {{/if}}
</small> </small>
@ -233,7 +232,6 @@ as the value of $top_child_total (this is done at the end of this file)
<a class="time" href="{{$item.plink.orig}}"><span class="wall-item-ago">{{$item.ago}}</span></a> <a class="time" href="{{$item.plink.orig}}"><span class="wall-item-ago">{{$item.ago}}</span></a>
{{if $item.location}}&nbsp;&mdash;&nbsp;({{$item.location nofilter}}){{/if}} {{if $item.location}}&nbsp;&mdash;&nbsp;({{$item.location nofilter}}){{/if}}
{{if $item.owner_self}} {{if $item.owner_self}}
&bullet;
{{include file="sub/delivery_count.tpl" delivery=$item.delivery}} {{include file="sub/delivery_count.tpl" delivery=$item.delivery}}
{{/if}} {{/if}}
</small> </small>
@ -253,7 +251,6 @@ as the value of $top_child_total (this is done at the end of this file)
<a class="time" href="{{$item.plink.orig}}" title="{{$item.localtime}}" data-toggle="tooltip">{{$item.ago}}</a> <a class="time" href="{{$item.plink.orig}}" title="{{$item.localtime}}" data-toggle="tooltip">{{$item.ago}}</a>
{{if $item.location}}&nbsp;&mdash;&nbsp;({{$item.location nofilter}}){{/if}} {{if $item.location}}&nbsp;&mdash;&nbsp;({{$item.location nofilter}}){{/if}}
{{if $item.owner_self}} {{if $item.owner_self}}
&bullet;
{{include file="sub/delivery_count.tpl" delivery=$item.delivery}} {{include file="sub/delivery_count.tpl" delivery=$item.delivery}}
{{/if}} {{/if}}
</small> </small>

29
view/theme/vier/templates/sub/delivery_count.tpl
View File

@ -1,13 +1,18 @@
{{if $delivery.queue_count == 0}} {{if $delivery.queue_count >= -1 && $delivery.queue_count !== '' && $delivery.queue_count !== null}}
<i class="icon-spinner" aria-hidden="true" title="{{$delivery.notifier_pending|escape}}"></i> <span class="delivery">
<span class="sr-only">{{$delivery.notifier_pending|escape}}</span> &bullet;
{{elseif $delivery.queue_done == 0}} {{if $delivery.queue_count == 0}}
<i class="icon-spinner" aria-hidden="true" title="{{$delivery.delivery_pending|escape}} {{$item.delivery.queue_done}}/{{$item.delivery.queue_count}}"></i> <i class="icon-spinner" aria-hidden="true" title="{{$delivery.notifier_pending}}"></i>
<span class="sr-only">{{$delivery.delivery_pending|escape}}</span> <span class="sr-only">{{$delivery.notifier_pending}}</span>
{{elseif $delivery.queue_done / $delivery.queue_count < 0.75}} {{elseif $delivery.queue_done == 0}}
<i class="icon-plane" aria-hidden="true" title="{{$delivery.delivery_underway|escape}} {{$item.delivery.queue_done}}/{{$item.delivery.queue_count}}"></i> <i class="icon-spinner" aria-hidden="true" title="{{$delivery.delivery_pending}} {{$item.delivery.queue_done}}/{{$item.delivery.queue_count}}"></i>
<span class="sr-only">{{$delivery.delivery_underway|escape}}</span> <span class="sr-only">{{$delivery.delivery_pending}}</span>
{{else}} {{elseif $delivery.queue_done / $delivery.queue_count < 0.75}}
<i class="icon-plane" aria-hidden="true" title="{{$delivery.delivery_almost|escape}} {{$item.delivery.queue_done}}/{{$item.delivery.queue_count}}"></i> <i class="icon-plane" aria-hidden="true" title="{{$delivery.delivery_underway}} {{$item.delivery.queue_done}}/{{$item.delivery.queue_count}}"></i>
<span class="sr-only">{{$delivery.delivery_almost|escape}}</span> <span class="sr-only">{{$delivery.delivery_underway}}</span>
{{else}}
<i class="icon-plane" aria-hidden="true" title="{{$delivery.delivery_almost}} {{$item.delivery.queue_done}}/{{$item.delivery.queue_count}}"></i>
<span class="sr-only">{{$delivery.delivery_almost}}</span>
{{/if}}
</span>
{{/if}} {{/if}}

1
view/theme/vier/templates/wall_thread.tpl
View File

@ -57,7 +57,6 @@
<span class="wall-item-ago"> <span class="wall-item-ago">
{{if $item.plink}}<a title="{{$item.plink.title}}" href="{{$item.plink.href}}" class="u-url" style="color: #999"><time class="dt-published" datetime="{{$item.localtime}}">{{$item.created}}</time></a>{{else}} <time class="dt-published" datetime="{{$item.localtime}}">{{$item.created}}</time> {{/if}} {{if $item.plink}}<a title="{{$item.plink.title}}" href="{{$item.plink.href}}" class="u-url" style="color: #999"><time class="dt-published" datetime="{{$item.localtime}}">{{$item.created}}</time></a>{{else}} <time class="dt-published" datetime="{{$item.localtime}}">{{$item.created}}</time> {{/if}}
{{if $item.owner_self}} {{if $item.owner_self}}
&bullet;
{{include file="sub/delivery_count.tpl" delivery=$item.delivery}} {{include file="sub/delivery_count.tpl" delivery=$item.delivery}}
{{/if}} {{/if}}
</span> </span>