more webpages - generic-content-wrapper fixes

This commit is contained in:
Mario Vavti
2015-07-10 13:16:45 +02:00
parent 1554b5a2ee
commit fee607db56
6 changed files with 93 additions and 82 deletions

View File

@@ -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;
}