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

PhotoPage: replace custom sub-photo boxes with generic equivalents

Browse Source
This commit is contained in:
Aaron van Geffen 2023-03-11 13:57:57 +01:00
parent cf31f0af07
commit a9a2c64d81
2 changed files with 15 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
public/css/default.css
View File

@ -421,14 +421,6 @@ a#previous_photo:hover, a#next_photo:hover {
font-size: 16px; font-size: 16px;
} }
#sub_photo {
background: #fff;
box-shadow: 2px 2px 4px rgba(0, 0, 0, 0.3);
float: left;
padding: 2%;
margin: 25px 3.5% 25px 0;
width: 68.5%;
}
#sub_photo #tag_list { #sub_photo #tag_list {
list-style: none; list-style: none;
margin: 1em 0; margin: 1em 0;
@ -446,15 +438,6 @@ a#previous_photo:hover, a#next_photo:hover {
} }
#photo_exif_box {
background: #fff;
box-shadow: 2px 2px 4px rgba(0, 0, 0, 0.3);
margin: 25px 0 25px 0;
overflow: auto;
padding: 2%;
float: right;
width: 20%;
}
#photo_exif_box dt { #photo_exif_box dt {
font-weight: bold; font-weight: bold;
float: left; float: left;
@ -469,15 +452,6 @@ a#previous_photo:hover, a#next_photo:hover {
margin: 0; margin: 0;
} }
#user_actions_box {
background: #fff;
box-shadow: 2px 2px 4px rgba(0, 0, 0, 0.3);
float: left;
margin: 25px 0 25px 0;
overflow: auto;
padding: 2%;
width: 20%;
}
/* Responsive: smartphone in portrait /* Responsive: smartphone in portrait
---------------------------------------*/ ---------------------------------------*/

22
templates/PhotoPage.php
View File

@ -40,21 +40,27 @@ class PhotoPage extends Template
$this->photo(); $this->photo();
echo ' echo '
<div id="sub_photo"> <div class="row mt-5">
<h2 class="entry-title">', $this->photo->getTitle(), '</h2>'; <div class="col-8">
<div id="sub_photo" class="content-box">
<h2 class="entry-title">', $this->photo->getTitle(), '</h2>';
$this->taggedPeople(); $this->taggedPeople();
$this->linkNewTags(); $this->linkNewTags();
echo ' echo '
</div>'; </div>
</div>
<div class="col-4">';
$this->photoMeta(); $this->photoMeta();
if($this->is_asset_owner) if ($this->is_asset_owner)
$this->addUserActions(); $this->addUserActions();
echo ' echo '
</div>
</div>
<script type="text/javascript" src="', BASEURL, '/js/photonav.js"></script>'; <script type="text/javascript" src="', BASEURL, '/js/photonav.js"></script>';
} }
@ -94,7 +100,7 @@ class PhotoPage extends Template
private function photoMeta() private function photoMeta()
{ {
echo ' echo '
<div id="photo_exif_box"> <div id="photo_exif_box" class="content-box clearfix">
<h3>EXIF</h3> <h3>EXIF</h3>
<dl class="photo_meta">'; <dl class="photo_meta">';
@ -171,7 +177,9 @@ class PhotoPage extends Template
echo ' echo '
<div> <div>
<h3>Link tags</h3> <h3>Link tags</h3>
<p style="position: relative"><input type="text" id="new_tag" placeholder="Type to link a new tag"></p> <p style="position: relative">
<input class="form-control w-auto" type="text" id="new_tag" placeholder="Type to link a new tag">
</p>
</div> </div>
<script type="text/javascript" src="', BASEURL, '/js/ajax.js"></script> <script type="text/javascript" src="', BASEURL, '/js/ajax.js"></script>
<script type="text/javascript" src="', BASEURL, '/js/autosuggest.js"></script> <script type="text/javascript" src="', BASEURL, '/js/autosuggest.js"></script>
@ -240,7 +248,7 @@ class PhotoPage extends Template
public function addUserActions() public function addUserActions()
{ {
echo ' echo '
<div id=user_actions_box> <div id="user_actions_box" class="content-box">
<h3>Actions</h3> <h3>Actions</h3>
<a class="btn btn-danger" href="', BASEURL, '/', $this->photo->getSlug(), '?confirm_delete">Delete</a> <a class="btn btn-danger" href="', BASEURL, '/', $this->photo->getSlug(), '?confirm_delete">Delete</a>
</div>'; </div>';