Skip to content

Media list adjustments #5345

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ekdahl wants to merge 1 commit into
base: main
Choose a base branch
from
+75 −73
Open

Media list adjustments #5345

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
146 changes: 74 additions & 72 deletions resources/views/modules/media-list/page.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,86 +97,88 @@ use Illuminate\Support\Collection;
<?php if ($media_objects->isNotEmpty()) : ?>
<?= view('modules/media-list/pagination', ['module' => $module, 'page' => $page, 'pages' => $pages, 'folder' => $folder, 'subdirs' => $subdirs, 'filter' => $filter, 'format' => $format, 'max' => $max, 'tree' => $tree]) ?>

<div class="row row-cols-1 row-cols-sm-2 row-cols-lg-3 g-4">
<?php foreach ($media_objects as $media_object) : ?>
<div class="col">
<div class="card h-100">
<div class="card-header">
<h4 class="card-title">
<a href="<?= e($media_object->url()) ?>"><?= $media_object->fullName() ?></a>
</h4>
</div>
<div class="card-body">
<?php foreach ($media_object->mediaFiles() as $media_file) : ?>
<?= $media_file->displayImage(300, 200, 'contain', ['class' => 'img-fluid']) ?>
<?php endforeach ?>

<?php $media_file = $media_object->mediaFiles()->first() ?>
<?php if ($media_file instanceof MediaFile) : ?>
<p class="card-text">
<?php
// Show file details
if ($media_file->type() !== '') {
$element = Registry::elementFactory()->make('OBJE:FILE:FORM:TYPE');
echo $element->labelValue($media_file->type(), $media_object->tree());
}

foreach ($media_object->facts(['SOUR']) as $fact) {
echo view('fact-gedcom-fields', ['gedcom' => $fact->gedcom(), 'parent' => $media_object->tag(), 'tree' => $tree]);
}

foreach ($media_object->facts(['NOTE']) as $fact) {
echo view('fact-gedcom-fields', ['gedcom' => $fact->gedcom(), 'parent' => $media_object->tag(), 'tree' => $tree]);
}

if ($media_file->isExternal()) {
echo Registry::elementFactory()->make('OBJE:FILE')->labelValue($media_file->filename(), $media_object->tree());
} elseif ($media_file->fileExists()) {
if (Auth::isEditor($tree)) {
<div class="my-3">
<div class="row row-cols-1 row-cols-sm-2 row-cols-lg-3 g-3">
<?php foreach ($media_objects as $media_object) : ?>
<div class="col">
<div class="card h-100">
<div class="card-header">
<h6 class="card-title">
<a href="<?= e($media_object->url()) ?>"><?= $media_object->fullName() ?></a>
</h6>
</div>
<div class="card-body">
<?php foreach ($media_object->mediaFiles() as $media_file) : ?>
<?= $media_file->displayImage(300, 200, 'contain', ['class' => 'img-fluid']) ?>
<?php endforeach ?>

<?php $media_file = $media_object->mediaFiles()->first() ?>
<?php if ($media_file instanceof MediaFile) : ?>
<p class="card-text">
<?php
// Show file details
if ($media_file->type() !== '') {
$element = Registry::elementFactory()->make('OBJE:FILE:FORM:TYPE');
echo $element->labelValue($media_file->type(), $media_object->tree());
}

foreach ($media_object->facts(['SOUR']) as $fact) {
echo view('fact-gedcom-fields', ['gedcom' => $fact->gedcom(), 'parent' => $media_object->tag(), 'tree' => $tree]);
}

foreach ($media_object->facts(['NOTE']) as $fact) {
echo view('fact-gedcom-fields', ['gedcom' => $fact->gedcom(), 'parent' => $media_object->tag(), 'tree' => $tree]);
}

if ($media_file->isExternal()) {
echo Registry::elementFactory()->make('OBJE:FILE')->labelValue($media_file->filename(), $media_object->tree());
} elseif ($media_file->fileExists()) {
if (Auth::isEditor($tree)) {
echo Registry::elementFactory()->make('OBJE:FILE')->labelValue($media_file->filename(), $media_object->tree());

foreach ($media_file->attributes() as $label => $value) {
$label = '<span class="label">' . $label . '</span>';
$value = '<span class="value">' . $value . '</span>';
foreach ($media_file->attributes() as $label => $value) {
$label = '<span class="label">' . $label . '</span>';
$value = '<span class="value">' . $value . '</span>';

echo '<div>' . I18N::translate(/* I18N: e.g. "Occupation: farmer" */ '%1$s: %2$s', $label, $value) . '</div>';
echo '<div>' . I18N::translate(/* I18N: e.g. "Occupation: farmer" */ '%1$s: %2$s', $label, $value) . '</div>';
}
}
} else {
echo '<p class="alert alert-danger">', /* I18N: %s is a filename */ I18N::translate('The file “%s” does not exist.', e($media_file->filename())), '</p>';
}
} else {
echo '<p class="alert alert-danger">', /* I18N: %s is a filename */ I18N::translate('The file “%s” does not exist.', e($media_file->filename())), '</p>';
}
?>
</p>
<?php endif ?>
</div>
<div class="card-footer">
<?php foreach ($linked_record_service->linkedIndividuals($media_object) as $record) : ?>
<?= view('icons/individual') ?>
<a href="<?= e($record->url()) ?>"><?= $record->fullName() ?></a>
<br>
<?php endforeach ?>

<?php foreach ($linked_record_service->linkedFamilies($media_object) as $record) : ?>
<?= view('icons/family') ?>
<a href="<?= e($record->url()) ?>"><?= $record->fullName() ?></a>
<br>
<?php endforeach ?>

<?php foreach ($linked_record_service->linkedSources($media_object) as $record) : ?>
<?= view('icons/source') ?>
<a href="<?= e($record->url()) ?>"><?= $record->fullName() ?></a>
<br>
<?php endforeach ?>
?>
</p>
<?php endif ?>
</div>
<div class="card-footer">
<?php foreach ($linked_record_service->linkedIndividuals($media_object) as $record) : ?>
<?= view('icons/individual') ?>
<a href="<?= e($record->url()) ?>"><?= $record->fullName() ?></a>
<br>
<?php endforeach ?>

<?php foreach ($linked_record_service->linkedFamilies($media_object) as $record) : ?>
<?= view('icons/family') ?>
<a href="<?= e($record->url()) ?>"><?= $record->fullName() ?></a>
<br>
<?php endforeach ?>

<?php foreach ($linked_record_service->linkedSources($media_object) as $record) : ?>
<?= view('icons/source') ?>
<a href="<?= e($record->url()) ?>"><?= $record->fullName() ?></a>
<br>
<?php endforeach ?>

<?php foreach ($linked_record_service->linkedLocations($media_object) as $record) : ?>
<?= view('icons/location') ?>
<a href="<?= e($record->url()) ?>"><?= $record->fullName() ?></a>
<br>
<?php endforeach ?>
<?php foreach ($linked_record_service->linkedLocations($media_object) as $record) : ?>
<?= view('icons/location') ?>
<a href="<?= e($record->url()) ?>"><?= $record->fullName() ?></a>
<br>
<?php endforeach ?>
</div>
</div>
</div>
</div>
<?php endforeach ?>
<?php endforeach ?>
</div>
</div>

<?= view('modules/media-list/pagination', ['module' => $module, 'page' => $page, 'pages' => $pages, 'folder' => $folder, 'subdirs' => $subdirs, 'filter' => $filter, 'format' => $format, 'max' => $max, 'tree' => $tree]) ?>
Expand Down
2 changes: 1 addition & 1 deletion resources/views/modules/media-list/pagination.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ use Fisharebest\Webtrees\Tree;

?>

<div class="row text-center">
<div class="row text-center align-items-center">
<div class="col">
<?php if ($page > 1) : ?>
<a class="btn btn-outline-secondary" href="<?= e($module->listUrl($tree, ['go' => '1', 'folder' => $folder, 'subdirs' => $subdirs, 'filter' => $filter, 'format' => $format, 'max' => $max, 'page' => 1])) ?>">
Expand Down