Skip to content

Commit 74c49e8

Browse files
xaviqvxaviqv
committed
Merge branch 'dev-update' into dev
2 parents deafe12 + 4e176aa commit 74c49e8

237 files changed

Lines changed: 7262 additions & 8087 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎src/Controllers/TicketsController.php‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ public function renderTicketTable($collection)
200200
return $field;
201201
}else{
202202
$field = '<div style="margin: 0em 0em 1em 0em;">'.$field.'</div>' . $ticket->content;
203-
if ($ticket->all_attachments_count>0) $field.= "<br />" . $ticket->all_attachments_count . ' <span class="glyphicons glyphicon glyphicon-paperclip tooltip-info attachment" title="'.trans('panichd::lang.table-info-attachments-total', ['num' => $ticket->all_attachments_count]).'"></span>';
203+
if ($ticket->all_attachments_count>0) $field.= "<br />" . $ticket->all_attachments_count . ' <span class="fa fa-paperclip tooltip-info attachment" title="'.trans('panichd::lang.table-info-attachments-total', ['num' => $ticket->all_attachments_count]).'"></span>';
204204

205205
return $field;
206206
}
@@ -209,7 +209,7 @@ public function renderTicketTable($collection)
209209
if (Setting::grab('subject_content_column') == 'no'){
210210
$collection->editColumn('content', function ($ticket) {
211211
$field = $ticket->content;
212-
if ($ticket->all_attachments_count>0) $field.= "<br />" . $ticket->all_attachments_count . ' <span class="glyphicons glyphicon glyphicon-paperclip tooltip-info attachment" title="'.trans('panichd::lang.table-info-attachments-total', ['num' => $ticket->all_attachments_count]).'"></span>';
212+
if ($ticket->all_attachments_count>0) $field.= "<br />" . $ticket->all_attachments_count . ' <span class="fa fa-paperclip tooltip-info attachment" title="'.trans('panichd::lang.table-info-attachments-total', ['num' => $ticket->all_attachments_count]).'"></span>';
213213

214214
return $field;
215215
});
@@ -219,13 +219,13 @@ public function renderTicketTable($collection)
219219
$field=$ticket->intervention;
220220
if ($ticket->intervention!="" and ($ticket->comments_count>0 or $ticket->hidden)) $field.="<br />";
221221

222-
if($ticket->hidden) $field.= '<span class="glyphicon glyphicon-eye-close tooltip-info tickethidden" data-toggle="tooltip" title="'.trans('panichd::lang.ticket-hidden').'" style="margin: 0em 0.5em 0em 0em;"></span>';
222+
if($ticket->hidden) $field.= '<span class="fa fa-eye-slash tooltip-info tickethidden" data-toggle="tooltip" title="'.trans('panichd::lang.ticket-hidden').'" style="margin: 0em 0.5em 0em 0em;"></span>';
223223

224224
if ($ticket->recent_comments_count>0){
225225
$field.=$ticket->recent_comments_count.' ';
226226
}
227227
if ($ticket->comments_count>0){
228-
$field.='<span class="glyphicons glyphicon glyphicon-comment tooltip-info comment" title="'.trans('panichd::lang.table-info-comments-total', ['num'=>$ticket->comments_count]).($ticket->recent_comments_count>0 ? ' '.trans('panichd::lang.table-info-comments-recent', ['num'=>$ticket->recent_comments_count]) : '').'"></span>';
228+
$field.='<span class="fa fa-comment tooltip-info comment" title="'.trans('panichd::lang.table-info-comments-total', ['num'=>$ticket->comments_count]).($ticket->recent_comments_count>0 ? ' '.trans('panichd::lang.table-info-comments-recent', ['num'=>$ticket->recent_comments_count]) : '').'"></span>';
229229
}
230230

231231
return $field;
@@ -266,15 +266,15 @@ public function renderTicketTable($collection)
266266
$text = "";
267267

268268
if ($ticket->agent_name == "" or is_null($ticket->agent)){
269-
$text.= "<span class=\"glyphicon glyphicon-exclamation-sign tooltip-info text-danger\" data-toggle=\"tooltip\" data-placement=\"auto bottom\" title=\"".trans('panichd::lang.deleted-member')."\"></span> ";
269+
$text.= "<span class=\"fa fa-exclamation-circle tooltip-info text-danger\" data-toggle=\"tooltip\" data-placement=\"bottom\" title=\"".trans('panichd::lang.deleted-member')."\"></span> ";
270270
}
271271

272272
if($count>4){
273273
$text.= '<a href="#" class="jquery_agent_change_modal" title="'.trans('panichd::lang.table-change-agent').'"';
274274
}elseif($count==1){
275-
$text.= '<a href="#" class="tooltip-info" title="'.trans('panichd::lang.table-one-agent').'" data-toggle="tooltip" data-placement="auto bottom" ';
275+
$text.= '<a href="#" class="tooltip-info" title="'.trans('panichd::lang.table-one-agent').'" data-toggle="tooltip" data-placement="bottom" ';
276276
}else{
277-
$text.= '<a href="#" class="jquery_popover" data-toggle="popover" data-placement="auto bottom" title="'
277+
$text.= '<a href="#" class="jquery_popover" data-toggle="popover" data-placement="bottom" title="'
278278
.e('<button type="button" class="pull-right" onclick="$(this).closest(\'.popover\').popover(\'hide\');">&times;</button> ')
279279
.trans('panichd::lang.agents').'" data-content="'.e(sprintf($a_cat[$ticket->category_id]['html'],$ticket->id)).'" data-tooltip-title="'.trans('panichd::lang.agents').'" ';
280280
}
@@ -296,7 +296,7 @@ public function renderTicketTable($collection)
296296
$html = '<div>'.$html.'</div><br />'
297297
.'<button type="button" class="btn btn-default btn-sm submit_priority_popover" data-ticket-id="'.$ticket->id.'">'.trans('panichd::lang.btn-change').'</button>';
298298

299-
return '<a href="#Priority" style="color: '.$ticket->color_priority.'" class="jquery_popover" data-toggle="popover" data-placement="auto bottom" title="'
299+
return '<a href="#Priority" style="color: '.$ticket->color_priority.'" class="jquery_popover" data-toggle="popover" data-placement="bottom" title="'
300300
.e('<button type="button" class="pull-right" onclick="$(this).closest(\'.popover\').popover(\'hide\');">&times;</button> ')
301301
.trans('panichd::lang.table-change-priority').'" data-content="'.e($html).'">'.e($ticket->priority).'</a>';
302302
});
@@ -308,8 +308,8 @@ public function renderTicketTable($collection)
308308
$return = str_replace (" ", "&nbsp;", $ticket->owner_name);
309309

310310
if ($ticket->owner_name == "" or is_null($ticket->owner)){
311-
$return = "<span class=\"tooltip-info\" data-toggle=\"tooltip\" data-placement=\"auto bottom\" title=\"".trans('panichd::lang.deleted-member')."\">"
312-
."<span class=\"glyphicon glyphicon-exclamation-sign text-danger\"></span>"
311+
$return = "<span class=\"tooltip-info\" data-toggle=\"tooltip\" data-placement=\"bottom\" title=\"".trans('panichd::lang.deleted-member')."\">"
312+
."<span class=\"fa fa-exclamation-circle text-danger\"></span>"
313313
."&nbsp;" . $return . "</span>";
314314
}
315315

@@ -320,7 +320,7 @@ public function renderTicketTable($collection)
320320
}
321321

322322
if ($ticket->user_id != $ticket->creator_id){
323-
$return .="&nbsp;<span class=\"glyphicon glyphicon-user tooltip-info\" title=\"".trans('panichd::lang.show-ticket-creator').trans('panichd::lang.colon'). ($ticket->creator_name == "" ? trans('panichd::lang.deleted-member') : (is_null($ticket->creator) ? $ticket->creator_name : $ticket->creator->name)) ."\" data-toggle=\"tooltip\" data-placement=\"auto bottom\" style=\"color: #aaa;\"></span>";
323+
$return .="&nbsp;<span class=\"fa fa-user tooltip-info\" title=\"".trans('panichd::lang.show-ticket-creator').trans('panichd::lang.colon'). ($ticket->creator_name == "" ? trans('panichd::lang.deleted-member') : (is_null($ticket->creator) ? $ticket->creator_name : $ticket->creator->name)) ."\" data-toggle=\"tooltip\" data-placement=\"bottom\" style=\"color: #aaa;\"></span>";
324324
}
325325

326326
return $return;

‎src/Helpers/Cdn.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@
1010
*/
1111
class Cdn
1212
{
13-
const CodeMirror = '5.31.0';
14-
const Summernote = '0.8.8';
15-
const FontAwesome = '4.7.0';
13+
const CodeMirror = '5.40.0';
14+
const Summernote = '0.8.10';
15+
const FontAwesome = '5.2.0';
1616

1717
// https://datatables.net/download/
18-
const DataTables = '1.10.16';
19-
const DataTablesResponsive = '2.2.0';
18+
const DataTables = '1.10.18';
19+
const DataTablesResponsive = '2.2.2';
2020
}

‎src/Models/Ticket.php‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -436,7 +436,7 @@ public function getCalendarInfo($question_sign = false, $show = 'field')
436436
$title = trans('panichd::lang.calendar-expired', ['description' => $this->getDateForHumans($date_field, true)]);
437437
}
438438

439-
$icon = "glyphicon-exclamation-sign";
439+
$icon = "fa fa-exclamation-circle";
440440
$color = "text-danger";
441441
}elseif($limit_days_diff > 0 or $limit_days_diff === false){
442442
if ($start_days_diff > 0){
@@ -454,18 +454,18 @@ public function getCalendarInfo($question_sign = false, $show = 'field')
454454
'date1' => $this->getDateForHumans('start_date'),
455455
'date2' => $this->getDateForHumans('limit_date')]);
456456
}
457-
$icon = $start_days_diff == 1 ? "glyphicon-time" : "glyphicon-calendar";
457+
$icon = $start_days_diff == 1 ? "fa fa-clock" : "fa fa-calendar";
458458
$color = "text-info";
459459
}else{
460460
$title = trans('panichd::lang.calendar-active-future', ['description' => $this->getDateForHumans($date_field, true)]);
461-
$icon = "glyphicon-file";
461+
$icon = "fa fa-file";
462462
}
463463

464464
}elseif($limit_days_diff){
465465
// Active with limit
466466
$date_field = 'limit_date';
467467
$title = trans('panichd::lang.calendar-expiration', ['description' => $this->getDateForHumans($date_field, true)]);
468-
$icon = "glyphicon-time";
468+
$icon = "fa fa-clock";
469469
$color = "text-info";
470470
}else{
471471
// Active without limit
@@ -476,7 +476,7 @@ public function getCalendarInfo($question_sign = false, $show = 'field')
476476
$title = trans('panichd::lang.calendar-active', ['description' => $this->getDateForHumans($date_field, true)]);
477477
}
478478

479-
$icon = "glyphicon-file";
479+
$icon = "fa fa-file";
480480
}
481481
}else{
482482
// Due today
@@ -492,7 +492,7 @@ public function getCalendarInfo($question_sign = false, $show = 'field')
492492
]);
493493
}
494494

495-
$icon = "glyphicon-warning-sign";
495+
$icon = "fa fa-exclamation-triangle";
496496
$color = "text-warning";
497497
}
498498

@@ -501,7 +501,7 @@ public function getCalendarInfo($question_sign = false, $show = 'field')
501501
return $title;
502502
}else{
503503
// Full field
504-
return "<span class=\"tooltip-info $color\" title=\"$title\" data-toggle=\"tooltip\" data-placement=\"auto bottom\"><span class=\"glyphicon $icon\"></span> ".$this->getDateForHumans($date_field)." ".($question_sign ? "<span class=\"glyphicon glyphicon-question-sign\"></span>" : "")."</span>";
504+
return "<span class=\"tooltip-info $color\" title=\"$title\" data-toggle=\"tooltip\" data-placement=\"bottom\"><span class=\"$icon\"></span> ".$this->getDateForHumans($date_field)." ".($question_sign ? "<span class=\"fa fa-question-circle\"></span>" : "")."</span>";
505505
}
506506
}
507507

‎src/PanicHDServiceProvider.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ public function boot()
129129
$view->with(compact('n_notices'));
130130
});
131131

132-
view()->composer('panichd::tickets.partials.summernote', function ($view) {
132+
view()->composer(['panichd::tickets.partials.summernote', 'panichd::shared.summernote'], function ($view) {
133133
$editor_locale = Setting::grab('summernote_locale');
134134

135135
if ($editor_locale == 'laravel') {

0 commit comments

Comments
 (0)