Skip to content

Commit ea7f473

Browse files
GuLinuxGuLinux
committed
Allow to specify tags for title and descriptions
1 parent 84b3dca commit ea7f473

9 files changed

Lines changed: 40 additions & 19 deletions

‎classes/Collection.php‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ public function __construct($tree, $api)
1717
$this->info = $tree;
1818
$this->collections = [];
1919
$this->sets = [];
20-
dump($tree);
2120
if(is_array($tree['collection'])) {
2221
foreach($tree['collection'] as $collection) {
2322
$this->collections[] = new Collection($collection, $api);
@@ -28,8 +27,6 @@ public function __construct($tree, $api)
2827
$this->sets[] = $api->photoset($set['id'], []);
2928
}
3029
}
31-
dump($this->collections);
32-
dump($this->sets);
3330
}
3431

3532

‎classes/FlickrCommons.php‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<?php
2+
namespace Grav\Plugin\Flickr;
3+
require_once(__DIR__.'/FlickrAPI.php');
4+
5+
class FlickrCommons {
6+
const DEFAULT_PARAMS = [
7+
'display-format-photo' => 's',
8+
'display-format-photo-lightbox' => 'z',
9+
'photoset-title-tag' => 'h4',
10+
'photoset-description-tag' => 'h5',
11+
'collection-title-tag' => 'h3',
12+
'collection-description-tag' => 'h5'
13+
];
14+
}

‎shortcodes/FlickrCollectionShortcode.php‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
<?php
22

33
namespace Grav\Plugin\Shortcodes;
4-
require_once(__DIR__.'/../classes/FlickrAPI.php');
4+
require_once(__DIR__.'/../classes/FlickrCommons.php');
5+
use Grav\Plugin\Flickr\FlickrCommons;
56
use Grav\Common\Utils;
67
use Thunder\Shortcode\Shortcode\ShortcodeInterface;
78
use Grav\Plugin\Flickr\FlickrAPI;
@@ -16,7 +17,7 @@ public function init()
1617
$content = $sc->getContent();
1718
$id = $sc->getParameter('id', '');
1819
$api = new FlickrAPI();
19-
$params = array_merge(['display-format-photo' => 's', 'display-format-photo-lightbox' => 'z'], $sc->getParameters());
20+
$params = array_merge(FlickrCommons::DEFAULT_PARAMS, $sc->getParameters());
2021
try {
2122
$collection = $api->collection($id );
2223
$output = $this->twig->processTemplate('partials/flickr-collection.html.twig', [

‎shortcodes/FlickrPhotoShortcode.php‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
<?php
22

33
namespace Grav\Plugin\Shortcodes;
4-
require_once(__DIR__.'/../classes/FlickrAPI.php');
4+
require_once(__DIR__.'/../classes/FlickrCommons.php');
5+
use Grav\Plugin\Flickr\FlickrCommons;
56
use Grav\Common\Utils;
67
use Thunder\Shortcode\Shortcode\ShortcodeInterface;
78
use Grav\Plugin\Flickr\FlickrAPI;
@@ -16,7 +17,7 @@ public function init()
1617
$content = $sc->getContent();
1718
$id = $sc->getParameter('id', '');
1819
$api = new FlickrAPI();
19-
$params = array_merge(['display-format-photo' => 's', 'display-format-photo-lightbox' => 'z'], $sc->getParameters());
20+
$params = array_merge(FlickrCommons::DEFAULT_PARAMS, $sc->getParameters());
2021
try {
2122
$photo = $api->photo($id );
2223
$output = $this->twig->processTemplate('partials/flickr-photo.html.twig', [

‎shortcodes/FlickrPhotosetShortcode.php‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
<?php
22

33
namespace Grav\Plugin\Shortcodes;
4-
require_once(__DIR__.'/../classes/FlickrAPI.php');
4+
require_once(__DIR__.'/../classes/FlickrCommons.php');
5+
use Grav\Plugin\Flickr\FlickrCommons;
56
use Grav\Common\Utils;
67
use Thunder\Shortcode\Shortcode\ShortcodeInterface;
78
use Grav\Plugin\Flickr\FlickrAPI;
@@ -16,7 +17,7 @@ public function init()
1617
$content = $sc->getContent();
1718
$id = $sc->getParameter('id', '');
1819
$api = new FlickrAPI();
19-
$params = array_merge(['display-format-photo' => 's', 'display-format-photo-lightbox' => 'z'], $sc->getParameters());
20+
$params = array_merge(FlickrCommons::DEFAULT_PARAMS, $sc->getParameters());
2021
try {
2122
$photoset = $api->photoset($id, $params );
2223
$output = $this->twig->processTemplate('partials/flickr-photoset.html.twig', [

‎templates/partials/flickr-collection.html.twig‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
1+
{% if count(collection.sets()) > 0 or not params['hide-empty-collections'] %}
12
<div class="flickr flickr-collection">
2-
<h2>{{ collection.title() }}</h2>
3-
<h3>{{ collection.description() }}</h3>
3+
<{{params['collection-title-tag']}}>{{ collection.title() }}</{{params['collection-title-tag']}}>
4+
{% if collection.description() %}
5+
<{{params['collection-description-tag']}}>{{ collection.description() }}</{{params['collection-description-tag']}}>
6+
{% endif %}
47
{% for set in collection.sets() %}
58
{% include 'partials/flickr-photoset.html.twig' with {'photoset':set} %}
69
{% endfor %}
710
</div>
11+
{% endif %}
812
{% for current in collection.collections() %}
913
{% include 'partials/flickr-collection.html.twig' with {'collection':current} %}
1014
{% endfor %}

‎templates/partials/flickr-photo-lightbox.html.twig‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
<div id="lightbox-{{ photo.id() }}" class="flickr-lightbox">
1+
<figure id="lightbox-{{ photo.id() }}" class="flickr-lightbox">
2+
<figcaption><h4>{{ photo.title() }}</h4> <span><a href="{{ photo.url('o') }}" target='_blank'>Original version</a></span></figcaption>
23
<img src="{{ photo.url(params['display-format-photo-lightbox']) }}">
3-
<figcaption>{{ photo.title() }}</figcaption>
4-
<span><a href="{{ photo.url('o') }}" target='_blank'>Original version</a></span>
5-
</div>
4+
</figure>

‎templates/partials/flickr-photo.html.twig‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<a href="#" data-featherlight="#lightbox-{{ photo.id() }}" class="flickr-photo">
2-
<img src="{{ photo.url(params['display-format-photo']) }}">
3-
<figcaption>{{ photo.title() }}</figcaption>
2+
<figure>
3+
<img src="{{ photo.url(params['display-format-photo']) }}">
4+
<figcaption>{{ photo.title() }}</figcaption>
5+
</figure>
46
</a>
57
{% include 'partials/flickr-photo-lightbox.html.twig' %}

‎templates/partials/flickr-photoset.html.twig‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
<div class="flickr flickr-photoset">
2-
<h2 class="flickr-photoset-title">{{ photoset.title() }}</h2>
3-
<h3 class="flickr-photoset-description">{{ photoset.description() }}</h3>
2+
<{{params['photoset-title-tag']}} class="flickr-photoset-title">{{ photoset.title() }}</{{params['photoset-title-tag']}}>
3+
{% if photoset.description() %}
4+
<{{params['photoset-description-tag']}} class="flickr-photoset-description">{{ photoset.description() }}</{{params['photoset-description-tag']}}>
5+
{% endif %}
46
<section data-featherlight-gallery data-featherlight-filter=".flickr-photo">
57
{% for photo in photoset.photos() %}
68
{% include 'partials/flickr-photo.html.twig' %}

0 commit comments

Comments
 (0)