aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcvogeley <christian.vogeley@hotmail.de>2014-01-11 17:34:37 -0800
committercvogeley <christian.vogeley@hotmail.de>2014-01-11 17:34:37 -0800
commitdf9e6284958d6eecdb990579cd82efab53fcf8cc (patch)
treecc8df39707db58cbb02ba82ac504e09c11398977
parent134bb139dcc71723d3449422c9746d05e41a4fc0 (diff)
parent325c5e4e7650329a42f61e9180fe986ef63671b5 (diff)
downloadvolse-hubzilla-df9e6284958d6eecdb990579cd82efab53fcf8cc.tar.gz
volse-hubzilla-df9e6284958d6eecdb990579cd82efab53fcf8cc.tar.bz2
volse-hubzilla-df9e6284958d6eecdb990579cd82efab53fcf8cc.zip
Merge pull request #268 from cvogeley/master
delete confirmation popup for blocks and layouts
-rw-r--r--mod/editblock.php5
-rw-r--r--mod/editlayout.php5
-rwxr-xr-xview/tpl/jot-header.tpl2
3 files changed, 7 insertions, 5 deletions
diff --git a/mod/editblock.php b/mod/editblock.php
index 32ad3de2c..dcb4b42a7 100644
--- a/mod/editblock.php
+++ b/mod/editblock.php
@@ -92,7 +92,8 @@ function editblock_content(&$a) {
'$editselect' => (($plaintext) ? 'none' : '/(profile-jot-text|prvmail-text)/'),
'$ispublic' => '&nbsp;', // t('Visible to <strong>everybody</strong>'),
'$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();
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;
diff --git a/mod/editlayout.php b/mod/editlayout.php
index 86de0e676..838a219c9 100644
--- a/mod/editlayout.php
+++ b/mod/editlayout.php
@@ -78,7 +78,8 @@ function editlayout_content(&$a) {
'$editselect' => (($plaintext) ? 'none' : '/(profile-jot-text|prvmail-text)/'),
'$ispublic' => '&nbsp;', // t('Visible to <strong>everybody</strong>'),
'$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();
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;
diff --git a/view/tpl/jot-header.tpl b/view/tpl/jot-header.tpl
index 37fa3d069..687ad7302 100755
--- a/view/tpl/jot-header.tpl
+++ b/view/tpl/jot-header.tpl
@@ -307,7 +307,7 @@ function enableOnUser(){
</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
e.preventDefault();
bootbox.confirm("<h4>{{$confirmdelete}}</h4>", function(result) {