diff --git a/resources/views/entities/pages/print/markdown.blade.php b/resources/views/entities/pages/print/markdown.blade.php index c29ea4417b..f9f5840cde 100644 --- a/resources/views/entities/pages/print/markdown.blade.php +++ b/resources/views/entities/pages/print/markdown.blade.php @@ -2,28 +2,30 @@ * @var \App\Models\MiscModel $model * @var \App\Models\Entity $entity */?> - +@php + $counter = 0; +@endphp # {!! $entity->name !!} @if ($model instanceof \App\Models\Character && $model->isDead()) - {{ __('characters.hints.is_dead') }} +{{ __('characters.hints.is_dead') }} @endif @if ($model instanceof \App\Models\Quest && $model->isCompleted()) - {{ __('quests.fields.is_completed') }} +{{ __('quests.fields.is_completed') }} @endif @if ($model instanceof \App\Models\Organisation && $model->isDefunct()) - {{ __('organisations.hints.is_defunct') }} +{{ __('organisations.hints.is_defunct') }} @endif @if ($model instanceof \App\Models\Creature && $model->isExtinct()) - {{ __('creatures.hints.is_extinct') }} +{{ __('creatures.hints.is_extinct') }} @endif @if ($model instanceof \App\Models\Character && !empty($model->title)) - {{ $model->title }} +{{ $model->title }} @endif @if (!empty($model->type)) - {{ $model->type }} +{{ $model->type }} @endif @if ($entity->hasPins()) @@ -37,27 +39,21 @@ @endforeach @endif @if(!$entity->pinnedAliases->isEmpty()) -| {{ __('entities/assets.actions.alias') }} | | -@foreach ($model->entity->pinnedAliases as $asset) -| {{ $asset->name }} | | -@endforeach -@endif +| {{ __('entities/assets.actions.alias') }} | @foreach ($model->entity->pinnedAliases as $asset) {{ $asset->name }}@if ($counter < $model->entity->pinnedAliases->count() - 1)@php $counter++; @endphp, @endif @endforeach |@endif @foreach ($entity->pinnedRelations as $relation) -| {{ $relation->relation }} | {!! $converter->convert($relation->target->tooltipedLink()) !!} | +| {{ $relation->relation }} | {{ $relation->target->name }} | @endforeach @if(method_exists($model, 'pinnedMembers') && !$model->pinnedMembers->isEmpty()) @foreach ($model->pinnedMembers as $member) @if ($model instanceof \App\Models\Character) -| {!! $converter->convert($member->organisation->tooltipedLink()) !!} | {{ $member->role }} | +| {{ $member->organisation->name }} | {{ $member->role }} | @else -| {!! $converter->convert($member->character->tooltipedLink()) !!} | {{ $member->role }} | +| {{ $member->character->name }} | {{ $member->role }} | @endif @endforeach @endif @endif -{!! $model->getTable() !!} - ## {{ __('crud.tabs.profile') }} | Name | Content | |:-|:-| diff --git a/resources/views/entities/pages/print/profile/_events.blade.php b/resources/views/entities/pages/print/profile/_events.blade.php index 858c23e57a..f527af1799 100644 --- a/resources/views/entities/pages/print/profile/_events.blade.php +++ b/resources/views/entities/pages/print/profile/_events.blade.php @@ -49,13 +49,13 @@ @foreach ($distinctCalendars as $calendarId => $calendarEvents) @php $birth = $calendarEvents['birth'] ?? null; $death = $calendarEvents['death'] ?? null; @endphp @if (!empty($birth) && !empty($death)) -| {{ __('characters.fields.life') }} | {{ $birth->readableDate() }} {{ $death->readableDate() }} ({{ $birth->calcElapsed($death) }}) | +| {{ __('characters.fields.life') }} | {{ $birth->readableDate() }} ✝ {{ $death->readableDate() }} ({{ $birth->calcElapsed($death) }}) | @elseif (!empty($birth)) @php $yearsAgo = $birth->calcElapsed() @endphp @if ($birth->isBirth()) -|
{{ __('entities/events.types.birth') }}
| {{ $birth->readableDate() }} ({{ $event->isBirth() ? $yearsAgo : trans_choice('entities/events.years-ago', $yearsAgo, ['count' => $yearsAgo]) }}) | +|
{{ __('entities/events.types.birth') }}
| {{ $birth->readableDate() }} ({{ $event->isBirth() ? $yearsAgo : trans_choice('entities/events.years-ago', $yearsAgo, ['count' => $yearsAgo]) }}) | @else -|
{{ __('entities/events.types.founded') }}
| {{ $birth->readableDate() }} ({{ $event->isBirth() ? $yearsAgo : trans_choice('entities/events.years-ago', $yearsAgo, ['count' => $yearsAgo]) }}) | +|
{{ __('entities/events.types.founded') }}
| {{ $birth->readableDate() }} ({{ $event->isBirth() ? $yearsAgo : trans_choice('entities/events.years-ago', $yearsAgo, ['count' => $yearsAgo]) }}) | @endif @elseif (!empty($death))
diff --git a/resources/views/entities/pages/print/profile/_location.blade.php b/resources/views/entities/pages/print/profile/_location.blade.php index a10d9f1e1a..e9e9174217 100644 --- a/resources/views/entities/pages/print/profile/_location.blade.php +++ b/resources/views/entities/pages/print/profile/_location.blade.php @@ -1,3 +1,3 @@ @if ($campaign->enabled('locations') && !empty($model->location)) -| {!! \App\Facades\Module::singular(config('entities.ids.location'), __('entities.location')) !!} | {!! $model->location->tooltipedLink() !!} | +| {!! \App\Facades\Module::singular(config('entities.ids.location'), __('entities.location')) !!} | {!! $model->location->name !!} | @endif diff --git a/resources/views/entities/pages/print/profile/_reminder.blade.php b/resources/views/entities/pages/print/profile/_reminder.blade.php index f9ca286e88..93fc75edc6 100644 --- a/resources/views/entities/pages/print/profile/_reminder.blade.php +++ b/resources/views/entities/pages/print/profile/_reminder.blade.php @@ -1,3 +1,3 @@ @if ($model->calendarReminder()) -| {{ __('crud.fields.calendar_date') }} | {{ $model->calendarReminder()->readableDate() }} | +| {{ __('crud.fields.calendar_date') }} | {{ $model->calendarReminder()->readableDate() }} | @endif diff --git a/resources/views/entities/pages/print/profile/_type.blade.php b/resources/views/entities/pages/print/profile/_type.blade.php index daa9c15674..86cdd58f5c 100644 --- a/resources/views/entities/pages/print/profile/_type.blade.php +++ b/resources/views/entities/pages/print/profile/_type.blade.php @@ -2,5 +2,5 @@ @php $defaultOptions = auth()->check() && auth()->user()->entityExplore === '1' ? [$campaign, 'm' => 'table'] : [$campaign]; @endphp -| {{ __('crud.fields.type') }} | {!! link_to_route($entity->pluralType() . '.index', $model->type, $defaultOptions + ['_clean' => true, 'type' => $model->type]); !!} | +| {{ __('crud.fields.type') }} | {{ $model->type }} | @endif diff --git a/resources/views/entities/pages/print/profile/attribute_templates.blade.php b/resources/views/entities/pages/print/profile/attribute_templates.blade.php index 8e8b683458..2d42981ad1 100644 --- a/resources/views/entities/pages/print/profile/attribute_templates.blade.php +++ b/resources/views/entities/pages/print/profile/attribute_templates.blade.php @@ -1,6 +1,6 @@ @if (!empty($model->attributeTemplate)) -| {{ __('crud.fields.parent') }} | {!! $model->attributeTemplate->tooltipedLink() !!} | +| {{ __('crud.fields.parent') }} | {!! $model->attributeTemplate->name !!} | @endif @if (!empty($model->entityType)) | {{ __('attribute_templates.fields.auto_apply') }} | {!! $model->entityType->name() !!} | diff --git a/resources/views/entities/pages/print/profile/characters.blade.php b/resources/views/entities/pages/print/profile/characters.blade.php index 8fb5182546..73bc16c988 100644 --- a/resources/views/entities/pages/print/profile/characters.blade.php +++ b/resources/views/entities/pages/print/profile/characters.blade.php @@ -3,39 +3,27 @@ * @var \App\Models\Entity $entity */?> @if ($campaign->enabled('families') && !$model->families->isEmpty()) -| {!! \App\Facades\Module::singular(config('entities.ids.family'), __('entities.families')) !!} | | -@php $existingFamilies = []; @endphp -@foreach ($model->families as $family) -@if(!empty($existingFamilies[$family->id])) -@continue -@endif -@php $existingRaces[$family->id] = true; @endphp -| | {!! $family->tooltipedLink() !!} | -@endforeach +@php +$existingFamilies = []; +$counter = 0; +@endphp +| {!! \App\Facades\Module::singular(config('entities.ids.family'), __('entities.families')) !!} | @foreach ($model->families as $family) @if(!empty($existingFamilies[$family->id])) @continue @endif @php $existingRaces[$family->id] = true; @endphp {!! $family->name !!}@if ($counter < $model->families->count() - 1)@php $counter++; @endphp, @endif @endforeach | @endif @if (!$model->races->isEmpty() || $model->hasAge()) @if (!$model->races->isEmpty() && !$model->hasAge()) -| {!! \App\Facades\Module::plural(config('entities.ids.race'), __('entities.races')) !!} | | -@php $existingRaces = []; @endphp -@foreach ($model->races as $race) -@if(!empty($existingRaces[$race->id])) -@continue -@endif -@php $existingRaces[$race->id] = true; @endphp -| | {!! $race->tooltipedLink() !!} | -@endforeach +@php +$existingRaces = []; +$counter = 0; +@endphp +| {!! \App\Facades\Module::plural(config('entities.ids.race'), __('entities.races')) !!} | @foreach ($model->races as $race) @if(!empty($existingRaces[$race->id])) @continue @endif @php $existingRaces[$race->id] = true; @endphp {!! $race->name !!}@if ($counter < $model->races->count() - 1)@php $counter++; @endphp, @endif @endforeach | @elseif ($model->races->isEmpty() && $model->hasAge()) | {{ __('characters.fields.age') }} | {{ $model->age }} | @else -| {!! \App\Facades\Module::plural(config('entities.ids.race'), __('entities.races')) !!} | | -@php $existingRaces = []; @endphp -@foreach ($model->races as $race) -@if(!empty($existingRaces[$race->id])) -@continue -@endif -@php $existingRaces[$race->id] = true; @endphp -| | {!! $race->tooltipedLink() !!} | -@endforeach +@php +$existingRaces = []; +$counter = 0; +@endphp +| {!! \App\Facades\Module::plural(config('entities.ids.race'), __('entities.races')) !!} | @foreach ($model->races as $race) @if(!empty($existingRaces[$race->id])) @continue @endif @php $existingRaces[$race->id] = true; @endphp {!! $race->name !!}@if ($counter < $model->races->count() - 1)@php $counter++; @endphp, @endif @endforeach | | {{ __('characters.fields.age') }} | {{ $model->age }} | @endif @endif diff --git a/resources/views/entities/pages/print/profile/creatures.blade.php b/resources/views/entities/pages/print/profile/creatures.blade.php index 27e6af7634..03110fb5b8 100644 --- a/resources/views/entities/pages/print/profile/creatures.blade.php +++ b/resources/views/entities/pages/print/profile/creatures.blade.php @@ -1,13 +1,9 @@ @if ($campaign->enabled('locations') && !$model->locations->isEmpty()) -| {!! \App\Facades\Module::plural(config('entities.ids.location'), __('entities.locations')) !!} | | -@php $existingLocations = []; @endphp -@foreach ($model->locations as $location) -@if(!empty($existingLocations[$location->id])) -@continue -@endif -@php $existingLocations[$location->id] = true; @endphp -| | {!! $location->tooltipedLink() !!} | -@endforeach +@php +$existingLocations = []; +$counter = 0; +@endphp +| {!! \App\Facades\Module::plural(config('entities.ids.location'), __('entities.locations')) !!} | @foreach ($model->locations as $location) @if(!empty($existingLocations[$location->id])) @continue @endif @php $existingLocations[$location->id] = true; @endphp {!! $location->name !!}@if ($counter < $model->locations->count())@php $counter++; @endphp, @endif@endforeach | @endif @include('entities.pages.print.profile._type') diff --git a/resources/views/entities/pages/print/profile/dice_rolls.blade.php b/resources/views/entities/pages/print/profile/dice_rolls.blade.php index 8c0dc47b07..d1700430b0 100644 --- a/resources/views/entities/pages/print/profile/dice_rolls.blade.php +++ b/resources/views/entities/pages/print/profile/dice_rolls.blade.php @@ -3,5 +3,5 @@ | {{ __('dice_rolls.fields.parameters') }} | {{ $model->parameters }} | @endif @if ($model->character) -| {!! \App\Facades\Module::singular(config('entities.ids.character'), __('entities.character')) !!} | {!! $model->character->tooltipedLink() !!} | +| {!! \App\Facades\Module::singular(config('entities.ids.character'), __('entities.character')) !!} | {!! $model->character->name !!} | @endif diff --git a/resources/views/entities/pages/print/profile/families.blade.php b/resources/views/entities/pages/print/profile/families.blade.php index a6dcc2b9ab..3d88a5e3bc 100644 --- a/resources/views/entities/pages/print/profile/families.blade.php +++ b/resources/views/entities/pages/print/profile/families.blade.php @@ -1,6 +1,6 @@ @if (!empty($model->family)) -| {!! \App\Facades\Module::singular(config('entities.ids.family'), __('entities.family')) !!} | {!! $model->family->tooltipedLink() !!} | +| {!! \App\Facades\Module::singular(config('entities.ids.family'), __('entities.family')) !!} | {!! $model->family->name !!} | @endif @include('entities.pages.print.profile._type') @include('entities.pages.print.profile._events') diff --git a/resources/views/entities/pages/print/profile/items.blade.php b/resources/views/entities/pages/print/profile/items.blade.php index a51968dbb2..a207c9ad37 100644 --- a/resources/views/entities/pages/print/profile/items.blade.php +++ b/resources/views/entities/pages/print/profile/items.blade.php @@ -7,6 +7,6 @@ @endif @include('entities.components.profile._location') @if ($model->character) -| {{ __('items.fields.character') }} | {!! $model->character->tooltipedLink() !!} | +| {{ __('items.fields.character') }} | {!! $model->character->name !!} | @endif @include('entities.pages.print.profile._type') diff --git a/resources/views/entities/pages/print/profile/journals.blade.php b/resources/views/entities/pages/print/profile/journals.blade.php index 74fba442b3..789abbdfd1 100644 --- a/resources/views/entities/pages/print/profile/journals.blade.php +++ b/resources/views/entities/pages/print/profile/journals.blade.php @@ -4,7 +4,7 @@ | {{ __('journals.fields.date') }} | {{ \App\Facades\UserDate::format($model->date) }} | @endif @if ($model->author && $model->author) -| {{ __('journals.fields.author') }} | {!! $model->author->tooltipedLink() !!} | +| {{ __('journals.fields.author') }} | {!! $model->author->name !!} | @endif @include('entities.pages.print.profile._reminder') @include('entities.pages.print.profile._type') diff --git a/resources/views/entities/pages/print/profile/locations.blade.php b/resources/views/entities/pages/print/profile/locations.blade.php index e9eb78d40d..5055a2f2e7 100644 --- a/resources/views/entities/pages/print/profile/locations.blade.php +++ b/resources/views/entities/pages/print/profile/locations.blade.php @@ -2,8 +2,6 @@ @include('entities.pages.print.profile._type') @include('entities.pages.print.profile._events') @if (!$model->maps->isEmpty()) -| {!! \App\Facades\Module::singular(config('entities.ids.map'), __('entities.map')) !!} | | -@foreach ($model->maps as $map) -| | {!! $map->tooltipedLink() !!} {!! $map->exploreLink() !!} | -@endforeach +@php $counter = 0; @endphp +| {!! \App\Facades\Module::singular(config('entities.ids.map'), __('entities.map')) !!} | @foreach ($model->maps as $map) {!! $map->name !!} @if ($counter > $model->maps->count() - 1) @php $counter++ @endphp, @endif @endforeach | @endif diff --git a/resources/views/entities/pages/print/profile/quests.blade.php b/resources/views/entities/pages/print/profile/quests.blade.php index 6bebe8a5fd..838b7d0420 100644 --- a/resources/views/entities/pages/print/profile/quests.blade.php +++ b/resources/views/entities/pages/print/profile/quests.blade.php @@ -1,6 +1,6 @@ @if (!empty($model->instigator)) -| {{ __('quests.fields.instigator') }} | {!! $model->instigator->tooltipedLink() !!} | +| {{ __('quests.fields.instigator') }} | {!! $model->instigator->name !!} | @endif @if ($model->date) | {{ __('journals.fields.date') }} | {{ \App\Facades\UserDate::format($model->date) }} | diff --git a/resources/views/entities/pages/print/profile/races.blade.php b/resources/views/entities/pages/print/profile/races.blade.php index 729b355878..fa67156584 100644 --- a/resources/views/entities/pages/print/profile/races.blade.php +++ b/resources/views/entities/pages/print/profile/races.blade.php @@ -1,13 +1,9 @@ @if ($campaign->enabled('locations') && !$model->locations->isEmpty()) -| {!! \App\Facades\Module::plural(config('entities.ids.location'), __('entities.locations')) !!} | | -@php $existingRaces = []; @endphp -@foreach ($model->locations as $location) -@if(!empty($existingLocations[$location->id])) -@continue -@endif -@php $existingLocations[$location->id] = true; @endphp -| | {!! $location->tooltipedLink() !!} | -@endforeach +@php +$existingRaces = []; +$counter = 0; +@endphp +| {!! \App\Facades\Module::plural(config('entities.ids.location'), __('entities.locations')) !!} | @foreach ($model->locations as $location) @if(!empty($existingLocations[$location->id])) @continue @endif @php $existingLocations[$location->id] = true; @endphp {!! $location->name !!} @if ($counter > $model->locations->count() )@php $counter++ @endphp,@endif @endforeach | @endif @include('entities.pages.print.profile._type') \ No newline at end of file