Skip to content

Commit 9903ca4

Browse files
LaravelDailyLaravelDaily
committed
Merge pull request #36 from andersondeoliveiramachado/master
Implementation of sweetalert for deletion , roles translation for pt_BR
2 parents f958725 + 5d8d10a commit 9903ca4

File tree

10 files changed

+1088
-75
lines changed

10 files changed

+1088
-75
lines changed

‎src/Public/quickadmin/css/sweetalert.css‎

Lines changed: 932 additions & 0 deletions
Large diffs are not rendered by default.

‎src/Public/quickadmin/js/sweetalert.min.js‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/Templates/view_index‎

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
$FIELDS$
3131
<td>
3232
{!! link_to_route('admin.$ROUTE$.edit', trans('quickadmin::templates.templates-view_index-edit'), array($row->id), array('class' => 'btn btn-xs btn-info')) !!}
33-
{!! Form::open(array('style' => 'display: inline-block;', 'method' => 'DELETE', 'onsubmit' => "return confirm('".trans("quickadmin::templates.templates-view_index-are_you_sure")."');", 'route' => array('admin.$ROUTE$.destroy', $row->id))) !!}
34-
{!! Form::submit(trans('quickadmin::templates.templates-view_index-delete'), array('class' => 'btn btn-xs btn-danger')) !!}
33+
{!! Form::open(array('style' => 'display: inline-block;', 'method' => 'DELETE', 'route' => array('admin.$ROUTE$.destroy', $row->id))) !!}
34+
{!! Form::submit(trans('quickadmin::templates.templates-view_index-delete'), array('class' => 'btn btn-xs btn-danger confirm-delete')) !!}
3535
{!! Form::close() !!}
3636
</td>
3737
</tr>
@@ -60,7 +60,18 @@
6060
<script>
6161
$(document).ready(function () {
6262
$('#delete').click(function () {
63-
if (window.confirm('{{ trans('quickadmin::templates.templates-view_index-are_you_sure') }}')) {
63+
swal({
64+
title: "{{ trans("quickadmin::strings.delete_are_you_sure") }}",
65+
text: "{{ trans("quickadmin::strings.delete_not_able_recover") }}",
66+
type: "warning",
67+
showCancelButton: true,
68+
confirmButtonColor: "#DD6B55",
69+
confirmButtonText: "{{ trans("quickadmin::strings.delete_confirm_button") }}",
70+
cancelButtonText: "{{ trans("quickadmin::strings.delete_cancel_button") }}",
71+
closeOnConfirm: false
72+
},
73+
function (isConfirm) {
74+
if (isConfirm) {
6475
var send = $('#send');
6576
var mass = $('.mass').is(":checked");
6677
if (mass == true) {
@@ -75,7 +86,8 @@
7586
send.val(JSON.stringify(toDelete));
7687
}
7788
$('#massDelete').submit();
78-
}
89+
}
90+
});
7991
});
8092
});
8193
</script>

‎src/Translations/en/strings.php‎

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,19 @@
55
Datatables Internationalisation - Available translations
66
https://www.datatables.net/plug-ins/i18n/
77
*/
8-
'datatable_url_language' => '//cdn.datatables.net/plug-ins/1.10.11/i18n/English.json',
8+
'datatable_url_language' => '//cdn.datatables.net/plug-ins/1.10.11/i18n/English.json',
99

1010
// strings
11-
'yes' => 'Yes',
12-
'no' => 'No',
13-
'optional' => 'Optional',
14-
'required' => 'Required',
15-
'required_unique' => 'Required unique',
16-
'default_unchecked' => 'Default unchecked',
17-
'default_checked' => 'Default checked'
18-
11+
'yes' => 'Yes',
12+
'no' => 'No',
13+
'optional' => 'Optional',
14+
'required' => 'Required',
15+
'required_unique' => 'Required unique',
16+
'default_unchecked' => 'Default unchecked',
17+
'default_checked' => 'Default checked',
18+
'delete_are_you_sure' => 'Are you sure?',
19+
'delete_not_able_recover' => "You will not be able to recover!",
20+
'delete_confirm_button' => 'Yes, delete!',
21+
'delete_cancel_button' => 'Cancel'
22+
1923
];

‎src/Translations/pt_BR/admin.php‎

Lines changed: 77 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,82 @@
11
<?php
22
return [
33

4-
// dashboard
5-
'dashboard-title' => 'Seja Bem vindo ao Painel de Controle do seu projeto',
6-
7-
// partials-header
8-
'partials-header-title' => 'QuickAdmin pt_BR',
9-
10-
// admin-partials-sidebar
11-
'partials-sidebar-menu' => 'Menu',
12-
'partials-sidebar-users' => 'Usuários',
13-
'partials-sidebar-user-actions' => 'Ações dos Usuários',
14-
'partials-sidebar-logout' => 'Desconectar',
15-
16-
// admin-partials-topbar
17-
'partials-topbar-title' => 'QuickAdmin pt_BR',
18-
19-
// users-create
20-
'users-create-create_user' => 'Inclusão de Usuário',
21-
'users-create-name' => 'Nome',
22-
'users-create-name_placeholder' => 'Nome',
23-
'users-create-email' => 'E-mail',
24-
'users-create-email_placeholder' => 'E-mail',
25-
'users-create-password' => 'Senha',
26-
'users-create-password_placeholder' => 'Senha',
27-
'users-create-role' => 'Papel',
28-
'users-create-btncreate' => 'Incluir',
29-
30-
// users-edit
31-
'users-edit-edit_user' => 'Alteração de Usuário',
32-
'users-edit-name' => 'Nome',
33-
'users-edit-name_placeholder' => 'Nome',
34-
'users-edit-email' => 'E-mail',
35-
'users-edit-email_placeholder' => 'E-mail',
36-
'users-edit-password' => 'Senha',
37-
'users-edit-password_placeholder' => 'Senha',
38-
'users-edit-role' => 'Papel',
39-
'users-edit-btnupdate' => 'Alterar',
40-
41-
// users-index
42-
'users-index-add_new' => 'Incluir',
43-
'users-index-users_list' => 'Lista de Usuários',
44-
'users-index-name' => 'Nome',
45-
'users-index-edit' => 'Editar',
46-
'users-index-delete' => 'Excluir',
47-
'users-index-are_you_sure' => 'Tem certeza?',
48-
'users-index-no_entries_found' => 'Nenhum registro encontrado',
49-
50-
// users-controller
51-
'users-controller-successfully_created' => 'Usuário foi criado com êxito!',
52-
'users-controller-successfully_updated' => 'Usuário foi atualizado com sucesso !',
53-
'users-controller-successfully_deleted' => 'Usuário foi excluído com sucesso!',
4+
// dashboard
5+
'dashboard-title' => 'Seja Bem vindo ao Painel de Controle do seu projeto',
6+
7+
// partials-header
8+
'partials-header-title' => 'QuickAdmin pt_BR',
9+
10+
// admin-partials-sidebar
11+
'partials-sidebar-menu' => 'Menu',
12+
'partials-sidebar-users' => 'Usuários',
13+
'partials-sidebar-roles' => 'Papéis dos Usuários',
14+
'partials-sidebar-user-actions' => 'Ações dos Usuários',
15+
'partials-sidebar-logout' => 'Desconectar',
16+
17+
// admin-partials-topbar
18+
'partials-topbar-title' => 'QuickAdmin pt_BR',
19+
20+
// users-create
21+
'users-create-create_user' => 'Inclusão de Usuário',
22+
'users-create-name' => 'Nome',
23+
'users-create-name_placeholder' => 'Nome',
24+
'users-create-email' => 'E-mail',
25+
'users-create-email_placeholder' => 'E-mail',
26+
'users-create-password' => 'Senha',
27+
'users-create-password_placeholder' => 'Senha',
28+
'users-create-role' => 'Papel',
29+
'users-create-btncreate' => 'Incluir',
30+
31+
// users-edit
32+
'users-edit-edit_user' => 'Alteração de Usuário',
33+
'users-edit-name' => 'Nome',
34+
'users-edit-name_placeholder' => 'Nome',
35+
'users-edit-email' => 'E-mail',
36+
'users-edit-email_placeholder' => 'E-mail',
37+
'users-edit-password' => 'Senha',
38+
'users-edit-password_placeholder' => 'Senha',
39+
'users-edit-role' => 'Papel',
40+
'users-edit-btnupdate' => 'Alterar',
41+
42+
// users-index
43+
'users-index-add_new' => 'Incluir',
44+
'users-index-users_list' => 'Lista de Usuários',
45+
'users-index-name' => 'Nome',
46+
'users-index-edit' => 'Editar',
47+
'users-index-delete' => 'Excluir',
48+
'users-index-are_you_sure' => 'Tem certeza?',
49+
'users-index-no_entries_found' => 'Nenhum registro encontrado',
50+
51+
// users-controller
52+
'users-controller-successfully_created' => 'Usuário foi criado com êxito!',
53+
'users-controller-successfully_updated' => 'Usuário foi atualizado com sucesso !',
54+
'users-controller-successfully_deleted' => 'Usuário foi excluído com sucesso!',
55+
56+
// roles-index
57+
'roles-index-add_new' => 'Incluir',
58+
'roles-index-roles_list' => 'Lista de Papéis',
59+
'roles-index-title' => 'Título',
60+
'roles-index-edit' => 'Editar',
61+
'roles-index-delete' => 'Excluir',
62+
'roles-index-are_you_sure' => 'Tem certeza?',
63+
'roles-index-no_entries_found' => 'Nenhum registro encontrado',
64+
65+
// roles-create
66+
'roles-create-create_role' => 'Inclusão de Papel',
67+
'roles-create-title' => 'Título',
68+
'roles-create-title_placeholder' => 'Título',
69+
'roles-create-btncreate' => 'Incluir',
70+
71+
// roles-edit
72+
'roles-edit-edit_role' => 'Alteração de Papel',
73+
'roles-edit-title' => 'Título',
74+
'roles-edit-title_placeholder' => 'Título',
75+
'roles-edit-btnupdate' => 'Alterar',
76+
77+
// roles-controller
78+
'roles-controller-successfully_created' => 'Papel foi criado com êxito!',
79+
'roles-controller-successfully_updated' => 'Papel foi atualizado com sucesso !',
80+
'roles-controller-successfully_deleted' => 'Papel foi excluído com sucesso!',
5481

5582
];

‎src/Translations/pt_BR/strings.php‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,19 @@
55
Datatables Internationalisation - Available translations
66
https://www.datatables.net/plug-ins/i18n/
77
*/
8-
'datatable_url_language' => '//cdn.datatables.net/plug-ins/1.10.11/i18n/Portuguese-Brasil.json',
8+
'datatable_url_language' => '//cdn.datatables.net/plug-ins/1.10.11/i18n/Portuguese-Brasil.json',
99

1010
// strings
11-
'yes' => 'Sim',
12-
'no' => 'Não',
13-
'optional' => 'Opcional',
14-
'required' => 'Requerido',
15-
'required_unique' => 'Requerido como Único',
16-
'default_unchecked' => 'Desmarcado como padrão',
17-
'default_checked' => 'Marcado como padrão',
11+
'yes' => 'Sim',
12+
'no' => 'Não',
13+
'optional' => 'Opcional',
14+
'required' => 'Requerido',
15+
'required_unique' => 'Requerido como Único',
16+
'default_unchecked' => 'Desmarcado como padrão',
17+
'default_checked' => 'Marcado como padrão',
18+
'delete_are_you_sure' => 'Você tem certeza?',
19+
'delete_not_able_recover' => "Você não será capaz de recuperar o registro!",
20+
'delete_confirm_button' => 'Sim, exclua!',
21+
'delete_cancel_button' => 'Cancelar'
1822

1923
];

‎src/Views/admin/partials/header.blade.php‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@
2727
href="{{ url('quickadmin/css') }}/quickadmin-layout.css"/>
2828
<link rel="stylesheet"
2929
href="{{ url('quickadmin/css') }}/quickadmin-theme-default.css"/>
30+
<link rel="stylesheet"
31+
href="{{ url('quickadmin/css') }}/sweetalert.css"/>
3032
<link rel="stylesheet"
3133
href="https://code.jquery.com/ui/1.11.3/themes/smoothness/jquery-ui.css">
3234
<link rel="stylesheet"

‎src/Views/admin/partials/javascripts.blade.php‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
<script src="//cdn.ckeditor.com/4.5.4/full/ckeditor.js"></script>
77
<script src="{{ url('quickadmin/js') }}/bootstrap.min.js"></script>
88
<script src="{{ url('quickadmin/js') }}/main.js"></script>
9+
<script src="{{ url('quickadmin/js') }}/sweetalert.min.js"></script>
910

1011
<script>
1112
@@ -26,4 +27,34 @@
2627
}
2728
});
2829
30+
function handleDelete(e, stop){
31+
if(stop){
32+
e.preventDefault();
33+
swal({
34+
title: "{!! trans("quickadmin::strings.delete_are_you_sure") !!}",
35+
text: "{!! trans("quickadmin::strings.delete_not_able_recover") !!}",
36+
type: "warning",
37+
showCancelButton: true,
38+
confirmButtonColor: "#DD6B55",
39+
confirmButtonText: "{!! trans("quickadmin::strings.delete_confirm_button") !!}",
40+
cancelButtonText: "{!! trans("quickadmin::strings.delete_cancel_button") !!}",
41+
closeOnConfirm: false
42+
},
43+
function (isConfirm) {
44+
if (isConfirm) {
45+
$('.confirm-delete').trigger('click', {});
46+
}
47+
});
48+
}
49+
};
50+
51+
$(document).ready(function () {
52+
$('.confirm-delete').on('click',function(e, data){
53+
if(!data){
54+
handleDelete(e, 1);
55+
}
56+
});
57+
});
58+
2959
</script>
60+

‎src/Views/admin/roles/index.blade.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
<td>{{ $role->title }}</td>
2525
<td>
2626
{!! link_to_route('roles.edit', trans('quickadmin::admin.roles-index-edit'), [$role->id], ['class' => 'btn btn-xs btn-info']) !!}
27-
{!! Form::open(['style' => 'display: inline-block;', 'method' => 'DELETE', 'onsubmit' => 'return confirm(\'' . trans('quickadmin::admin.roles-index-are_you_sure') . '\');', 'route' => ['roles.destroy', $role->id]]) !!}
28-
{!! Form::submit(trans('quickadmin::admin.roles-index-delete'), ['class' => 'btn btn-xs btn-danger']) !!}
27+
{!! Form::open(['style' => 'display: inline-block;', 'method' => 'DELETE', 'route' => ['roles.destroy', $role->id]]) !!}
28+
{!! Form::submit(trans('quickadmin::admin.roles-index-delete'), ['class' => 'btn btn-xs btn-danger confirm-delete']) !!}
2929
{!! Form::close() !!}
3030
</td>
3131
</tr>

‎src/Views/admin/users/index.blade.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
<td>{{ $user->name }}</td>
2525
<td>
2626
{!! link_to_route('users.edit', trans('quickadmin::admin.users-index-edit'), [$user->id], ['class' => 'btn btn-xs btn-info']) !!}
27-
{!! Form::open(['style' => 'display: inline-block;', 'method' => 'DELETE', 'onsubmit' => 'return confirm(\'' . trans('quickadmin::admin.users-index-are_you_sure') . '\');', 'route' => array('users.destroy', $user->id)]) !!}
28-
{!! Form::submit(trans('quickadmin::admin.users-index-delete'), array('class' => 'btn btn-xs btn-danger')) !!}
27+
{!! Form::open(['style' => 'display: inline-block;', 'method' => 'DELETE', 'route' => array('users.destroy', $user->id)]) !!}
28+
{!! Form::submit(trans('quickadmin::admin.users-index-delete'), array('class' => 'btn btn-xs btn-danger confirm-delete')) !!}
2929
{!! Form::close() !!}
3030
</td>
3131
</tr>

0 commit comments

Comments
 (0)