more webpages - generic-content-wrapper fixes

mod/editblock.php

@@ -108,12 +108,6 @@ function editblock_content(&$a) {
 	else
 		$mimeselect = mimetype_select($itm[0]['uid'],$mimetype); 
 
-	$o .= replace_macros(get_markup_template('edpost_head.tpl'), array(
-		'$title' => t('Edit Block'),
-		'$delete' => ((($itm[0]['author_xchan'] === $ob_hash) || ($itm[0]['owner_xchan'] === $ob_hash)) ? t('Delete') : false),
-		'$id' => $itm[0]['id']
-	));
-
 	$a->page['htmlhead'] .= replace_macros(get_markup_template('jot-header.tpl'), array(
 		'$baseurl'       => $a->get_baseurl(),
 		'$editselect'    => (($plaintext) ? 'none' : '/(profile-jot-text|prvmail-text)/'),
@@ -133,7 +127,7 @@ function editblock_content(&$a) {
 
 	$rp = 'blocks/' . $channel['channel_address'];
 
-	$o .= replace_macros($tpl,array(
+	$editor = replace_macros($tpl,array(
 		'$return_path'         => $rp,
 		'$action'              => 'item',
 		'$webpage'             => ITEM_BUILDBLOCK,
@@ -181,6 +175,13 @@ function editblock_content(&$a) {
 		'$expires'             => t('Set expiration date'),
 	));
 
+	$o .= replace_macros(get_markup_template('edpost_head.tpl'), array(
+		'$title' => t('Edit Block'),
+		'$delete' => ((($itm[0]['author_xchan'] === $ob_hash) || ($itm[0]['owner_xchan'] === $ob_hash)) ? t('Delete') : false),
+		'$id' => $itm[0]['id'],
+		'$editor' => $editor
+	));
+
 	return $o;
 
 }

mod/editlayout.php

@@ -102,12 +102,6 @@ function editlayout_content(&$a) {
 
 	$plaintext = true;
 	
-	$o .= replace_macros(get_markup_template('edpost_head.tpl'), array(
-		'$title' => t('Edit Layout'),
-		'$delete' => ((($itm[0]['author_xchan'] === $ob_hash) || ($itm[0]['owner_xchan'] === $ob_hash)) ? t('Delete') : false),
-		'$id' => $itm[0]['id']
-	));
-	
 	$a->page['htmlhead'] .= replace_macros(get_markup_template('jot-header.tpl'), array(
 		'$baseurl'       => $a->get_baseurl(),
 		'$editselect'    =>  (($plaintext) ? 'none' : '/(profile-jot-text|prvmail-text)/'),
@@ -132,7 +126,7 @@ function editlayout_content(&$a) {
 
 	$rp = 'layouts/' . $which;
 
-	$o .= replace_macros($tpl,array(
+	$editor = replace_macros($tpl,array(
 		'$return_path'         => $rp,
 		'$action'              => 'item',
 		'$webpage'             => ITEM_PDL,
@@ -178,6 +172,14 @@ function editlayout_content(&$a) {
 		'$expires'             => t('Set expiration date'),
 	));
 
+
+	$o .= replace_macros(get_markup_template('edpost_head.tpl'), array(
+		'$title' => t('Edit Layout'),
+		'$delete' => ((($itm[0]['author_xchan'] === $ob_hash) || ($itm[0]['owner_xchan'] === $ob_hash)) ? t('Delete') : false),
+		'$id' => $itm[0]['id'],
+		'$editor' => $editor
+	));
+
 	return $o;
 
 }

mod/editpost.php

@@ -100,7 +100,7 @@ function editpost_content(&$a) {
 		$cipher = 'aes256';
 
 
-	$editor .= replace_macros($tpl,array(
+	$editor = replace_macros($tpl,array(
 		'$return_path' => $_SESSION['return_url'],
 		'$action' => 'item',
 		'$share' => t('Edit'),

view/tpl/menuedit.tpl

@@ -1,4 +1,5 @@
 {{if $header}}
+<div class="generic-content-wrapper">
 <div class="section-title-wrapper">
 	{{if $menu_id}}
 	<div class="pull-right">
@@ -27,3 +28,6 @@
 		<div class="clear"></div>
 	</form>
 </div>
+{{if $header}}
+</div>
+{{/if}}

view/tpl/mitemedit.tpl

@@ -1,4 +1,5 @@
 {{if $header}}
+<div class="generic-content-wrapper">
 	<div class="section-title-wrapper">
 		<h2>{{$header}}</h2>
 	</div>
@@ -33,5 +34,9 @@
 				</div>
 				{{$aclselect}}
 			</div>
+			<div class="clear"></div>
 		</form>
 	</div>
+{{if $header}}
+</div>
+{{/if}}

view/tpl/mitemlist.tpl

@@ -1,3 +1,4 @@
+<div class="generic-content-wrapper">
 	<div class="section-title-wrapper">
 		<div class="pull-right">
 			<button id="webpage-create-btn" class="btn btn-xs btn-success" onclick="openClose('menu-element-creator');"><i class="icon-edit"></i>&nbsp;{{$hintnew}}</button>
@@ -30,6 +31,4 @@
 		</table>
 	</div>
 	{{/if}}
-
+</div>
- 
-