Beanz/flatpress
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed gallery output, also fixes #127

Browse Source
This commit is contained in:
azett 2022-06-30 20:26:01 +02:00
parent 63b75fe5fc
commit 97fdec44ff
2 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
fp-plugins/photoswipe/photoswipefunctions.class.php
View File

@ -58,10 +58,10 @@ class PhotoSwipeFunctions {
// for usage in HTML attributes, we need to remove quotes and HTML tags from the title // for usage in HTML attributes, we need to remove quotes and HTML tags from the title
$titleForAttributes = isset($attr ['title']) ? htmlentities(strip_tags($attr ['title'])) : ''; $titleForAttributes = isset($attr ['title']) ? htmlentities(strip_tags($attr ['title'])) : '';
// image may float, according the the given float attribute // image may float, according the the given float attribute - if not given, use "nofloat" class
$float = ' class="thumbnail nofloat" '; $floatClasses = 'thumbnail nofloat';
if (isset($attr ['float'])) { if (isset($attr ['float'])) {
$float = ' class="thumbnail float' . $attr ['float'] . '"'; $floatClasses = 'float' . $attr ['float'];
} }
// to get the HTML code for preview image, we use the Flatpress standard function do_bbcode_img() // to get the HTML code for preview image, we use the Flatpress standard function do_bbcode_img()
@ -78,28 +78,34 @@ class PhotoSwipeFunctions {
$previewHtml .= ' itemprop="thumbnail" title="' . $titleForAttributes . '">'; $previewHtml .= ' itemprop="thumbnail" title="' . $titleForAttributes . '">';
// PhotoSwipe needs to know the dimensions of the image - so we read them // PhotoSwipe needs to know the dimensions of the image - so we read them
$imgsize = getimagesize($imgPathRel); $imgsize = @getimagesize($imgPathRel);
$datasizeAttr = ($imgsize === false) ? '' : 'data-size="' . $imgsize [0] . 'x' . $imgsize [1] . '" ';
// set max width of the figure according to the width attribute
$styleAttr = isset($attr ['width']) ? ' style="width:' . $attr ['width'] . 'px" ' : '';
// now lets assemble the whole HTML code - including the overlay HTML, if not inserted into the DOM before // now lets assemble the whole HTML code - including the overlay HTML, if not inserted into the DOM before
$imgHtml = self::getPhotoSwipeOverlay() . // $imgHtml = self::getPhotoSwipeOverlay() . //
'<div class="photoswipe"> '<div ' . //
<figure ' . // 'class="photoswipe ' . $floatClasses . '"' . $styleAttr . //
'>' . //
'<figure ' . //
'itemprop="associatedMedia" ' . // 'itemprop="associatedMedia" ' . //
'itemscope ' . // 'itemscope ' . //
'itemtype="http://schema.org/ImageObject" ' . // 'itemtype="http://schema.org/ImageObject" ' . //
'data-index="' . self::$lastusedDataIndex . '" ' . // 'data-index="' . self::$lastusedDataIndex . '" ' . //
$float . ' ' . // 'class="' . $floatClasses . '" ' . //
'>' . // '>' . //
'<a ' . // '<a ' . //
'href="' . $imgUrl . '" ' . // 'href="' . $imgUrl . '" ' . //
'itemprop="contentUrl" ' . // 'itemprop="contentUrl" ' . //
'data-size="' . $imgsize [0] . 'x' . $imgsize [1] . '" ' . // $datasizeAttr . //
'data-index="' . self::$lastusedDataIndex . '" ' . // 'data-index="' . self::$lastusedDataIndex . '" ' . //
'title="' . htmlentities($title) . '" ' . // 'title="' . htmlentities($title) . '" ' . //
'>' . // '>' . //
$previewHtml . // $previewHtml . //
'</a>' . // '</a>' . //
'<figcaption>' . $title . '</figcaption>' . // '<figcaption' . $styleAttr . '>' . $title . '</figcaption>' . //
'</figure>' . // '</figure>' . //
'</div>'; '</div>';

9
fp-plugins/photoswipe/res/photoswipe-4.1.1/photoswipe.css
View File

@ -199,23 +199,22 @@ div.photoswipe figcaption {
text-align:center; text-align:center;
} }
div.photoswipe figure.floatleft { div.floatleft {
float:left; float:left;
margin:0 1em 1em 0; margin:0 1em 1em 0;
} }
div.photoswipe figure.floatleft img.floatleft { div.floatleft img.floatleft {
float:none; float:none;
} }
div.photoswipe figure.floatright { div.floatright {
float:right; float:right;
margin:0 0 1em 1em; margin:0 0 1em 1em;
} }
div.photoswipe figure.floatright img.floatright { div.floatright img.floatright {
float:none; float:none;
} }
.img-gallery div.photoswipe figure { .img-gallery div.photoswipe figure {
display:inline-block; display:inline-block;
width:140px;
vertical-align: top; vertical-align: top;
text-align:center; text-align:center;
margin:.5em 1em 0 0; margin:.5em 1em 0 0;