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

Merge pull request #268 from cvogeley/master

Browse Source 
delete confirmation popup for blocks and layouts
This commit is contained in:
cvogeley 2014-01-11 17:34:37 -08:00
commit df9e628495
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mod/editblock.php
View File

@ -92,7 +92,8 @@ function editblock_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 block?')
)); ));
@ -159,7 +160,7 @@ function editblock_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 Block') . '</a><br />'; $o .= '<br /><br /><a class="block-delete-link" href="item/drop/' . $itm[0]['id'] . '" >' . t('Delete Block') . '</a><br />';
return $o; return $o;

5
mod/editlayout.php
View File

@ -78,7 +78,8 @@ function editlayout_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 layout?')
)); ));
@ -143,7 +144,7 @@ function editlayout_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 Layout') . '</a><br />'; $o .= '<br /><br /><a class="layout-delete-link" href="item/drop/' . $itm[0]['id'] . '" >' . t('Delete Layout') . '</a><br />';
return $o; return $o;

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

@ -307,7 +307,7 @@ function enableOnUser(){
</script> </script>
<script> <script>
$( document ).on( "click", ".wall-item-delete-link,.page-delete-link", function(e) { $( document ).on( "click", ".wall-item-delete-link,.page-delete-link,.layout-delete-link,.block-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>{{$confirmdelete}}</h4>", function(result) { bootbox.confirm("<h4>{{$confirmdelete}}</h4>", function(result) {