Skip to content

Commit e13ef44

Browse files
xaviqvxaviqv
committed
Improved new comment form appearance
1 parent 950f0aa commit e13ef44

2 files changed

Lines changed: 31 additions & 20 deletions

File tree

‎src/Views/tickets/partials/comments/modal_edit.blade.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<div class="modal fade jquery_panel_hightlight comment-modal" id="comment-modal-edit-{{$comment->id}}" tabindex="-1" role="dialog" aria-labelledby="comment-modal-edit-{{$comment->id}}-Label">
2-
<div class="modal-dialog model-lg" role="document">
2+
<div class="modal-dialog modal-lg" role="document">
33
<div class="modal-content">
44
<div class="modal-header">
55
<h4 class="modal-title">{{ trans('panichd::lang.edit-internal-note-title') }}</h4>

‎src/Views/tickets/partials/comments/modal_new.blade.php‎

Lines changed: 30 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<div class="modal fade comment-modal" id="modal-comment-new" tabindex="-1" role="dialog" aria-labelledby="modal-comment-new-Label">
2-
<div class="modal-dialog model-lg" role="document">
2+
<div class="modal-dialog modal-lg" role="document">
33
<div class="modal-content">
44
<div class="modal-header">
55
<h4 class="modal-title" id="modal-comment-new-Label">{{ trans('panichd::lang.show-ticket-add-comment') }}</h4>
@@ -23,8 +23,8 @@
2323
<div id="comment-type-buttons" class="form-group row">
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 bg-info text-white btn-sm response_type" id="popup_comment_btn_note" data-type="note" data-active-class="bg-info text-white"><span aria-hidden="true" class="fa fa-pencil-alt"></span> {{ trans('panichd::lang.show-ticket-add-comment-note') }}</button>&nbsp;
27-
<button type="button" class="btn btn-light btn-sm response_type" id="popup_comment_btn_reply" data-type="reply"data-active-class="bg-warning text-white"><span aria-hidden="true" class="fa fa-envelope"></span> {{ trans('panichd::lang.show-ticket-add-comment-reply') }}</button>
26+
<button type="button" class="btn btn-light bg-info text-white btn-sm response_type" id="popup_comment_btn_note" data-type="note" data-active-class="bg-info text-white"><span aria-hidden="true" class="fas fa-pencil-alt"></span> {{ trans('panichd::lang.show-ticket-add-comment-note') }}</button>&nbsp;
27+
<button type="button" class="btn btn-light btn-sm response_type" id="popup_comment_btn_reply" data-type="reply"data-active-class="bg-info text-white"><span aria-hidden="true" class="fas fa-comment"></span> {{ trans('panichd::lang.show-ticket-add-comment-reply') }}</button>
2828
{!! CollectiveForm::hidden('response_type', 'note',['id'=>'response_type'] ) !!}
2929
</div>
3030
</div>
@@ -51,23 +51,34 @@
5151
</div>
5252
@endif
5353
@if ($u->currentLevel() > 1)
54-
<div class="form-group row">
55-
<div class="col-lg-12" style="display: none;">
56-
<label><input type="checkbox" id="add_in_user_notification_text" name="add_in_user_notification_text" value="yes" disabled> {{ trans('panichd::lang.show-ticket-add-com-check-email-text') }}</label>
57-
</div>
54+
<div class="form-row">
55+
<div class="form-check" style="display: none;">
56+
<label><input type="checkbox" id="add_in_user_notification_text" name="add_in_user_notification_text" value="yes" disabled> {{ trans('panichd::lang.show-ticket-add-com-check-email-text') }}</label>
57+
</div>
58+
</div>
5859

59-
@if ($u->canManageTicket($ticket->id))
60-
<div class="col-lg-12" style="display: none;">
61-
<label><input type="checkbox" id="add_to_intervention" name="add_to_intervention" value="yes" disabled> {{ trans('panichd::lang.show-ticket-add-com-check-intervention') }}</label>
62-
</div>
63-
@if ($u->canCloseTicket($ticket->id) && !$ticket->isComplete())
64-
<div class="col-lg-12">
65-
<label><input type="checkbox" name="complete_ticket" value="yes"> {{ trans('panichd::lang.show-ticket-add-com-check-resolve') . trans('panichd::lang.colon')}}</label>
66-
&nbsp;{!! CollectiveForm::select('status_id', $status_lists, $setting->grab('default_close_status_id'), []) !!}
67-
</div>
68-
@endif
69-
@endif
70-
</div>
60+
@if ($u->canManageTicket($ticket->id))
61+
<div class="form-row">
62+
<div class="form-check" style="display: none;">
63+
<label><input type="checkbox" id="add_to_intervention" name="add_to_intervention" value="yes" disabled> {{ trans('panichd::lang.show-ticket-add-com-check-intervention') }}</label>
64+
</div>
65+
</div>
66+
@endif
67+
68+
69+
@if ($u->canManageTicket($ticket->id) && $u->canCloseTicket($ticket->id) && !$ticket->isComplete())
70+
<div class="form-row align-items-center">
71+
<div class="form-check">
72+
<label class="mb-0"><input type="checkbox" class="" name="complete_ticket" value="yes"> {{ trans('panichd::lang.show-ticket-add-com-check-resolve') . trans('panichd::lang.colon')}}</label>
73+
&nbsp;
74+
</div>
75+
<div class="form-group col-auto mb-0">
76+
{!! CollectiveForm::select('status_id', $status_lists, $setting->grab('default_close_status_id'), [
77+
'class' => 'form-control'
78+
]) !!}
79+
</div>
80+
</div>
81+
@endif
7182
@endif
7283

7384
<div class="text-right col-md-12">

0 commit comments

Comments
 (0)