ilmedova
/
Attendize
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'bilettm' of https://gitlab.com/merdan.m/bilettm into bilettm

This commit is contained in:
merdan 2020-05-15 19:12:59 +05:00
parent 1cf9e55097 30ff401e92
commit 2e98991d49
2 changed files with 63 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
public/assets/stylesheet/custom.css
View File

@ -2409,3 +2409,29 @@ display: block;
#helpSearchForm input::placeholder{
color: #d43d34;
}
.message-one-right:after{
content: ' ';
position: absolute;
width: 0;
height: 0;
left: auto;
right: -15px;
top: 8px;
bottom: auto;
border: 12px solid;
border-color: #e3e3e3 transparent transparent #e3e3e3;
}
.message-one-left:after{
content: ' ';
position: absolute;
width: 0;
height: 0;
right: auto;
left: -15px;
top: 8px;
bottom: auto;
border: 12px solid;
border-color: #d43d34 #d43d34 transparent transparent;
}

57
resources/views/desktop/Pages/HelpDeskTicket.blade.php
View File

@ -10,20 +10,25 @@
</h1>
<div style="height: 4px;width: 100px;background-color: #d43d34;"></div>
</div>
<div>
<form action="{{route('help.show',['code'=>''])}}" method="GET">
{!! Form::text('code', null, array('class'=>'form-control')) !!}}
</form>
</div>
{{--<div>--}}
{{--<form action="{{route('help.show',['code'=>''])}}" method="GET">--}}
{{--{!! Form::text('code', null, array('class'=>'form-control')) !!}}--}}
{{--</form>--}}
{{--</div>--}}
</div>
<div class="row w-100 m-auto" style="margin-top: 20px !important;">
<div class="card w-100">
<div class="card-body">
<div class="row">
<div class="card w-100" style="border: none;">
<div class="card-body" style="height: 400px; overflow-y: scroll; border: 1px solid #eeeeee; border-radius: 5px;">
<div class="row justify-content-end">
<div class="col-lg-8 col-md-8">
<div class="alert alert-info" role="alert">
<p><strong>{{$ticket->owner}} : </strong> <small>{{$ticket->created_at->diffForHumans()}}</small></p>
<p>{{$ticket->text}}</p>
<div>
<p style="width: 120px; float: right;">
<strong class="d-block">{{$ticket->owner}} </strong>
<small class="d-block">{{$ticket->created_at->diffForHumans()}}</small>
</p>
<div style="width: calc(100% - 120px);">
<p class="message-one-right" style="margin-bottom: -8px; position: relative; width: calc(100% - 50px); background-color: #e3e3e3; color: #000000; padding: 10px 30px; border-radius: 5px;">{{$ticket->text}}</p>
</div>
<br>
@if($ticket->attachment)
<span><strong>Attachment:</strong> <a href="{{asset('user_content/'.$entry->attachment)}}">{{$entry->attachment}}</a></span>
@ -32,15 +37,27 @@
</div>
</div>
@foreach($ticket->comments as $comment)
<div class="row">
<div class="@if($comment->user_id)col-lg-offset-4 col-md-offset-4 @endif col-lg-8 col-md-8">
<div class="alert alert-success" role="alert">
<p><strong>{{$comment->name}} : </strong><small>{{$comment->created_at->diffForHumans()}}</small></p>
<div class="row @if($comment->user_id)justify-content-start @else justify-content-end @endif ">
<div class="col-lg-8 col-md-8">
<div>
<p style="width: 120px; @if($comment->user_id) float: left; @else float: right; @endif">
<strong class="d-block">{{$comment->name}} </strong>
<small class="d-block">{{$comment->created_at->diffForHumans()}}</small>
</p>
<p>{{$comment->text}}</p>
<div style="width: calc(100% - 120px); @if($comment->user_id) float: left; @endif">
<p class="@if($comment->user_id) message-one-left @else message-one-right @endif"
style="@if($comment->user_id) background-color: #d43d34; color: #ffffff; @else margin-bottom: -8px; background-color: #e3e3e3; color: #000000; @endif position: relative; width: calc(100% - 50px); padding: 10px 30px; border-radius: 5px;">{{$comment->text}}</p>
</div>
<br>
@if($comment->attachment)
<span><strong>Attachment:</strong> <a href="{{asset('user_content/'.$comment->attachment)}}">{{$comment->attachment}}</a></span>
<span>
<strong style="float: left">Attachment:</strong>
<a href="{{asset('user_content/'.$comment->attachment)}}" target="_blank">
{{--{{$comment->attachment}}--}}
<img src="{{asset('user_content/'.$comment->attachment)}}" style="width: 300px; float: left; clear: left; border: 1px solid #eeeeee; box-shadow: 0px 0px 19px rgba(0,0,0,.3); margin-top: 15px; margin-bottom: 20px">
</a>
</span>
@endif
</div>
</div>
@ -48,7 +65,7 @@
@endforeach
</div>
<div class="card-footer">
<div class="card-footer px-0" style="border: none; background-color: transparent">
<form action="{{route('help.comment',['code' => $ticket->code])}}" method="post" enctype="multipart/form-data">
@csrf
<div class="form-group custom-theme {{ ($errors->has('text')) ? 'has-error' : '' }}">
@ -64,12 +81,12 @@
</div>
<div class="form-group {{ ($errors->has('attachment')) ? 'has-error' : '' }}">
{!! Form::label('attachment', trans("ClientSide.attachment"), array('class'=>'control-label')) !!}
{!! Form::file('attachment') !!}
{!! Form::file('attachment', ['class'=>'form-control', 'style'=>'width: fit-content']) !!}
@if($errors->has('attachment'))
<p class="help-block">{{ $errors->first('attachment') }}</p>
@endif
</div>
{!! Form::submit(trans("ClientSide.reply"), ['class'=>"btn btn-success"]) !!}
{!! Form::submit(trans("ClientSide.reply"), ['class'=>"btn btn-success", 'style'=>'background-color: #d43d34; border: #d43d34; padding: 8px 35px']) !!}
</form>
</div>
</div>