Bootstrap4 :: Organization module UI updates

This commit is contained in:
Sakthi002
2020-12-29 15:52:27 +05:30
committed by Manish Verma
parent fddad53e60
commit 84aa8f803d
14 changed files with 821 additions and 661 deletions

View File

@@ -1,20 +1,20 @@
<div class="modal fade in" id="myModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="false" style="display: none; padding-right: 15px;background-color: rgba(0, 0, 0, 0.7);">
<div class="modal-dialog" role="document">
<div class="col-md-2"></div>
<div class="col-md-8">
<div class="modal-content">
<div class="modal fade" id="myModal">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close closemodal" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button>
<h4 class="modal-title" id="myModalLabel"></h4>
<button type="button" class="close closemodal" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button>
</div>
<div class="modal-body" id="custom-alert-body" >
</div>
<div class="modal-footer">
<button type="button" class="btn btn-primary pull-left yes" data-dismiss="modal">{{Lang::get('lang.ok')}}</button>
<div class="modal-footer justify-content-between">
<button type="button" class="btn btn-default no">{{Lang::get('lang.cancel')}}</button>
<button type="button" class="btn btn-primary yes" data-dismiss="modal">{{Lang::get('lang.ok')}}</button>
</div>
</div>
</div>
</div>
</div>
@@ -23,8 +23,9 @@
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" id="merge-close" aria-label="Close"><span aria-hidden="true">&times;</span></button>
<h4 class="modal-title">{!! Lang::get('lang.merge-ticket') !!} </h4>
<button type="button" class="close" data-dismiss="modal" id="merge-close" aria-label="Close"><span aria-hidden="true">&times;</span>
</button>
</div><!-- /.modal-header-->
<div class ="modal-body">
<div class="row">
@@ -40,12 +41,12 @@
<div class="col-md-12">
<div id="merge-succ-alert" class="alert alert-success alert-dismissable" style="display:none;" >
<!--<button id="dismiss-merge" type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button>-->
<h4><i class="icon fa fa-check"></i>{!! Lang::get('lang.alert') !!}!</h4>
<h4><i class="icon fas fa-check"></i>{!! Lang::get('lang.alert') !!}!</h4>
<div id="message-merge-succ"></div>
</div>
<div id="merge-err-alert" class="alert alert-danger alert-dismissable" style="display:none;">
<!--<button id="dismiss-merge2" type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button>-->
<h4><i class="icon fa fa-ban"></i>{!! Lang::get('lang.alert') !!}!</h4>
<h4><i class="icon fas fa-ban"></i>{!! Lang::get('lang.alert') !!}!</h4>
<div id="message-merge-err"></div>
</div>
</div>
@@ -73,9 +74,9 @@
</div><!-- mereg-body-form -->
</div><!-- merge-body -->
</div><!-- /.modal-body -->
<div class="modal-footer">
<button type="button" class="btn btn-default pull-left" data-dismiss="modal" id="dismis2">{!! Lang::get('lang.close') !!}</button>
<input type="submit" id="merge-btn" class="btn btn-primary pull-right" value="{!! Lang::get('lang.merge') !!}"></input>
<div class="modal-footer justify-content-between">
<button type="button" class="btn btn-default" data-dismiss="modal" id="dismis2">{!! Lang::get('lang.close') !!}</button>
<input type="submit" id="merge-btn" class="btn btn-primary" value="{!! Lang::get('lang.merge') !!}"></input>
{!! Form::close() !!}
</div><!-- /.modal-footer -->
</div><!-- /.modal-content -->
@@ -86,8 +87,9 @@
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" id="assign-close" aria-label="Close"><span aria-hidden="true">&times;</span></button>
<h4 class="modal-title">{!! Lang::get('lang.assign-ticket') !!} </h4>
<button type="button" class="close" data-dismiss="modal" id="assign-close" aria-label="Close"><span aria-hidden="true">&times;</span>
</button>
</div><!-- /.modal-header-->
<div class ="modal-body">
<div class="row">
@@ -127,9 +129,9 @@
</div>
</div><!-- mereg-body-form -->
</div><!-- merge-body -->
<div class="modal-footer">
<button type="button" class="btn btn-default pull-left" data-dismiss="modal" id="dismis2">{!! Lang::get('lang.close') !!}</button>
<input type="submit" id="merge-btn" class="btn btn-primary pull-right" value="{!! Lang::get('lang.assign') !!}"></input>
<div class="modal-footer justify-content-between">
<button type="button" class="btn btn-default" data-dismiss="modal" id="dismis2">{!! Lang::get('lang.close') !!}</button>
<input type="submit" id="merge-btn" class="btn btn-primary" value="{!! Lang::get('lang.assign') !!}"></input>
{!! Form::close() !!}
</div><!-- /.modal-footer -->
</div><!-- /.modal-content -->

View File

@@ -12,11 +12,11 @@ var filterClick = 0;
if (clicks) {
//Uncheck all checkboxes
$(".mailbox-messages input[type='checkbox']").iCheck("uncheck");
$(".fa", this).removeClass("fa-check-square-o").addClass('fa-square-o');
$(".far", this).removeClass("fa-check-square").addClass('fa-square');
} else {
//Check all checkboxes
$(".mailbox-messages input[type='checkbox']").iCheck("check");
$(".fa", this).removeClass("fa-square-o").addClass('fa-check-square-o');
$(".far", this).removeClass("fa-square").addClass('fa-check-square');
}
$(this).data("clicks", !clicks);
});
@@ -52,18 +52,22 @@ var filterClick = 0;
$(".closemodal, .no").click(function () {
$("#myModal").css("display", "none");
$('#myModal').modal('toggle');
});
$(".closemodal, .no").click(function () {
$("#myModal").css("display", "none");
$('#myModal').modal('toggle');
});
$('.yes').click(function () {
var values = getValues();
if (values == "") {
$("#myModal").css("display", "none");
$('#myModal').modal('toggle');
} else {
$("#myModal").css("display", "none");
$('#myModal').modal('toggle');
if (c_status != 'hard-delete') {
var url = '{{url("select_all")}}/';
$.ajax({
@@ -77,6 +81,8 @@ var filterClick = 0;
beforeSend: function() {
$('.loader1').css('display','block');
$('.loader').css('display','block');
$('#refresh').css('display','none');
$('#loader1').css('display','block');
$('#d1').prop('disabled', true);
$("#hidespin").hide();
$("#spin").show();
@@ -86,6 +92,8 @@ var filterClick = 0;
success: function(response) {
$('.loader1').css('display','none');
$('.loader').css('display','none');
$('#refresh').css('display','block');
$('#loader1').css('display','none');
$('#d1').prop('disabled', false);
$("#hide2").show();
$("#show2").hide();
@@ -146,6 +154,7 @@ var filterClick = 0;
}
$('#custom-alert-body').html(msg);
$("#myModal").css("display", "block");
$('#myModal').modal('toggle');
}
$('#modalpopup').on('submit', function(e){