Public/pics
2
2
Fork 2
Code Issues 6 Pull Requests Releases Wiki Activity

Compare commits

base: Public:35cb6798c863e3910df0bdd1ddfef29b41844d28
Branches Tags
Public:master
Public:version-1.2
Public:version-1.1
Public:version-1.0
...
compare: Public:1f53689e4bbdb795ca32eefe1d770bb406485b46
Branches Tags
Public:master
Public:version-1.2
Public:version-1.1
Public:version-1.0

2 Commits
35cb6798c8 ... 1f53689e4b

Author SHA1 Message Date
Aaron van Geffen
1f53689e4b AlbumButtonBox: add visual cue to indicate a filter is active 2024-01-15 00:55:33 +01:00
Aaron van Geffen
accf093935 PageIndex: rewrite getLink to be way less messy 2024-01-15 00:51:06 +01:00
3 changed files with 21 additions and 15 deletions
Show Stats Expand all files Collapse all files

1
controllers/ViewPhotoAlbum.php
View File

@ -55,6 +55,7 @@ class ViewPhotoAlbum extends HTMLController
{ {
$filters[$contributor['slug']] = [ $filters[$contributor['slug']] = [
'id_user' => $contributor['id_user'], 'id_user' => $contributor['id_user'],
'label' => $contributor['first_name'],
'caption' => sprintf('By %s (%s photos)', 'caption' => sprintf('By %s (%s photos)',
$contributor['first_name'], $contributor['num_assets']), $contributor['first_name'], $contributor['num_assets']),
'link' => $tag->getUrl() . '/?by=' . $contributor['slug'], 'link' => $tag->getUrl() . '/?by=' . $contributor['slug'],

24
models/PageIndex.php
View File

@ -155,24 +155,20 @@ class PageIndex
public function getLink($start = null, $order = null, $dir = null) public function getLink($start = null, $order = null, $dir = null)
{ {
$url = $this->base_url; $page = !is_string($start) ? ($start / $this->items_per_page) + 1 : $start;
$amp = strpos($this->base_url, '?') ? '&' : '?'; $url = $this->base_url . str_replace('%PAGE%', $page, $this->page_slug);
if (!empty($start)) $urlParams = [];
{
$page = $start !== '%d' ? ($start / $this->items_per_page) + 1 : $start;
$url .= strtr($this->page_slug, ['%PAGE%' => $page, '%AMP%' => $amp]);
$amp = '&';
}
if (!empty($order)) if (!empty($order))
{ $urlParams['order'] = $order;
$url .= $amp . 'order=' . $order;
$amp = '&';
}
if (!empty($dir)) if (!empty($dir))
$urlParams['dir'] = $dir;
if (!empty($urlParams))
{ {
$url .= $amp . 'dir=' . $dir; $queryString = (strpos($uri, '?') !== false ? '&' : '?');
$amp = '&'; $queryString .= http_build_query($urlParams);
$url .= $queryString;
} }
return $url; return $url;

11
templates/AlbumButtonBox.php
View File

@ -33,7 +33,16 @@ class AlbumButtonBox extends Template
echo ' echo '
<div class="dropdown"> <div class="dropdown">
<button class="btn btn-light dropdown-toggle" type="button" data-bs-toggle="dropdown" aria-expanded="false"> <button class="btn btn-light dropdown-toggle" type="button" data-bs-toggle="dropdown" aria-expanded="false">
<i class="bi bi-filter"></i> <i class="bi bi-filter"></i>';
if ($this->active_filter)
{
echo '
<span class="badge text-bg-danger">',
$this->filters[$this->active_filter]['label'], '</span>';
}
echo '
</button> </button>
<ul class="dropdown-menu">'; <ul class="dropdown-menu">';