From 34bbf460ee1644a57c5e219280efd8c5ecf7877a Mon Sep 17 00:00:00 2001 From: snipe Date: Wed, 20 Nov 2013 00:56:39 -0500 Subject: [PATCH] Added modal confirm-delete --- app/views/backend/assets/index.blade.php | 15 +++------------ app/views/backend/categories/index.blade.php | 2 +- .../backend/depreciations/index.blade.php | 2 +- app/views/backend/groups/index.blade.php | 2 +- app/views/backend/layouts/default.blade.php | 18 ++++++++++++++++++ app/views/backend/licenses/index.blade.php | 6 +++++- app/views/backend/locations/index.blade.php | 2 +- .../backend/manufacturers/index.blade.php | 2 +- app/views/backend/models/index.blade.php | 11 ++++------- app/views/backend/users/index.blade.php | 3 ++- 10 files changed, 37 insertions(+), 26 deletions(-) diff --git a/app/views/backend/assets/index.blade.php b/app/views/backend/assets/index.blade.php index b33e14b8e2bc..ce63aadb5108 100755 --- a/app/views/backend/assets/index.blade.php +++ b/app/views/backend/assets/index.blade.php @@ -8,8 +8,6 @@ {{-- Page content --}} @section('content') - - + @if ($assets->getTotal() > 10) {{ $assets->links() }} @endif diff --git a/app/views/backend/categories/index.blade.php b/app/views/backend/categories/index.blade.php index 111eaf11106f..a93ab5a5f485 100755 --- a/app/views/backend/categories/index.blade.php +++ b/app/views/backend/categories/index.blade.php @@ -43,7 +43,7 @@ @lang('button.edit') - @lang('button.delete') + @lang('button.delete') @endforeach diff --git a/app/views/backend/depreciations/index.blade.php b/app/views/backend/depreciations/index.blade.php index 6a8d03bf48ed..f4f7cdc8468a 100755 --- a/app/views/backend/depreciations/index.blade.php +++ b/app/views/backend/depreciations/index.blade.php @@ -38,7 +38,7 @@ {{ $depreciation->months }} @lang('admin/depreciations/table.months') @lang('button.edit') - @lang('button.delete') + @lang('button.delete') @endforeach diff --git a/app/views/backend/groups/index.blade.php b/app/views/backend/groups/index.blade.php index 3849090e8037..54316276361f 100755 --- a/app/views/backend/groups/index.blade.php +++ b/app/views/backend/groups/index.blade.php @@ -43,7 +43,7 @@ {{ $group->created_at->diffForHumans() }} @lang('button.edit') - @lang('button.delete') + @lang('button.delete') @endforeach diff --git a/app/views/backend/layouts/default.blade.php b/app/views/backend/layouts/default.blade.php index 8a9179b6020c..c81aecaa4fee 100755 --- a/app/views/backend/layouts/default.blade.php +++ b/app/views/backend/layouts/default.blade.php @@ -296,10 +296,28 @@ // jQuery Knobs $(".knob").knob(); + // confirm delete modal + $('.delete-asset').click(function(evnt) { + var href = $(this).attr('href'); + var message = $(this).attr('data-content'); + var title = $(this).attr('data-title'); + + if (!$('#dataConfirmModal').length) { + $('body').append(''); + } + + $('#dataConfirmModal').find('.modal-body').text(message); + $('#dataConfirmOK').attr('href', href); + $('#dataConfirmModal').modal({show:true}); +}) + }); + + + diff --git a/app/views/backend/licenses/index.blade.php b/app/views/backend/licenses/index.blade.php index 7bb590ef7f6c..49bf776707d0 100755 --- a/app/views/backend/licenses/index.blade.php +++ b/app/views/backend/licenses/index.blade.php @@ -57,7 +57,11 @@ @lang('button.edit') - @lang('button.delete') + @lang('button.delete') + + + + @endforeach diff --git a/app/views/backend/locations/index.blade.php b/app/views/backend/locations/index.blade.php index 4813fb057497..6a43a6c257cf 100755 --- a/app/views/backend/locations/index.blade.php +++ b/app/views/backend/locations/index.blade.php @@ -42,7 +42,7 @@ {{ $location->city }}, {{ $location->state }} {{ $location->country }} @lang('button.edit') - @lang('button.delete') + @lang('button.delete') @endforeach diff --git a/app/views/backend/manufacturers/index.blade.php b/app/views/backend/manufacturers/index.blade.php index 67b00690491f..4da51c70bbfd 100755 --- a/app/views/backend/manufacturers/index.blade.php +++ b/app/views/backend/manufacturers/index.blade.php @@ -36,7 +36,7 @@ {{ $manufacturer->name }} @lang('button.edit') - @lang('button.delete') + @lang('button.delete') @endforeach diff --git a/app/views/backend/models/index.blade.php b/app/views/backend/models/index.blade.php index c75e83546a69..57530306d9f4 100755 --- a/app/views/backend/models/index.blade.php +++ b/app/views/backend/models/index.blade.php @@ -28,24 +28,21 @@ @lang('admin/models/table.title') @lang('admin/models/table.modelnumber') @lang('admin/models/table.numassets') - @lang('admin/models/table.created_at') + @lang('admin/models/table.created_at') @lang('table.actions') @foreach ($models as $model) - {{ $model->name }} - - - - + {{ $model->name }} {{ $model->modelno }} {{ ($model->assets->count()) }} {{ $model->created_at->diffForHumans() }} @lang('button.edit') - @lang('button.delete') + @lang('button.delete') + @endforeach diff --git a/app/views/backend/users/index.blade.php b/app/views/backend/users/index.blade.php index 51dfd0400dab..9f9d6655b7b4 100755 --- a/app/views/backend/users/index.blade.php +++ b/app/views/backend/users/index.blade.php @@ -71,7 +71,8 @@ @else @lang('button.edit') @if (Sentry::getId() !== $user->id) - @lang('button.delete') + @lang('button.delete') + @else @lang('button.delete') @endif