Merge pull request #254 from cvogeley/master

Webpage fixes for the moment without the fix for page not found after editing a webpage

4 files changed, 9 insertions, 7 deletions

diff --git a/mod/editpost.php b/mod/editpost.php
index f012c47cd..7cc33d60d 100644
--- a/mod/editpost.php
+++ b/mod/editpost.php
@@ -50,6 +50,7 @@ function editpost_content(&$a) {
 		'$geotag' => $geotag,
 		'$nickname' => $channel['channel_address'],
 		'$expireswhen' => t('Expires YYYY-MM-DD HH:MM'),
+	    '$confirmdelete' => t('Delete item?'),
 	));
 
 
diff --git a/mod/editwebpage.php b/mod/editwebpage.php
index 85bd9e918..00659b4b7 100644
--- a/mod/editwebpage.php
+++ b/mod/editwebpage.php
@@ -112,7 +112,8 @@ function editwebpage_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 webpage?')
 	));
 
 	
@@ -185,7 +186,7 @@ function editwebpage_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 Webpage') . '</a><br />';
+		$o .= '<br /><br /><a class="page-delete-link" href="item/drop/' . $itm[0]['id'] . '" >' . t('Delete Webpage') . '</a><br />';
 
 	return $o;
 
diff --git a/mod/item.php b/mod/item.php
index 444248846..2c0a36d52 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -1146,8 +1146,9 @@ function item_check_service_class($channel_id,$iswebpage) {
 	if ($iswebpage) {
 		$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 )  
-			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_DELETED),
 		intval($channel_id)
 	);
 	}
diff --git a/view/tpl/jot-header.tpl b/view/tpl/jot-header.tpl
index 09d035979..75239c179 100755
--- a/view/tpl/jot-header.tpl
+++ b/view/tpl/jot-header.tpl
@@ -306,16 +306,15 @@ function enableOnUser(){
 
 </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
     e.preventDefault();
-  	bootbox.confirm("<h4>Delete item?</h4>", function(result) {
+  	bootbox.confirm("<h4>{{$confirmdelete}}</h4>", function(result) {
     				if (result) {
       				document.location.href = link;}
       				});
     });
 </script>
- -->
+