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

Compare commits

base: Public:8eb6be02b15edc0f35f2bed8b64cf2b52dd11bad
Branches Tags
Public:master
Public:version-1.2
Public:version-1.1
Public:version-1.0
..
compare: Public:f109f21cd79f4e0ae7981692f628d41f907b1dc1
Branches Tags
Public:master
Public:version-1.2
Public:version-1.1
Public:version-1.0

4 Commits
8eb6be02b1 ... f109f21cd7

Author SHA1 Message Date
Aaron van Geffen
f109f21cd7 PhotoPage: fade the tag delete buttons a little 2024-01-11 21:58:01 +01:00
Aaron van Geffen
949a45ff8f PhotoPage: simplify tag html nodes 2024-01-11 21:53:44 +01:00
Aaron van Geffen
9922cd0833 PhotoPage: update and refactor tagging script slightly 2024-01-11 20:48:54 +01:00
Aaron van Geffen
0b010be0b4 PhotoPage: change how tags are displayed 2024-01-11 20:48:54 +01:00
5 changed files with 125 additions and 98 deletions
Show Stats Expand all files Collapse all files

76
controllers/ViewPhoto.php
View File

@ -8,8 +8,6 @@
class ViewPhoto extends HTMLController
{
private Image $photo;
public function __construct()
{
// Ensure we're logged in at this point.
@ -21,36 +19,44 @@ class ViewPhoto extends HTMLController
if (empty($photo))
throw new NotFoundException();
$this->photo = $photo->getImage();
Session::resetSessionToken();
parent::__construct($this->photo->getTitle() . ' - ' . SITE_TITLE);
parent::__construct($photo->getTitle() . ' - ' . SITE_TITLE);
if (!empty($_POST))
$this->handleTagging();
$this->handleTagging($photo->getImage());
else
$this->handleViewPhoto();
$this->handleViewPhoto($photo);
}
private function handleViewPhoto()
private function handleViewPhoto(Asset $photo)
{
$page = new PhotoPage($this->photo);
$page = new PhotoPage($photo->getImage());
// Any (EXIF) meta data?
$metaData = $this->prepareMetaData();
$page->setMetaData($metaData);
// Exif data?
$exif = EXIF::fromFile($photo->getFullPath());
if ($exif)
$page->setExif($exif);
// What tag are we browsing?
$tag = isset($_GET['in']) ? Tag::fromId($_GET['in']) : null;
if (isset($tag))
$page->setTag($tag);
$id_tag = isset($tag) ? $tag->id_tag : null;
// Find previous photo in set.
$previous_url = $photo->getUrlForPreviousInSet($id_tag);
if ($previous_url)
$page->setPreviousPhotoUrl($previous_url);
// ... and the next photo, too.
$next_url = $photo->getUrlForNextInSet($id_tag);
if ($next_url)
$page->setNextPhotoUrl($next_url);
$this->page->adopt($page);
$this->page->setCanonicalUrl($this->photo->getPageUrl());
$this->page->setCanonicalUrl($photo->getPageUrl());
}
private function handleTagging()
private function handleTagging(Image $photo)
{
header('Content-Type: text/json; charset=utf-8');
@ -64,7 +70,7 @@ class ViewPhoto extends HTMLController
// We are!
if (!isset($_POST['delete']))
{
$this->photo->linkTags([(int) $_POST['id_tag']]);
$photo->linkTags([(int) $_POST['id_tag']]);
echo json_encode(['success' => true]);
exit;
}
@ -72,43 +78,9 @@ class ViewPhoto extends HTMLController
// ... deleting, that is.
else
{
$this->photo->unlinkTags([(int) $_POST['id_tag']]);
$photo->unlinkTags([(int) $_POST['id_tag']]);
echo json_encode(['success' => true]);
exit;
}
}
private function prepareMetaData()
{
if (!($exif = EXIF::fromFile($this->photo->getFullPath())))
throw new UnexpectedValueException('Photo file not found!');
$metaData = [];
if (!empty($exif->created_timestamp))
$metaData['Date Taken'] = date("j M Y, H:i:s", $exif->created_timestamp);
if ($author = $this->photo->getAuthor())
$metaData['Uploaded by'] = $author->getfullName();
if (!empty($exif->camera))
$metaData['Camera Model'] = $exif->camera;
if (!empty($exif->shutter_speed))
$metaData['Shutter Speed'] = $exif->shutterSpeedFraction();
if (!empty($exif->aperture))
$metaData['Aperture'] = 'f/' . number_format($exif->aperture, 1);
if (!empty($exif->focal_length))
$metaData['Focal Length'] = $exif->focal_length . ' mm';
if (!empty($exif->iso))
$metaData['ISO Speed'] = $exif->iso;
if (!empty($exif->software))
$metaData['Software'] = $exif->software;
return $metaData;
}
}

16
models/Asset.php
View File

@ -697,11 +697,11 @@ class Asset
$params);
}
public function getUrlForPreviousInSet(?Tag $tag)
public function getUrlForPreviousInSet($id_tag = null)
{
$row = Registry::get('db')->queryAssoc('
SELECT a.*
' . (isset($tag) ? '
' . (isset($id_tag) ? '
FROM assets_tags AS t
INNER JOIN assets AS a ON a.id_asset = t.id_asset
WHERE t.id_tag = {int:id_tag} AND
@ -715,24 +715,24 @@ class Asset
LIMIT 1',
[
'id_asset' => $this->id_asset,
'id_tag' => $tag->id_tag,
'id_tag' => $id_tag,
'date_captured' => $this->date_captured,
]);
if ($row)
{
$obj = self::byRow($row, 'object');
return $obj->getPageUrl() . ($tag ? '?in=' . $tag->id_tag : '');
return $obj->getPageUrl() . ($id_tag ? '?in=' . $id_tag : '');
}
else
return false;
}
public function getUrlForNextInSet(?Tag $tag)
public function getUrlForNextInSet($id_tag = null)
{
$row = Registry::get('db')->queryAssoc('
SELECT a.*
' . (isset($tag) ? '
' . (isset($id_tag) ? '
FROM assets_tags AS t
INNER JOIN assets AS a ON a.id_asset = t.id_asset
WHERE t.id_tag = {int:id_tag} AND
@ -746,14 +746,14 @@ class Asset
LIMIT 1',
[
'id_asset' => $this->id_asset,
'id_tag' => $tag->id_tag,
'id_tag' => $id_tag,
'date_captured' => $this->date_captured,
]);
if ($row)
{
$obj = self::byRow($row, 'object');
return $obj->getPageUrl() . ($tag ? '?in=' . $tag->id_tag : '');
return $obj->getPageUrl() . ($id_tag ? '?in=' . $id_tag : '');
}
else
return false;

4
models/EXIF.php
View File

@ -90,9 +90,7 @@ class EXIF
if (!empty($exif['Model']))
{
if (strpos($exif['Model'], 'PENTAX') !== false)
$meta['camera'] = trim($exif['Model']);
elseif (!empty($exif['Make']) && strpos($exif['Model'], $exif['Make']) === false)
if (!empty($exif['Make']) && strpos($exif['Model'], $exif['Make']) === false)
$meta['camera'] = trim($exif['Make']) . ' ' . trim($exif['Model']);
else
$meta['camera'] = trim($exif['Model']);

23
public/css/default.css
View File

@ -523,7 +523,7 @@ a#previous_photo:hover, a#next_photo:hover {
right: 0;
}
#sub_photo h2, #sub_photo h3 {
#sub_photo h2, #sub_photo h3, #photo_exif_box h3, #user_actions_box h3 {
margin-bottom: 1rem;
}
#sub_photo .tag-list {
@ -549,6 +549,20 @@ a#previous_photo:hover, a#next_photo:hover {
border-color: rgb(100, 0, 0);
}
#photo_exif_box dt {
font-weight: bold;
float: left;
clear: left;
width: 120px;
}
#photo_exif_box dt:after {
content: ':';
}
#photo_exif_box dd {
float: left;
margin: 0;
}
/* Responsive: smartphone in portrait
---------------------------------------*/
@ -575,6 +589,13 @@ a#previous_photo:hover, a#next_photo:hover {
#previous_photo, #next_photo {
display: none;
}
#sub_photo, #photo_exif_box {
float: none;
margin: 30px 0;
padding: 10px;
width: auto;
}
}

104
templates/PhotoPage.php
View File

@ -8,15 +8,26 @@
class PhotoPage extends Template
{
private $photo;
private $metaData;
private $tag;
protected $photo;
private $exif;
private $previous_photo_url = '';
private $next_photo_url = '';
public function __construct(Image $photo)
{
$this->photo = $photo;
}
public function setPreviousPhotoUrl($url)
{
$this->previous_photo_url = $url;
}
public function setNextPhotoUrl($url)
{
$this->next_photo_url = $url;
}
public function html_main()
{
$this->photoNav();
@ -24,12 +35,8 @@ class PhotoPage extends Template
echo '
<div class="row mt-5">
<div class="col-lg-9">
<div id="sub_photo" class="content-box">';
$this->userActions();
echo '
<div class="col-lg-8">
<div id="sub_photo" class="content-box">
<h2 class="entry-title">', $this->photo->getTitle(), '</h2>';
$this->printTags('Album', 'Album', false);
@ -38,9 +45,10 @@ class PhotoPage extends Template
echo '
</div>
</div>
<div class="col-lg-3">';
<div class="col-lg-4">';
$this->photoMeta();
$this->userActions();
echo '
</div>
@ -78,23 +86,18 @@ class PhotoPage extends Template
</a>';
}
public function setTag(Tag $tag)
{
$this->tag = $tag;
}
private function photoNav()
{
if ($previousUrl = $this->photo->getUrlForPreviousInSet($this->tag))
if ($this->previous_photo_url)
echo '
<a href="', $previousUrl, '#photo_frame" id="previous_photo"><i class="bi bi-arrow-left"></i></a>';
<a href="', $this->previous_photo_url, '#photo_frame" id="previous_photo"><i class="bi bi-arrow-left"></i></a>';
else
echo '
<span id="previous_photo"><i class="bi bi-arrow-left"></i></span>';
if ($nextUrl = $this->photo->getUrlForNextInSet($this->tag))
if ($this->next_photo_url)
echo '
<a href="', $nextUrl, '#photo_frame" id="next_photo"><i class="bi bi-arrow-right"></i></a>';
<a href="', $this->next_photo_url, '#photo_frame" id="next_photo"><i class="bi bi-arrow-right"></i></a>';
else
echo '
<span id="next_photo"><i class="bi bi-arrow-right"></i></span>';
@ -103,19 +106,52 @@ class PhotoPage extends Template
private function photoMeta()
{
echo '
<ul class="list-group photo_meta">';
<div id="photo_exif_box" class="content-box clearfix">
<h3>EXIF</h3>
<dl class="photo_meta">';
foreach ($this->metaData as $header => $body)
{
if (!empty($this->exif->created_timestamp))
echo '
<li class="list-group-item">
<h4>', $header, '</h4>
', $body, '
</li>';
}
<dt>Date Taken</dt>
<dd>', date("j M Y, H:i:s", $this->exif->created_timestamp), '</dd>';
echo '
</ul>';
<dt>Uploaded by</dt>
<dd>', $this->photo->getAuthor()->getfullName(), '</dd>';
if (!empty($this->exif->camera))
echo '
<dt>Camera Model</dt>
<dd>', $this->exif->camera, '</dd>';
if (!empty($this->exif->shutter_speed))
echo '
<dt>Shutter Speed</dt>
<dd>', $this->exif->shutterSpeedFraction(), '</dd>';
if (!empty($this->exif->aperture))
echo '
<dt>Aperture</dt>
<dd>f/', number_format($this->exif->aperture, 1), '</dd>';
if (!empty($this->exif->focal_length))
echo '
<dt>Focal Length</dt>
<dd>', $this->exif->focal_length, ' mm</dd>';
if (!empty($this->exif->iso))
echo '
<dt>ISO Speed</dt>
<dd>', $this->exif->iso, '</dd>';
if (!empty($this->exif->software))
echo '
<dt>Software</dt>
<dd>', $this->exif->software, '</dd>';
echo '
</dl>
</div>';
}
private function printTags($header, $tagKind, $allowLinkingNewTags)
@ -230,9 +266,9 @@ class PhotoPage extends Template
</script>';
}
public function setMetaData(array $metaData)
public function setExif(EXIF $exif)
{
$this->metaData = $metaData;
$this->exif = $exif;
}
public function userActions()
@ -241,13 +277,13 @@ class PhotoPage extends Template
return;
echo '
<div class="float-end">
<a class="btn btn-primary" href="', $this->photo->getEditUrl(), '">
<i class="bi bi-pencil"></i> Edit</a>
<div id="user_actions_box" class="content-box">
<h3>Actions</h3>
<a class="btn btn-primary" href="', $this->photo->getEditUrl(), '">Edit photo</a>
<a class="btn btn-danger" href="', $this->photo->getDeleteUrl(), '&',
Session::getSessionTokenKey(), '=', Session::getSessionToken(),
'" onclick="return confirm(\'Are you sure you want to delete this photo?\');"',
'"><i class="bi bi-pencil"></i> Delete</a></a>
'">Delete photo</a>
</div>';
}
}