Skip to content

Commit f4efa18

Browse files
xaviqvxaviqv
committed
Attachment list and card design. Patch also on file type icons
1 parent 07fb53a commit f4efa18

7 files changed

Lines changed: 21 additions & 17 deletions

File tree

‎src/Public/css/panichd.css‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -385,6 +385,10 @@ h1, h2, h3, h4, h5, h6 {
385385
}
386386

387387
/* Ticket attachments */
388+
.attached_list .card {
389+
margin: 0em 0.5em 0.5em 0em;
390+
}
391+
388392
.attached_list .card-body {
389393
padding: 8px;
390394
}

‎src/Views/admin/index.blade.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
<div class="col-md-8">
3535
<div class="card bg-light">
3636
<div class="card-header">
37-
<i class="fa fa-bar-chart-o fa-fw"></i> {{ trans('panichd::admin.index-performance-indicator') }}
37+
<i class="fa fa-chart-bar fa-fw"></i> {{ trans('panichd::admin.index-performance-indicator') }}
3838
<div class="pull-right">
3939
<div class="btn-group">
4040
<button type="button" class="btn btn-light btn-xs dropdown-toggle" data-toggle="dropdown">

‎src/Views/shared/attach_files_script.blade.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@
2121
2222
for(var i=0,file;file=files[i];i++) {
2323
var num = list_i+i;
24-
var html = '<div><div id="attachment_block_'+num+'" class="jquery_attachment_block panel panel-default text-warning check_parent unchecked check_related_bg"><div class="card-body"><div class="media">'
24+
var html = '<div><div id="attachment_block_'+num+'" class="jquery_attachment_block card bg-default text-warning check_parent unchecked check_related_bg"><div class="card-body"><div class="media">'
2525
2626
// Upload icon
27-
+'<div class="media-left"><span class="media-object fa fa-upload" style="font-size: 30px" title="{{ trans('panichd::lang.pending-attachment') }}" style="cursor: help"></span></div>'
27+
+'<div class="media-left mr-3"><span class="media-object fa fa-upload" style="font-size: 30px" title="{{ trans('panichd::lang.pending-attachment') }}" style="cursor: help"></span></div>'
2828
2929
// Filename
3030
+'<div class="media-body check_related_text">'

‎src/Views/tickets/partials/attachment.blade.php‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<div id="attachment_block_{{ $loop->index }}" class="jquery_attachment_block card bg-default text-default check_parent unchecked check_related_bg">
33
<div class="card-body">
44
<div class="media">
5-
<div class="media-left">
5+
<div class="media-left mr-3">
66
<?php
77
$mime = $attachment->getShorthandMime($attachment->mimetype);
88
?>
@@ -23,18 +23,18 @@ class="{{ $mime }}"
2323
@if (\File::exists(storage_path('app'.DIRECTORY_SEPARATOR.'public'.DIRECTORY_SEPARATOR.$setting->grab('thumbnails_path').DIRECTORY_SEPARATOR).basename($attachment->file_path)))
2424
<img width="40px" height="40px" src="{{ URL::to('/').'/storage/'.$setting->grab('thumbnails_path').'/'.basename($attachment->file_path) }}">
2525
@else
26-
<i class="fa fa-file-image-o fa-2x" aria-hidden="true"></i>
26+
<i class="fa fa-file-image fa-2x" aria-hidden="true"></i>
2727
@endif
2828
@elseif ($mime == 'pdf')
29-
<i class="fa fa-file-pdf-o fa-2x" aria-hidden="true"></i>
29+
<i class="fa fa-file-pdf fa-2x" aria-hidden="true"></i>
3030
@elseif ($mime == 'msword')
31-
<i class="fa fa-file-word-o fa-2x" aria-hidden="true"></i>
31+
<i class="fa fa-file-word fa-2x" aria-hidden="true"></i>
3232
@elseif ($mime == 'msexcel')
33-
<i class="fa fa-file-excel-o fa-2x" aria-hidden="true"></i>
33+
<i class="fa fa-file-excel fa-2x" aria-hidden="true"></i>
3434
@elseif ($mime == 'compressed')
35-
<i class="fa fa-file-zip-o fa-2x" aria-hidden="true"></i>
35+
<i class="fa fa-file-archive fa-2x" aria-hidden="true"></i>
3636
@else
37-
<i class="fa fa-file-o fa-2x" aria-hidden="true"></i>
37+
<i class="fa fa-file fa-2x" aria-hidden="true"></i>
3838
@endif
3939
</a>
4040
</div>

‎src/Views/tickets/partials/attachment_image.blade.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
@if (\File::exists(storage_path('app'.DIRECTORY_SEPARATOR.'public'.DIRECTORY_SEPARATOR.$setting->grab('thumbnails_path').DIRECTORY_SEPARATOR).basename($attachment->file_path)))
99
<img src="{{ URL::to('/').'/storage/'.$setting->grab('thumbnails_path').'/'.basename($attachment->file_path) }}">
1010
@else
11-
<i class="fa fa-file-image-o fa-2x" aria-hidden="true"></i>
11+
<i class="fa fa-file-image fa-2x" aria-hidden="true"></i>
1212
@endif
1313
</div>
1414
</div>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<div style="margin-top: 2em;">
1616
<h3 style="margin-top: 0em;">{{ trans('panichd::lang.comments') }}
1717
@if ($u->canCommentTicket($ticket->id))
18-
<button type="button" class="btn btn-light" data-toggle="modal" data-target="#modal-comment-new" data-add-comment="{{ $ticket->hidden ? 'no' : 'yes' }}">{{ $ticket->hidden ? trans('panichd::lang.show-ticket-add-note') : trans('panichd::lang.show-ticket-add-comment') }}</button>
18+
<button type="button" class="btn btn-light btn-default" data-toggle="modal" data-target="#modal-comment-new" data-add-comment="{{ $ticket->hidden ? 'no' : 'yes' }}">{{ $ticket->hidden ? trans('panichd::lang.show-ticket-add-note') : trans('panichd::lang.show-ticket-add-comment') }}</button>
1919
@endif
2020
</h3>
2121
</div>

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -209,8 +209,8 @@ class="btn btn-light"
209209
@if($images_count > 0)
210210
<div class="{{ $ticket->attachments()->notImages()->count() > 0 ? 'col-sm-6' : 'col-xs-12' }}">
211211
<div class="row">
212-
<div class="col-xs-12"><b style="display: block; margin: 0em 0em 0.5em 0em;">{{ trans('panichd::lang.attached-images') }}</b></div>
213-
<div class="col-xs-12">
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">
214214
<div id="ticket_attached" class="panel-group grouped_check_list deletion_list attached_list">
215215

216216
@foreach($ticket->attachments()->images()->get() as $attachment)
@@ -224,8 +224,8 @@ class="btn btn-light"
224224
@if($notimages_count > 0)
225225
<div class="{{ $ticket->attachments()->images()->count() > 0 ? 'col-sm-6' : 'col-xs-12' }}">
226226
<div class="row">
227-
<div class="col-xs-12"><b style="display: block; margin: 0em 0em 0.5em 0em;">{{ trans('panichd::lang.attached-files') }}</b></div>
228-
<div class="col-xs-12">
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">
229229
<div id="ticket_attached" class="row panel-group attached_list">
230230

231231
@foreach($ticket->attachments()->notImages()->get() as $attachment)
@@ -245,7 +245,7 @@ class="btn btn-light"
245245

246246
<div style="margin: 1em 0em 0em 0em;">
247247
@if(! $ticket->completed_at && $close_perm == 'yes')
248-
<button type="submit" class="btn btn-light" data-toggle="modal" data-target="#ticket-complete-modal" data-status_id="{{ $setting->grab('default_close_status_id') }}">{{ trans('panichd::lang.btn-mark-complete') }}</button>
248+
<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>
249249
@elseif($ticket->completed_at && $reopen_perm == 'yes')
250250
{!! link_to_route($setting->grab('main_route').'.reopen', trans('panichd::lang.reopen-ticket'), $ticket->id,
251251
['class' => 'btn btn-light btn-default']) !!}

0 commit comments

Comments
 (0)