mirror of
https://github.com/friendica/friendica
synced 2024-10-08 16:01:55 +02:00
photos - include paginate into the templates - provide a photo_album.tpl for frio
This commit is contained in:
parent
d698534027
commit
3921113e5c
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
|
@ -17,3 +17,5 @@
|
|||
</div>
|
||||
<div class="photo-album-image-wrapper-end"></div>
|
||||
{{/foreach}}
|
||||
|
||||
{{$paginate}}
|
||||
|
|
|
@ -10,3 +10,5 @@
|
|||
{{/foreach}}
|
||||
</div>
|
||||
<div class="photos-end"></div>
|
||||
|
||||
{{$paginate}}
|
||||
|
|
|
@ -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;
|
||||
|
|
28
view/theme/frio/templates/photo_album.tpl
Normal file
28
view/theme/frio/templates/photo_album.tpl
Normal file
|
@ -0,0 +1,28 @@
|
|||
|
||||
<div class="generic-page-wrapper">
|
||||
|
||||
<h3 id="photo-album-title">{{$album}}</h3>
|
||||
|
||||
<div class="photo-album-actions">
|
||||
{{if $can_post}}
|
||||
<a class="photos-upload-link" href="{{$upload.1}}">{{$upload.0}}</a>
|
||||
{{/if}}
|
||||
{{if $can_post && $edit}}<span role="presentation" class="separator"> • </span>{{/if}}
|
||||
{{if $edit}}
|
||||
<a id="album-edit-link" href="{{$edit.1}}" title="{{$edit.0}}">{{$edit.0}}</a>
|
||||
{{/if}}
|
||||
<a class="photos-order-link" href="{{$order.1}}" title="{{$order.0}}">{{$order.0}}</a>
|
||||
</div>
|
||||
<div class="clear"></div>
|
||||
|
||||
<div class="photo-album-wrapper" id="photo-album-contents">
|
||||
{{foreach $photos as $photo}}
|
||||
{{include file="photo_top.tpl"}}
|
||||
{{/foreach}}
|
||||
|
||||
<div class="photo-album-end"></div>
|
||||
|
||||
{{$paginate}}
|
||||
</div>
|
||||
|
||||
<script>$(document).ready(function() { loadingPage = false; justifyPhotos('photo-album-contents-{{$album_id}}'); });</script>
|
|
@ -1,14 +1,20 @@
|
|||
|
||||
<h3>{{$title}}</h3>
|
||||
{{if $can_post}}
|
||||
<a id="photo-top-upload-link" href="{{$upload.1}}">{{$upload.0}}</a>
|
||||
{{/if}}
|
||||
<div class="generic-page-wrapper">
|
||||
|
||||
<div id="photo-album-contents" class="photos">
|
||||
{{foreach $photos as $photo}}
|
||||
{{include file="photo_top.tpl"}}
|
||||
{{/foreach}}
|
||||
<h3>{{$title}}</h3>
|
||||
|
||||
{{if $can_post}}
|
||||
<a id="photo-top-upload-link" href="{{$upload.1}}">{{$upload.0}}</a>
|
||||
{{/if}}
|
||||
|
||||
<div id="photo-album-contents" class="photos">
|
||||
{{foreach $photos as $photo}}
|
||||
{{include file="photo_top.tpl"}}
|
||||
{{/foreach}}
|
||||
</div>
|
||||
<div class="photos-end"></div>
|
||||
|
||||
{{$paginate}}
|
||||
</div>
|
||||
<div class="photos-end"></div>
|
||||
|
||||
<script>$(document).ready(function() { loadingPage = false; justifyPhotos(); });</script>
|
||||
|
|
Loading…
Reference in a new issue