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

3 files changed, 21 insertions, 9 deletions

diff --git a/mod/editblock.php b/mod/editblock.php
index e8f3e90f8..dcb4b42a7 100644
--- a/mod/editblock.php
+++ b/mod/editblock.php
@@ -56,7 +56,11 @@ function editblock_content(&$a) {
                 intval($post_id),
                 intval($owner)
         );
-
+	$item_id = q("select * from item_id where service = 'BUILDBLOCK' and iid = %d limit 1",
+		$itm[0]['id']
+	);
+	if($item_id)
+		$block_title = $item_id[0]['sid'];
 
 
 	$plaintext = true;
@@ -88,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?')
 	));
 
 
@@ -135,6 +140,7 @@ function editblock_content(&$a) {
 		'$jotnets' => $jotnets,
 		'$title' => htmlspecialchars($itm[0]['title'],ENT_COMPAT,'UTF-8'),
 		'$placeholdertitle' => t('Set title'),
+		'$pagetitle' => $block_title,
 		'$category' => '',
 		'$placeholdercategory' => t('Categories (comma-separated list)'),
 		'$emtitle' => t('Example: bob@example.com, mary@example.com'),
@@ -154,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 e6be1056f..838a219c9 100644
--- a/mod/editlayout.php
+++ b/mod/editlayout.php
@@ -57,7 +57,11 @@ function editlayout_content(&$a) {
                 intval($owner)
         );
 
-
+	$item_id = q("select * from item_id where service = 'PDL' and iid = %d limit 1",
+		$itm[0]['id']
+	);
+	if($item_id)
+		$layout_title = $item_id[0]['sid'];
 
 	$plaintext = true;
 // You may or may not be a local user.  This won't work,
@@ -74,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?')
 	));
 
 
@@ -120,6 +125,7 @@ function editlayout_content(&$a) {
 		'$jotnets' => $jotnets,
 		'$title' => htmlspecialchars($itm[0]['title'],ENT_COMPAT,'UTF-8'),
 		'$placeholdertitle' => t('Set title'),
+		'$pagetitle' => $layout_title,
 		'$category' => '',
 		'$placeholdercategory' => t('Categories (comma-separated list)'),
 		'$emtitle' => t('Example: bob@example.com, mary@example.com'),
@@ -134,11 +140,11 @@ function editlayout_content(&$a) {
 		'$feature_expire' => 'none',
 		'$expires' => t('Set expiration date'),
 	));
-
+	
 	$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/mod/editwebpage.php b/mod/editwebpage.php
index e1de09e37..f11210eea 100644
--- a/mod/editwebpage.php
+++ b/mod/editwebpage.php
@@ -99,8 +99,8 @@ function editwebpage_content(&$a) {
 	if($layout)
 		$layoutselect = '<input type="hidden" name="layout_mid" value="' . $layout . '" />'; 			
 	else
-		$layoutselect = layout_select($itm[0]['uid']);
-
+		$layoutselect = layout_select($itm[0]['uid'],$itm[0]['layout_mid']);
+		
 
 	$o .= replace_macros(get_markup_template('edpost_head.tpl'), array(
 		'$title' => t('Edit Webpage')