Skip to content

Commit 512d9bf

Browse files
xaviqvxaviqv
committed
Ticket card visual improvements
1 parent 790ce5d commit 512d9bf

1 file changed

Lines changed: 47 additions & 56 deletions

File tree

‎src/Views/tickets/show/body.blade.php‎

Lines changed: 47 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
11
<div class="card">
22
<div id="ticket-body" class="card-body">
3-
<div class="row" style="margin-bottom: 0.2em;">
4-
<div class="col-sm-8 col-lg-7">
5-
<h2 style="margin: 0em 0em 0.5em 0em;">
6-
@if ($ticket->completed_at)
7-
<span class="text-success"><span class="fa fa-check-circle" title="tiquet completat" style="cursor: help"></span> {{ $ticket->subject }}</span>
8-
@else
9-
<span class="text-warning"><span class="fa fa-file" title="tiquet obert" style="cursor: help"></span> {{ $ticket->subject }}</span>
10-
@endif
11-
</h2>
12-
</div>
13-
<div class="col-sm-4 col-lg-5 text-right">
3+
<div class="d-lg-flex mb-2">
4+
<h2 class="mr-auto">
5+
@if ($ticket->completed_at)
6+
<span class="text-success"><span class="fa fa-check-circle" title="tiquet completat" style="cursor: help"></span> {{ $ticket->subject }}</span>
7+
@else
8+
<span class="text-warning"><span class="fa fa-file" title="tiquet obert" style="cursor: help"></span> {{ $ticket->subject }}</span>
9+
@endif
10+
</h2>
11+
12+
<div class="text-right">
1413
@if ($u->currentLevel() > 1)
1514
<a href="{{ route($setting->grab('main_route').'.hide', ['value' => $ticket->hidden ? 'false' : 'true', 'ticket'=>$ticket->id]) }}" class="btn btn-light tooltip-info" style="border: none; color: #aaa;" data-toggle="tooltip" data-placement="top" title="{{ trans('panichd::lang.ticket-hidden-button-title') }}">{!! $ticket->hidden ? '<span class="fa fa-eye-slash"></span> '.trans('panichd::lang.ticket-hidden') : '<span class="fa fa-eye"></span> '.trans('panichd::lang.ticket-visible') !!}</a>
1615
@endif
@@ -26,7 +25,7 @@
2625
]) }}" style="display: inline-block; color: #aaa; cursor: help">
2726
<span class="fa fa-certificate"></span> {{ $ticket->created_at->diffForHumans() }}
2827
</span>&nbsp;
29-
28+
3029
@if($u->isAdmin())
3130
@if($setting->grab('delete_modal_type') == 'builtin')
3231
{!! link_to_route(
@@ -76,34 +75,34 @@ class="btn btn-light"
7675
@endif
7776
<br />
7877
@endif
79-
80-
<br /><strong>{{ trans('panichd::lang.owner') }}</strong>{{ trans('panichd::lang.colon') }}
78+
79+
<br /><strong>{{ trans('panichd::lang.owner') }}</strong>{{ trans('panichd::lang.colon') }}
8180
<?php $owner_name = $ticket->owner_name == "" ? trans('panichd::lang.deleted-member') : (is_null($ticket->owner) ? $ticket->owner_name : $ticket->owner->name); ?>
82-
81+
8382
@if ($setting->grab('user_route') != 'disabled')
8483
<a href="{{ route($setting->grab('user_route'), ['id'=> $ticket->user_id]) }}">
8584
@endif
86-
85+
8786
@if (is_null($ticket->owner))
8887
<span class="tooltip-info" data-toggle="tooltip" data-placement="bottom" title="{{ trans('panichd::lang.deleted-member') }}">{!! $owner_name !!}</span>
8988
@elseif ($ticket->owner_email != "")
9089
<span class="tooltip-info" data-toggle="tooltip" data-placement="bottom" title="{{ $ticket->owner_email }}">{!! $ticket->owner_name !!} <span class="fa fa-question-circle"></span></span>
9190
@else
9291
{!! $ticket->owner_name !!}
9392
@endif
94-
93+
9594
@if ($setting->grab('user_route') != 'disabled')
9695
</a>
9796
@endif
98-
97+
9998
@if (is_null($ticket->owner))
10099
<br /><span class="text-danger"><span class="fa fa-exclamation-circle"></span> {{ trans('panichd::lang.ticket-owner-deleted-warning') }}</span>
101100
@endif
102-
101+
103102
@if ($ticket->owner_email == "")
104103
<br /><span class="text-warning"><span class="fa fa-exclamation-triangle"></span> {{ trans('panichd::lang.ticket-owner-no-email-warning') }}</span>
105104
@endif
106-
105+
107106
@if ($setting->grab('departments_feature') && isset($ticket->owner->department))
108107
@if ($ticket->owner->department->ancestor || $ticket->owner->department->is_main())
109108
<br /><strong>{{ trans('panichd::lang.department') }}</strong>{{ trans('panichd::lang.colon') . ($ticket->owner->department->is_main() ? $ticket->owner->department->getName() : $ticket->owner->department->ancestor->getName()) }}
@@ -113,24 +112,24 @@ class="btn btn-light"
113112
@endif
114113
@endif
115114
@endif
116-
115+
117116
<br /><strong>{{ trans('panichd::lang.status') }}</strong>{{ trans('panichd::lang.colon') }}
118117
@if( $ticket->isComplete() && ! $setting->grab('default_close_status_id') )
119118
<span style="color: blue">Complete</span>
120119
@else
121120
<span style="color: {{ $ticket->status->color }}">{{ $ticket->status->name }}</span>
122121
@endif
123-
122+
124123
@php
125124
\Carbon\Carbon::setLocale(config('app.locale'));
126125
@endphp
127-
126+
128127
@if ($u->currentLevel() > 1)
129128
<br /><strong>{{ trans('panichd::lang.priority') }}</strong>{{ trans('panichd::lang.colon') }}
130129
<span style="color: {{ $ticket->priority->color }}">
131130
{{ $ticket->priority->name }}
132131
</span>
133-
132+
134133
<br />
135134
@if ($ticket->isComplete())
136135
<strong>{{ trans('panichd::lang.start-date') }}</strong>{{ trans('panichd::lang.colon') }}{!! $ticket->getDateForHumans('start_date') !!}
@@ -144,17 +143,17 @@ class="btn btn-light"
144143
@else
145144
<strong>{{ trans('panichd::lang.table-calendar') }}</strong>{{ trans('panichd::lang.colon') }}{!! $ticket->getCalendarInfo(true) !!}
146145
@endif
147-
148-
</p><p>
146+
147+
</p><p>
149148
@else
150149
<br />
151150
@endif
152-
151+
153152
<strong>{{ trans('panichd::lang.category') }}</strong>{{ trans('panichd::lang.colon') }}
154153
<span style="color: {{ $ticket->category->color }}">
155154
{{ $ticket->category->name }}
156155
</span>
157-
156+
158157
@if ($u->currentLevel() > 1)
159158
<?php $agent_name = $ticket->agent_name == "" ? trans('panichd::lang.deleted-member') : (is_null($ticket->agent) ? $ticket->agent_name : $ticket->agent->name); ?>
160159
<br /><strong>{{ trans('panichd::lang.responsible') }}</strong>{{ trans('panichd::lang.colon') }}
@@ -164,14 +163,14 @@ class="btn btn-light"
164163
{{ $agent_name }}
165164
@endif
166165
@endif
167-
166+
168167
@if ($ticket->has('tags') && ($u->currentLevel() > 1 || in_array($ticket->user_id, $u->getMyNoticesUsers())) )
169168
<br /><strong>{{ trans('panichd::lang.tags') }}</strong>{{ trans('panichd::lang.colon') }}
170169
@foreach ($ticket->tags as $i=>$tag)
171170
<button class="btn btn-light btn-xs" style="pointer-events: none; border: none; color: {{$tag->text_color}}; background: {{$tag->bg_color}}">{{$tag->name}}</button>
172-
@endforeach
171+
@endforeach
173172
@endif
174-
</p>
173+
</p>
175174
</div>
176175
<div class="col-xl-10 col-lg-9 col-md-8">
177176
<div class="row equal">
@@ -196,55 +195,47 @@ class="btn btn-light"
196195
</div>
197196
</div>
198197
</div>
199-
@endif
198+
@endif
200199
</div>
201-
200+
202201
@if($setting->grab('ticket_attachments_feature') && $ticket->attachments->count() > 0)
203202
<div class="row row-ticket-attachments" style="">
204203
<?php
205204
$images_count = $ticket->attachments()->images()->count();
206205
$notimages_count = $ticket->attachments()->notImages()->count();
207206
?>
208-
207+
209208
@if($images_count > 0)
210209
<div class="{{ $ticket->attachments()->notImages()->count() > 0 ? 'col-sm-6' : 'col-xs-12' }}">
211-
<div class="row">
212-
<div class="col-md-3"><b style="display: block; margin: 0em 0em 0.5em 0em;">{{ trans('panichd::lang.attached-images') }}</b></div>
213-
<div class="col-md-9">
210+
<b style="display: block; margin: 0em 0em 0.5em 0em;">{{ trans('panichd::lang.attached-images') }}</b>
214211
<div id="ticket_attached" class="panel-group grouped_check_list deletion_list attached_list">
215-
216-
@foreach($ticket->attachments()->images()->get() as $attachment)
212+
213+
@foreach($ticket->attachments()->images()->get() as $attachment)
217214
@include('panichd::tickets.partials.attachment_image')
218215
@endforeach
219216
</div>
220217
</div>
221-
</div>
222-
</div>
223218
@endif
224219
@if($notimages_count > 0)
225220
<div class="{{ $ticket->attachments()->images()->count() > 0 ? 'col-sm-6' : 'col-xs-12' }}">
226-
<div class="row">
227-
<div class="col-md-4"><b style="display: block; margin: 0em 0em 0.5em 0em;">{{ trans('panichd::lang.attached-files') }}</b></div>
228-
<div class="col-md-8">
229-
<div id="ticket_attached" class="row panel-group attached_list">
230-
231-
@foreach($ticket->attachments()->notImages()->get() as $attachment)
232-
<div class="{{ $images_count > 0 ? 'col-xs-12' : 'col-lg-3 col-md-4 col-sm-6' }}" style="margin-bottom: {{ $images_count > 0 ? '10px' : '15px' }}">
221+
<b style="display: block; margin: 0em 0em 0.5em 0em;">{{ trans('panichd::lang.attached-files') }}</b>
222+
<div id="ticket_attached" class="panel-group attached_list">
223+
224+
@foreach($ticket->attachments()->notImages()->get() as $attachment)
225+
<div style="margin-bottom: {{ $images_count > 0 ? '10px' : '15px' }}">
233226
@include('panichd::tickets.partials.attachment', ['template'=>'view'])
234227
</div>
235228
@endforeach
236229
</div>
237-
</div>
238-
</div>
239230
</div>
240-
@endif
241-
</div>
231+
@endif
232+
</div>
242233
@endif
243234
</div>
244235
</div>
245-
236+
246237
<div style="margin: 1em 0em 0em 0em;">
247-
@if(! $ticket->completed_at && $close_perm == 'yes')
238+
@if(! $ticket->completed_at && $close_perm == 'yes')
248239
<button type="submit" class="btn btn-light btn-default" data-toggle="modal" data-target="#ticket-complete-modal" data-status_id="{{ $setting->grab('default_close_status_id') }}">{{ trans('panichd::lang.btn-mark-complete') }}</button>
249240
@elseif($ticket->completed_at && $reopen_perm == 'yes')
250241
{!! link_to_route($setting->grab('main_route').'.reopen', trans('panichd::lang.reopen-ticket'), $ticket->id,
@@ -258,7 +249,7 @@ class="btn btn-light"
258249
<div class="visible-xs"><br /></div>
259250
@endif
260251
</div>
261-
252+
262253
{!! CollectiveForm::open([
263254
'method' => 'DELETE',
264255
'route' => [
@@ -270,4 +261,4 @@ class="btn btn-light"
270261
!!}
271262
{!! CollectiveForm::close() !!}
272263
</div>
273-
</div>
264+
</div>

0 commit comments

Comments
 (0)