update main branch #47

Merged
jorge merged 166 commits from develop into main 2021-12-01 11:20:13 +01:00
2 changed files with 19 additions and 3 deletions
Showing only changes of commit 987215a2d9 - Show all commits

View File

@ -31,7 +31,6 @@ $("#archive_page_title").html('<?php echo $_html ?>');
<!-- arc-hive page header-image insert ends --> <!-- arc-hive page header-image insert ends -->
<div class="resource-title"> <div class="resource-title">
<?php echo $this->pageTitle($item->displayTitle(), 2); ?> <?php echo $this->pageTitle($item->displayTitle(), 2); ?>
</div> </div>
@ -49,9 +48,19 @@ $("#archive_page_title").html('<?php echo $_html ?>');
<?php endif; ?> <?php endif; ?>
<?php if (!$embedMedia && $itemMedia): ?> <?php if (!$embedMedia && $itemMedia): ?>
<div class="media-list"> <div class="media-list" style="display: flex;">
<?php foreach ($itemMedia as $media): ?> <?php foreach ($itemMedia as $media): ?>
<?php echo $media->linkPretty(); ?> <?php //echo $media->linkPretty(); ?>
<div style="display: flex;
flex: 1;
flex-direction: column;
padding: 0 10px 10px 0;">
<a href="<?= $media->originalUrl(); ?>">
<img src="<?= $media->thumbnailUrl("square"); ?>" />
<br />
<?= $media->displayTitle(); ?>
</a>
</div>
<?php endforeach; ?> <?php endforeach; ?>
</div> </div>
<?php endif; ?> <?php endif; ?>

View File

@ -1,3 +1,10 @@
<!--
We have modified omkeka/site/item/show.phtml to render a link to the original
files intead of the media page (this page).
That means that this page is not (in theory) used.
-->
<?php <?php
$translate = $this->plugin('translate'); $translate = $this->plugin('translate');
?> ?>