- @include('layouts.datagrid._table', ['responsive' => true])
+
- @include('layouts.datagrid._table', ['responsive' => true])
+
+ @include('layouts.datagrid._table')
@endif
@endif
diff --git a/resources/views/components/box.blade.php b/resources/views/components/box.blade.php
index 7540e8ef8c..1f663cdbb3 100644
--- a/resources/views/components/box.blade.php
+++ b/resources/views/components/box.blade.php
@@ -1,6 +1,8 @@
-
$v) data-{{ $k }}="{{ $v }}" @endforeach
>
{!! $slot !!}
diff --git a/resources/views/cruds/fields/image.blade.php b/resources/views/cruds/fields/image.blade.php
index 6ce5ce1fc9..7f7b745961 100644
--- a/resources/views/cruds/fields/image.blade.php
+++ b/resources/views/cruds/fields/image.blade.php
@@ -32,7 +32,7 @@
}
?>
-
+
diff --git a/resources/views/entities/pages/print/_abilities.blade.php b/resources/views/entities/pages/print/_abilities.blade.php
index 49807b4bd0..280253cf9f 100644
--- a/resources/views/entities/pages/print/_abilities.blade.php
+++ b/resources/views/entities/pages/print/_abilities.blade.php
@@ -1,11 +1,11 @@
@inject('abilities', 'App\Services\Abilities\AbilityService')
-@php $entityAbilities = $abilities->campaign($campaign)->entity($entity)->abilities() @endphp
+@php $entityAbilities = $abilities->campaign($campaign)->entity($entity)->get() @endphp
{{ __('entities.abilities') }}
- @foreach ($entityAbilities['parents'] as $parent)
+ @foreach ($entityAbilities['groups'] as $parent)
{{ $parent['name'] }}
@foreach ($parent['abilities'] as $ability)
@@ -39,33 +39,4 @@
@endforeach
-
- @foreach ($entityAbilities['abilities'] as $ability)
-
-
- {{ $ability['name'] }}
- @if ($ability['type']) - {{ $ability['type'] }}@endif
-
-
-
- {!! $ability['entry'] !!}
-
- @if ($ability['note'])
- {!! $ability['note'] !!}
- @endif
-
- @if(!empty($ability['charges']))
-
- @for ($i = 1; $i <= $ability['charges']; $i++)
- @if ($i <= $ability['used_charges'])
- [ x ]
- @else
- [ ]
- @endif
- @endfor
-
- @endif
-
-
- @endforeach
diff --git a/resources/views/layouts/datagrid/_table.blade.php b/resources/views/layouts/datagrid/_table.blade.php
index da79ab2503..a4d0700baf 100644
--- a/resources/views/layouts/datagrid/_table.blade.php
+++ b/resources/views/layouts/datagrid/_table.blade.php
@@ -1,13 +1,12 @@
@if (!empty($datagridUrl))
-
-
-
-
+
+
+
+
@endif
-@if (isset($responsive))
@endif
-
+
@foreach (Datagrid::headers() as $header)
@@ -33,7 +32,7 @@
@endforelse
-
+
@@ -42,7 +41,6 @@
|
-@if (isset($responsive))@endif
@if ($rows->hasPages() || Datagrid::hasBulks() )
@includeWhen(Datagrid::hasBulks(), 'layouts.datagrid.bulks')
diff --git a/resources/views/maps/panels/groups.blade.php b/resources/views/maps/panels/groups.blade.php
index 36cb0f0972..0149f2485c 100644
--- a/resources/views/maps/panels/groups.blade.php
+++ b/resources/views/maps/panels/groups.blade.php
@@ -11,13 +11,13 @@
@if(Datagrid::hasBulks())
-
- @include('layouts.datagrid._table', ['responsive' => true])
+
+ @include('layouts.datagrid._table')
@else
-
- @include('layouts.datagrid._table', ['responsive' => true])
+
+ @include('layouts.datagrid._table')
@endif
diff --git a/resources/views/maps/panels/layers.blade.php b/resources/views/maps/panels/layers.blade.php
index 3342cac277..3fe1725edb 100644
--- a/resources/views/maps/panels/layers.blade.php
+++ b/resources/views/maps/panels/layers.blade.php
@@ -11,13 +11,13 @@
@if(Datagrid::hasBulks())
-
- @include('layouts.datagrid._table', ['responsive' => true])
+
+ @include('layouts.datagrid._table')
@else
-
- @include('layouts.datagrid._table', ['responsive' => true])
+
+ @include('layouts.datagrid._table')
@endif
diff --git a/resources/views/maps/panels/markers.blade.php b/resources/views/maps/panels/markers.blade.php
index ac6f073ac5..c7bb8d7635 100644
--- a/resources/views/maps/panels/markers.blade.php
+++ b/resources/views/maps/panels/markers.blade.php
@@ -5,13 +5,13 @@
@if(Datagrid::hasBulks())
-
- @include('layouts.datagrid._table', ['responsive' => true])
+
+ @include('layouts.datagrid._table')
@else
-
- @include('layouts.datagrid._table', ['responsive' => true])
+
+ @include('layouts.datagrid._table')
@endif
diff --git a/resources/views/organisations/panels/members.blade.php b/resources/views/organisations/panels/members.blade.php
index 40737cbfd3..2821f47a7a 100644
--- a/resources/views/organisations/panels/members.blade.php
+++ b/resources/views/organisations/panels/members.blade.php
@@ -6,7 +6,7 @@
$datagridOptions = [
$campaign,
$model,
- 'init' => 1
+ 'init' => 1,
];
if (request()->has('all')) {
$datagridOptions['all'] = 1;
diff --git a/resources/views/timelines/panels/eras.blade.php b/resources/views/timelines/panels/eras.blade.php
index 671bf3aa6c..17ce49c34f 100644
--- a/resources/views/timelines/panels/eras.blade.php
+++ b/resources/views/timelines/panels/eras.blade.php
@@ -1,12 +1,12 @@
@if(Datagrid::hasBulks())
-
+
@include('layouts.datagrid._table')
@else
-
+
@include('layouts.datagrid._table')
@endif