Skip to content
This repository has been archived by the owner on Sep 28, 2021. It is now read-only.

Display warning expiry on player interface. Fixes ftbastler#62 #95

Merged
merged 1 commit into from
Dec 8, 2018
Merged

Display warning expiry on player interface. Fixes ftbastler#62 #95

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 17 additions & 2 deletions application/resources/views/partials/timelineItem.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
@else
{{ ucfirst(trans('app.expires')) }} {{ $item->expires->diffForHumans() }}.
<br /><br />

<div class="progress">
<div class="progress-bar" role="progressbar" aria-valuenow="{{ timePasedToPercent($item->expires, $item->created) }}" aria-valuemin="0" aria-valuemax="100" style="width: {{ timePasedToPercent($item->expires, $item->created) }}%;">
{{ timePasedToPercent($item->expires, $item->created) }}%
Expand Down Expand Up @@ -214,7 +214,22 @@
</p>
</div>
<div class="timeline-body">
<pre>{{ $item->reason }}</pre>
@if($item->reason)
{{ ucfirst(trans('app.reason')) }}: {{ $item->reason }}
@endif
<br />
@if($item->expires->timestamp == 0)
{{ trans('app.noExpire') }}
@else
{{ ucfirst(trans('app.expires')) }} {{ $item->expires->diffForHumans() }}.
<br /><br />

<div class="progress">
<div class="progress-bar" role="progressbar" aria-valuenow="{{ timePasedToPercent($item->expires, $item->created) }}" aria-valuemin="0" aria-valuemax="100" style="width: {{ timePasedToPercent($item->expires, $item->created) }}%;">
{{ timePasedToPercent($item->expires, $item->created) }}%
</div>
</div>
@endif
@if(isset($admin) && $admin)
<hr />
<a href="{{ url('/admin/warnings/'.$item->serverId.'/'.$item->id) }}" class="btn btn-default"><i class="fa fa-edit"></i></a>
Expand Down