From c2ef6cce611966058e0b6f371972ba2ef081df56 Mon Sep 17 00:00:00 2001 From: imnavajas Date: Fri, 11 Aug 2023 18:01:10 +0200 Subject: [PATCH 1/2] Cambiado Swal y referencia propia del CSS --- .../papel/viewPapelImpresionForm.php | 32 +++---------------- .../papel/viewPapelImpresionList.php | 3 +- .../tarifas/acabado/viewTarifaAcabadoList.php | 2 +- 3 files changed, 7 insertions(+), 30 deletions(-) diff --git a/ci4/app/Views/themes/backend/vuexy/form/configuracion/papel/viewPapelImpresionForm.php b/ci4/app/Views/themes/backend/vuexy/form/configuracion/papel/viewPapelImpresionForm.php index 0694fcee..8f63c14e 100644 --- a/ci4/app/Views/themes/backend/vuexy/form/configuracion/papel/viewPapelImpresionForm.php +++ b/ci4/app/Views/themes/backend/vuexy/form/configuracion/papel/viewPapelImpresionForm.php @@ -231,16 +231,9 @@ ] } ); - editor.on( 'initCreate', function () { if ($('#tableOfPapelimpresiontipologias').DataTable().data().count() >= 3){ - Swal.fire({ - title: '', - icon: 'info', - confirmButtonColor: '#3085d6', - confirmButtonText: '', - - }); + popErrorAlert(); } } ); @@ -495,11 +488,7 @@ yeniden(json.); if(json.error){ document.getElementById("check_" + json.data.papel_impresion_id).checked = false; - Swal.fire({ - icon: 'error', - title: '', - text: json.error, - }); + popErrorAlert(json.error); } }); @@ -511,8 +500,7 @@ .submit(); } ); - - // Para los calculos del precio + // Calculos del precio $("#ancho").on('input', function () { updateValue(); }); @@ -546,22 +534,14 @@ $('#precioPliego').val(value2); } - endSection() ?> + section('css') ?> - - "> - -*/ ?> - - + - - endSection() ?> - section('additionalExternalJs') ?> @@ -570,8 +550,6 @@ - - endSection() ?> diff --git a/ci4/app/Views/themes/backend/vuexy/form/configuracion/papel/viewPapelImpresionList.php b/ci4/app/Views/themes/backend/vuexy/form/configuracion/papel/viewPapelImpresionList.php index 4ae5971d..6eeece15 100644 --- a/ci4/app/Views/themes/backend/vuexy/form/configuracion/papel/viewPapelImpresionList.php +++ b/ci4/app/Views/themes/backend/vuexy/form/configuracion/papel/viewPapelImpresionList.php @@ -66,8 +66,7 @@ lengthMenu: [ 5, 10, 25, 50, 75, 100, 250, 500, 1000, 2500 ], pageLength: 10, lengthChange: true, - "dom": 'lfBrtip', // 'lfBrtip', // you can try different layout combinations by uncommenting one or the other - // "dom": '<"top"lf><"clear">rt<"bottom"ipB><"clear">', // remember to comment this line if you uncomment the above + "dom": 'lfBrtip', "buttons": [ 'copy', 'csv', 'excel', 'print', { extend: 'pdfHtml5', diff --git a/ci4/app/Views/themes/backend/vuexy/form/tarifas/acabado/viewTarifaAcabadoList.php b/ci4/app/Views/themes/backend/vuexy/form/tarifas/acabado/viewTarifaAcabadoList.php index 8f9a689f..bb18b419 100644 --- a/ci4/app/Views/themes/backend/vuexy/form/tarifas/acabado/viewTarifaAcabadoList.php +++ b/ci4/app/Views/themes/backend/vuexy/form/tarifas/acabado/viewTarifaAcabadoList.php @@ -115,7 +115,7 @@ theTable.row($(row)).invalidate().draw(); popSuccessAlert(data.msg ?? jqXHR.statusText); }).fail((jqXHR, textStatus, errorThrown) => { - popErrorAlert(jqXHR.responseJSON.messages.error) + popErrorAlert(jqXHR.responseJSON.messages.error); }) } }); From 4a3c054e1bb66f8f415d27d46180fdee3ca6db1e Mon Sep 17 00:00:00 2001 From: imnavajas Date: Mon, 14 Aug 2023 14:52:02 +0200 Subject: [PATCH 2/2] =?UTF-8?q?Cambiados=20CSS=20genericos=20y=20a=C3=B1ad?= =?UTF-8?q?ido=20uno=20especifico=20para=20sobrescribir=20datatables=20por?= =?UTF-8?q?=20defecto?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/themes/backend/vuexy/login/header.php | 2 +- .../backend/vuexy/main/activities_layout.php | 2 +- ci4/app/Views/themes/backend/vuexy/main/all.php | 2 +- .../themes/backend/vuexy/main/defaultlayout.php | 4 +++- .../Views/themes/backend/vuexy/main/demo_view.php | 2 +- .../vuexy/main/general_settings_layout.php | 2 +- .../Views/themes/backend/vuexy/main/header.php | 2 +- .../backend/vuexy/main/presupuestos_layout.php | 2 +- .../themes/vuexy/css/{demo.css => safekat.css} | 2 +- httpdocs/themes/vuexy/css/sk-datatables.css | 15 +++++++++++++++ 10 files changed, 26 insertions(+), 9 deletions(-) rename httpdocs/themes/vuexy/css/{demo.css => safekat.css} (99%) create mode 100644 httpdocs/themes/vuexy/css/sk-datatables.css diff --git a/ci4/app/Views/themes/backend/vuexy/login/header.php b/ci4/app/Views/themes/backend/vuexy/login/header.php index fec3e52d..7b8eb5f5 100644 --- a/ci4/app/Views/themes/backend/vuexy/login/header.php +++ b/ci4/app/Views/themes/backend/vuexy/login/header.php @@ -73,7 +73,7 @@ if (!empty($token) && $tfa == false) { - + diff --git a/ci4/app/Views/themes/backend/vuexy/main/activities_layout.php b/ci4/app/Views/themes/backend/vuexy/main/activities_layout.php index fb37147c..f1925adf 100644 --- a/ci4/app/Views/themes/backend/vuexy/main/activities_layout.php +++ b/ci4/app/Views/themes/backend/vuexy/main/activities_layout.php @@ -77,7 +77,7 @@ if (!empty($token) && $tfa == false) { - + diff --git a/ci4/app/Views/themes/backend/vuexy/main/all.php b/ci4/app/Views/themes/backend/vuexy/main/all.php index c7127724..bdc0b785 100644 --- a/ci4/app/Views/themes/backend/vuexy/main/all.php +++ b/ci4/app/Views/themes/backend/vuexy/main/all.php @@ -77,7 +77,7 @@ if (!empty($token) && $tfa == false) { - + diff --git a/ci4/app/Views/themes/backend/vuexy/main/defaultlayout.php b/ci4/app/Views/themes/backend/vuexy/main/defaultlayout.php index 7a225272..bd145fa5 100644 --- a/ci4/app/Views/themes/backend/vuexy/main/defaultlayout.php +++ b/ci4/app/Views/themes/backend/vuexy/main/defaultlayout.php @@ -77,7 +77,7 @@ if (!empty($token) && $tfa == false) { - + @@ -86,6 +86,8 @@ if (!empty($token) && $tfa == false) { renderSection('css') ?> + + diff --git a/ci4/app/Views/themes/backend/vuexy/main/demo_view.php b/ci4/app/Views/themes/backend/vuexy/main/demo_view.php index 5c96ceb5..5efa5c48 100644 --- a/ci4/app/Views/themes/backend/vuexy/main/demo_view.php +++ b/ci4/app/Views/themes/backend/vuexy/main/demo_view.php @@ -76,7 +76,7 @@ if (!empty($token) && $tfa == false) { - + diff --git a/ci4/app/Views/themes/backend/vuexy/main/general_settings_layout.php b/ci4/app/Views/themes/backend/vuexy/main/general_settings_layout.php index 67d418c0..c2ae8a35 100644 --- a/ci4/app/Views/themes/backend/vuexy/main/general_settings_layout.php +++ b/ci4/app/Views/themes/backend/vuexy/main/general_settings_layout.php @@ -77,7 +77,7 @@ if (!empty($token) && $tfa == false) { - + diff --git a/ci4/app/Views/themes/backend/vuexy/main/header.php b/ci4/app/Views/themes/backend/vuexy/main/header.php index ff069297..5edbb201 100644 --- a/ci4/app/Views/themes/backend/vuexy/main/header.php +++ b/ci4/app/Views/themes/backend/vuexy/main/header.php @@ -79,7 +79,7 @@ if (!empty($token) && $tfa == false) { - + diff --git a/ci4/app/Views/themes/backend/vuexy/main/presupuestos_layout.php b/ci4/app/Views/themes/backend/vuexy/main/presupuestos_layout.php index ae5a4b4d..bbefab79 100644 --- a/ci4/app/Views/themes/backend/vuexy/main/presupuestos_layout.php +++ b/ci4/app/Views/themes/backend/vuexy/main/presupuestos_layout.php @@ -77,7 +77,7 @@ if (!empty($token) && $tfa == false) { - + diff --git a/httpdocs/themes/vuexy/css/demo.css b/httpdocs/themes/vuexy/css/safekat.css similarity index 99% rename from httpdocs/themes/vuexy/css/demo.css rename to httpdocs/themes/vuexy/css/safekat.css index 277097b9..4914d797 100644 --- a/httpdocs/themes/vuexy/css/demo.css +++ b/httpdocs/themes/vuexy/css/safekat.css @@ -1,5 +1,5 @@ /* -* demo.css +* safekat.css * File include item demo only specific css only ******************************************************************************/ diff --git a/httpdocs/themes/vuexy/css/sk-datatables.css b/httpdocs/themes/vuexy/css/sk-datatables.css new file mode 100644 index 00000000..6f1342e2 --- /dev/null +++ b/httpdocs/themes/vuexy/css/sk-datatables.css @@ -0,0 +1,15 @@ + +/* Overwrite datatables styles */ + +table.dataTable.table-striped > tbody > tr.odd.selected > * { + box-shadow: inset 0 0 0 9999px rgba(13, 110, 253, 0.5); +} + +table.dataTable > tbody > tr.selected > * { + box-shadow: inset 0 0 0 9999px rgba(13, 110, 253, 0.5); + color: white; +} + +table.dataTable.table-hover > tbody > tr.selected:hover > * { + box-shadow: inset 0 0 0 9999px rgba(13, 110, 253, 0.65); +} \ No newline at end of file