Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-11-17 23:43:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix photo comments: use $drop array as in wall_thread and search_item

Browse source
This commit is contained in:
Fabrixxm 2014-04-28 09:29:48 -04:00
parent 2904b7d354
commit aba27ad404
3 changed files with 17 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
mod/photos.php
View file

@ -1640,10 +1640,15 @@ function photos_content(&$a) {
$profile_link = $profile_url; $profile_link = $profile_url;
$drop = '';
if(($item['contact-id'] == $contact_id) || ($item['uid'] == local_user())) $dropping = (($item['contact-id'] == $contact_id) || ($item['uid'] == local_user()));
$drop = replace_macros(get_markup_template('photo_drop.tpl'), array('$id' => $item['id'], '$delete' => t('Delete'))); $drop = array(
'dropping' => $dropping,
'pagedrop' => false,
'select' => t('Select'),
'delete' => t('Delete'),
);
if($a->theme['template_engine'] === 'internal') { if($a->theme['template_engine'] === 'internal') {

9
view/templates/photo_drop.tpl
View file

@ -1,9 +0,0 @@
{{*
* AUTOMATICALLY GENERATED TEMPLATE
* DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
*
*}}
<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-{{$id}}" >
<a href="item/drop/{{$id}}" onclick="return confirmDelete();" class="icon drophide" title="{{$delete}}" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>
</div>
<div class="wall-item-delete-end"></div>

9
view/templates/photo_item.tpl
View file

@ -17,7 +17,14 @@
<div class="wall-item-title" id="wall-item-title-{{$id}}">{{$title}}</div> <div class="wall-item-title" id="wall-item-title-{{$id}}">{{$title}}</div>
<div class="wall-item-body" id="wall-item-body-{{$id}}" >{{$body}}</div> <div class="wall-item-body" id="wall-item-body-{{$id}}" >{{$body}}</div>
</div> </div>
{{$drop}}
{{if $drop.dropping }}
<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-{{$id}}" >
<a href="item/drop/{{$id}}" onclick="return confirmDelete();" class="icon drophide" title="{{$drop.delete}}" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>
</div>
<div class="wall-item-delete-end"></div>
{{/if}}
<div class="wall-item-wrapper-end"></div> <div class="wall-item-wrapper-end"></div>
<div class="wall-item-comment-separator"></div> <div class="wall-item-comment-separator"></div>
{{$comment}} {{$comment}}