cuongpv/faveo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug-fix-patch

Browse Source 
# not sending diagnostic mail while configuring system mail
# correct due today ticket count in agent panel
# iframe height in client panel ticket pages
# Removed place holder in client profile edit
# reload page while after edit/assign/surrender tickets
This commit is contained in:
Manish Verma
2016-11-29 18:05:23 +05:30
parent cb1402f481
commit e878835ae3
5 changed files with 44 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
resources/views/themes/default1/client/helpdesk/ckeckticket.blade.php
View File

@@ -224,27 +224,10 @@ foreach ($conversations as $conversation) {
<div class="comment-content">
@if($conversation->firstContent()=='yes')
<div class="embed-responsive embed-responsive-16by9">
<iframe id="loader_frame{{$conversation->id}}" class="embed-responsive-item">Body of html email here</iframe>
<script type="text/javascript">
jQuery(document).ready(function () {
jQuery('.embed-responsive-16by9').css('height','auto');
jQuery('.embed-responsive-16by9').css('padding','0');
jQuery('#loader_frame{{$conversation->id}}').css('width','100%');
jQuery('#loader_frame{{$conversation->id}}').css('position','static');
jQuery('#loader_frame{{$conversation->id}}').css('border','none');
var mydiv = jQuery('#loader_frame{{$conversation->id}}').contents().find("body");
var h = mydiv.height();
jQuery('#loader_frame{{$conversation->id}}').css('height', h+20);
setInterval(function(){
h = jQuery('#loader_frame{{$conversation->id}}').height();
if (!!navigator.userAgent.match(/Trident\/7\./)){
jQuery('#loader_frame{{$conversation->id}}').css('height', h);
}else{
jQuery('#loader_frame{{$conversation->id}}').css('height', h);
}
}, 2000);
});
</script>
<iframe id="loader_frame{{$conversation->id}}" class="embed-responsive-item" onload="iframeLoaded()">Body of html email here</iframe>
<script>
$('#loader_frame{{$conversation->id}}')[0].contentDocument.body.innerHTML = '{!!$conversation->purify()!!}';
</script>
</div>
<script>
setTimeout(function(){

10
resources/views/themes/default1/client/helpdesk/profile.blade.php
View File

@@ -64,10 +64,10 @@ class="active"
{!! Form::label('gender',Lang::get('lang.gender')) !!}
<div class="row">
<div class="col-xs-3">
{!! Form::radio('gender','1',true) !!}{{Lang::get('lang.male')}}
{!! Form::radio('gender','1',true) !!} {{Lang::get('lang.male')}}
</div>
<div class="col-xs-3">
{!! Form::radio('gender','0') !!}{{Lang::get('lang.female')}}
{!! Form::radio('gender','0') !!} {{Lang::get('lang.female')}}
</div>
</div>
</div>
@@ -150,21 +150,21 @@ class="active"
<!-- old password -->
<div class="form-group has-feedback {{ $errors->has('old_password') ? 'has-error' : '' }}">
{!! Form::label('old_password',Lang::get('lang.old_password')) !!}<span class="text-red"> *</span>
{!! Form::password('old_password',['placeholder'=>'Password','class' => 'form-control']) !!}
{!! Form::password('old_password',['class' => 'form-control']) !!}
{!! $errors->first('old_password', '<spam class="help-block">:message</spam>') !!}
<span class="glyphicon glyphicon-lock form-control-feedback"></span>
</div>
<!-- new password -->
<div class="form-group has-feedback {{ $errors->has('new_password') ? 'has-error' : '' }}">
{!! Form::label('new_password',Lang::get('lang.new_password')) !!}<span class="text-red"> *</span>
{!! Form::password('new_password',['placeholder'=>'New Password','class' => 'form-control']) !!}
{!! Form::password('new_password',['class' => 'form-control']) !!}
{!! $errors->first('new_password', '<spam class="help-block">:message</spam>') !!}
<span class="glyphicon glyphicon-lock form-control-feedback"></span>
</div>
<!-- cofirm password -->
<div class="form-group has-feedback {{ $errors->has('confirm_password') ? 'has-error' : '' }}">
{!! Form::label('confirm_password',Lang::get('lang.confirm_password')) !!}<span class="text-red"> *</span>
{!! Form::password('confirm_password',['placeholder'=>'Confirm Password','class' => 'form-control']) !!}
{!! Form::password('confirm_password',['class' => 'form-control']) !!}
{!! $errors->first('confirm_password', '<spam class="help-block">:message</spam>') !!}
<span class="glyphicon glyphicon-lock form-control-feedback"></span>
</div>