+
@endsection
-
-@section('fullpage-form-end')
- {!! Form::close() !!}
-@endsection
-
@section('scripts')
@vite('resources/js/attributes.js')
@endsection
diff --git a/resources/views/entities/pages/attributes/live/_form.blade.php b/resources/views/entities/pages/attributes/live/_form.blade.php
index d2d629be40..b9bf7778b6 100644
--- a/resources/views/entities/pages/attributes/live/_form.blade.php
+++ b/resources/views/entities/pages/attributes/live/_form.blade.php
@@ -4,7 +4,7 @@
value) checked="checked" @endif />
@elseif ($attribute->isText())
- {!! Form::textarea('value', $attribute->value, ['class' => '', 'rows' => 4]) !!}
+
validConstraints()) max="{{ $attribute->numberMax() }}" min="{{ $attribute->numberMin() }}" @endif />
diff --git a/resources/views/entities/pages/attributes/live/edit.blade.php b/resources/views/entities/pages/attributes/live/edit.blade.php
index 3547bea549..6af79ec1f0 100644
--- a/resources/views/entities/pages/attributes/live/edit.blade.php
+++ b/resources/views/entities/pages/attributes/live/edit.blade.php
@@ -1,12 +1,12 @@
-{!! Form::open(['route' => ['entities.attributes.live.save', $campaign, $entity, $attribute]]) !!}
-@include('partials.forms.form', [
- 'title' =>__('entities/attributes.live.title', ['attribute' => $attribute->name()]),
- 'content' => 'entities.pages.attributes.live._form',
- 'submit' => __('crud.update'),
- 'dialog' => true,
- 'dropdownParent' => '#primary-dialog',
- ])
-{!! Form::hidden('uid', $uid) !!}
-{!! Form::close() !!}
+
diff --git a/resources/views/entities/pages/attributes/rendering/marketplace.blade.php b/resources/views/entities/pages/attributes/rendering/marketplace.blade.php
index 4205c4bb19..cea79a9817 100644
--- a/resources/views/entities/pages/attributes/rendering/marketplace.blade.php
+++ b/resources/views/entities/pages/attributes/rendering/marketplace.blade.php
@@ -5,6 +5,9 @@
* @var \App\Models\Entity $entity
* @var \App\Models\MiscModel $model
*/
+if (!isset($entity)) {
+ $entity = $model->entity;
+}
?>
@if ($plugin->version->isDraft())
@@ -15,7 +18,7 @@
@@ -26,7 +29,7 @@
/** Entity attributes **/
:root {
- @foreach ((isset($entity) ? $entity->allAttributes : $model->entity->allAttributes) as $attribute) @if ($attribute->isText()) @continue @endif
+ @foreach ($entity->allAttributes as $attribute) @if ($attribute->isText()) @continue @endif
--attribute-{{ \Illuminate\Support\Str::slug($attribute->name) }}: {{ trim(preg_replace('/\s+/', ' ', $attribute->value)) }};
@endforeach
}
@@ -38,4 +41,25 @@
-@endsection
\ No newline at end of file
+
+@endsection
diff --git a/resources/views/entities/pages/entry/edit.blade.php b/resources/views/entities/pages/entry/edit.blade.php
index af4026c497..ebeb8246d6 100644
--- a/resources/views/entities/pages/entry/edit.blade.php
+++ b/resources/views/entities/pages/entry/edit.blade.php
@@ -13,22 +13,26 @@
@section('content')
- {!! Form::model($entity->child, ['route' => ['entities.entry.update', $campaign, $entity], 'method' => 'PATCH', 'data-shortcut' => 1, 'class' => 'entity-form entity-entry-form', 'data-maintenance' => 1, 'data-unload' => 1,]) !!}
-
+
@include('partials.errors')
-
-
- {!! Form::textarea('entryForEdition', null, ['class' => ' html-editor', 'id' => 'entry', 'name' => 'entry']) !!}
-
-
-
-
- @include('partials.footer_cancel')
+
+
+
+
+
+
+
+ @include('partials.footer_cancel')
+
+
-
-
- {!! Form::close() !!}
+
+
{{-- For bragi --}}
@if ($entity->isCharacter())
diff --git a/resources/views/entities/pages/files/_form.blade.php b/resources/views/entities/pages/files/_form.blade.php
index 3538bc34b9..50fee8791f 100644
--- a/resources/views/entities/pages/files/_form.blade.php
+++ b/resources/views/entities/pages/files/_form.blade.php
@@ -8,7 +8,7 @@
css="col-span-2"
:required="true"
:label="__('entities/files.fields.file')">
- {!! Form::file('file', array('class' => 'image ')) !!}
+
{{ __('crud.files.hints.limitations', ['formats' => 'jpg, jpeg, png, gif, webp, pdf, xls(x), csv, mp3, ogg, json', 'size' => Limit::readable()->upload()]) }}
@@ -21,15 +21,8 @@
field="file"
css="col-span-2"
:required="isset($entityAsset)"
- :label="__('entities/files.fields.file')">
- {!! Form::text(
- 'name',
- null,
- [
- 'class' => '',
- 'maxlength' => 45
- ]
- ) !!}
+ :label="__('entities/files.fields.name')">
+
@include('cruds.fields.is_pinned', ['model' => $entity ?? null, 'fieldName' => 'is_pinned'])
diff --git a/resources/views/entities/pages/files/create.blade.php b/resources/views/entities/pages/files/create.blade.php
index 6713125682..84f4d57ed0 100644
--- a/resources/views/entities/pages/files/create.blade.php
+++ b/resources/views/entities/pages/files/create.blade.php
@@ -10,13 +10,12 @@
])
@section('content')
- {!! Form::open(['route' => ['entities.entity_assets.store', $campaign, $entity], 'method'=>'POST', 'data-shortcut' => 1, 'enctype' => 'multipart/form-data', 'class' => 'ajax-subform']) !!}
-
- @include('partials.forms.form', [
+
+ @include('partials.forms.form', [
'title' => __('entities/files.create.title', ['entity' => $entity->name]),
'content' => 'entities.pages.files._form',
'dialog' => true,
])
-
- {!! Form::close() !!}
+
+
@endsection
diff --git a/resources/views/entities/pages/files/update.blade.php b/resources/views/entities/pages/files/update.blade.php
index fdae5562b4..9bb8378368 100644
--- a/resources/views/entities/pages/files/update.blade.php
+++ b/resources/views/entities/pages/files/update.blade.php
@@ -11,7 +11,7 @@
])
@section('content')
- {!! Form::model($entityAsset, ['route' => ['entities.entity_assets.update', $campaign, $entity->id, $entityAsset], 'method' => 'PATCH', 'data-shortcut' => 1, 'class' => 'ajax-subform']) !!}
+
@include('partials.forms.form', [
'title' => $entityAsset->name,
@@ -20,8 +20,7 @@
'dialog' => true,
])
- {!! Form::close() !!}
+
- {!! Form::open(['method' => 'DELETE', 'route' => ['entities.entity_assets.destroy', $campaign, 'entity' => $entity, 'entity_asset' => $entityAsset], 'style' => 'display:inline', 'id' => 'delete-file-' . $entityAsset->id]) !!}
- {!! Form::close() !!}
+
@endsection
diff --git a/resources/views/entities/pages/image/focus.blade.php b/resources/views/entities/pages/image/focus.blade.php
index 13a1bab170..fedb650424 100644
--- a/resources/views/entities/pages/image/focus.blade.php
+++ b/resources/views/entities/pages/image/focus.blade.php
@@ -19,7 +19,7 @@
@if ($campaign->boosted())
@if($campaign->superboosted() && empty($entity->image_path) && !empty($entity->image_uuid))
- {!! __('entities/image.focus.warning_v2', ['gallery' => link_to_route('campaign.gallery.index', __('sidebar.gallery'), $campaign)]) !!}
+ {!! __('entities/image.focus.warning_v2', ['gallery' => '' . __('sidebar.gallery') . '']) !!}
@@ -39,27 +39,22 @@
- {!! Form::open([
-'route' => ['entities.image.focus', $campaign, $entity],
-'method' => 'POST'
-]) !!}
- {!! Form::hidden('focus_x', null) !!}
- {!! Form::hidden('focus_y', null) !!}
-
-
-
-
-
- {!! Form::close() !!}
+
+
+
+
+
+
+
@endif
@else
{!! __('entities/image.focus.unboosted', [
- 'boosted-campaigns' => link_to(\App\Facades\Domain::toFront('pricing'), __('concept.premium-campaigns'), ['#premium'])
+ 'boosted-campaigns' => '' . __('concept.premium-campaigns') . ''
]) !!}
diff --git a/resources/views/entities/pages/image/replace.blade.php b/resources/views/entities/pages/image/replace.blade.php
index 1ba942959d..84ebb44548 100644
--- a/resources/views/entities/pages/image/replace.blade.php
+++ b/resources/views/entities/pages/image/replace.blade.php
@@ -14,18 +14,12 @@
@section('content')
- {!! Form::open([
- 'route' => ['entities.image.replace', $campaign, $entity],
- 'method' => 'POST',
- 'enctype' => 'multipart/form-data',
- 'class' => 'ajax-subform',
- ]) !!}
+
@include('partials.forms.form', [
'title' => __('entities/image.replace.title', ['name' => $entity->name]),
'content' => 'entities.pages.image._form',
'submit' => __('entities/image.actions.save-replace'),
'dialog' => true,
])
-
- {!! Form::close() !!}
+
@endsection
diff --git a/resources/views/entities/pages/inventory/_form.blade.php b/resources/views/entities/pages/inventory/_form.blade.php
index 1add2da757..4b589dd9f6 100644
--- a/resources/views/entities/pages/inventory/_form.blade.php
+++ b/resources/views/entities/pages/inventory/_form.blade.php
@@ -18,15 +18,7 @@
:required="true"
:helper="__('entities/inventories.helpers.name')"
:label="__('entities/inventories.fields.name')">
- {!! Form::text(
- 'name',
- null,
- [
- 'placeholder' => __('entities/inventories.placeholders.name'),
- 'class' => '',
- 'max-length' => 45
- ]
- ) !!}
+
@@ -68,37 +60,35 @@
:required="true"
:label="__('entities/inventories.fields.amount')"
:helper="__('entities/inventories.helpers.amount')">
- {!! Form::number('amount', (empty($inventory) ? 1 : null), ['class' => '', 'max' => 1000000000, 'min' => 0, 'required']) !!}
+
+
- {!! Form::select('position', $positionOptions, $positionPreset, [
- 'data-placeholder' => __('entities/inventories.placeholders.position'),
- 'class' => 'position-dropdown',
- ]) !!}
+
- {!! Form::hidden('is_equipped', 0) !!}
+
- {!! Form::checkbox('is_equipped', 1, isset($inventory) ? $inventory->is_equipped : null) !!}
+ is_equipped ?? false)) checked="checked" @endif />
- {!! Form::hidden('copy_item_entry', 0) !!}
+
- {!! Form::checkbox('copy_item_entry') !!}
+ copy_item_entry ?? false)) checked="checked" @endif />
@include('cruds.fields.visibility_id', ['model' => $inventory ?? null])
- {!! Form::text('description', null, ['placeholder' => __('entities/inventories.placeholders.description'), 'class' => '', 'maxlength' => 191]) !!}
+
diff --git a/resources/views/entities/pages/inventory/copy.blade.php b/resources/views/entities/pages/inventory/copy.blade.php
index 0846b3c137..b125f45e8e 100644
--- a/resources/views/entities/pages/inventory/copy.blade.php
+++ b/resources/views/entities/pages/inventory/copy.blade.php
@@ -9,12 +9,12 @@
])
@section('content')
- {!! Form::open(['route' => ['entities.inventory.copy.store', $campaign, $entity->id], 'method'=>'POST', 'data-shortcut' => 1, 'data-maintenance' => 1, 'class' => 'ajax-subform']) !!}
+
@include('partials.forms.form', [
'title' => __('entities/inventories.copy.title', ['name' => $entity->name]),
'content' => 'entities.pages.inventory._copy',
'submit' => __('entities/inventories.actions.copy_inventory'),
'dialog' => true,
- ])
- {!! Form::close() !!}
+ ])
+
@endsection
diff --git a/resources/views/entities/pages/inventory/create.blade.php b/resources/views/entities/pages/inventory/create.blade.php
index df80bbb6ee..1dbd50874c 100644
--- a/resources/views/entities/pages/inventory/create.blade.php
+++ b/resources/views/entities/pages/inventory/create.blade.php
@@ -9,14 +9,14 @@
])
@section('content')
- {!! Form::open(['route' => ['entities.inventories.store', $campaign, $entity->id], 'method'=>'POST', 'data-shortcut' => 1, 'data-maintenance' => 1, 'class' => 'ajax-subform']) !!}
- @include('partials.forms.form', [
+
+ @include('partials.forms.form', [
'title' => __('entities/inventories.create.title', ['name' => $entity->name]),
'content' => 'entities.pages.inventory._form',
'submit' => __('entities/inventories.actions.add'),
'dialog' => true,
'multiple' => true,
])
- {!! Form::hidden('entity_id', $entity->id) !!}
- {!! Form::close() !!}
+
+
@endsection
diff --git a/resources/views/entities/pages/inventory/update.blade.php b/resources/views/entities/pages/inventory/update.blade.php
index cf4c58e42f..f838d594e0 100644
--- a/resources/views/entities/pages/inventory/update.blade.php
+++ b/resources/views/entities/pages/inventory/update.blade.php
@@ -9,8 +9,7 @@
])
@section('content')
- {!! Form::model($inventory, ['route' => ['entities.inventories.update', $campaign, $entity->id, $inventory], 'method' => 'PATCH', 'data-shortcut' => 1, 'data-maintenance' => 1, 'class' => 'ajax-subform']) !!}
-
+
@include('partials.forms.form', [
'title' => __('entities/inventories.update.title', ['name' => $entity->name]),
'content' => 'entities.pages.inventory._form',
@@ -18,9 +17,8 @@
'dialog' => true,
])
- {!! Form::hidden('entity_id', $entity->id) !!}
- {!! Form::close() !!}
+
+
- {!! Form::open(['method' => 'DELETE', 'route' => ['entities.inventories.destroy', 'campaign' => $campaign, 'entity' => $entity, 'inventory' => $inventory], 'id' => 'delete-inventory-' . $inventory->id]) !!}
- {!! Form::close() !!}
+
@endsection
diff --git a/resources/views/entities/pages/links/_form.blade.php b/resources/views/entities/pages/links/_form.blade.php
index e3bfa0307f..6c4c34edaf 100644
--- a/resources/views/entities/pages/links/_form.blade.php
+++ b/resources/views/entities/pages/links/_form.blade.php
@@ -4,33 +4,17 @@
field="name"
:label="__('entities/links.fields.name')"
:required="true">
- {!! Form::text(
- 'name',
- null,
- [
- 'placeholder' => __('entities/links.placeholders.name'),
- 'class' => '',
- 'maxlength' => 45
- ]
- ) !!}
+
- {!! Form::text(
- 'metadata[url]',
- null,
- [
- 'placeholder' => __('entities/links.placeholders.url'),
- 'class' => '',
- 'maxlength' => 255
- ]
- ) !!}
+
- @include('cruds.fields.icon', ['iconFieldName' => 'metadata[icon]', 'placeholder' => 'fa-brands fa-d-and-d-beyond, ra ra-aura'])
- @include('cruds.fields.visibility_id', ['model' => $entity ?? null])
+ @include('cruds.fields.icon', ['iconFieldName' => 'metadata[icon]', 'placeholder' => 'fa-brands fa-d-and-d-beyond, ra ra-aura', 'model' => $entityAsset ?? null])
+ @include('cruds.fields.visibility_id', ['model' => $entityAsset ?? null])
diff --git a/resources/views/entities/pages/links/create.blade.php b/resources/views/entities/pages/links/create.blade.php
index 7a6fd1a90c..9d9de3e61c 100644
--- a/resources/views/entities/pages/links/create.blade.php
+++ b/resources/views/entities/pages/links/create.blade.php
@@ -10,12 +10,11 @@
])
@section('content')
- {!! Form::open(['route' => ['entities.entity_assets.store', $campaign, $entity], 'method'=>'POST', 'data-shortcut' => 1, 'class' => 'ajax-subform']) !!}
-
- @include('partials.forms.form', [
+
+ @include('partials.forms.form', [
'title' => __('entities/links.create.title', ['name' => $entity->name]),
'content' => 'entities.pages.links._form',
'dialog' => true,
])
- {!! Form::close() !!}
+
@endsection
diff --git a/resources/views/entities/pages/links/update.blade.php b/resources/views/entities/pages/links/update.blade.php
index aa94631e22..13bcf3cab0 100644
--- a/resources/views/entities/pages/links/update.blade.php
+++ b/resources/views/entities/pages/links/update.blade.php
@@ -11,17 +11,14 @@
])
@section('content')
- {!! Form::model($entityAsset, ['route' => ['entities.entity_assets.update', $campaign, $entity, $entityAsset], 'method' => 'PATCH', 'data-shortcut' => 1, 'class' => 'ajax-subform']) !!}
+
+ @include('partials.forms.form', [
+ 'title' => $entityAsset->name,
+ 'content' => 'entities.pages.links._form',
+ 'deleteID' => '#delete-link-' . $entityAsset->id,
+ 'dialog' => true,
+ ])
+
- @include('partials.forms.form', [
- 'title' => $entityAsset->name,
- 'content' => 'entities.pages.links._form',
- 'deleteID' => '#delete-link-' . $entityAsset->id,
- 'dialog' => true,
- ])
-
- {!! Form::close() !!}
-
- {!! Form::open(['method' => 'DELETE', 'route' => ['entities.entity_assets.destroy', $campaign, 'entity' => $entity, 'entity_asset' => $entityAsset], 'style' => 'display:inline', 'id' => 'delete-link-' . $entityAsset->id]) !!}
- {!! Form::close() !!}
+
@endsection
diff --git a/resources/views/entities/pages/logs/history.blade.php b/resources/views/entities/pages/logs/history.blade.php
index 937aefdd21..b126539f32 100644
--- a/resources/views/entities/pages/logs/history.blade.php
+++ b/resources/views/entities/pages/logs/history.blade.php
@@ -4,10 +4,10 @@
@if ($model->entity)
{!! __('crud.history.created_clean', [
- 'name' => (!empty($model->entity->created_by) ? link_to_route('users.profile', e(\App\Facades\UserCache::name($model->entity->created_by)), $model->entity->created_by, ['target' => '_blank']) : __('crud.history.unknown')),
+ 'name' => (!empty($model->entity->created_by) ? '' . e(\App\Facades\UserCache::name($model->entity->created_by)) . '' : __('crud.history.unknown')),
'date' => '' . $model->created_at->diffForHumans() . '',
]) !!}. {!! __('crud.history.updated_clean', [
- 'name' => (!empty($model->entity->updated_by) ? link_to_route('users.profile', e(\App\Facades\UserCache::name($model->entity->updated_by)), $model->entity->updated_by, ['target' => '_blank']) : __('crud.history.unknown')),
+ 'name' => (!empty($model->entity->updated_by) ? '' . e(\App\Facades\UserCache::name($model->entity->updated_by)) . '' : __('crud.history.unknown')),
'date' => '' . $model->updated_at->diffForHumans() . '',
]) !!}
@can('update', $model)
@@ -18,10 +18,10 @@
@endcan
@else
{!! __('crud.history.created_clean', [
- 'name' => (!empty($model->created_by) ? link_to_route('users.profile', e(\App\Facades\UserCache::name($model->created_by)), $model->created_by, ['target' => '_blank']) : __('crud.history.unknown')),
+ 'name' => (!empty($model->created_by) ? '' . e(\App\Facades\UserCache::name($model->created_by)) . '': __('crud.history.unknown')),
'date' => '' . $model->created_at->diffForHumans() . '',
]) !!}. {!! __('crud.history.updated_clean', [
- 'name' => (!empty($model->updated_by) ? link_to_route('users.profile', e(\App\Facades\UserCache::name($model->updated_by)), $model->updated_by, ['target' => '_blank']) : __('crud.history.unknown')),
+ 'name' => (!empty($model->updated_by) ? '' . e(\App\Facades\UserCache::name($model->updated_by)). '': __('crud.history.unknown')),
'date' =>'' . $model->updated_at->diffForHumans() . '',
]) !!}
@endif
diff --git a/resources/views/entities/pages/logs/logs.blade.php b/resources/views/entities/pages/logs/logs.blade.php
index f83df216de..3eee3189ad 100644
--- a/resources/views/entities/pages/logs/logs.blade.php
+++ b/resources/views/entities/pages/logs/logs.blade.php
@@ -35,7 +35,7 @@
{{ __('entities/logs.actions.' . $log->actionCode(), ['post' => $log->post?->name]) }}
@if ($log->user)
- {!! link_to_route('users.profile', $log->user->name, $log->user, ['target' => '_blank']) !!}
+ {!! $log->user->name !!}}
@else
{{ __('crud.history.unknown') }}
@endif
diff --git a/resources/views/entities/pages/move/index.blade.php b/resources/views/entities/pages/move/index.blade.php
index ea80e57717..a2c08006e8 100644
--- a/resources/views/entities/pages/move/index.blade.php
+++ b/resources/views/entities/pages/move/index.blade.php
@@ -10,9 +10,7 @@
@section('content')
@include('partials.errors')
- {!! Form::open(['route' => ['entities.move', $campaign, $entity->id], 'method' => 'POST']) !!}
-
- {{ csrf_field() }}
+
@@ -20,17 +18,17 @@
- {!! Form::select('campaign', $campaigns, null, ['class' => '']) !!}
+
@can('update', $entity->child)
- {!! Form::checkbox('copy', 1, true) !!}
+
@else
- {!! Form::hidden('copy', 1) !!}
+
@endcan
@includeIf($entity->pluralType() . '.bulk.modals._copy_to_campaign')
@@ -44,5 +42,5 @@
- {!! Form::close() !!}
+
@endsection
diff --git a/resources/views/entities/pages/posts/_form.blade.php b/resources/views/entities/pages/posts/_form.blade.php
index ae403d92bb..02a02d8ea2 100644
--- a/resources/views/entities/pages/posts/_form.blade.php
+++ b/resources/views/entities/pages/posts/_form.blade.php
@@ -53,11 +53,11 @@
- {!! Form::text('name', null, ['placeholder' => __('entities/notes.placeholders.name'), 'class' => '', 'maxlength' => 191, 'data-live-disabled' => '1', 'required', 'data-bragi-name' => $bragiName]) !!}
+
- {!! Form::select('layout_id', $layoutOptions, isset($model) ? $model->layout_id : '',['class' => '', 'id' => 'post-layout-selector']) !!}
+
@includeWhen(!$campaign->superboosted(), 'entities.pages.posts._boosted')
@@ -67,7 +67,12 @@
@endif
- {!! Form::textarea('entryForEdition', null, ['class' => ' html-editor', 'id' => 'entry', 'name' => 'entry']) !!}
+
+
@include('cruds.fields.location', ['from' => null])
@@ -76,7 +81,7 @@
@include('cruds.fields.visibility_id')
- {!! Form::select('position', $options, (!empty($model->position) ? -9999 : $last), ['class' => '']) !!}
+
@php
$collapsedOptions = [
@@ -85,11 +90,11 @@
];
@endphp
- {!! Form::select('settings[collapsed]', $collapsedOptions, $defaultCollapsed, ['class' => '']) !!}
+
- {!! Form::text('settings[class]', null, ['class' => '', 'id' => 'config[class]', 'disabled' => !$campaign->boosted() ? 'disabled' : null]) !!}
+ boosted()) disabled="disabled" @endif class="w-full" id="config[class]" />
@includeWhen(!$campaign->boosted(), 'entities.pages.posts._boosted')
@@ -99,4 +104,4 @@
-{!! Form::hidden('entity_id', $entity->id) !!}
+
diff --git a/resources/views/entities/pages/posts/_permissions.blade.php b/resources/views/entities/pages/posts/_permissions.blade.php
index 48239d7cfc..b431a45828 100644
--- a/resources/views/entities/pages/posts/_permissions.blade.php
+++ b/resources/views/entities/pages/posts/_permissions.blade.php
@@ -11,8 +11,7 @@
- {!! Form::select('perm_role_perm[]', $permissions, $perm->permission, ['class' => ' grow']) !!}
-
+
- {!! Form::select('perm_user_perm[]', $permissions, $perm->permission, ['class' => ' grow']) !!}
+
- {!! Form::hidden('permissions', true) !!}
+
@section('modals')
@@ -81,9 +80,7 @@
- {!! Form::select('perm_user_perm[]', $permissions, null, [
- 'class' => ' grow'
- ]) !!}
+
@@ -96,9 +93,7 @@
- {!! Form::select('perm_role_perm[]', $permissions, null, [
- 'class' => ' grow'
- ]) !!}
+
diff --git a/resources/views/entities/pages/posts/create.blade.php b/resources/views/entities/pages/posts/create.blade.php
index fc08e9910a..73969fe2fa 100644
--- a/resources/views/entities/pages/posts/create.blade.php
+++ b/resources/views/entities/pages/posts/create.blade.php
@@ -9,24 +9,15 @@
'centered' => true,
])
-@section('fullpage-form')
- {!! Form::open([
- 'route' => ['entities.posts.store', $campaign, $entity->id],
- 'method'=>'POST',
- 'data-shortcut' => '1',
- 'id' => 'entity-form',
- 'class' => 'entity-form post-form entity-note-form',
- 'data-maintenance' => 1,
- 'data-unload' => 1,
- ]) !!}
-@endsection
-
@section('content')
- @include('entities.pages.posts._form')
+
+ @include('entities.pages.posts._form')
+
@endsection
@include('editors.editor', $entity->isCharacter() ? ['name' => 'characters'] : [])
-
-@section('fullpage-form-end')
- {!! Form::close() !!}
-@endsection
diff --git a/resources/views/entities/pages/posts/edit.blade.php b/resources/views/entities/pages/posts/edit.blade.php
index 90690e3429..b74bb2e423 100644
--- a/resources/views/entities/pages/posts/edit.blade.php
+++ b/resources/views/entities/pages/posts/edit.blade.php
@@ -9,20 +9,15 @@
'centered' => true,
])
-@section('fullpage-form')
- {!! Form::model($model, [
- 'method' => 'PATCH',
- 'route' => ['entities.posts.update', $campaign, $entity->id, $model->id],
- 'data-shortcut' => '1',
- 'class' => 'entity-note-form post-form entity-form',
- 'id' => 'entity-form',
- 'data-maintenance' => 1,
- 'data-unload' => 1,
- ]) !!}
-@endsection
-
@section('content')
+
@include('entities.pages.posts._form')
@@ -34,21 +29,19 @@
@if(!empty($model) && $campaign->hasEditingWarning())
@endif
-@endsection
-
-@include('editors.editor', $entity->isCharacter() ? ['name' => 'characters'] : [])
-@section('fullpage-form-end')
@if(!empty($from))
@endif
- {!! Form::close() !!}
+
@endsection
+@include('editors.editor', $entity->isCharacter() ? ['name' => 'characters'] : [])
+
+
@section('modals')
@parent
- {!! Form::open(['method' => 'DELETE', 'route' => ['entities.posts.destroy', $campaign, 'entity' => $entity, 'post' => $model], 'style' => 'display:inline', 'id' => 'delete-form-note-' . $model->id]) !!}
- {!! Form::close() !!}
+
@includeWhen(!empty($editingUsers) && !empty($model), 'cruds.forms.edit_warning', ['model' => $model, 'entity' => $entity])
diff --git a/resources/views/entities/pages/posts/move/index.blade.php b/resources/views/entities/pages/posts/move/index.blade.php
index 6be94ac50d..b1c791676d 100644
--- a/resources/views/entities/pages/posts/move/index.blade.php
+++ b/resources/views/entities/pages/posts/move/index.blade.php
@@ -9,9 +9,7 @@
@section('content')
@include('partials.errors')
- {!! Form::open(['route' => ['posts.move', $campaign, $entity->id, $post->id], 'method' => 'POST']) !!}
-
- {{ csrf_field() }}
+
@@ -20,7 +18,7 @@
- {!! Form::checkbox('copy', 1, true) !!}
+
@@ -30,5 +28,5 @@
- {!! Form::close() !!}
+
@endsection
diff --git a/resources/views/entities/pages/relations/_form.blade.php b/resources/views/entities/pages/relations/_form.blade.php
index 77f670fd41..65cc2457e6 100644
--- a/resources/views/entities/pages/relations/_form.blade.php
+++ b/resources/views/entities/pages/relations/_form.blade.php
@@ -25,16 +25,16 @@
])
@endif
- {!! Form::text('relation', null, ['placeholder' => __('entities/relations.placeholders.relation'), 'class' => '', 'maxlength' => 191, 'required']) !!}
+
- @include('cruds.fields.colour_picker', request()->ajax() ? ['dropdownParent' => '#primary-dialog'] : [])
- @include('cruds.fields.attitude')
+ @include('cruds.fields.colour_picker', request()->ajax() ? ['dropdownParent' => '#primary-dialog', 'model' => $relation ?? null] : ['model' => $relation ?? null])
+ @include('cruds.fields.attitude', ['model' => $relation ?? null])
@if(empty($relation) && (!isset($mirror) || $mirror == true))
- {!! Form::checkbox('two_way', 1, null, ['data-animate' => 'collapse', 'data-target' => '#two-way-relation']) !!}
+
@@ -45,7 +45,7 @@
:label="__('entities/relations.fields.target_relation')"
:helper="__('entities/relations.hints.target_relation')"
:tooltip="true">
- {!! Form::text('target_relation', null, ['class' => '', 'maxlength' => 191, 'placeholder' => __('entities/relations.placeholders.target_relation')]) !!}
+
@@ -59,9 +59,9 @@
'link' => '" . $relation->target->name . ''
]) !!}
- {!! Form::hidden('unmirror', 0) !!}
+
- {!! Form::checkbox('unmirror', 1)!!}
+
diff --git a/resources/views/entities/pages/relations/_map.blade.php b/resources/views/entities/pages/relations/_map.blade.php
index ffdc12c87f..f5bab034aa 100644
--- a/resources/views/entities/pages/relations/_map.blade.php
+++ b/resources/views/entities/pages/relations/_map.blade.php
@@ -17,16 +17,13 @@
@endif
-{!! Form::open([
- 'route' => ['entities.relations.index', $campaign, $entity],
- 'method' => 'GET',
-]) !!}
+
- {!! Form::select('option', $options, $option, ['class' => 'w-full join-item']) !!}
+
-{!! Form::hidden('mode', 'map') !!}
-{!! Form::close() !!}
+
+
diff --git a/resources/views/entities/pages/relations/create.blade.php b/resources/views/entities/pages/relations/create.blade.php
index 3890037e20..428674807f 100644
--- a/resources/views/entities/pages/relations/create.blade.php
+++ b/resources/views/entities/pages/relations/create.blade.php
@@ -11,17 +11,16 @@
])
@section('content')
- {!! Form::open(['route' => ['entities.relations.store', $campaign, $entity->id], 'method' => 'POST', 'data-shortcut' => 1, 'class' => 'ajax-subform']) !!}
+
+ @include('partials.forms.form', [
+ 'title' => __('entities/relations.create.title', ['name' => $entity->name]),
+ 'content' => 'entities.pages.relations._form',
+ 'dialog' => true,
+ ])
- @include('partials.forms.form', [
- 'title' => __('entities/relations.create.title', ['name' => $entity->name]),
- 'content' => 'entities.pages.relations._form',
- 'dialog' => true,
- ])
-
- {!! Form::hidden('entity_id', $entity->id) !!}
- {!! Form::hidden('owner_id', $entity->id) !!}
- {!! Form::close() !!}
+
+
+
@endsection
@section('scripts')
diff --git a/resources/views/entities/pages/relations/full-form/_entry.blade.php b/resources/views/entities/pages/relations/full-form/_entry.blade.php
index ffc071ced1..046133f586 100644
--- a/resources/views/entities/pages/relations/full-form/_entry.blade.php
+++ b/resources/views/entities/pages/relations/full-form/_entry.blade.php
@@ -6,14 +6,14 @@
@include('cruds.fields.relation')
@include('cruds.fields.colour_picker')
- @include('cruds.fields.attitude')
+ @include('cruds.fields.attitude', ['model' => $relation ?? null])
@include('cruds.fields.visibility_id', ['model' => $relation ?? null])
@if(empty($relation) && (!isset($mirror) || $mirror == true))
- {!! Form::checkbox('two_way', 1, null, ['data-animate' => 'collapse', 'data-target' => '#two-way-relation']) !!}
+
@@ -24,7 +24,7 @@
{!! __('entities/relations.fields.target_relation') !!}
- {!! Form::text('target_relation', null, ['class' => '', 'maxlength' => 191, 'placeholder' => __('entities/relations.placeholders.target_relation')]) !!}
+
{{ __('entities/relations.hints.target_relation') }}
diff --git a/resources/views/entities/pages/relations/full-form/create.blade.php b/resources/views/entities/pages/relations/full-form/create.blade.php
index 4c2adcda10..d8c6b93f0b 100644
--- a/resources/views/entities/pages/relations/full-form/create.blade.php
+++ b/resources/views/entities/pages/relations/full-form/create.blade.php
@@ -7,48 +7,34 @@
'centered' => true,
])
-@section('fullpage-form')
- {!! Form::open([
- 'method' => 'POST',
- 'enctype' => 'multipart/form-data',
- 'route' => ['relations.store', $campaign],
- 'data-shortcut' => '1',
- 'class' => 'entity-form',
- 'id' => 'entity-form',
- 'data-maintenance' => 1,
- ]) !!}
-@endsection
@section('content')
- @include('cruds.forms._errors')
-
-
-
-
+ @include('cruds.forms._errors')
+
+
+
+
+ @include('cruds.fields.save', ['disableCancel' => true, 'target' => 'entity-form'])
- @include('cruds.fields.save', ['disableCancel' => true, 'target' => 'entity-form'])
-
-
-
- {{ csrf_field() }}
- @include('entities.pages.relations.full-form._entry', ['source' => $source])
+
+
+ {{ csrf_field() }}
+ @include('entities.pages.relations.full-form._entry', ['source' => $source])
+
-
- {!! Form::close() !!}
+
@endsection
@include('editors.editor')
-@section('fullpage-form-end')
- {!! Form::close() !!}
-@endsection
-
@section('scripts')
@parent
diff --git a/resources/views/entities/pages/relations/full-form/update.blade.php b/resources/views/entities/pages/relations/full-form/update.blade.php
index 995692e1b7..81b6d1fb5f 100644
--- a/resources/views/entities/pages/relations/full-form/update.blade.php
+++ b/resources/views/entities/pages/relations/full-form/update.blade.php
@@ -7,20 +7,9 @@
'centered' => true,
])
-@section('fullpage-form')
- {!! Form::model($relation, [
- 'method' => 'PATCH',
- 'enctype' => 'multipart/form-data',
- 'route' => ['relations.update', $campaign, $relation],
- 'data-shortcut' => '1',
- 'class' => 'entity-form',
- 'id' => 'entity-form',
- 'data-maintenance' => 1
- ]) !!}
-@endsection
-
@section('content')
@include('cruds.forms._errors')
+
- {!! Form::close() !!}
+
@endsection
@include('editors.editor')
-@section('fullpage-form-end')
- {!! Form::close() !!}
-@endsection
-
@section('scripts')
@parent
diff --git a/resources/views/entities/pages/relations/update.blade.php b/resources/views/entities/pages/relations/update.blade.php
index 6eb82d5900..ab4ffaca76 100644
--- a/resources/views/entities/pages/relations/update.blade.php
+++ b/resources/views/entities/pages/relations/update.blade.php
@@ -11,29 +11,22 @@
])
@section('content')
- {!! Form::model($relation, ['route' => ['entities.relations.update', $campaign, $entity->id, $relation], 'method' => 'PATCH', 'data-shortcut' => 1, 'class' => 'ajax-subform']) !!}
+
+ @include('partials.forms.form', [
+ 'title' => __('entities/relations.update.title', ['name' => '' . $entity->name . '']),
+ 'content' => 'entities.pages.relations._form',
+ 'deleteID' => '#delete-relation-' . $relation->id,
+ 'dialog' => true,
+ ])
+ @if(!empty($from))
+
+ @endif
+
+
+
+
- @include('partials.forms.form', [
- 'title' => __('entities/relations.update.title', ['name' => link_to($entity->url(), $entity->name)]),
- 'content' => 'entities.pages.relations._form',
- 'deleteID' => '#delete-relation-' . $relation->id,
- 'dialog' => true,
- ])
-
- @if(!empty($from))
-
- @endif
- {!! Form::hidden('owner_id', $entity->id) !!}
- {!! Form::hidden('option', request()->get('option')) !!}
- {!! Form::hidden('mode', request()->get('mode')) !!}
-
- {!! Form::close() !!}
-
- {!! Form::open([
- 'method' => 'DELETE',
- 'route' => ['entities.relations.destroy', 'campaign' => $campaign, 'entity' => $entity->id, 'relation' => $relation->id, 'mode' => request()->mode, 'option' => request()->option],
- 'id' => 'delete-relation-' . $relation->id])
- !!}
+
@if ($relation->isMirrored())@endif
- {!! Form::close() !!}
+
@endsection
diff --git a/resources/views/entities/pages/story/_reorder.blade.php b/resources/views/entities/pages/story/_reorder.blade.php
index 722dd5c122..68ad38b0a5 100644
--- a/resources/views/entities/pages/story/_reorder.blade.php
+++ b/resources/views/entities/pages/story/_reorder.blade.php
@@ -16,10 +16,7 @@
$hasEntry = true;
}
?>
-{!! Form::open([
- 'route' => ['entities.story.reorder-save', $campaign, $entity],
- 'method' => 'POST',
-]) !!}
+
@includeWhen($startWithStory, 'entities.pages.story.reorder._story')
@@ -32,7 +29,7 @@
- {!! Form::hidden('posts[' . $note->id . '][id]', $note->id) !!}
+
@@ -64,4 +61,4 @@
-{!! Form::close() !!}
+
diff --git a/resources/views/entities/pages/story/reorder/_story.blade.php b/resources/views/entities/pages/story/reorder/_story.blade.php
index 1de49d429d..0dfc22b5d1 100644
--- a/resources/views/entities/pages/story/reorder/_story.blade.php
+++ b/resources/views/entities/pages/story/reorder/_story.blade.php
@@ -1,5 +1,5 @@
- {!! Form::hidden('posts[story]', 'story') !!}
+
diff --git a/resources/views/entities/pages/transform/index.blade.php b/resources/views/entities/pages/transform/index.blade.php
index f01bea97bd..40fde448dc 100644
--- a/resources/views/entities/pages/transform/index.blade.php
+++ b/resources/views/entities/pages/transform/index.blade.php
@@ -11,32 +11,29 @@
@section('content')
@include('partials.errors')
- {!! Form::open(['route' => ['entities.transform', $campaign, $entity->id], 'method' => 'POST']) !!}
+
+
+
+
+ {{ __('entities/transform.panel.description') }}
+
- {{ csrf_field() }}
-
-
-
- {{ __('entities/transform.panel.description') }}
-
+
+
+ {{ __('crud.helpers.learn_more', ['documentation' => __('footer.documentation')]) }}
+
-
-
- {{ __('crud.helpers.learn_more', ['documentation' => __('footer.documentation')]) }}
-
+
+
+
+
-
- {!! Form::select('target', $entities, null, ['class' => '']) !!}
-
-
-
-
-
-
-
-
- {!! Form::close() !!}
+
+
+
+
+
@endsection
diff --git a/resources/views/errors/maintenance.blade.php b/resources/views/errors/maintenance.blade.php
index 349ff5e021..12398a060c 100644
--- a/resources/views/errors/maintenance.blade.php
+++ b/resources/views/errors/maintenance.blade.php
@@ -50,7 +50,7 @@
Kanka is currently unavailable due to planned server maintenance.
This maintenance is planned to last until 16:00 UTC.
- Join us over on our {!! link_to(config('social.discord'), 'Discord', ['class' => 'link-light']) !!} to be notified as soon as the maintenance is over.
+ Join us over on our Discord to be notified as soon as the maintenance is over.
{{ __('errors.503.title') }}
diff --git a/resources/views/events/form/_entry.blade.php b/resources/views/events/form/_entry.blade.php
index 0cb9e402c6..7e15f99c65 100644
--- a/resources/views/events/form/_entry.blade.php
+++ b/resources/views/events/form/_entry.blade.php
@@ -6,7 +6,7 @@
@include('cruds.fields.location')
- {!! Form::text('date', FormCopy::field('date')->string(), ['placeholder' => __('events.placeholders.date'), 'class' => '', 'maxlength' => 191]) !!}
+
@include('cruds.fields.entry2')
diff --git a/resources/views/families/members/create.blade.php b/resources/views/families/members/create.blade.php
index a9771dcb1b..09badbb697 100644
--- a/resources/views/families/members/create.blade.php
+++ b/resources/views/families/members/create.blade.php
@@ -9,14 +9,13 @@
])
@section('content')
- {!! Form::open(['route' => ['families.members.store', $campaign, $model->id], 'method'=>'POST']) !!}
-
+
@include('partials.forms.form', [
'title' => __('families.members.create.title', ['name' => $model->name]),
'content' => 'families.members._form',
'submit' => __('families.members.create.submit'),
'dialog' => true,
])
- {!! Form::hidden('family_id', $model->id) !!}
- {!! Form::close() !!}
+
+
@endsection
diff --git a/resources/views/families/panels/_members.blade.php b/resources/views/families/panels/_members.blade.php
index 57bff58ff9..a879d45591 100644
--- a/resources/views/families/panels/_members.blade.php
+++ b/resources/views/families/panels/_members.blade.php
@@ -40,7 +40,7 @@
@endcan
-
+
@include('layouts.datagrid._table', ['datagridUrl' => route('families.members', $datagridOptions)])
diff --git a/resources/views/filters/form.blade.php b/resources/views/filters/form.blade.php
index 70306e980d..c010ce68b4 100644
--- a/resources/views/filters/form.blade.php
+++ b/resources/views/filters/form.blade.php
@@ -1,12 +1,7 @@
@php
use Illuminate\Support\Arr;
@endphp
-{!! Form::open([
- 'url' => route($route, [$campaign, 'm' => $mode]),
- 'method' => 'GET',
- 'id' => 'crud-filters-form',
- 'class' => 'block'
-]) !!}
+
{{ __('crud.filters.title') }}
@@ -100,4 +95,4 @@
@endif
-{!! Form::close() !!}
+
diff --git a/resources/views/gallery/file/_form.blade.php b/resources/views/gallery/file/_form.blade.php
index b7d3a85ec0..12e0093a30 100644
--- a/resources/views/gallery/file/_form.blade.php
+++ b/resources/views/gallery/file/_form.blade.php
@@ -69,12 +69,12 @@
@can('edit', [$image, $campaign])
- {!! Form::text('name', null, ['maxlength' => 45, 'class' => '']) !!}
+
@if(!$image->isFolder())
- {!! Form::select('folder_id', $folders, null, ['class' => '']) !!}
+
@endif
diff --git a/resources/views/gallery/file/edit.blade.php b/resources/views/gallery/file/edit.blade.php
index 90babfe8fb..f62ed56fc2 100644
--- a/resources/views/gallery/file/edit.blade.php
+++ b/resources/views/gallery/file/edit.blade.php
@@ -2,8 +2,20 @@
$imageCount = 0;
?>
@can('edit', [$image, $campaign])
-{!! Form::model($image, ['route' => ['images.update', $campaign, $image], 'method' => 'PUT', 'class' => 'flex flex-col gap-5']) !!}
-@endcan
+
+ @include('partials.forms.form', [
+ 'title' => $image->name,
+ 'content' => 'gallery.file._form',
+ 'submit' => __('campaigns/gallery.actions.save'),
+ 'dialog' => true,
+ 'actions' => 'gallery.file._actions',
+ 'deleteID' => auth()->user()->can('delete', [$image, $campaign]) && ($image->isFolder() || $image->hasNoFolders()) ? '#delete-confirm-form' : null,
+ ])
+
+ @if(!$image->isFolder() || $image->hasNoFolders())
+
+ @endif
+@else
@include('partials.forms.form', [
'title' => $image->name,
'content' => 'gallery.file._form',
@@ -12,11 +24,4 @@
'actions' => 'gallery.file._actions',
'deleteID' => auth()->user()->can('delete', [$image, $campaign]) && ($image->isFolder() || $image->hasNoFolders()) ? '#delete-confirm-form' : null,
])
-@can('edit', [$image, $campaign])
-{!! Form::close() !!}
-
-@if(!$image->isFolder() || $image->hasNoFolders())
- {!! Form::open(['method' => 'DELETE','route' => ['images.destroy', $campaign, $image->id], 'style'=>'display:inline', 'id' => 'delete-confirm-form']) !!}
- {!! Form::close() !!}
-@endif
@endcan
diff --git a/resources/views/gallery/file/focus/_actions.blade.php b/resources/views/gallery/file/focus/_actions.blade.php
index 2247f10833..04dacab0aa 100644
--- a/resources/views/gallery/file/focus/_actions.blade.php
+++ b/resources/views/gallery/file/focus/_actions.blade.php
@@ -1,11 +1,10 @@
+
+
+
- {!! Form::model($image, ['route' => ['campaign.gallery.save-focus', $campaign, $image], 'method' => 'POST']) !!}
-
- {!! Form::close() !!}
-
- {!! Form::model($image, ['route' => ['campaign.gallery.save-focus', $campaign, $image], 'method' => 'POST']) !!}
- {!! Form::hidden('focus_x', null) !!}
- {!! Form::hidden('focus_y', null) !!}
-
- {!! Form::close() !!}
+
+
+
+
+
diff --git a/resources/views/gallery/folders/_form.blade.php b/resources/views/gallery/folders/_form.blade.php
index 43d021a2b2..e793deabbe 100644
--- a/resources/views/gallery/folders/_form.blade.php
+++ b/resources/views/gallery/folders/_form.blade.php
@@ -1,6 +1,6 @@
- {!! Form::text('name', null, ['class' => 'w-full', 'maxlength' => 100, 'required']) !!}
+
@include('cruds.fields.visibility_id', ['model' => null])
diff --git a/resources/views/gallery/folders/create.blade.php b/resources/views/gallery/folders/create.blade.php
index f9904b4fa3..865c34b090 100644
--- a/resources/views/gallery/folders/create.blade.php
+++ b/resources/views/gallery/folders/create.blade.php
@@ -1,11 +1,11 @@
-{!! Form::open(['route' => ['campaign.gallery.folders.store', $campaign], 'method' => 'POST', 'class' => 'ajax-subform']) !!}
-@include('partials.forms.form', [
- 'title' => __('campaigns/gallery.new_folder.title'),
- 'content' => 'gallery.folders._form',
- 'submit' => __('crud.create'),
- 'dialog' => true,
-])
-@if(!empty($folder))
- {!! Form::hidden('folder_id', $folder->id) !!}
-@endif
-{!! Form::close() !!}
+
+ @include('partials.forms.form', [
+ 'title' => __('campaigns/gallery.new_folder.title'),
+ 'content' => 'gallery.folders._form',
+ 'submit' => __('crud.create'),
+ 'dialog' => true,
+ ])
+ @if(!empty($folder))
+
+ @endif
+
diff --git a/resources/views/gallery/index.blade.php b/resources/views/gallery/index.blade.php
index ac80302305..6aff442a26 100644
--- a/resources/views/gallery/index.blade.php
+++ b/resources/views/gallery/index.blade.php
@@ -100,7 +100,7 @@
- {!! Form::hidden('folder_id', $folder?->id) !!}
+
@endcan
diff --git a/resources/views/helpers/troubleshooting/index.blade.php b/resources/views/helpers/troubleshooting/index.blade.php
index e95919bf9b..10e5b388c0 100644
--- a/resources/views/helpers/troubleshooting/index.blade.php
+++ b/resources/views/helpers/troubleshooting/index.blade.php
@@ -8,7 +8,7 @@
{{ __('helpers.troubleshooting.subtitle') }}
- {!! Form::open(['route' => 'troubleshooting.generate', 'method' => 'POST']) !!}
+
@@ -27,7 +27,7 @@
@else
- {!! Form::select('campaign', $campaigns, null, ['class' => '']) !!}
+
@endif
@@ -38,6 +38,6 @@
@endif
- {!! Form::close() !!}
+
@endsection
diff --git a/resources/views/history/index.blade.php b/resources/views/history/index.blade.php
index 02aaa5ad65..9a23082dc2 100644
--- a/resources/views/history/index.blade.php
+++ b/resources/views/history/index.blade.php
@@ -22,10 +22,10 @@
@endif
@if ($superboosted)
- {!! Form::open(['method' => 'GET', 'route' => ['history.index', $campaign], 'class' => 'history-filters flex flex-col gap-5']) !!}
+
- {!! Form::select('action', $actions, $action, ['class' => '']) !!}
+
- {!! Form::close() !!}
+
@endif
@if ($models->count() > 0)
@@ -63,9 +63,16 @@
@if ($superboosted || $count === 0)
+@php
+if (!$log->entity) {
+ $entityLink = ' ' . __('history.unknown.entity') . '';
+} else {
+ $entityLink = $log->entity->tooltipedLink($log->entity->name, false);
+}
+@endphp
{!! __('history.log.' . $log->actionCode(), [
'user' => $log->userLink(),
- 'entity' => $log->entityLink(),
+ 'entity' => $entityLink,
'post' => $log->post?->name,
]) !!}
@if ($log->impersonator)
diff --git a/resources/views/home.blade.php b/resources/views/home.blade.php
index 3ecdf2c3b1..a3ed61087b 100644
--- a/resources/views/home.blade.php
+++ b/resources/views/home.blade.php
@@ -73,7 +73,7 @@
{!! __('dashboard.setup.tutorial.text', [
- 'blog' => link_to('https://blog.kanka.io/2020/09/20/how-to-style-your-kanka-campaign-dashboard/', __('dashboard.setup.tutorial.blog'), ['target' => '_blank'])
+ 'blog' => '' . __('dashboard.setup.tutorial.blog') . '',
]) !!}
diff --git a/resources/views/items/form/_entry.blade.php b/resources/views/items/form/_entry.blade.php
index 4a9580751c..2eaf00b4df 100644
--- a/resources/views/items/form/_entry.blade.php
+++ b/resources/views/items/form/_entry.blade.php
@@ -4,19 +4,7 @@
@include('cruds.fields.item', ['isParent' => true])
@include('cruds.fields.price', ['trans' => 'items'])
-
-
- {!! Form::text(
- 'size',
- FormCopy::field('size')->string(),
- [
- 'placeholder' => __('items.placeholders.size'),
- 'maxlength' => 191
- ]
- ) !!}
-
+ @include('cruds.fields.size', ['trans' => 'items'])
@include('cruds.fields.location')
diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
index 5c944dc915..394d438fec 100644
--- a/resources/views/layouts/app.blade.php
+++ b/resources/views/layouts/app.blade.php
@@ -81,8 +81,6 @@
@include('layouts.header', ['toggle' => $showSidebar])
@includeWhen(isset($campaign) || isset($sidebar) && $sidebar == 'settings', 'layouts.sidebars.' . ($sidebar ?? 'app'))
- @yield('fullpage-form')
-
@include('layouts.banner')
@@ -134,8 +132,6 @@
- @yield('fullpage-form-end')
-
@include('layouts.footer')
diff --git a/resources/views/layouts/callouts/recoverable.blade.php b/resources/views/layouts/callouts/recoverable.blade.php
index eda489eecb..cc1341ca16 100644
--- a/resources/views/layouts/callouts/recoverable.blade.php
+++ b/resources/views/layouts/callouts/recoverable.blade.php
@@ -5,7 +5,7 @@
{!! __('crud.delete_modal.recoverable', [
-'boosted-campaign' => link_to(Domain::toFront('pricing'), __('concept.premium-campaign'), '#premium'),
+'boosted-campaign' => ' ' . __('concept.premium-campaigns') . '',
'day' => config('entities.hard_delete')
])!!}
diff --git a/resources/views/layouts/datagrid/bulks/_calendar-event.blade.php b/resources/views/layouts/datagrid/bulks/_calendar-event.blade.php
index 0c49184c17..ee98af5549 100644
--- a/resources/views/layouts/datagrid/bulks/_calendar-event.blade.php
+++ b/resources/views/layouts/datagrid/bulks/_calendar-event.blade.php
@@ -16,7 +16,8 @@
>
- {!! Form::text('comment', null, ['placeholder' => __('calendars.placeholders.comment'), 'maxlength' => 191]) !!}
+
+
- {!! Form::number('length', null, ['placeholder' => __('calendars.placeholders.length'), 'maxlength' => 0, 'data-url' => route('calendars.event-length', [$campaign, 'calendar' => isset($calendar) ? $calendar : 0])]) !!}
+
- {!! __('calendars.warnings.event_length', ['documentation' => link_to('https://docs.kanka.io/en/latest/entities/calendars.html#long-lasting-reminders', ' ' . __('footer.documentation'), ['target' => '_blank'], null, false)])!!}
+ {!! __('calendars.warnings.event_length', ['documentation' => ' ' . __('footer.documentation') . ''])!!}
-
- {!! Form::text('colour', null, ['class' => ' spectrum', 'maxlength' => 6, 'data-append-to' => '#primary-dialog'] ) !!}
-
+ @include('cruds.fields.colour_picker', ['dropdownParent' => request()->ajax() ? '#primary-dialog' : null])
diff --git a/resources/views/layouts/datagrid/bulks/_map-group.blade.php b/resources/views/layouts/datagrid/bulks/_map-group.blade.php
index 258dbd3b89..5bb53dd0e0 100644
--- a/resources/views/layouts/datagrid/bulks/_map-group.blade.php
+++ b/resources/views/layouts/datagrid/bulks/_map-group.blade.php
@@ -7,7 +7,7 @@
?>
- {{ Form::select('is_shown', $typeOptions, null, ['class' => '', 'id' => 'type_id']) }}
+
@include('cruds.fields.visibility_id', ['bulk' => true])
diff --git a/resources/views/layouts/datagrid/bulks/_map-layer.blade.php b/resources/views/layouts/datagrid/bulks/_map-layer.blade.php
index 51357643f1..84cbc07162 100644
--- a/resources/views/layouts/datagrid/bulks/_map-layer.blade.php
+++ b/resources/views/layouts/datagrid/bulks/_map-layer.blade.php
@@ -8,7 +8,7 @@
?>
- {{ Form::select('type_id', $typeOptions, null, ['class' => '', 'id' => 'type_id']) }}
+
@include('cruds.fields.visibility_id', ['bulk' => true])
diff --git a/resources/views/layouts/datagrid/bulks/_map-marker.blade.php b/resources/views/layouts/datagrid/bulks/_map-marker.blade.php
index 6d0226176e..1dda20a0b9 100644
--- a/resources/views/layouts/datagrid/bulks/_map-marker.blade.php
+++ b/resources/views/layouts/datagrid/bulks/_map-marker.blade.php
@@ -30,21 +30,13 @@
?>
- {!! Form::select('icon', $iconOptions, null, ['class' => '', 'id' => 'icon']) !!}
+
@if ($campaign->boosted())
- {!! Form::text(
- 'custom_icon',
- null,
- [
- 'class' => '',
- 'placeholder' => __('maps/markers.placeholders.custom_icon', ['example1' => '"fa-solid fa-gem"', 'example2' => '"ra ra-sword"']),
- 'list' => 'map-marker-icon-list',
- 'autocomplete' => 'off'
- ])
- !!}
+
+ '"ra ra-sword"']) }}" autocomplete="off" list="map-marker-icon-list" />
@endif
-
- {!! Form::text('font_colour', null, ['class' => ' spectrum', 'maxlength' => 6, 'data-append-to' => '#primary-dialog'] ) !!}
-
+ @include('maps.markers.fields.font_colour', ['dropdownParent' => '#primary-dialog'])
- {{ Form::select('is_draggable', $typeOptions, null, ['class' => '', 'id' => 'type_id']) }}
+
- {!! Form::number('opacity', (!empty($source) ? $source->opacity : (isset($model) ? $model->opacity : null)), ['class' => '', 'maxlength' => 3, 'step' => 10, 'max' => 100, 'min' => 0, 'id' => 'opacity'] ) !!}
+
-
- {!! Form::text('colour', null, ['class' => ' spectrum', 'maxlength' => 6, 'data-append-to' => '#primary-dialog'] ) !!}
-
+ @include('maps.markers.fields.background_colour', ['dropdownParent' => '#primary-dialog'])
- {{ Form::select('group_id', $groups, null, ['class' => '', 'id' => 'group_id']) }}
+
@include('cruds.fields.visibility_id', ['bulk' => true])
diff --git a/resources/views/layouts/datagrid/bulks/update.blade.php b/resources/views/layouts/datagrid/bulks/update.blade.php
index 306f2ebca2..8bcffdc433 100644
--- a/resources/views/layouts/datagrid/bulks/update.blade.php
+++ b/resources/views/layouts/datagrid/bulks/update.blade.php
@@ -1,4 +1,4 @@
-
diff --git a/resources/views/layouts/datagrid/search.blade.php b/resources/views/layouts/datagrid/search.blade.php
index b7e48e8fcc..d25ae1cbf5 100644
--- a/resources/views/layouts/datagrid/search.blade.php
+++ b/resources/views/layouts/datagrid/search.blade.php
@@ -1,6 +1,6 @@
-{!! Form::open(['url' => $route, 'method' => 'GET', 'class' => 'flex-0 form-inline datagrid-search inline-block', 'role' => 'form']) !!}
+
- {{ Form::text('search', isset($filterService) ? $filterService->search() : null, ['class' => '', 'placeholder' => __('crud.search')]) }}
+
-{!! Form::close() !!}
+
diff --git a/resources/views/layouts/error.blade.php b/resources/views/layouts/error.blade.php
index e4232cab56..9eb2226f0d 100644
--- a/resources/views/layouts/error.blade.php
+++ b/resources/views/layouts/error.blade.php
@@ -56,8 +56,9 @@
{!! __('errors.footer', [
- 'discord' => link_to(config('social.discord'), 'Discord', ['class' => 'link-light']),
- 'email' => link_to('mailto:' . config('app.email'), config('app.email'), ['class' => 'link-light'])]) !!}
+ 'discord' => 'Discord',
+ 'email' => '' . config('app.email') . '',
+]) !!}
diff --git a/resources/views/locations/panels/characters.blade.php b/resources/views/locations/panels/characters.blade.php
index 186913ddec..05c6980087 100644
--- a/resources/views/locations/panels/characters.blade.php
+++ b/resources/views/locations/panels/characters.blade.php
@@ -1,4 +1,4 @@
-
+
@include('layouts.datagrid._table')
diff --git a/resources/views/maps/_explore-link.blade.php b/resources/views/maps/_explore-link.blade.php
new file mode 100644
index 0000000000..dd9051bb6f
--- /dev/null
+++ b/resources/views/maps/_explore-link.blade.php
@@ -0,0 +1,19 @@
+@php
+ /** @var \App\Models\Map $map */
+if (!$map->explorable()) {
+ return '';
+}
+if ($map->isChunked()) {
+ if ($map->chunkingError()) {
+ return ' ';
+ } elseif ($map->chunkingRunning()) {
+ return ' ';
+ }
+}
+@endphp
+
+
+
diff --git a/resources/views/maps/bulk/modals/_copy_to_campaign.blade.php b/resources/views/maps/bulk/modals/_copy_to_campaign.blade.php
index 980a79c763..7481721f4c 100644
--- a/resources/views/maps/bulk/modals/_copy_to_campaign.blade.php
+++ b/resources/views/maps/bulk/modals/_copy_to_campaign.blade.php
@@ -1,5 +1,5 @@
- {!! Form::checkbox('copy_related_elements', 1, true) !!}
+
diff --git a/resources/views/maps/datagrid.blade.php b/resources/views/maps/datagrid.blade.php
index c7ae82818f..2ade927133 100644
--- a/resources/views/maps/datagrid.blade.php
+++ b/resources/views/maps/datagrid.blade.php
@@ -13,8 +13,8 @@
],
[
'label' => ' ',
- 'render' => function($model) {
- return $model->exploreLink();
+ 'render' => function($model) use ($campaign) {
+ return \Illuminate\Support\Facades\Blade::render('maps._explore-link', ['map' => $model, 'campaign' => $campaign]);
},
'disableSort' => true,
],
diff --git a/resources/views/maps/explore.blade.php b/resources/views/maps/explore.blade.php
index fe4d017449..2ce31aa315 100644
--- a/resources/views/maps/explore.blade.php
+++ b/resources/views/maps/explore.blade.php
@@ -165,13 +165,14 @@
@can('update', $map)
+
+ footer="maps.markers._new-footer">
@include('partials.errors')
@include('maps.markers._form', ['model' => null, 'map' => $map, 'activeTab' => 1, 'dropdownParent' => '#marker-modal', 'from' => 'explore'])
+
@endcan
@endsection
diff --git a/resources/views/maps/form/_copy.blade.php b/resources/views/maps/form/_copy.blade.php
index b8cc1a30a7..fa8f52548e 100644
--- a/resources/views/maps/form/_copy.blade.php
+++ b/resources/views/maps/form/_copy.blade.php
@@ -1,5 +1,5 @@
- {!! Form::checkbox('copy_related_elements', 1, true) !!}
+
>
diff --git a/resources/views/maps/form/_entry.blade.php b/resources/views/maps/form/_entry.blade.php
index e247d68608..840ff750bc 100644
--- a/resources/views/maps/form/_entry.blade.php
+++ b/resources/views/maps/form/_entry.blade.php
@@ -3,7 +3,7 @@
@include('cruds.fields.type', ['base' => \App\Models\Map::class, 'trans' => 'maps'])
- @include('cruds.fields.map', ['isParent' => true, 'from' => (isset($model) ? $model : null)])
+ @include('cruds.fields.map', ['isParent' => true, 'from' => $model ?? null])
@include('cruds.fields.location')
diff --git a/resources/views/maps/form/_markers.blade.php b/resources/views/maps/form/_markers.blade.php
index 47a43e3439..a2ce405392 100644
--- a/resources/views/maps/form/_markers.blade.php
+++ b/resources/views/maps/form/_markers.blade.php
@@ -129,20 +129,14 @@
@section('modals')
@parent
+
+ footer="maps.markers._new-footer">
@include('maps.markers._form', ['model' => null, 'map' => $model, 'activeTab' => 1, 'dropdownParent' => '#marker-modal', 'from' => base64_encode('maps.map_markers.index:' . $model->id)])
+
@endsection
@endif
diff --git a/resources/views/maps/form/_panes.blade.php b/resources/views/maps/form/_panes.blade.php
index 2d483be2ba..e7a151f6cd 100644
--- a/resources/views/maps/form/_panes.blade.php
+++ b/resources/views/maps/form/_panes.blade.php
@@ -1,3 +1,3 @@
- @include('maps.form._settings', ['source' => null])
+ @include('maps.form._settings')
diff --git a/resources/views/maps/form/_settings.blade.php b/resources/views/maps/form/_settings.blade.php
index 62b014bd04..11bb3dd07d 100644
--- a/resources/views/maps/form/_settings.blade.php
+++ b/resources/views/maps/form/_settings.blade.php
@@ -17,7 +17,7 @@
:label="__('maps.fields.is_real')">
- {!! Form::checkbox('is_real') !!}
+ is_real ?? false)) checked="checked" @endif />
@@ -26,7 +26,7 @@
:label="__('maps.fields.has_clustering')">
- {!! Form::checkbox('has_clustering', 1, !isset($model) ? true : $model->has_clustering) !!}
+ has_clustering ?? true)) checked="checked" @endif />
@@ -41,14 +41,7 @@
field="max-zoom"
:label="__('maps.fields.max_zoom')"
:helper="__('maps.helpers.max_zoom', ['max' => Map::MAX_ZOOM, 'default' => 5])">
- {!! Form::number(
- 'max_zoom',
- FormCopy::field('max_zoom')->string(),
- [
- 'placeholder' => 5,
- 'class' => '',
- ]
- ) !!}
+
- {!! Form::number(
- 'min_zoom',
- FormCopy::field('min_zoom')->string(),
- [
- 'placeholder' => -2,
- 'class' => '',
- ]
- ) !!}
+
@endif
@@ -71,29 +57,14 @@
field="initial-zoom"
:label="__('maps.fields.initial_zoom')"
:helper=" __('maps.helpers.initial_zoom', ['min' => $minInitial, 'max' => $maxInitial, 'default' => $defaultInitial])">
- {!! Form::number(
- 'initial_zoom',
- FormCopy::field('initial_zoom')->string(),
- [
- 'placeholder' => 5,
- 'class' => '',
- ]
- ) !!}
+
- {!! Form::number(
- 'grid',
- FormCopy::field('grid')->string(),
- [
- 'placeholder' => __('maps.placeholders.grid'),
- 'class' => '',
- 'maxlength' => 4
- ]
- ) !!}
+
@@ -101,15 +72,8 @@
- {!! Form::text(
- 'config[distance_name]',
- FormCopy::field('config[distance_name]')->string(),
- [
- 'placeholder' => __('maps.placeholders.distance_name'),
- 'class' => '',
- 'maxlength' => 20
- ]
- ) !!}
+
+
- {!! Form::number(
- 'config[distance_measure]',
- FormCopy::field('config[distance_measure]')->string(),
- [
- 'class' => '',
- 'min' => 0.0001,
- 'max' => 100.99,
- 'step' => 0.0001,
- ]
- ) !!}
+
@@ -156,29 +111,11 @@
- {!! Form::number(
- 'center_y',
- FormCopy::field('center_y')->string(),
- [
- 'placeholder' => __('maps.placeholders.center_y'),
- 'class' => '',
- 'min' => -90,
- 'step' => 0.001
- ]
- ) !!}
+
- {!! Form::number(
- 'center_x',
- FormCopy::field('center_x')->string(),
- [
- 'placeholder' => __('maps.placeholders.center_x'),
- 'class' => '',
- 'min' => -180,
- 'step' => 0.001
- ]
- ) !!}
+
diff --git a/resources/views/maps/groups/_form.blade.php b/resources/views/maps/groups/_form.blade.php
index e68349d1f6..cc761f8d89 100644
--- a/resources/views/maps/groups/_form.blade.php
+++ b/resources/views/maps/groups/_form.blade.php
@@ -4,15 +4,15 @@
:label="__('crud.fields.name')"
field="name"
css="col-span-2">
- {!! Form::text('name', null, ['placeholder' => __('maps/groups.placeholders.name'), 'class' => '', 'maxlength' => 191, 'required' => true]) !!}
+
- {!! Form::hidden('is_shown', 0) !!}
+
- {!! Form::checkbox('is_shown', 1, isset($model) ? $model->is_shown : 1) !!}
+ is_shown ?? true)) checked="checked" @endif />
@@ -23,7 +23,7 @@
- {!! Form::select('position', $options, (!empty($model->position) ? $model->position : $last), ['class' => '']) !!}
+
@include('cruds.fields.visibility_id')
diff --git a/resources/views/maps/groups/_reorder.blade.php b/resources/views/maps/groups/_reorder.blade.php
index d9e7c2fe07..a637cea95a 100644
--- a/resources/views/maps/groups/_reorder.blade.php
+++ b/resources/views/maps/groups/_reorder.blade.php
@@ -2,15 +2,12 @@
{{ __('maps/groups.reorder.title') }}
-{!! Form::open([
- 'route' => ['maps.groups.reorder-save', $campaign, 'map' => $model],
- 'method' => 'POST',
-]) !!}
+
@foreach($rows as $group)
- {!! Form::hidden('group[]', $group->id) !!}
+
@@ -29,4 +26,4 @@
{{ __('maps/groups.reorder.save') }}
-{!! Form::close() !!}
+
diff --git a/resources/views/maps/groups/create.blade.php b/resources/views/maps/groups/create.blade.php
index 7ef20f8271..e7630a52d9 100644
--- a/resources/views/maps/groups/create.blade.php
+++ b/resources/views/maps/groups/create.blade.php
@@ -16,16 +16,13 @@
])
@section('content')
-
- {!! Form::open(['route' => ['maps.map_groups.store', $campaign, $map], 'method' => 'POST', 'data-shortcut' => 1, 'data-maintenance' => 1]) !!}
-
- @include('partials.forms.form', [
- 'title' => __('maps/groups.create.title', ['name' => $map->name]),
- 'content' => 'maps.groups._form',
- 'formParams' => ['model' => null, 'map' => $map],
- 'actions' => 'maps.groups._actions',
- 'dialog' => true,
- ])
-
- {!! Form::close() !!}
+
+ @include('partials.forms.form', [
+ 'title' => __('maps/groups.create.title', ['name' => $map->name]),
+ 'content' => 'maps.groups._form',
+ 'formParams' => ['model' => null, 'map' => $map],
+ 'actions' => 'maps.groups._actions',
+ 'dialog' => true,
+ ])
+
@endsection
diff --git a/resources/views/maps/groups/edit.blade.php b/resources/views/maps/groups/edit.blade.php
index 9cae2c1f45..27a84f48f5 100644
--- a/resources/views/maps/groups/edit.blade.php
+++ b/resources/views/maps/groups/edit.blade.php
@@ -16,14 +16,12 @@
])
@section('content')
- {!! Form::model($model, ['route' => ['maps.map_groups.update', 'campaign' => $campaign, 'map' => $map, 'map_group' => $model], 'method' => 'PATCH', 'id' => 'map-group-form', 'enctype' => 'multipart/form-data', 'class' => 'ajax-subform', 'data-maintenance' => 1]) !!}
-
- @include('partials.forms.form', [
- 'title' => __('maps/groups.edit.title', ['name' => $map->name]),
- 'content' => 'maps.groups._form',
- 'actions' => 'maps.groups._actions',
- 'dialog' => true,
- ])
-
- {!! Form::close() !!}
+
+ @include('partials.forms.form', [
+ 'title' => __('maps/groups.edit.title', ['name' => $map->name]),
+ 'content' => 'maps.groups._form',
+ 'actions' => 'maps.groups._actions',
+ 'dialog' => true,
+ ])
+
@endsection
diff --git a/resources/views/maps/layers/_form.blade.php b/resources/views/maps/layers/_form.blade.php
index 456665d4af..b22a763e6d 100644
--- a/resources/views/maps/layers/_form.blade.php
+++ b/resources/views/maps/layers/_form.blade.php
@@ -11,7 +11,7 @@
field="name"
:required="true"
:label="__('crud.fields.name')">
- {!! Form::text('name', null, ['placeholder' => __('maps/layers.placeholders.name'), 'class' => '', 'maxlength' => 191, 'required' => true]) !!}
+
@php
$options = $map->layerPositionOptions(!empty($model->position) ? $model->position : null);
@@ -20,13 +20,18 @@
- {{ Form::select('type_id', $typeOptions, null, ['class' => '', 'id' => 'type_id']) }}
+
- {!! Form::textarea('entry', null, ['class' => ' html-editor', 'id' => 'layer-entry', 'name' => 'entry']) !!}
+
+
@include('cruds.fields.visibility_id')
@@ -34,7 +39,7 @@
- {!! Form::select('position', $options, (!empty($model->position) ? $model->position : $last), ['class' => '']) !!}
+
diff --git a/resources/views/maps/layers/_reorder.blade.php b/resources/views/maps/layers/_reorder.blade.php
index 1926f53c32..46e521d33a 100644
--- a/resources/views/maps/layers/_reorder.blade.php
+++ b/resources/views/maps/layers/_reorder.blade.php
@@ -1,15 +1,12 @@
{{ __('maps/layers.reorder.title') }}
-{!! Form::open([
- 'route' => ['maps.layers.reorder-save', $campaign, 'map' => $model],
- 'method' => 'POST',
-]) !!}
+
@foreach($rows as $layer)
- {!! Form::hidden('layer[]', $layer->id) !!}
+
@@ -26,4 +23,4 @@
{{ __('maps/layers.reorder.save') }}
-{!! Form::close() !!}
+
diff --git a/resources/views/maps/layers/create.blade.php b/resources/views/maps/layers/create.blade.php
index 1523b8eb08..e133d3c822 100644
--- a/resources/views/maps/layers/create.blade.php
+++ b/resources/views/maps/layers/create.blade.php
@@ -17,10 +17,8 @@
])
@section('content')
- {!! Form::open(['route' => ['maps.map_layers.store', $campaign, $map], 'method' => 'POST', 'id' => 'map-layer-form', 'enctype' => 'multipart/form-data', 'data-maintenance' => 1]) !!}
-
+
-
@include('partials.errors')
@include('maps.layers._form', ['model' => null])
@@ -35,5 +33,5 @@
- {!! Form::close() !!}
+
@endsection
diff --git a/resources/views/maps/layers/edit.blade.php b/resources/views/maps/layers/edit.blade.php
index 51d6a6e7e3..9470bda17b 100644
--- a/resources/views/maps/layers/edit.blade.php
+++ b/resources/views/maps/layers/edit.blade.php
@@ -16,8 +16,7 @@
])
@section('content')
- {!! Form::model($model, ['route' => ['maps.map_layers.update', $campaign, 'map' => $map, 'map_layer' => $model], 'method' => 'PATCH', 'id' => 'map-layer-form', 'enctype' => 'multipart/form-data', 'data-maintenance' => 1]) !!}
-
+
@include('partials.errors')
@@ -34,5 +33,5 @@
- {!! Form::close() !!}
+
@endsection
diff --git a/resources/views/maps/markers/_form.blade.php b/resources/views/maps/markers/_form.blade.php
index 53a73bf28d..6282bc5ca4 100644
--- a/resources/views/maps/markers/_form.blade.php
+++ b/resources/views/maps/markers/_form.blade.php
@@ -60,9 +60,9 @@
@include('maps.markers.fields.font_colour')
- {!! Form::hidden('is_draggable', 0) !!}
+
- {!! Form::checkbox('is_draggable', 1, (!empty($source) ? $source->is_draggable : null)) !!}
+ is_draggable ?? $model->is_draggable ?? false)) checked="checked" @endif />
@@ -73,11 +73,11 @@
- {!! Form::select('size_id', $sizeOptions, \App\Facades\FormCopy::field('size_id')->string(), ['class' => '', 'id' => 'size_id']) !!}
+
- {!! Form::text('circle_radius', \App\Facades\FormCopy::field('circle_radius')->string(), ['class' => ' map-marker-circle-radius', 'id' => 'circle_radius', 'style' => (!isset($model) || $model->shape_id != 6) ? 'display:none;' : '']) !!}
+
@@ -116,7 +116,7 @@
@endif
- {!! Form::textarea('custom_shape', \App\Facades\FormCopy::field('custom_shape')->string(), ['class' => '', 'rows' => 2, 'placeholder' => __('maps/markers.placeholders.custom_shape')]) !!}
+
@else
{{ __('maps/markers.pitches.poly') }}
@@ -128,22 +128,18 @@
- {!! Form::text('polygon_style[stroke]', \App\Facades\FormCopy::field('polygon_style[stroke]')->string(), ['class' => ' spectrum']) !!}
+
+
- {!! Form::number('polygon_style[stroke-width]', \App\Facades\FormCopy::field('polygon_style[stroke-width]')->string(), ['class' => '', 'maxlength' => 2, 'step' => 1, 'max' => 99, 'min' => 0, 'id' => 'stroke-width']) !!}
+
+
- {!! Form::number('polygon_style[stroke-opacity]', \App\Facades\FormCopy::field('polygon_style[stroke-opacity]')->string(), [
- 'maxlength' => 3,
- 'step' => 10,
- 'max' => 100,
- 'min' => 0,
- 'id' => 'stroke-opacity'
- ]) !!}
+
@@ -173,7 +169,7 @@
- {!! Form::text('name', \App\Facades\FormCopy::field('name')->string(), ['placeholder' => __('maps/markers.placeholders.name'), 'class' => '', 'maxlength' => 191, 'id' => 'name']) !!}
+
@include('cruds.fields.entity')
@@ -190,11 +186,7 @@
- {!! Form::textarea(
- 'entry',
- \App\Facades\FormCopy::field('entry')->string(),
- ['class' => ' html-editor', 'id' => 'marker-entry', 'name' => 'entry']
- ) !!}
+
@endif
@@ -206,13 +198,13 @@
- {{ Form::select('group_id', $map->groupOptions(), \App\Facades\FormCopy::field('group_id')->string(), ['class' => '', 'id' => 'group_id']) }}
+
- {!! Form::hidden('is_popupless', 0) !!}
+
- {!! Form::checkbox('is_popupless', 1, FormCopy::field('is_popupless')->string()) !!}
+ is_popupless ?? old('is_popupless', $model->is_popupless ?? false)) checked="checked" @endif />
@@ -222,16 +214,16 @@
- {!! Form::number('latitude', \App\Facades\FormCopy::field('latitude')->string(), ['class' => '', 'id' => 'marker-latitude', 'step' => 0.001]) !!}
+
- {!! Form::number('longitude', \App\Facades\FormCopy::field('longitude')->string(), ['class' => '', 'id' => 'marker-longitude', 'step' => 0.001]) !!}
+
-{!! Form::hidden('shape_id', (!isset($model) ? !empty($source) ? $source->shape_id : 1 : null)) !!}
+
@if (isset($from))
@endif
diff --git a/resources/views/maps/markers/create.blade.php b/resources/views/maps/markers/create.blade.php
index 81f65f4f82..44b76c287b 100644
--- a/resources/views/maps/markers/create.blade.php
+++ b/resources/views/maps/markers/create.blade.php
@@ -17,8 +17,8 @@
])
@section('content')
+
- {!! Form::open(['route' => ['maps.map_markers.store', $campaign, $map], 'method' => 'POST', 'id' => 'map-marker-form', 'class' => 'ajax-subform']) !!}
@if (request()->ajax())
- {!! Form::open(['method' => 'DELETE', 'route' => ['maps.map_markers.destroy', $campaign, $marker->map, $marker], 'style' => 'display:inline', 'id' => 'delete-marker-confirm-form-' . $marker->id]) !!}
+
- {!! Form::close() !!}
+
@endcan
diff --git a/resources/views/maps/markers/edit.blade.php b/resources/views/maps/markers/edit.blade.php
index 3376b8c97c..505f64fbad 100644
--- a/resources/views/maps/markers/edit.blade.php
+++ b/resources/views/maps/markers/edit.blade.php
@@ -32,7 +32,7 @@
@include('partials.errors')
- {!! Form::model($model, ['route' => ['maps.map_markers.update', $campaign, 'map' => $map, 'map_marker' => $model], 'method' => 'PATCH', 'id' => 'map-marker-form', 'class' => 'ajax-subform', 'data-shortcut' => 1, 'data-maintenance' => 1]) !!}
+
@include('maps.markers._form')
@@ -50,18 +50,11 @@
@if (isset($from) && $from === 'explore')
@endif
- {!! Form::close() !!}
+
@endif
- {!! Form::open([
- 'method' => 'DELETE',
- 'route' => ['maps.map_markers.destroy', $campaign, $model->map_id, $model->id],
- 'style' => 'display:inline',
- 'id' => 'delete-marker-confirm-form-' . $model->id]) !!}
- {!! Form::close() !!}
-
-
+
@endsection
@if ($map->explorable())
diff --git a/resources/views/maps/markers/fields/background_colour.blade.php b/resources/views/maps/markers/fields/background_colour.blade.php
index c9bad7c042..0d65ca0c02 100644
--- a/resources/views/maps/markers/fields/background_colour.blade.php
+++ b/resources/views/maps/markers/fields/background_colour.blade.php
@@ -1,9 +1,6 @@
+@php $fieldname = $fieldname ?? 'colour'; @endphp
- {!! Form::text($fieldname ?? 'colour', \App\Facades\FormCopy::field('colour')->string(), [
- 'class' => 'spectrum',
- 'maxlength' => 6,
- 'data-append-to' => !isset($model) || empty($model) ? '#marker-modal' : null,
- ] ) !!}
+
diff --git a/resources/views/maps/markers/fields/custom_icon.blade.php b/resources/views/maps/markers/fields/custom_icon.blade.php
index 755dd3fd64..39443daac1 100644
--- a/resources/views/maps/markers/fields/custom_icon.blade.php
+++ b/resources/views/maps/markers/fields/custom_icon.blade.php
@@ -1,31 +1,25 @@
@php $helper = __('maps/markers.helpers.custom_icon_v2', [
'rpgawesome' => 'RPG Awesome',
'fontawesome' => 'Font Awesome',
-'docs' => link_to('https://docs.kanka.io/en/latest/entities/maps/markers.html#custom-icon', __('footer.documentation'), ['target' => '_blank'])
-]); @endphp
+'docs' => '' . __('footer.documentation') . '',
+]);
+ $fieldname = $fieldname ?? 'custom_icon';
+ @endphp
- {!! Form::text(
- $fieldname ?? 'custom_icon',
- \App\Facades\FormCopy::field($fieldname ?? 'custom_icon')->string(),
- ['class' => '',
- 'placeholder' => __('maps/markers.placeholders.custom_icon', ['example1' => '"fa-solid fa-gem"', 'example2' => '"ra ra-aura"']),
- 'list' => 'map-marker-icon-list',
- 'autocomplete' => 'off',
- 'data-paste' => 'fontawesome',
- ($campaign->boosted() ? null : 'disabled')])
- !!}
+
+ '"ra ra-aura"']) }}" list="map-marker-icon-list" autocomplete="off" data-paste="fontawesome" @if (!$campaign->boosted()) disabled="disabled" @endif />
@if (!$campaign->boosted())
@if (auth()->check() && auth()->user()->hasBoosters())
- {!! __('crud.errors.boosted_campaigns', ['boosted' => link_to_route('settings.premium', __('concept.premium-campaign'), ['campaign' => $campaign])]) !!}
+ {!! __('crud.errors.boosted_campaigns', ['boosted' => '' . __('concept.premium-campaign') . '']) !!}
@else
- {!! __('crud.errors.boosted_campaigns', ['boosted' => link_to('https://kanka.io/premium', __('concept.boosted-campaign'))]) !!}
+ {!! __('crud.errors.boosted_campaigns', ['boosted' => '' . __('concepts.premium-campaign') . '']) !!}
@endif
@endif
diff --git a/resources/views/maps/markers/fields/font_colour.blade.php b/resources/views/maps/markers/fields/font_colour.blade.php
index 80ea6a0155..a6b8c37295 100644
--- a/resources/views/maps/markers/fields/font_colour.blade.php
+++ b/resources/views/maps/markers/fields/font_colour.blade.php
@@ -1,9 +1,6 @@
+@php $fieldname = $fieldname ?? 'font_colour'; @endphp
- {!! Form::text($fieldname ?? 'font_colour', \App\Facades\FormCopy::field('font_colour')->string(), [
- 'class' => 'spectrum',
- 'maxlength' => 6,
- 'data-append-to' => !isset($model) || empty($model) ? '#marker-modal' : null,
- ] ) !!}
+
diff --git a/resources/views/maps/markers/fields/icon.blade.php b/resources/views/maps/markers/fields/icon.blade.php
index 87d72f3fd0..eac89cc4fb 100644
--- a/resources/views/maps/markers/fields/icon.blade.php
+++ b/resources/views/maps/markers/fields/icon.blade.php
@@ -11,5 +11,5 @@
- {!! Form::select($fieldname ?? 'icon', $iconOptions, \App\Facades\FormCopy::field('icon')->string(), ['class' => '', 'id' => 'icon']) !!}
+
diff --git a/resources/views/maps/markers/fields/opacity.blade.php b/resources/views/maps/markers/fields/opacity.blade.php
index f2651cb193..46531c4efb 100644
--- a/resources/views/maps/markers/fields/opacity.blade.php
+++ b/resources/views/maps/markers/fields/opacity.blade.php
@@ -1,10 +1,11 @@
- {!! Form::number($fieldname ?? 'opacity', (!empty($source) ? $source->opacity : (isset($model) ? $model->opacity : (!isset($fieldname) ? 100 : null))), [
- 'class' => '',
- 'maxlength' => 3,
- 'step' => 10,
- 'max' => 100,
- 'min' => 0,
- 'id' => 'opacity'
- ]) !!}
+
diff --git a/resources/views/maps/markers/fields/pin_size.blade.php b/resources/views/maps/markers/fields/pin_size.blade.php
index 51547532bb..fbb0ef91ad 100644
--- a/resources/views/maps/markers/fields/pin_size.blade.php
+++ b/resources/views/maps/markers/fields/pin_size.blade.php
@@ -1,11 +1,12 @@
- {!! Form::number($fieldname ?? 'pin_size', \App\Facades\FormCopy::field('pin_size')->string(), [
- 'class' => '',
- 'maxlength' => 3,
- 'step' => 2,
- 'max' => 100,
- 'min' => 10,
- 'placeholder' => 40,
- 'id' => 'pin_size'
- ] ) !!}
+
diff --git a/resources/views/maps/panels/groups.blade.php b/resources/views/maps/panels/groups.blade.php
index 34833f0664..24405aa27b 100644
--- a/resources/views/maps/panels/groups.blade.php
+++ b/resources/views/maps/panels/groups.blade.php
@@ -9,11 +9,17 @@
- @if(Datagrid::hasBulks()) {!! Form::open(['route' => ['maps.groups.bulk', $campaign, 'map' => $model]]) !!} @endif
-
- @include('layouts.datagrid._table', ['responsive' => true])
-
- @if(Datagrid::hasBulks()) {!! Form::close() !!} @endif
+ @if(Datagrid::hasBulks())
+
+
+ @include('layouts.datagrid._table', ['responsive' => true])
+
+
+ @else
+
+ @include('layouts.datagrid._table', ['responsive' => true])
+
+ @endif
@includeWhen($rows->count() > 1, 'maps.groups._reorder')
diff --git a/resources/views/maps/panels/layers.blade.php b/resources/views/maps/panels/layers.blade.php
index 79a75408b7..dfac2561a9 100644
--- a/resources/views/maps/panels/layers.blade.php
+++ b/resources/views/maps/panels/layers.blade.php
@@ -9,11 +9,17 @@
- @if(Datagrid::hasBulks()) {!! Form::open(['route' => ['maps.layers.bulk', $campaign, 'map' => $model]]) !!} @endif
-
- @include('layouts.datagrid._table', ['responsive' => true])
-
- @if(Datagrid::hasBulks()) {!! Form::close() !!} @endif
+ @if(Datagrid::hasBulks())
+
+
+ @include('layouts.datagrid._table', ['responsive' => true])
+
+
+ @else
+
+ @include('layouts.datagrid._table', ['responsive' => true])
+
+ @endif
@includeWhen($rows->count() > 1, 'maps.layers._reorder')
diff --git a/resources/views/maps/panels/markers.blade.php b/resources/views/maps/panels/markers.blade.php
index 9ddc1f655e..e510897621 100644
--- a/resources/views/maps/panels/markers.blade.php
+++ b/resources/views/maps/panels/markers.blade.php
@@ -3,11 +3,17 @@
{{ __('maps.panels.markers') }}
- @if(Datagrid::hasBulks()) {!! Form::open(['route' => ['maps.markers.bulk', $campaign, 'map' => $model]]) !!} @endif
-
- @include('layouts.datagrid._table', ['responsive' => true])
-
- @if(Datagrid::hasBulks()) {!! Form::close() !!} @endif
+ @if(Datagrid::hasBulks())
+
+
+ @include('layouts.datagrid._table', ['responsive' => true])
+
+
+ @else
+
+ @include('layouts.datagrid._table', ['responsive' => true])
+
+ @endif
@section('modals')
diff --git a/resources/views/maps/show.blade.php b/resources/views/maps/show.blade.php
index 5a5bb90df6..9fc275d83d 100644
--- a/resources/views/maps/show.blade.php
+++ b/resources/views/maps/show.blade.php
@@ -15,7 +15,7 @@
@if ($model->explorable())
@if ($model->isChunked() && $model->chunkingError())
- {!! __('maps.errors.chunking.error', ['discord' => link_to(config('social.discord'), 'Discord', ['target' => '_blank'])]) !!}
+ {!! __('maps.errors.chunking.error', ['discord' => 'Discord']) !!}
@elseif ($model->isChunked() && !$model->chunkingReady())
diff --git a/resources/views/notifications/index.blade.php b/resources/views/notifications/index.blade.php
index f0ac35fb70..58f89918c6 100644
--- a/resources/views/notifications/index.blade.php
+++ b/resources/views/notifications/index.blade.php
@@ -80,16 +80,12 @@
{{ __('crud.cancel') }}
- {!! Form::open([
- 'method' => 'POST',
- 'route' => 'notifications.clear-all',
- 'id' => 'notifications-clear'
- ]) !!}
+
{{ __('crud.remove') }}
- {!! Form::close() !!}
+
@endsection
diff --git a/resources/views/organisations/form/_entry.blade.php b/resources/views/organisations/form/_entry.blade.php
index c0a69f2580..015a9fff25 100644
--- a/resources/views/organisations/form/_entry.blade.php
+++ b/resources/views/organisations/form/_entry.blade.php
@@ -3,7 +3,7 @@
@include('cruds.fields.type', ['base' => \App\Models\Organisation::class, 'trans' => 'organisations'])
@include('cruds.fields.organisation', ['isParent' => true])
- @include('cruds.fields.locations', ['from' => isset($model) ? $model : null, 'quickCreator' => true])
+ @include('cruds.fields.locations', ['from' => $model ?? null, 'quickCreator' => true])
@include('cruds.fields.entry2')
@@ -18,9 +18,9 @@
@endif
- {!! Form::hidden('is_defunct', 0) !!}
+
- {!! Form::checkbox('is_defunct', 1, $model->is_defunct ?? '' )!!}
+ is_defunct ?? false)) checked="checked" @endif />
diff --git a/resources/views/organisations/members/_form.blade.php b/resources/views/organisations/members/_form.blade.php
index 42b10d2120..700ecdad95 100644
--- a/resources/views/organisations/members/_form.blade.php
+++ b/resources/views/organisations/members/_form.blade.php
@@ -38,14 +38,14 @@
])
- {!! Form::text('role', null, ['placeholder' => __('organisations.members.placeholders.role'), 'class' => '', 'maxlength' => 45]) !!}
+
- {!! Form::select('status_id', $statuses, null, ['class' => '']) !!}
+
- {!! Form::select('pin_id', $options, null, ['class' => '']) !!}
+
diff --git a/resources/views/organisations/members/create.blade.php b/resources/views/organisations/members/create.blade.php
index ac559753dd..f2b6680b3b 100644
--- a/resources/views/organisations/members/create.blade.php
+++ b/resources/views/organisations/members/create.blade.php
@@ -8,14 +8,13 @@
])
@section('content')
- {!! Form::open(array('route' => ['organisations.organisation_members.store', $campaign, $model->id], 'method'=>'POST')) !!}
-
- @include('partials.forms.form', [
- 'title' => __('organisations.members.create.title', ['name' => $model->name]),
- 'content' => 'organisations.members._form',
- 'submit' => __('organisations.members.actions.submit'),
- 'dialog' => true,
- ])
- {!! Form::hidden('organisation_id', $model->id) !!}
- {!! Form::close() !!}
+
+ @include('partials.forms.form', [
+ 'title' => __('organisations.members.create.title', ['name' => $model->name]),
+ 'content' => 'organisations.members._form',
+ 'submit' => __('organisations.members.actions.submit'),
+ 'dialog' => true,
+ ])
+
+
@endsection
diff --git a/resources/views/organisations/members/edit.blade.php b/resources/views/organisations/members/edit.blade.php
index e15333edba..bce962754a 100644
--- a/resources/views/organisations/members/edit.blade.php
+++ b/resources/views/organisations/members/edit.blade.php
@@ -6,13 +6,12 @@
]
])
@section('content')
- {!! Form::model($member, ['method' => 'PATCH', 'route' => ['organisations.organisation_members.update', $campaign, $model->id, $member->id], 'data-shortcut' => 1]) !!}
-
- @include('partials.forms.form', [
- 'title' => __('organisations.members.edit.title', ['name' => $model->name]),
- 'content' => 'organisations.members._form',
- 'dialog' => true,
- ])
- {!! Form::hidden('organisation_id', $model->id) !!}
- {!! Form::close() !!}
+
+ @include('partials.forms.form', [
+ 'title' => __('organisations.members.edit.title', ['name' => $model->name]),
+ 'content' => 'organisations.members._form',
+ 'dialog' => true,
+ ])
+
+
@endsection
diff --git a/resources/views/organisations/panels/members.blade.php b/resources/views/organisations/panels/members.blade.php
index fe3ffb18c2..40737cbfd3 100644
--- a/resources/views/organisations/panels/members.blade.php
+++ b/resources/views/organisations/panels/members.blade.php
@@ -60,7 +60,7 @@
@endcan
-
+
@if ($direct === 0 && !$allMembers)
diff --git a/resources/views/partials/ads/top.blade.php b/resources/views/partials/ads/top.blade.php
index 64f29617a9..46084786f6 100644
--- a/resources/views/partials/ads/top.blade.php
+++ b/resources/views/partials/ads/top.blade.php
@@ -20,8 +20,8 @@
{!! __('misc.ads.remove_v3', [
- 'subscribing' => link_to_route('settings.subscription', __('misc.ads.subscribing')),
- 'boosting' => link_to('https://kanka.io/premium', __('misc.ads.premium')),
+ 'subscribing' => '' . __('misc.ads.subscribing') . '',
+ 'boosting' => '' . __('misc.ads.premium') . '',
]) !!}
diff --git a/resources/views/partials/or_cancel.blade.php b/resources/views/partials/or_cancel.blade.php
index f29aaa90f1..4bc7a9ae80 100644
--- a/resources/views/partials/or_cancel.blade.php
+++ b/resources/views/partials/or_cancel.blade.php
@@ -1 +1 @@
-{!! __('crud.navigation.or_cancel', ['cancel' => link_to((!empty($cancel) ? $cancel : url()->previous()), __('crud.navigation.cancel'))]) !!}
+{!! __('crud.navigation.or_cancel', ['cancel' => '' . __('crud.navigation.cancel') . '']) !!}
diff --git a/resources/views/partials/superboosted.blade.php b/resources/views/partials/superboosted.blade.php
index 1293918142..b4d9ea744c 100644
--- a/resources/views/partials/superboosted.blade.php
+++ b/resources/views/partials/superboosted.blade.php
@@ -2,11 +2,11 @@
{{ __('crud.errors.unavailable_feature') }}
- {!! __('crud.errors.boosted_campaigns', ['boosted' => link_to('https://kanka.io/premium', __('crud.superboosted_campaigns'), '#superboosted')]) !!}
+ {!! __('crud.errors.boosted_campaigns', ['boosted' => '' . __('concept.premium-campaigns') . '']) !!}
@else
- {!! __('crud.errors.boosted_campaigns', ['boosted' => link_to('https://kanka.io/premium', __('crud.superboosted_campaigns'), '#superboosted')]) !!}
+ {!! __('crud.errors.boosted_campaigns', ['boosted' => '' . __('concept.premium-campaigns') . '']) !!}
@endif
diff --git a/resources/views/presets/forms/_marker.blade.php b/resources/views/presets/forms/_marker.blade.php
index 5bba0ff763..c4ef6a022b 100644
--- a/resources/views/presets/forms/_marker.blade.php
+++ b/resources/views/presets/forms/_marker.blade.php
@@ -7,12 +7,7 @@
@endphp
- {!! Form::text('name', null, [
- 'class' => '',
- 'placeholder' => __('presets.placeholders.name'),
- 'required',
- 'autofocus',
- ]) !!}
+
@include('maps.markers.fields.icon', ['fieldname' => 'config[icon]'])
diff --git a/resources/views/presets/forms/edit.blade.php b/resources/views/presets/forms/edit.blade.php
index 5c69fc1700..0bb1f04a10 100644
--- a/resources/views/presets/forms/edit.blade.php
+++ b/resources/views/presets/forms/edit.blade.php
@@ -6,21 +6,21 @@
@section('content')
- {!! Form::model($preset, ['route' => ['preset_types.presets.update', $campaign, $presetType, $preset], 'method' => 'PATCH', 'data-shortcut' => 1]) !!}
+
@include('partials.forms.form', [
- 'title' => __('presets.edit.title', ['name' => $preset->name]),
- 'content' => 'presets.forms._' . $presetType->code,
- 'deleteID' => '#delete-form-preset-' . $preset->id,
+ 'title' => __('presets.edit.title', ['name' => $preset->name]),
+ 'content' => 'presets.forms._' . $presetType->code,
+ 'deleteID' => '#delete-form-preset-' . $preset->id,
])
-
- {!! Form::close() !!}
+
+
@endsection
@section('modals')
@parent
- {!! Form::open(['method' => 'DELETE', 'route' => ['preset_types.presets.destroy', $campaign, 'preset_type' => $presetType, 'preset' => $preset], 'id' => 'delete-form-preset-' . $preset->id]) !!}
+
- {!! Form::close() !!}
+
@endsection
diff --git a/resources/views/quests/elements/_elements.blade.php b/resources/views/quests/elements/_elements.blade.php
index 7b3133c5dd..b0d8cb5639 100644
--- a/resources/views/quests/elements/_elements.blade.php
+++ b/resources/views/quests/elements/_elements.blade.php
@@ -51,18 +51,7 @@
- {!! Form::open([
- 'method' => 'DELETE',
- 'route' => [
- 'quests.quest_elements.destroy',
- $campaign,
- $model,
- $element
- ],
- 'class' => 'hidden',
- 'id' => 'delete-form-' . $element->id
- ]) !!}
- {!! Form::close() !!}
+
@endcan
diff --git a/resources/views/quests/elements/_form.blade.php b/resources/views/quests/elements/_form.blade.php
index 4525b9e0b3..4e5009674e 100644
--- a/resources/views/quests/elements/_form.blade.php
+++ b/resources/views/quests/elements/_form.blade.php
@@ -9,7 +9,7 @@
@include('cruds.fields.entity')
- {!! Form::text('name', null, ['class' => '', 'maxlength' => 100, 'spellcheck' => 'true']) !!}
+
@@ -18,22 +18,22 @@
field="role"
css="col-span-2"
:label="__('quests.fields.role')">
- {!! Form::text('role', null, ['class' => '', 'maxlength' => 45, 'spellcheck' => 'true']) !!}
+
- {!! Form::textarea('entryForEdition', null, ['class' => ' html-editor', 'id' => 'description', 'name' => 'description']) !!}
-
-
- {!! Form::select('colour', FormCopy::colours(), null, ['class' => ' select2-colour']) !!}
+
+ @include('cruds.fields.colour')
@include('cruds.fields.visibility_id')
diff --git a/resources/views/quests/elements/create.blade.php b/resources/views/quests/elements/create.blade.php
index 08341aa7f6..a84760e034 100644
--- a/resources/views/quests/elements/create.blade.php
+++ b/resources/views/quests/elements/create.blade.php
@@ -10,12 +10,7 @@
])
@section('content')
- {!! Form::open([
- 'route' => ['quests.quest_elements.store', $campaign, $quest->id],
- 'method'=>'POST',
- 'data-shortcut' => 1,
- 'data-maintenance' => 1,
- ]) !!}
+
@include('partials.errors')
@@ -54,7 +49,7 @@
- {!! Form::close() !!}
+
@endsection
@include('editors.editor')
diff --git a/resources/views/quests/elements/update.blade.php b/resources/views/quests/elements/update.blade.php
index 40f41de377..6e26fb8e1a 100644
--- a/resources/views/quests/elements/update.blade.php
+++ b/resources/views/quests/elements/update.blade.php
@@ -10,49 +10,44 @@
])
@section('content')
- {!! Form::model($model, [
- 'method' => 'PATCH',
- 'route' => ['quests.quest_elements.update', $campaign, $quest, $model->id],
- 'data-shortcut' => 1,
- 'data-maintenance' => 1,
- ]) !!}
-
- @include('partials.errors')
- @include('quests.elements._form')
-
-
-
-
-
- {!! Form::close() !!}
+
@endif
@endif
@@ -56,18 +56,18 @@
@section('modals')
@parent
@if($user->passwordSecurity?->google2fa_enable)
- {!! Form::model($user, ['method' => 'POST', 'route' => ['settings.security.disable-2fa']]) !!}
-
-
- {{ __('settings.account.2fa.disable.helper') }}
-
-
-
-
- {{ __('crud.click_modal.confirm') }}
-
-
-
- {!! Form::close() !!}
+
+
+
+ {{ __('settings.account.2fa.disable.helper') }}
+
+
+
+
+ {{ __('crud.click_modal.confirm') }}
+
+
+
+
@endif
@endsection
diff --git a/resources/views/settings/account.blade.php b/resources/views/settings/account.blade.php
index 7aaa0040f6..1d96acc062 100644
--- a/resources/views/settings/account.blade.php
+++ b/resources/views/settings/account.blade.php
@@ -13,7 +13,7 @@
{{ __('settings.account.email') }}
- {!! Form::model($user, ['method' => 'PATCH', 'route' => ['settings.account.email']]) !!}
+
{!! Form::email('email', null, ['placeholder' => __('profiles.placeholders.email'), 'class' => '']) !!}
@@ -25,7 +25,7 @@
- {!! Form::close() !!}
+
@@ -33,8 +33,7 @@
{{ __('settings.account.password') }}
- {!! Form::model($user, ['method' => 'PATCH', 'route' => ['settings.account.password']]) !!}
-
+
{!! Form::password('password_new', ['placeholder' => __('profiles.placeholders.new_password'), 'class' => '']) !!}
@@ -49,14 +48,14 @@
- {!! Form::close() !!}
+
@else
{{ __('settings.account.social.title') }}
- {!! Form::model($user, ['method' => 'PATCH', 'route' => ['settings.account.social']]) !!}
+
{{ __('settings.account.social.helper', ['provider' => ucfirst($user->provider)]) }}
@@ -69,7 +68,7 @@
- {!! Form::close() !!}
+
@endif
@@ -89,7 +88,7 @@
@if (auth()->user()->subscribed('kanka') && !auth()->user()->subscription('kanka')->canceled())
{!! __('profiles.sections.delete.subscribed', [
- 'subscription' => link_to_route('settings.subscription', __('settings.menu.subscription'))
+ 'subscription' => '' . __('settings.menu.subscription') . ''
]) !!}
@endif
@@ -116,19 +115,19 @@
{{ __('profiles.sections.delete.warning') }}
- {!! Form::model($user, ['method' => 'PATCH', 'route' => ['settings.account.destroy'], 'class' => 'w-full']) !!}
+
{!! __('profiles.sections.delete.goodbye', ['code' => 'goodbye ']) !!}
- {!! Form::text('goodbye',null, ['class' => '','required']) !!}
+
{{ __('profiles.sections.delete.confirm') }}
- {!! Form::close() !!}
+
@endsection
diff --git a/resources/views/settings/appearance.blade.php b/resources/views/settings/appearance.blade.php
index 00eb3674ea..49600c22a2 100644
--- a/resources/views/settings/appearance.blade.php
+++ b/resources/views/settings/appearance.blade.php
@@ -16,169 +16,169 @@
{{ __('settings/appearance.dismissible.main') }}
-
- {!! Form::model(auth()->user(), ['method' => 'PATCH', 'route' => ['settings.appearance.update'], 'data-shortcut' => 1]) !!}
-
-
-
-
-
- {{ __('settings/appearance.helpers.theme')}}
- {{ __('settings/appearance.helpers.overridable')}}
-
- {!! Form::select('theme', [
- '' => __('profiles.theme.themes.default'),
- 'dark' => __('profiles.theme.themes.dark'),
- 'midnight' => __('profiles.theme.themes.midnight')
- ], null, ['class' => ' self-end w-full border rounded p-2']) !!}
-
-
-
- {!! __('settings/premium.pitch.more', ['premium' => link_to('https://kanka.io/premium', __('concept.premium-campaigns'))]) !!}
+ {!! __('settings/premium.pitch.more', ['premium' => '' . __('concept.premium-campaigns') . '']) !!}
diff --git a/resources/views/settings/premium/remove.blade.php b/resources/views/settings/premium/remove.blade.php
index 3adeed7e74..480218ecf3 100644
--- a/resources/views/settings/premium/remove.blade.php
+++ b/resources/views/settings/premium/remove.blade.php
@@ -5,11 +5,11 @@
*/
?>
-{!! Form::open(['method' => 'DELETE', 'route' => ['campaign_boosts.destroy', $boost->id]]) !!}
+
@include('partials.forms.form', [
'title' => __('settings/premium.remove.title'),
'content' => 'settings.premium.remove._form',
'actions' => 'settings.premium.remove._actions',
'dialog' => true,
])
-{!! Form::close() !!}
+
diff --git a/resources/views/settings/profile.blade.php b/resources/views/settings/profile.blade.php
index 630713eb89..0c926a60f4 100644
--- a/resources/views/settings/profile.blade.php
+++ b/resources/views/settings/profile.blade.php
@@ -13,54 +13,53 @@
{{ __('settings.profile.title') }}
- {!! Form::model($user, ['method' => 'PATCH', 'enctype' => 'multipart/form-data', 'route' => ['settings.profile'], 'data-shortcut' => 1]) !!}
+
- {!! Form::text('name', null, ['placeholder' => __('profiles.placeholders.name'), 'class' => 'rounded border p-2 w-full']) !!}
+
@php $helper = __('profiles.helpers.profile-name', [
- 'marketplace' => link_to(config('marketplace.url'), __('footer.marketplace'), ['target' => '_blank']),
- 'profile' => link_to_route('users.profile', __('profiles.settings.helpers.profile'), $user, ['target' => '_blank'])]) @endphp
+ 'marketplace' => ' ' . __('footer.marketplace'). '',
+ 'profile' => ' ' . __('profiles.settings.helpers.profile') . '']) @endphp
- {!! Form::text('settings[marketplace_name]', null, ['class' => 'rounded border p-2 w-full', 'maxlength' => 32]) !!}
+
-
- {!! Form::textarea('profile[bio]', null, ['placeholder' => __('profiles.placeholders.bio'), 'class' => 'rounded border p-2 w-full', 'rows' => 5, 'maxlength' => 300]) !!}
+ @php $helper = __('profiles.settings.helpers.bio', [
+ 'link' => '' . __('profiles.settings.helpers.profile') . ''
+ ]); @endphp
+
+
- {!! Form::hidden('has_last_login_sharing', 0) !!}
+
- {!! Form::checkbox('has_last_login_sharing') !!}
+ user()->has_last_login_sharing ?? false)) checked="checked" @endif />
@if (auth()->user()->isSubscriber())
- {!! Form::hidden('settings[hide_subscription]', 0) !!}
+
- {!! Form::checkbox('settings[hide_subscription]', 1) !!}
+ user()->settings['hide_subscription'] ?? false)) checked="checked" @endif />
@endif
- {!! Form::file('avatar', ['class' => 'image']) !!}
+
@if (!empty(auth()->user()->avatar) && auth()->user()->avatar != 'users/default.png')
-
@endif
-
@@ -68,9 +67,9 @@
{{ __('settings.profile.actions.update_profile') }}
- {!! Form::close() !!}
+
@if (!app()->isProduction())
- {!! Form::model($user, ['method' => 'PATCH', 'enctype' => 'multipart/form-data', 'route' => ['tutorials.reset']]) !!}
+
Reset Tutorials
@@ -79,7 +78,7 @@
Reset tutorials
- {!! Form::close() !!}
+
@endif
@endsection
diff --git a/resources/views/settings/subscription/_cancel.blade.php b/resources/views/settings/subscription/_cancel.blade.php
index 1e3ecfb023..465cf5492f 100644
--- a/resources/views/settings/subscription/_cancel.blade.php
+++ b/resources/views/settings/subscription/_cancel.blade.php
@@ -2,13 +2,7 @@
@php
$endDate = date($user->date_format, $user->upcomingInvoice()?->period_end);
@endphp
-{!! Form::open([
- 'route' => ['settings.subscription.cancel'],
- 'method' => 'POST',
- 'id' => 'cancellation-confirm',
- 'class' => 'subscription-form text-left'
-]) !!}
-
+
{!! __('settings.subscription.cancel.text', ['date' => $endDate])!!}
@@ -16,27 +10,19 @@
- {!! Form::select('reason', [
- '' => __('crud.select'),
- 'financial' => __('settings.subscription.cancel.options.financial'),
- 'not_for' => __('settings.subscription.cancel.options.not_for'),
- 'not_using' => __('settings.subscription.cancel.options.not_using'),
- 'not_playing' => __('settings.subscription.cancel.options.not_playing'),
- 'missing_features' => __('settings.subscription.cancel.options.missing_features'),
- 'competitor' => __('settings.subscription.cancel.options.competitor'),
- 'custom' => __('settings.subscription.cancel.options.other')
- ], null, ['class' => 'w-full']) !!}
+ @php $reasons = [
+ '' => __('crud.select'),
+ 'financial' => __('settings.subscription.cancel.options.financial'),
+ 'not_for' => __('settings.subscription.cancel.options.not_for'),
+ 'not_using' => __('settings.subscription.cancel.options.not_using'),
+ 'not_playing' => __('settings.subscription.cancel.options.not_playing'),
+ 'missing_features' => __('settings.subscription.cancel.options.missing_features'),
+ 'competitor' => __('settings.subscription.cancel.options.competitor'),
+ 'custom' => __('settings.subscription.cancel.options.other')
+ ]; @endphp
+
- {!! Form::textarea(
- 'reason_custom',
- null,
- [
- 'placeholder' => __('settings.subscription.placeholders.reason'),
- 'class' => 'w-full',
- 'rows' => 4,
- 'id' => 'cancel-reason-custom'
- ]
- ) !!}
+
@@ -51,4 +37,4 @@
-{!! Form::close() !!}
+
diff --git a/resources/views/settings/subscription/cancellation/form.blade.php b/resources/views/settings/subscription/cancellation/form.blade.php
index 1ca2b7d6b5..bdc9cc3446 100644
--- a/resources/views/settings/subscription/cancellation/form.blade.php
+++ b/resources/views/settings/subscription/cancellation/form.blade.php
@@ -8,12 +8,7 @@
- {!! Form::open([
- 'route' => ['settings.subscription.cancel'],
- 'method' => 'POST',
- 'id' => 'cancellation-confirm',
- 'class' => 'subscription-form text-left'
- ]) !!}
+
{!! __('settings.subscription.actions.cancel_sub') !!}
@@ -24,27 +19,18 @@
- {!! Form::select('reason', [
- '' => __('crud.select'),
- 'financial' => __('settings.subscription.cancel.options.financial'),
- 'not_for' => __('settings.subscription.cancel.options.not_for'),
- 'not_using' => __('settings.subscription.cancel.options.not_using'),
- 'not_playing' => __('settings.subscription.cancel.options.not_playing'),
- 'missing_features' => __('settings.subscription.cancel.options.missing_features'),
- 'competitor' => __('settings.subscription.cancel.options.competitor'),
- 'custom' => __('settings.subscription.cancel.options.other')
- ], null, ['class' => 'w-full']) !!}
-
- {!! Form::textarea(
- 'reason_custom',
- null,
- [
- 'placeholder' => __('settings.subscription.placeholders.reason'),
- 'class' => 'w-full',
- 'rows' => 4,
- 'id' => 'cancel-reason-custom'
- ]
- ) !!}
+ @php $reasons = [
+ '' => __('crud.select'),
+ 'financial' => __('settings.subscription.cancel.options.financial'),
+ 'not_for' => __('settings.subscription.cancel.options.not_for'),
+ 'not_using' => __('settings.subscription.cancel.options.not_using'),
+ 'not_playing' => __('settings.subscription.cancel.options.not_playing'),
+ 'missing_features' => __('settings.subscription.cancel.options.missing_features'),
+ 'competitor' => __('settings.subscription.cancel.options.competitor'),
+ 'custom' => __('settings.subscription.cancel.options.other')
+ ]; @endphp
+
+
@@ -53,5 +39,5 @@
- {!! Form::close() !!}
+
diff --git a/resources/views/settings/subscription/change.blade.php b/resources/views/settings/subscription/change.blade.php
index 327e79d851..4534e73313 100644
--- a/resources/views/settings/subscription/change.blade.php
+++ b/resources/views/settings/subscription/change.blade.php
@@ -59,12 +59,12 @@
@if (! $limited)
- {!! Form::open(['route' => ['settings.subscription.subscribe', 'tier' => $tier], 'method' => 'POST', 'id' => 'subscription-confirm']) !!}
+
@if (!$card)
- {!! Form::text('card-holder-name', null, ['class' => '']) !!}
+
@@ -84,24 +84,17 @@
- {!! Form::select('reason', [
+
+ @php $reasons = [
'' => __('crud.select'),
'financial' => __('settings.subscription.cancel.options.financial'),
'not_using' => __('settings.subscription.cancel.options.not_using'),
'missing_features' => __('settings.subscription.cancel.options.missing_features'),
'custom' => __('settings.subscription.cancel.options.custom')
- ], null, ['class' => 'w-full select-reveal-field', 'data-change-target' => '#downgrade-reason-custom']) !!}
- {!! Form::textarea(
- 'reason_custom',
- null,
- [
- 'placeholder' => __('settings.subscription.placeholders.downgrade_reason'),
- 'class' => '',
- 'style' => 'display: none',
- 'rows' => 4,
- 'id' => 'downgrade-reason-custom'
- ]
- )!!}
+ ]; @endphp
+
+
+
@endif
@@ -118,7 +111,7 @@
- {!! Form::close() !!}
+
@endif
@@ -144,7 +137,7 @@
@endif
- {!! Form::open(['route' => ['paypal.process-transaction', 'tier' => $tier], 'method' => 'POST', 'class' => 'subscription-form flex flex-row gap-5']) !!}
+
{{ __('settings.subscription.helpers.paypal_v3') }}
@@ -158,7 +151,7 @@
- {!! Form::close() !!}
+
@endif
@endif
@@ -167,9 +160,9 @@
- {!! __('settings.subscription.helpers.stripe', ['stripe' => link_to('https://stripe.com', 'Stripe', ['target' => '_blank'])]) !!}
+ {!! __('settings.subscription.helpers.stripe', ['stripe' => 'Stripe']) !!}
@if($isYearly)
- {!! __('settings.subscription.trial_period', ['email' => link_to('mailto:' . config('app.email'), config('app.email'))]) !!}
+ {!! __('settings.subscription.trial_period', ['email' => '' . config('app.email') . '']) !!}
@endif
diff --git a/resources/views/settings/subscription/currency/_blocked.blade.php b/resources/views/settings/subscription/currency/_blocked.blade.php
index 91a37c963d..e380428ef8 100644
--- a/resources/views/settings/subscription/currency/_blocked.blade.php
+++ b/resources/views/settings/subscription/currency/_blocked.blade.php
@@ -1,7 +1,7 @@
- {!! __('settings.subscription.helpers.currency_blocked', ['email' => link_to('mailto:' . config('app.email'), config('app.email'))])!!}
+ {!! __('settings.subscription.helpers.currency_blocked', ['email' => '' . config('app.email') . ''])!!}
diff --git a/resources/views/settings/subscription/currency/_form.blade.php b/resources/views/settings/subscription/currency/_form.blade.php
index 85e16c6c36..5f46d3446d 100644
--- a/resources/views/settings/subscription/currency/_form.blade.php
+++ b/resources/views/settings/subscription/currency/_form.blade.php
@@ -1,5 +1,5 @@
- {!! Form::select('currency', $currencies, auth()->user()->currency(), ['class' => '']) !!}
+
diff --git a/resources/views/settings/subscription/currency/edit.blade.php b/resources/views/settings/subscription/currency/edit.blade.php
index 99288e1f52..9811eeb94f 100644
--- a/resources/views/settings/subscription/currency/edit.blade.php
+++ b/resources/views/settings/subscription/currency/edit.blade.php
@@ -1,9 +1,9 @@
-{!! Form::model(auth()->user(), ['method' => 'PATCH', 'route' => ['billing.payment-method.save']]) !!}
-@include('partials.forms.form', [
- 'title' => __('settings.subscription.currency.title'),
- 'content' => 'settings.subscription.currency.' . $content,
- 'submit' => __('settings.subscription.actions.update_currency'),
- 'dialog' => true,
-])
-
-{!! Form::close() !!}
+
+ @include('partials.forms.form', [
+ 'title' => __('settings.subscription.currency.title'),
+ 'content' => 'settings.subscription.currency.' . $content,
+ 'submit' => __('settings.subscription.actions.update_currency'),
+ 'dialog' => true,
+ ])
+
+
diff --git a/resources/views/settings/subscription/index.blade.php b/resources/views/settings/subscription/index.blade.php
index 9002352597..63c5fbb896 100644
--- a/resources/views/settings/subscription/index.blade.php
+++ b/resources/views/settings/subscription/index.blade.php
@@ -19,9 +19,9 @@
{!! __('subscription.benefits.main', [
- 'more' => link_to(Domain::toFront('pricing'), __('subscription.benefits.more'), '#paid-features'),
- 'boosters' => link_to(Domain::toFront('premium'), __('concept.premium-campaigns')),
- 'stripe' => link_to('https://www.stripe.com', 'Stripe', ['target' => '_blank'])
+ 'more' => '' . __('footer.public-campaigns') . '',
+ 'boosters' => '' . __('concept.premium-campaigns') . '',
+ 'stripe' => 'Stripe'
]) !!}
@@ -126,7 +126,7 @@
{!! __('settings.subscription.trial_period', [
- 'email' => link_to('mailto:' . config('app.email'), config('app.email'))
+ 'email' => '' . config('app.email') . ''
]) !!}
diff --git a/resources/views/settings/subscription/tiers/benefits/_elemental.blade.php b/resources/views/settings/subscription/tiers/benefits/_elemental.blade.php
index e7cf1c3e6d..cd5550b024 100644
--- a/resources/views/settings/subscription/tiers/benefits/_elemental.blade.php
+++ b/resources/views/settings/subscription/tiers/benefits/_elemental.blade.php
@@ -3,11 +3,11 @@
@if (auth()->user()->hasBoosterNomenclature())
- {!! link_to('https://kanka.io/premium', 10 . ' ' . __('tiers.features.boosters'), '', ['target' => '_blank']) !!}
+ 10 {{ __('tiers.features.boosters') }}
@else
-{!! link_to('https://kanka.io/premium', 6 . ' ' . __('concept.premium-campaigns'), '', ['target' => '_blank']) !!}
+6 {{ __('concept.premium-campaigns') }}
@endif
@@ -51,7 +51,7 @@
- {!! __('tiers.features.discord', ['discord' => link_to('https://kanka.io/go/discord', 'Discord')]) !!}
+ {!! __('tiers.features.discord', ['discord' => ' Discord']) !!}
@@ -60,7 +60,7 @@
- {!! __('tiers.features.hall_of_fame', ['hall-of-fame' => link_to('https://kanka.io/go/discord', __('front/hall-of-fame.title'))]) !!}
+ {!! __('tiers.features.hall_of_fame', ['hall-of-fame' => ' ' . __('front/hall-of-fame.title') . '']) !!}
@@ -75,7 +75,7 @@
- {!! link_to('https://app.kanka.io/roadmap', __('tiers.features.roadmap'), null, ['target' => '_blank']) !!}
+ {{ __('tiers.features.roadmap') }}
diff --git a/resources/views/settings/subscription/tiers/benefits/_owlbear.blade.php b/resources/views/settings/subscription/tiers/benefits/_owlbear.blade.php
index 1d7c52056c..abb8ad03fd 100644
--- a/resources/views/settings/subscription/tiers/benefits/_owlbear.blade.php
+++ b/resources/views/settings/subscription/tiers/benefits/_owlbear.blade.php
@@ -3,11 +3,11 @@
@if (auth()->user()->hasBoosterNomenclature())
- {!! link_to('https://kanka.io/premium', 3 . ' ' . __('tiers.features.boosters'), '', ['target' => '_blank']) !!}
+ 3 {{ __('tiers.features.boosters') }}
@else
-{!! link_to('https://kanka.io/premium', 1 . ' ' . __('concept.premium-campaigns'), '', ['target' => '_blank']) !!}
+1 {{ __('concept.premium-campaigns') }}
@endif
@@ -52,7 +52,7 @@
- {!! __('tiers.features.discord', ['discord' => link_to('https://kanka.io/go/discord', 'Discord')]) !!}
+ {!! __('tiers.features.discord', ['discord' => ' Discord',]) !!}
@@ -61,7 +61,7 @@
- {!! __('tiers.features.hall_of_fame', ['hall-of-fame' => link_to('https://kanka.io/go/discord', __('front/hall-of-fame.title'))]) !!}
+ {!! __('tiers.features.hall_of_fame', ['hall-of-fame' => ' ' . __('front/hall-of-fame.title') . '']) !!}
@@ -76,5 +76,5 @@
- {!! link_to('https://app.kanka.io/roadmap', __('tiers.features.roadmap'), null, ['target' => '_blank']) !!}
+ {{ __('tiers.features.roadmap') }}
diff --git a/resources/views/settings/subscription/tiers/benefits/_wyvern.blade.php b/resources/views/settings/subscription/tiers/benefits/_wyvern.blade.php
index ec48159031..8f94c3ac31 100644
--- a/resources/views/settings/subscription/tiers/benefits/_wyvern.blade.php
+++ b/resources/views/settings/subscription/tiers/benefits/_wyvern.blade.php
@@ -3,11 +3,11 @@
@if (auth()->user()->hasBoosterNomenclature())
- {!! link_to('https://kanka.io/premium', 6 . ' ' . __('tiers.features.boosters'), '', ['target' => '_blank']) !!}
+ 6 {{ __('tiers.features.boosters') }}
@else
-{!! link_to('https://kanka.io/premium', 3 . ' ' . __('concept.premium-campaigns'), '', ['target' => '_blank']) !!}
+3 {{ __('concept.premium-campaigns') }}
@endif
@@ -51,7 +51,7 @@
- {!! __('tiers.features.discord', ['discord' => link_to('https://kanka.io/go/discord', 'Discord')]) !!}
+ {!! __('tiers.features.discord', ['discord' => ' Discord',]) !!}
@@ -60,7 +60,7 @@
- {!! __('tiers.features.hall_of_fame', ['hall-of-fame' => link_to('https://kanka.io/go/discord', __('front/hall-of-fame.title'))]) !!}
+ {!! __('tiers.features.hall_of_fame', ['hall-of-fame' => ' ' . __('front/hall-of-fame.title') . '']) !!}
@@ -75,5 +75,5 @@
- {!! link_to('https://app.kanka.io/roadmap', __('tiers.features.roadmap'), null, ['target' => '_blank']) !!}
+ {{ __('tiers.features.roadmap') }}
diff --git a/resources/views/settings/tiers/_elemental.blade.php b/resources/views/settings/tiers/_elemental.blade.php
index df9ebf32d3..3a367c14e4 100644
--- a/resources/views/settings/tiers/_elemental.blade.php
+++ b/resources/views/settings/tiers/_elemental.blade.php
@@ -14,11 +14,11 @@
8 mb
{{ __('front.features.patreon.upload_limit_map') }}
10 mb
- {!! __('front.features.patreon.discord', ['discord' => link_to(config('social.discord'), 'Discord', ['target' => '_blank'])]) !!}
+ {!! __('front.features.patreon.discord', ['discord' => ' Discord']) !!}
{{ __('front.features.patreon.default_image') }}
- {!! __('front.features.patreon.hall_of_fame', ['link' => link_to('https://kanka.io/hall-of-fame', __('front/hall-of-fame.title'))]) !!}
+
{{ __('front.features.patreon.api_calls') }}
diff --git a/resources/views/settings/tiers/_goblin.blade.php b/resources/views/settings/tiers/_goblin.blade.php
index 478ab3a31c..864f822da3 100644
--- a/resources/views/settings/tiers/_goblin.blade.php
+++ b/resources/views/settings/tiers/_goblin.blade.php
@@ -15,13 +15,13 @@
{{ __('front.features.patreon.upload_limit_map') }}
10 mb
- {!! __('front.features.patreon.discord', ['discord' => link_to(config('social.discord'), 'Discord', ['target' => '_blank'])]) !!}
+ {!! __('front.features.patreon.discord', ['discord' => ' Discord']) !!}
{{ __('front.features.patreon.default_image') }}
- {!! __('front.features.patreon.hall_of_fame', ['link' => link_to('https://kanka.io/hall-of-fame', __('front/hall-of-fame.title'))]) !!}
+
{{ __('front.features.patreon.api_calls') }}
diff --git a/resources/views/settings/tiers/_kobold.blade.php b/resources/views/settings/tiers/_kobold.blade.php
index 2f2b53a9ee..5180638ca2 100644
--- a/resources/views/settings/tiers/_kobold.blade.php
+++ b/resources/views/settings/tiers/_kobold.blade.php
@@ -16,7 +16,7 @@
{{ __('front.features.patreon.upload_limit_map') }}
10 mb
- {!! __('front.features.patreon.discord', ['discord' => link_to(config('social.discord'), 'Discord', ['target' => '_blank'])]) !!}
+ {!! __('front.features.patreon.discord', ['discord' => ' Discord']) !!}
diff --git a/resources/views/settings/tiers/_owlbear.blade.php b/resources/views/settings/tiers/_owlbear.blade.php
index 4015eaa2bb..b28281b0f1 100644
--- a/resources/views/settings/tiers/_owlbear.blade.php
+++ b/resources/views/settings/tiers/_owlbear.blade.php
@@ -13,11 +13,11 @@
8 mb
{{ __('front.features.patreon.upload_limit_map') }}
10 mb
- {!! __('front.features.patreon.discord', ['discord' => link_to(config('social.discord'), 'Discord', ['target' => '_blank'])]) !!}
+ {!! __('front.features.patreon.discord', ['discord' => ' Discord']) !!}
{{ __('front.features.patreon.default_image') }}
- {!! __('front.features.patreon.hall_of_fame', ['link' => link_to('https://kanka.io/hall-of-fame', __('front/hall-of-fame.title'))]) !!}
+
{{ __('front.features.patreon.api_calls') }}
diff --git a/resources/views/tags/entities/create.blade.php b/resources/views/tags/entities/create.blade.php
index bf2a4421d9..2ca5ac12c0 100644
--- a/resources/views/tags/entities/create.blade.php
+++ b/resources/views/tags/entities/create.blade.php
@@ -10,19 +10,13 @@
])
@section('content')
- {!! Form::open([
- 'route' => $formOptions,
- 'method' => 'POST',
- 'data-shortcut' => 1,
- 'class' => 'ajax-subform',
- ]) !!}
-
- @include('partials.forms.form', [
- 'title' => __('tags.children.create.modal_title', ['name' => $model->name]),
- 'content' => 'tags.entities._form',
- 'submit' => __('tags.children.actions.add'),
- 'dialog' => true,
- ])
- {!! Form::hidden('tag_id', $model->entity->id) !!}
- {!! Form::close() !!}
+
+ @include('partials.forms.form', [
+ 'title' => __('tags.children.create.modal_title', ['name' => $model->name]),
+ 'content' => 'tags.entities._form',
+ 'submit' => __('tags.children.actions.add'),
+ 'dialog' => true,
+ ])
+
+
@endsection
diff --git a/resources/views/tags/form/_entry.blade.php b/resources/views/tags/form/_entry.blade.php
index 4e3ce8c43b..38d205ab0f 100644
--- a/resources/views/tags/form/_entry.blade.php
+++ b/resources/views/tags/form/_entry.blade.php
@@ -8,15 +8,15 @@
@include('cruds.fields.entry2')
- {!! Form::hidden('is_auto_applied', 0) !!}
+
- {!! Form::checkbox('is_auto_applied', 1, $model->is_auto_applied ?? '' )!!}
+ is_auto_applied ?? false)) checked="checked" @endif />
- {!! Form::hidden('is_hidden', 0) !!}
+
- {!! Form::checkbox('is_hidden', 1, $model->is_hidden ?? '' )!!}
+ is_hidden ?? false)) checked="checked" @endif />
@include('cruds.fields.image')
diff --git a/resources/views/tags/transfer.blade.php b/resources/views/tags/transfer.blade.php
index d18e771251..b6c2733f48 100644
--- a/resources/views/tags/transfer.blade.php
+++ b/resources/views/tags/transfer.blade.php
@@ -9,12 +9,12 @@
])
@section('content')
- {!! Form::open(['route' => ['tags.transfer', [$campaign, $tag->id]], 'method' => 'POST']) !!}
+
@include('partials.forms.form', [
'title' => __('tags.transfer.transfer'),
'content' => 'tags.transfer._form',
'submit' => __('tags.transfer.transfer'),
'dialog' => true,
])
- {!! Form::close() !!}
+
@endsection
diff --git a/resources/views/timelines/elements/_form.blade.php b/resources/views/timelines/elements/_form.blade.php
index cf8de1e233..466138a439 100644
--- a/resources/views/timelines/elements/_form.blade.php
+++ b/resources/views/timelines/elements/_form.blade.php
@@ -13,54 +13,48 @@
- {!! Form::select('era_id', $timeline->eras->pluck('name', 'id'), (!empty($eraId) ? $eraId : null), ['class' => '', 'id' => 'element-era-id']) !!}
+
- {!! Form::text('name', null, ['class' => '', 'placeholder' => __('timelines/elements.placeholders.name')]) !!}
+
@include('cruds.fields.entity')
- {!! Form::textarea('entryForEdition', null, ['class' => ' html-editor', 'id' => 'element-entry', 'name' => 'entry']) !!}
- {!! Form::hidden('use_entity_entry', 0) !!}
+
+
+
- {!! Form::checkbox('use_entity_entry') !!}
+ use_entity_entry ?? false)) checked="checked" @endif />
- {!! Form::text('date', null, ['placeholder' => __('timelines/elements.placeholders.date'), 'class' => '', 'maxlength' => 45]) !!}
+
- {!! Form::hidden('use_event_date', 0) !!}
+
- {!! Form::checkbox('use_event_date') !!}
+ use_event_date ?? false)) checked="checked" @endif />
- {!! Form::select('position', $positions, (!empty($model->position) ? -9999 : $oldPosition), ['class' => '', 'name' => 'position']) !!}
+
-
- {!! Form::select('colour', FormCopy::colours(false), (!empty($model) ? null : 'grey'), ['class' => ' select2-colour']) !!}
-
+ @include('cruds.fields.colour', ['default' => 'grey'])
- {!! Form::text(
- 'icon',
- null,
- ['class' => '',
- 'placeholder' => 'fa-solid fa-gem, ra ra-sword',
- ($campaign->boosted() ? null : 'disabled'),
- 'list' => 'timeline-element-icon-list',
- 'autocomplete' => 'off',
- 'data-paste' => 'fontawesome',
- ])
- !!}
+
+ boosted()) disabled="disabled" @endif />
- {!! Form::close() !!}
+
@endsection
diff --git a/resources/views/timelines/elements/edit.blade.php b/resources/views/timelines/elements/edit.blade.php
index f9c84aa0c5..9fde4eaa5f 100644
--- a/resources/views/timelines/elements/edit.blade.php
+++ b/resources/views/timelines/elements/edit.blade.php
@@ -19,7 +19,7 @@
@section('content')
@include('partials.errors')
- {!! Form::model($model, ['route' => ['timelines.timeline_elements.update', $campaign, 'timeline' => $timeline, 'timeline_element' => $model], 'method' => 'PATCH', 'id' => 'timeline-element-form', 'enctype' => 'multipart/form-data', 'class' => 'ajax-subform', 'data-shortcut' => 1, 'data-maintenance' => 1]) !!}
+
@include('timelines.elements._form')
@@ -31,7 +31,7 @@
- {!! Form::close() !!}
+
@if(!empty($model) && $campaign->hasEditingWarning())
diff --git a/resources/views/timelines/eras/_form.blade.php b/resources/views/timelines/eras/_form.blade.php
index d8d54f9b52..e583d86f17 100644
--- a/resources/views/timelines/eras/_form.blade.php
+++ b/resources/views/timelines/eras/_form.blade.php
@@ -1,28 +1,33 @@
- {!! Form::text('name', null, ['placeholder' => __('timelines/eras.placeholders.name'), 'class' => '', 'maxlength' => 191, 'required']) !!}
+
- {!! Form::text('abbreviation', null, ['placeholder' => __('timelines/eras.placeholders.abbreviation'), 'class' => '', 'maxlength' => 191]) !!}
+
- {!! Form::textarea('entryForEdition', null, ['class' => ' html-editor', 'id' => 'era-entry', 'name' => 'entry']) !!}
+
+
- {!! Form::number('start_year', null, ['placeholder' => __('timelines/eras.placeholders.start_year'), 'class' => '', 'maxlength' => 8]) !!}
+
- {!! Form::number('end_year', null, ['placeholder' => __('timelines/eras.placeholders.end_year'), 'class' => '', 'maxlength' => 8]) !!}
+
- {!! Form::hidden('is_collapsed', 0) !!}
+
- {!! Form::checkbox('is_collapsed', 1) !!}
+ is_collapsed ?? false)) checked="checked" @endif />
diff --git a/resources/views/timelines/eras/create.blade.php b/resources/views/timelines/eras/create.blade.php
index 16e97723d3..703204e150 100644
--- a/resources/views/timelines/eras/create.blade.php
+++ b/resources/views/timelines/eras/create.blade.php
@@ -17,28 +17,20 @@
@section('content')
@include('partials.errors')
- {!! Form::open([
- 'route' => ['timelines.timeline_eras.store', $campaign, $timeline],
- 'method' => 'POST',
- 'id' => 'timeline-era-form',
- 'class' => 'ajax-subform',
- 'data-shortcut' => 1,
- 'data-maintenance' => 1,
- ]) !!}
-
+
+
+ @include('timelines.eras._form', ['model' => null])
- @include('timelines.eras._form', ['model' => null])
-
-
-
- @if (!empty($from))
-
- @endif
- {!! Form::close() !!}
+ @if (!empty($from))
+
+ @endif
+
@endsection
diff --git a/resources/views/timelines/form/_copy.blade.php b/resources/views/timelines/form/_copy.blade.php
index b4d3155431..783984956d 100644
--- a/resources/views/timelines/form/_copy.blade.php
+++ b/resources/views/timelines/form/_copy.blade.php
@@ -1,15 +1,15 @@
- {!! Form::hidden('copy_eras', null) !!}
+
- {!! Form::checkbox('copy_eras', 1, true) !!}
+
- {!! Form::hidden('copy_elements', null) !!}
+
- {!! Form::checkbox('copy_elements', 1, true) !!}
+
diff --git a/resources/views/timelines/panels/eras.blade.php b/resources/views/timelines/panels/eras.blade.php
index b283a8a058..9a14373aeb 100644
--- a/resources/views/timelines/panels/eras.blade.php
+++ b/resources/views/timelines/panels/eras.blade.php
@@ -1,9 +1,15 @@
- @if(Datagrid::hasBulks()) {!! Form::open(['route' => ['timelines.eras.bulk', $campaign, 'timeline' => $model]]) !!} @endif
-
- @include('layouts.datagrid._table')
-
- @if(Datagrid::hasBulks()) {!! Form::close() !!} @endif
+ @if(Datagrid::hasBulks())
+
+
+ @include('layouts.datagrid._table')
+
+
+ @else
+
+ @include('layouts.datagrid._table')
+
+ @endif
diff --git a/resources/views/timelines/reorder/_reorder.blade.php b/resources/views/timelines/reorder/_reorder.blade.php
index e6c17b304b..0a43cfd9d9 100644
--- a/resources/views/timelines/reorder/_reorder.blade.php
+++ b/resources/views/timelines/reorder/_reorder.blade.php
@@ -6,15 +6,12 @@
@endif
-{!! Form::open([
- 'route' => ['timelines.reorder-save', $campaign, $timeline],
- 'method' => 'POST',
- ]) !!}
+
@foreach($eras as $era)
- {!! Form::hidden('timeline_era[]', $era->id) !!}
+
@@ -32,7 +29,7 @@
@continue
@endif
- {!! Form::hidden('timeline_element[' . $era->id . '][]', $element->id) !!}
+
{!! $element->htmlIcon(false) !!}
@@ -52,4 +49,4 @@
{{ __('crud.save') }}
-{!! Form::close() !!}
+
|