aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-09-08 16:28:02 -0700
committerfriendica <info@friendica.com>2014-09-08 16:28:02 -0700
commitb1254a71bc98cff230bbbba597da98cb96947cc6 (patch)
tree1d2ee501a133ab52c4db97657e418b20d4166dfe
parent715417c0e3ef51d0acf39a4a001656a07380eba4 (diff)
downloadvolse-hubzilla-b1254a71bc98cff230bbbba597da98cb96947cc6.tar.gz
volse-hubzilla-b1254a71bc98cff230bbbba597da98cb96947cc6.tar.bz2
volse-hubzilla-b1254a71bc98cff230bbbba597da98cb96947cc6.zip
wrap photo albums (albums and top level) in a div id=photo-album-contents
-rw-r--r--mod/photos.php5
-rwxr-xr-xview/tpl/photos_recent.tpl2
2 files changed, 5 insertions, 2 deletions
diff --git a/mod/photos.php b/mod/photos.php
index 70870a33a..b1d105986 100644
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -702,6 +702,9 @@ function photos_content(&$a) {
$tpl = get_markup_template('photo_album.tpl');
if(count($r)) {
$twist = 'rotright';
+ $o .= "<script> var page_query = '" . $_GET['q'] . "'; var extra_args = '" . extra_query_args() . "' ; </script>";
+ $o .= '<div id="photo-album-contents">';
+
foreach($r as $rr) {
if($twist == 'rotright')
@@ -730,7 +733,6 @@ function photos_content(&$a) {
$rel=("photo");
// }
- $o .= "<script> var page_query = '" . $_GET['q'] . "'; var extra_args = '" . extra_query_args() . "' ; </script>";
$tmp = replace_macros($tpl,array(
'$id' => $rr['id'],
@@ -758,6 +760,7 @@ function photos_content(&$a) {
}
$o .= '<div id="page-end"></div>';
+ $o .= '</div>'; // photo-album-contents
$o .= '<div id="photo-album-end"></div>';
$o .= '<script>$(document).ready(function() { loadingPage = false;});</script>';
$o .= '<div id="page-spinner"></div>';
diff --git a/view/tpl/photos_recent.tpl b/view/tpl/photos_recent.tpl
index 9be1b12a7..386979de5 100755
--- a/view/tpl/photos_recent.tpl
+++ b/view/tpl/photos_recent.tpl
@@ -3,7 +3,7 @@
<a id="photo-top-upload-link" href="{{$upload.1}}">{{$upload.0}}</a>
{{/if}}
-<div class="photos">
+<div id="photo-album-contents" class="photos">
{{foreach $photos as $photo}}
{{include file="photo_top.tpl"}}
{{/foreach}}