harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge https://github.com/friendica/red into zpull

Browse Source
This commit is contained in:
friendica 2014-01-03 14:18:48 -08:00
commit 9f4e9f247a
4 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
mod/editpost.php
View File

@ -50,6 +50,7 @@ function editpost_content(&$a) {
'$geotag' => $geotag, '$geotag' => $geotag,
'$nickname' => $channel['channel_address'], '$nickname' => $channel['channel_address'],
'$expireswhen' => t('Expires YYYY-MM-DD HH:MM'), '$expireswhen' => t('Expires YYYY-MM-DD HH:MM'),
'$confirmdelete' => t('Delete item?'),
)); ));

5
mod/editwebpage.php
View File

@ -112,7 +112,8 @@ function editwebpage_content(&$a) {
'$editselect' => (($plaintext) ? 'none' : '/(profile-jot-text|prvmail-text)/'), '$editselect' => (($plaintext) ? 'none' : '/(profile-jot-text|prvmail-text)/'),
'$ispublic' => '&nbsp;', // t('Visible to <strong>everybody</strong>'), '$ispublic' => '&nbsp;', // t('Visible to <strong>everybody</strong>'),
'$geotag' => $geotag, '$geotag' => $geotag,
'$nickname' => $a->user['nickname'] '$nickname' => $a->user['nickname'],
'$confirmdelete' => t('Delete webpage?')
)); ));
@ -185,7 +186,7 @@ function editwebpage_content(&$a) {
$ob = get_observer_hash(); $ob = get_observer_hash();
if(($itm[0]['author_xchan'] === $ob) || ($itm[0]['owner_xchan'] === $ob)) if(($itm[0]['author_xchan'] === $ob) || ($itm[0]['owner_xchan'] === $ob))
$o .= '<br /><br /><a href="item/drop/' . $itm[0]['id'] . '" >' . t('Delete Webpage') . '</a><br />'; $o .= '<br /><br /><a class="page-delete-link" href="item/drop/' . $itm[0]['id'] . '" >' . t('Delete Webpage') . '</a><br />';
return $o; return $o;

3
mod/item.php
View File

@ -1146,8 +1146,9 @@ function item_check_service_class($channel_id,$iswebpage) {
if ($iswebpage) { if ($iswebpage) {
$r = q("select count(i.id) as total from item i $r = q("select count(i.id) as total from item i
right join channel c on (i.author_xchan=c.channel_hash and i.uid=c.channel_id ) right join channel c on (i.author_xchan=c.channel_hash and i.uid=c.channel_id )
and i.parent=i.id and (i.item_restrict & %d) and i.uid= %d ", and i.parent=i.id and (i.item_restrict & %d) and not (i.item_restrict & %d) and i.uid= %d ",
intval(ITEM_WEBPAGE), intval(ITEM_WEBPAGE),
intval(ITEM_DELETED),
intval($channel_id) intval($channel_id)
); );
} }

7
view/tpl/jot-header.tpl
View File

@ -306,16 +306,15 @@ function enableOnUser(){
</script> </script>
<!--
<script> <script>
$( document ).on( "click", ".wall-item-delete-link", function(e) { $( document ).on( "click", ".wall-item-delete-link,.page-delete-link", function(e) {
var link = $(this).attr("href"); // "get" the intended link in a var var link = $(this).attr("href"); // "get" the intended link in a var
e.preventDefault(); e.preventDefault();
bootbox.confirm("<h4>Delete item?</h4>", function(result) { bootbox.confirm("<h4>{{$confirmdelete}}</h4>", function(result) {
if (result) { if (result) {
document.location.href = link;} document.location.href = link;}
}); });
}); });
</script> </script>
-->