Skip to content

Commit 055e937

Browse files
committed
Updated obsolete icons in FA 5.2
1 parent 2269bf1 commit 055e937

9 files changed

Lines changed: 15 additions & 15 deletions

File tree

src/Helpers/Cdn.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ class Cdn
1212
{
1313
const CodeMirror = '5.31.0';
1414
const Summernote = '0.8.10';
15-
const FontAwesome = '4.7.0';
15+
const FontAwesome = '5.2.0';
1616

1717
// https://datatables.net/download/
1818
const DataTables = '1.10.16';

src/Models/Ticket.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -455,7 +455,7 @@ public function getCalendarInfo($question_sign = false, $show = 'field')
455455
'date1' => $this->getDateForHumans('start_date'),
456456
'date2' => $this->getDateForHumans('limit_date')]);
457457
}
458-
$icon = $start_days_diff == 1 ? "fa fa-clock-o" : "fa fa-calendar";
458+
$icon = $start_days_diff == 1 ? "fa fa-clock" : "fa fa-calendar";
459459
$color = "text-info";
460460
}else{
461461
$title = trans('panichd::lang.calendar-active-future', ['description' => $this->getDateForHumans($date_field, true)]);
@@ -466,7 +466,7 @@ public function getCalendarInfo($question_sign = false, $show = 'field')
466466
// Active with limit
467467
$date_field = 'limit_date';
468468
$title = trans('panichd::lang.calendar-expiration', ['description' => $this->getDateForHumans($date_field, true)]);
469-
$icon = "fa fa-clock-o";
469+
$icon = "fa fa-clock";
470470
$color = "text-info";
471471
}else{
472472
// Active without limit

src/Views/admin/category/form.blade.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
<div class="btn-group check_parent unchecked">
6666
<a href="#" role="button" id="reason_{{$i}}" class="btn btn-light btn-default check_info" aria-label="{{ trans('panichd::admin.category-delete-reason') }}" title="{{ trans('panichd::admin.btn-edit') }}" data-toggle="modal" data-target="#reason-edit-modal" data-text="{{ $reason->text }}" data-reason_status_id="{{ $reason->status_id }}" data-i="{{$i}}"><span class="reason_text">{{ $reason->text }}</span> <span class="fa fa-arrow-right" style="color: #bbb"></span> <span class="reason_status">{{ $reason->status->name }}</span></a>
6767

68-
<a href="#" role="button" id="jquery_reason_{{$i}}" class="btn btn-light btn-default check_button" data-delete_id="jquery_delete_reason_{{$i}}" title="{{ trans('panichd::admin.category-delete-reason') }}" aria-label="{{ trans('panichd::admin.category-delete-reason') }}"><span class="fa fa-remove" aria-hidden="true"></span><span class="fa fa-check" aria-hidden="true" style="display: none"></span></a>
68+
<a href="#" role="button" id="jquery_reason_{{$i}}" class="btn btn-light btn-default check_button" data-delete_id="jquery_delete_reason_{{$i}}" title="{{ trans('panichd::admin.category-delete-reason') }}" aria-label="{{ trans('panichd::admin.category-delete-reason') }}"><span class="fa fa-times" aria-hidden="true"></span><span class="fa fa-check" aria-hidden="true" style="display: none"></span></a>
6969
</div>
7070

7171
<input type="hidden" id="jquery_delete_reason_{{$i}}" name="jquery_delete_reason_{{$i}}" value="{{$reason->id}}" disabled="disabled">
@@ -85,7 +85,7 @@
8585
<?php $i=1;?>
8686
<a href="#" role="button" id="reason_tempnum" class="btn btn-light btn-default check_info" aria-label="{{ trans('panichd::admin.category-delete-reason') }}" title="{{ trans('panichd::admin.btn-edit') }}" data-toggle="modal" data-target="#reason-edit-modal" data-text="button text" data-i="i"><span class="reason_text">reason text</span> <span class="fa fa-arrow-right" style="color: #bbb"></span> <span class="reason_status">reason status name</span></a>
8787

88-
<a href="#" role="button" id="jquery_reason_{{$i}}" class="btn btn-light btn-default check_button" data-delete_id="jquery_delete_reason_{{$i}}" title="{{ trans('panichd::admin.category-delete-reason') }}" aria-label="{{ trans('panichd::admin.category-delete-reason') }}"><span class="fa fa-remove" aria-hidden="true"></span><span class="fa fa-check" aria-hidden="true" style="display: none"></span></a>
88+
<a href="#" role="button" id="jquery_reason_{{$i}}" class="btn btn-light btn-default check_button" data-delete_id="jquery_delete_reason_{{$i}}" title="{{ trans('panichd::admin.category-delete-reason') }}" aria-label="{{ trans('panichd::admin.category-delete-reason') }}"><span class="fa fa-times" aria-hidden="true"></span><span class="fa fa-check" aria-hidden="true" style="display: none"></span></a>
8989
</div>
9090

9191
<input type="hidden" id="jquery_delete_reason_tempnum" name="jquery_delete_reason_tempnum" value="tempnum" disabled="disabled">
@@ -112,7 +112,7 @@
112112
<div id="tag-panel" class="grouped_check_list deletion_list no-border coloured-list pull-left">
113113
@foreach ($category->tags as $i=>$tag)
114114
<div class="btn-group check_parent unchecked">
115-
<a href="#" role="button" id="jquery_tag_check_{{$i}}" class="btn btn-light check_button" data-delete_id="jquery_delete_tag_{{$i}}" title="Eliminar etiqueta {{$tag->name}}" aria-label="Eliminar etiqueta {{$tag->name}}"><span class="fa fa-remove" aria-hidden="true"></span><span class="fa fa-check" aria-hidden="true" style="display: none"></span></a>
115+
<a href="#" role="button" id="jquery_tag_check_{{$i}}" class="btn btn-light check_button" data-delete_id="jquery_delete_tag_{{$i}}" title="Eliminar etiqueta {{$tag->name}}" aria-label="Eliminar etiqueta {{$tag->name}}"><span class="fa fa-times" aria-hidden="true"></span><span class="fa fa-check" aria-hidden="true" style="display: none"></span></a>
116116
<a href="#" role="button" id="tag_text_{{$i}}" class="btn btn-light btn-tag check_info" aria-label="Etiqueta {{$tag->name}}" title="Etiqueta '{{$tag->name}}' conté {{$tag->tickets_count}} tiquets relacionats" data-toggle="modal" data-target="#tag-edit-modal" data-tag_name="{{$tag->name}}" data-i="{{$i}}" style="color: {{$tag->text_color}}; background: {{$tag->bg_color}}"><span class="name">{{$tag->name}}</span> ({{$tag->tickets_count}})</a>
117117

118118
</div>

src/Views/shared/attach_files_script.blade.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
5151
// Block button
5252
+'<div class="media-right media-middle">'
53-
+'<a href="#" class="check_button" data-delete_id="delete_new_attachment_check_'+num+'"><span class="media-object pull-right fa fa-remove" aria-hidden="true"></span><span class="media-object pull-right fa fa-check" aria-hidden="true" style="display: none"></span></a>'
53+
+'<a href="#" class="check_button" data-delete_id="delete_new_attachment_check_'+num+'"><span class="media-object pull-right fa fa-times" aria-hidden="true"></span><span class="media-object pull-right fa fa-check" aria-hidden="true" style="display: none"></span></a>'
5454
+'<input type="checkbox" id="delete_new_attachment_check_'+num+'" name="block_file_names[]" value="'+file.name+'" checked="checked" style="display: none" disabled="disabled"></div>'
5555
+'</div></div></div>'
5656
+'<div class="jquery_error_text"></div></div>';

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ class="{{ $mime }}"
7979
</div>
8080
@if (isset($template) && $template == "createedit")
8181
<div class="media-right media-middle">
82-
<a href="#" class="check_button" data-delete_id="delete_attached_check_{{ $loop->index }}"><span class="media-object pull-right fa fa-remove" aria-hidden="true"></span><span class="media-object pull-right fa fa-check" aria-hidden="true" style="display: none"></span></a>
82+
<a href="#" class="check_button" data-delete_id="delete_attached_check_{{ $loop->index }}"><span class="media-object pull-right fa fa-times" aria-hidden="true"></span><span class="media-object pull-right fa fa-check" aria-hidden="true" style="display: none"></span></a>
8383
<input type="checkbox" id="delete_attached_check_{{ $loop->index }}" name="delete_files[]" value="{{ $attachment->id }}" checked="checked" style="display: none" disabled="disabled">
8484
</div>
8585
@endif

src/Views/tickets/partials/filter_calendar.blade.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
],
1717
'tomorrow' => [
1818
'text_class' => 'text-info',
19-
'icon' => 'fa fa-clock-o',
19+
'icon' => 'fa fa-clock',
2020
'badge_class' => 'text-white bg-info'
2121
]
2222
];

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<span class="tooltip-info" data-toggle="tooltip" data-placement="top" title="{{ trans('panichd::lang.updated-date', [
1919
'date' => \Carbon\Carbon::parse($ticket->updated_at)->format(trans('panichd::lang.datetime-format'))
2020
]) }}" style="display: inline-block; color: #aaa; cursor: help">
21-
<span class="fa fa-pencil"></span> {{ $ticket->updated_at->diffForHumans() }}
21+
<span class="fa fa-pencil-alt"></span> {{ $ticket->updated_at->diffForHumans() }}
2222
</span>
2323
@endif
2424
<span class="tooltip-info" data-toggle="tooltip" data-placement="top" title="{{ trans('panichd::lang.creation-date', [

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
66
switch ($comment->type){
77
case 'note':
8-
$icon_class = "fa fa-pencil text-info";
8+
$icon_class = "fa fa-pencil-alt text-info";
99
$comment_header = trans('panichd::lang.comment-note-from-agent', ['agent' => $comment->owner->name]);
1010
break;
1111
case 'complete': // Simple complete box
@@ -48,7 +48,7 @@
4848
<div class="row"><div class="col-xs-12"><div style="margin: 0em 0em 1em 0em; padding: 0px 15px;">
4949
<span class="{{ $icon_class }}" aria-hidden="true" style="margin: 0em 0.5em 0em 0em;"></span>{!! $comment_header !!}
5050
@if ($comment->created_at!=$comment->updated_at)
51-
<span class="fa fa-pencil" aria-hidden="true" style="color: gray"></span>
51+
<span class="fa fa-pencil-alt" aria-hidden="true" style="color: gray"></span>
5252
@endif
5353
{!! $comment->updated_at->diffForHumans() !!}
5454
</div></div></div>
@@ -61,12 +61,12 @@
6161
'date' => \Carbon\Carbon::parse($comment->created_at)->format(trans('panichd::lang.datetime-format'))
6262
]) }}">
6363
@if ($comment->created_at!=$comment->updated_at)
64-
<span class="fa fa-pencil" aria-hidden="true" style="color: gray"></span>
64+
<span class="fa fa-pencil-alt" aria-hidden="true" style="color: gray"></span>
6565
@endif
6666
{!! $comment->updated_at->diffForHumans() !!}
6767
@if ($u->currentLevel() > 1 && $u->canManageTicket($ticket->id) and $comment->type=='note')
6868
<button type="button" class="btn btn-light btn-sm comment_deleteit" data-toggle="modal" data-target="#modal-comment-delete" data-id="{{$comment->id}}" data-text="{{$comment->user->name}}" title="{{ trans('panichd::lang.show-ticket-delete-comment') }}">
69-
<span class="fa fa-remove" aria-label="{{ trans('panichd::lang.btn-delete') }}" style="color: gray"></span></button>
69+
<span class="fa fa-times" aria-label="{{ trans('panichd::lang.btn-delete') }}" style="color: gray"></span></button>
7070
@endif
7171
</span>
7272
</h6>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<div id="comment-type-buttons" class="form-group">
2424
{!! CollectiveForm::label('type', trans('panichd::lang.show-ticket-add-comment-type') . trans('panichd::lang.colon'), ['class' => 'col-lg-2 col-form-label']) !!}
2525
<div class="col-lg-10">
26-
<button type="button" class="btn btn-light btn-info btn-sm response_type" id="popup_comment_btn_note" data-type="note" data-active-class="btn-info"><span aria-hidden="true" class="fa fa-pencil"></span> {{ trans('panichd::lang.show-ticket-add-comment-note') }}</button>&nbsp;
26+
<button type="button" class="btn btn-light btn-info btn-sm response_type" id="popup_comment_btn_note" data-type="note" data-active-class="btn-info"><span aria-hidden="true" class="fa fa-pencil-alt"></span> {{ trans('panichd::lang.show-ticket-add-comment-note') }}</button>&nbsp;
2727
<button type="button" class="btn btn-light btn-sm response_type" id="popup_comment_btn_reply" data-type="reply"data-active-class="btn-warning"><span aria-hidden="true" class="fa fa-envelope"></span> {{ trans('panichd::lang.show-ticket-add-comment-reply') }}</button>
2828
{!! CollectiveForm::hidden('response_type', 'note',['id'=>'response_type'] ) !!}
2929
</div>

0 commit comments

Comments
 (0)