diff --git a/mod/photos.php b/mod/photos.php index ec71cc09d8..a191dcf071 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -1307,11 +1307,10 @@ function photos_content(&$a) { '$can_post' => $can_post, '$upload' => array(t('Upload New Photos'), 'photos/' . $a->data['user']['nickname'] . '/upload/' . bin2hex($album)), '$order' => $order, - '$edit' => $edit + '$edit' => $edit, + '$paginate' => paginate($a), )); - $o .= paginate($a); - return $o; } @@ -1888,10 +1887,9 @@ function photos_content(&$a) { '$can_post' => $can_post, '$upload' => array(t('Upload New Photos'), 'photos/'.$a->data['user']['nickname'].'/upload'), '$photos' => $photos, + '$paginate' => paginate($a), )); - - $o .= paginate($a); return $o; } diff --git a/view/templates/photo_album.tpl b/view/templates/photo_album.tpl index 770eaf14cf..5416066cf0 100644 --- a/view/templates/photo_album.tpl +++ b/view/templates/photo_album.tpl @@ -17,3 +17,5 @@
{{/foreach}} + +{{$paginate}} diff --git a/view/templates/photos_recent.tpl b/view/templates/photos_recent.tpl index 614e76e245..19456187bc 100644 --- a/view/templates/photos_recent.tpl +++ b/view/templates/photos_recent.tpl @@ -10,3 +10,5 @@ {{/foreach}}
+ +{{$paginate}} diff --git a/view/theme/frio/css/style.css b/view/theme/frio/css/style.css index 773a2f305c..fbe002b17b 100644 --- a/view/theme/frio/css/style.css +++ b/view/theme/frio/css/style.css @@ -2020,6 +2020,13 @@ ul li:hover .contact-wrapper a.contact-action-link:hover { #prvmail-end { clear:both; } +/* photos */ +.photo-album-actions { + margin-bottom: 10px; +} +.photo-album-actions .photos-order-link { + float: right; +} /* poke */ #poke-desc { margin: 5px 0 30px; diff --git a/view/theme/frio/templates/photo_album.tpl b/view/theme/frio/templates/photo_album.tpl new file mode 100644 index 0000000000..1afe4c8853 --- /dev/null +++ b/view/theme/frio/templates/photo_album.tpl @@ -0,0 +1,28 @@ + +
+ +

{{$album}}

+ +
+ {{if $can_post}} + {{$upload.0}} + {{/if}} + {{if $can_post && $edit}} • {{/if}} + {{if $edit}} + {{$edit.0}} + {{/if}} + {{$order.0}} +
+
+ +
+ {{foreach $photos as $photo}} + {{include file="photo_top.tpl"}} + {{/foreach}} + +
+ + {{$paginate}} +
+ + diff --git a/view/theme/frio/templates/photos_recent.tpl b/view/theme/frio/templates/photos_recent.tpl index c8769c9ef5..683ef544a3 100644 --- a/view/theme/frio/templates/photos_recent.tpl +++ b/view/theme/frio/templates/photos_recent.tpl @@ -1,14 +1,20 @@ -

{{$title}}

-{{if $can_post}} -{{$upload.0}} -{{/if}} +
-
-{{foreach $photos as $photo}} - {{include file="photo_top.tpl"}} -{{/foreach}} +

{{$title}}

+ + {{if $can_post}} + {{$upload.0}} + {{/if}} + +
+ {{foreach $photos as $photo}} + {{include file="photo_top.tpl"}} + {{/foreach}} +
+
+ + {{$paginate}}
-