bitPickups/friendica_2020-09-1_sharedHosting
1
0
Fork 0
Code Pull requests Activity

Merge pull request #2711 from rabuzarus/0408-frio-photo-tpl-fix

Browse source 
photos - include paginate into the templates - provide a photo_album.…
This commit is contained in:
Michael Vogel 2016-08-04 23:59:43 +02:00 committed by GitHub
parent b7ec844429 3921113e5c
commit 6abeff10c0
6 changed files with 57 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
mod/photos.php
View file

@ -1307,11 +1307,10 @@ function photos_content(&$a) {
'$can_post' => $can_post, '$can_post' => $can_post,
'$upload' => array(t('Upload New Photos'), 'photos/' . $a->data['user']['nickname'] . '/upload/' . bin2hex($album)), '$upload' => array(t('Upload New Photos'), 'photos/' . $a->data['user']['nickname'] . '/upload/' . bin2hex($album)),
'$order' => $order, '$order' => $order,
'$edit' => $edit '$edit' => $edit,
'$paginate' => paginate($a),
)); ));
$o .= paginate($a);
return $o; return $o;
} }
@ -1888,10 +1887,9 @@ function photos_content(&$a) {
'$can_post' => $can_post, '$can_post' => $can_post,
'$upload' => array(t('Upload New Photos'), 'photos/'.$a->data['user']['nickname'].'/upload'), '$upload' => array(t('Upload New Photos'), 'photos/'.$a->data['user']['nickname'].'/upload'),
'$photos' => $photos, '$photos' => $photos,
'$paginate' => paginate($a),
)); ));
$o .= paginate($a);
return $o; return $o;
} }

2
view/templates/photo_album.tpl
View file

@ -17,3 +17,5 @@
</div> </div>
<div class="photo-album-image-wrapper-end"></div> <div class="photo-album-image-wrapper-end"></div>
{{/foreach}} {{/foreach}}
{{$paginate}}

2
view/templates/photos_recent.tpl
View file

@ -10,3 +10,5 @@
{{/foreach}} {{/foreach}}
</div> </div>
<div class="photos-end"></div> <div class="photos-end"></div>
{{$paginate}}

7
view/theme/frio/css/style.css
View file

@ -2020,6 +2020,13 @@ ul li:hover .contact-wrapper a.contact-action-link:hover {
#prvmail-end { #prvmail-end {
clear:both; clear:both;
} }
/* photos */
.photo-album-actions {
margin-bottom: 10px;
}
.photo-album-actions .photos-order-link {
float: right;
}
/* poke */ /* poke */
#poke-desc { #poke-desc {
margin: 5px 0 30px; margin: 5px 0 30px;

28
view/theme/frio/templates/photo_album.tpl Normal file
View 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">&nbsp;•&nbsp;</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>

24
view/theme/frio/templates/photos_recent.tpl
View file

@ -1,14 +1,20 @@
<h3>{{$title}}</h3> <div class="generic-page-wrapper">
{{if $can_post}}
<a id="photo-top-upload-link" href="{{$upload.1}}">{{$upload.0}}</a>
{{/if}}
<div id="photo-album-contents" class="photos"> <h3>{{$title}}</h3>
{{foreach $photos as $photo}}
{{include file="photo_top.tpl"}} {{if $can_post}}
{{/foreach}} <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>
<div class="photos-end"></div>
<script>$(document).ready(function() { loadingPage = false; justifyPhotos(); });</script> <script>$(document).ready(function() { loadingPage = false; justifyPhotos(); });</script>