tim/invoiceninja
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Hide blank times on tasks

Browse source
This commit is contained in:
Hillel Coren 2017-12-03 12:14:30 +02:00
parent 60f711ec8b
commit 8d110c2a4b
2 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
resources/lang/en/texts.php
View file

@ -2603,6 +2603,7 @@ $LANG = array(
'please_register' => 'Please register your account',
'processing_request' => 'Processing request',
'mcrypt_warning' => 'Warning: Mcrypt is deprecated, run <code>php artisan ninja:update-key --legacy=true</code> to update your cipher.',
'edit_times' => 'Edit Times',
);

16
resources/views/tasks/edit.blade.php
View file

@ -72,20 +72,22 @@
<label for="simple-time" class="control-label col-lg-4 col-sm-4">
</label>
<div class="col-lg-8 col-sm-8" style="padding-top: 10px">
<p>{{ $task->getStartTime() }} -
@if (Auth::user()->account->timezone_id)
{{ $timezone }}
@else
{!! link_to('/settings/localization?focus=timezone_id', $timezone, ['target' => '_blank']) !!}
@if ($task->getStartTime())
<p>{{ $task->getStartTime() }} -
@if (Auth::user()->account->timezone_id)
{{ $timezone }}
@else
{!! link_to('/settings/localization?focus=timezone_id', $timezone, ['target' => '_blank']) !!}
@endif
<p/>
@endif
<p/>
@if ($task->hasPreviousDuration())
{{ trans('texts.duration') . ': ' . Utils::formatTime($task->getDuration()) }}<br/>
@endif
@if (!$task->is_running)
<p>{!! Button::primary(trans('texts.edit_details'))->withAttributes(['onclick'=>'showTimeDetails()'])->small() !!}</p>
<p>{!! Button::primary(trans('texts.edit_times'))->withAttributes(['onclick'=>'showTimeDetails()'])->small() !!}</p>
@endif
</div>
</div>