diff --git a/resources/css/datatables.css b/resources/css/datatables.css index 67a7aa82..28d9cc57 100644 --- a/resources/css/datatables.css +++ b/resources/css/datatables.css @@ -4,7 +4,9 @@ Source: https://cdn.datatables.net/1.10.20/css/dataTables.bootstrap4.css */ +table.table th, +table.table td, table.dataTable tbody th, table.dataTable tbody td { - padding: 8px 10px; + padding: 8px 10px; } diff --git a/resources/views/alerts/create.blade.php b/resources/views/alerts/create.blade.php index d335ba52..7d5a3597 100644 --- a/resources/views/alerts/create.blade.php +++ b/resources/views/alerts/create.blade.php @@ -33,10 +33,10 @@
- @foreach($devices as $d) @foreach($sensors[$d->deviceId] as $s) - + @endforeach @endforeach @@ -53,7 +53,7 @@
- @@ -71,7 +71,7 @@
- @error('threshold') @@ -81,7 +81,7 @@
-
diff --git a/resources/views/alerts/index.blade.php b/resources/views/alerts/index.blade.php index 06745d5c..e68be138 100644 --- a/resources/views/alerts/index.blade.php +++ b/resources/views/alerts/index.blade.php @@ -58,7 +58,7 @@ {{$list['alert']->threshold}} {{$list['alert']->lastSent?date("d/m/Y - H:i:s", strtotime($list['alert']->lastSent)):'-'}} @can(['isMod']) - + @@ -68,8 +68,8 @@ @endcan @can(['isAdmin']) - - + diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php index e02869e3..ce007703 100644 --- a/resources/views/auth/login.blade.php +++ b/resources/views/auth/login.blade.php @@ -21,7 +21,7 @@ @csrf
- @@ -33,7 +33,7 @@ class="form-control form-control-user @error('email') is-invalid @enderror"
- diff --git a/resources/views/auth/tfaLogin.blade.php b/resources/views/auth/tfaLogin.blade.php index aad64a41..722a6384 100644 --- a/resources/views/auth/tfaLogin.blade.php +++ b/resources/views/auth/tfaLogin.blade.php @@ -20,7 +20,7 @@
@csrf
- diff --git a/resources/views/devices/create.blade.php b/resources/views/devices/create.blade.php index 7cb02555..ec92f888 100644 --- a/resources/views/devices/create.blade.php +++ b/resources/views/devices/create.blade.php @@ -34,7 +34,7 @@
- + @error('realDeviceId') {{ $message }} @@ -45,7 +45,7 @@
- + @error('name') {{ $message }} @@ -57,7 +57,7 @@
- @foreach($gateways as $gateway) @endforeach @@ -74,7 +74,7 @@
- @@ -152,7 +152,7 @@
- + @error('sensorId') {{ $message }} @@ -174,7 +174,7 @@
- diff --git a/resources/views/devices/edit.blade.php b/resources/views/devices/edit.blade.php index 02bfdb8e..ad4c990f 100644 --- a/resources/views/devices/edit.blade.php +++ b/resources/views/devices/edit.blade.php @@ -36,7 +36,7 @@
- + @error('realDeviceId') {{ $message }} @@ -47,7 +47,7 @@
- + @error('name') {{ $message }} @@ -59,7 +59,7 @@
- @foreach($gateways as $gateway) @endforeach @@ -76,7 +76,7 @@
- @@ -168,7 +168,7 @@
- + @error('sensorId') {{ $message }} diff --git a/resources/views/entities/create.blade.php b/resources/views/entities/create.blade.php index 42a1c755..db8a0de5 100644 --- a/resources/views/entities/create.blade.php +++ b/resources/views/entities/create.blade.php @@ -33,7 +33,7 @@
- + @error('name') {{ $message }} diff --git a/resources/views/entities/edit.blade.php b/resources/views/entities/edit.blade.php index 96c6c256..884d1db1 100644 --- a/resources/views/entities/edit.blade.php +++ b/resources/views/entities/edit.blade.php @@ -47,7 +47,7 @@
- + @error('name') {{ $message }} diff --git a/resources/views/gateways/index.blade.php b/resources/views/gateways/index.blade.php index 8bde6252..0b58bbb9 100644 --- a/resources/views/gateways/index.blade.php +++ b/resources/views/gateways/index.blade.php @@ -56,14 +56,14 @@ {{substr($gWd['gateway']->name, 0, 3)}}{{substr($gWd['gateway']->name, 3)}} {{count($gWd['devices'])}} - {{$gWd['gateway']->lastSent??'-'}} - + {{$gWd['gateway']->lastSent?date("d/m/Y - H:i:s", strtotime($gWd['gateway']->lastSent)):'-'}} + - - - + + + Invia config. diff --git a/resources/views/layouts/sidebar.blade.php b/resources/views/layouts/sidebar.blade.php index 02c6f755..11a32321 100644 --- a/resources/views/layouts/sidebar.blade.php +++ b/resources/views/layouts/sidebar.blade.php @@ -81,7 +81,7 @@ @endcan @@ -104,7 +104,7 @@ Gestione gateways @endcan diff --git a/resources/views/logs/index.blade.php b/resources/views/logs/index.blade.php index 75209d99..1de8d1c7 100644 --- a/resources/views/logs/index.blade.php +++ b/resources/views/logs/index.blade.php @@ -20,7 +20,7 @@
-
Lista Logs
+
Lista Logs
@can(['isMod'])
Si stanno visualizzando le logs di tutti gli utenti del proprio ente.
@endcan @@ -40,7 +40,7 @@ @foreach($logs as $l) {{$l["log"]->time}} - {{$l["log"]->operation}} + {{$l["log"]->operation}} {{$l['user']->name. ' ' .$l['user']->surname}} {{$l['user']->getRole()}} {{$l["log"]->ipAddr}} diff --git a/resources/views/settings/edit.blade.php b/resources/views/settings/edit.blade.php index aca3b162..deb6101f 100644 --- a/resources/views/settings/edit.blade.php +++ b/resources/views/settings/edit.blade.php @@ -31,7 +31,7 @@
- + @error('email') {{ $message }} @@ -97,7 +97,7 @@
- @error('password') @@ -110,7 +110,7 @@
- @error('new_password') @@ -123,7 +123,7 @@
- @error('confirm_password') diff --git a/resources/views/users/create.blade.php b/resources/views/users/create.blade.php index 01191ca7..68ed2567 100644 --- a/resources/views/users/create.blade.php +++ b/resources/views/users/create.blade.php @@ -29,7 +29,7 @@
- + @error('name') {{ $message }} @@ -40,7 +40,7 @@
- + @error('surname') {{ $message }} @@ -52,7 +52,7 @@
- @@ -66,7 +66,7 @@
- @foreach($entities as $entity) @endforeach @@ -82,7 +82,7 @@
- + @error('email') {{ $message }} diff --git a/resources/views/users/edit.blade.php b/resources/views/users/edit.blade.php index 4ca1bc5f..7e452c28 100644 --- a/resources/views/users/edit.blade.php +++ b/resources/views/users/edit.blade.php @@ -30,7 +30,7 @@
- + @error('name') {{ $message }} @@ -41,7 +41,7 @@
- + @error('surname') {{ $message }} @@ -54,7 +54,7 @@
- @@ -70,7 +70,7 @@
- + @error('email') {{ $message }} diff --git a/resources/views/users/index.blade.php b/resources/views/users/index.blade.php index 8e50b91e..d0e9a585 100644 --- a/resources/views/users/index.blade.php +++ b/resources/views/users/index.blade.php @@ -62,14 +62,12 @@ @endcan @if($u['user']->type < Auth::user()->type) - + + + + + Modifica + @endif diff --git a/resources/views/views/index.blade.php b/resources/views/views/index.blade.php index 24272d83..a0e8f392 100644 --- a/resources/views/views/index.blade.php +++ b/resources/views/views/index.blade.php @@ -30,7 +30,7 @@
- + @error('viewName') {{ $message }} diff --git a/resources/views/views/show.blade.php b/resources/views/views/show.blade.php index 83b670b1..6f20e4a1 100644 --- a/resources/views/views/show.blade.php +++ b/resources/views/views/show.blade.php @@ -44,7 +44,7 @@
- @foreach($devices as $d) @foreach($sensors[$d->deviceId] as $s)