mirror of
https://codeberg.org/streams/streams.git
synced 2024-09-19 23:55:19 +00:00
add generic content wrapper to post/webpage editor and make editpost render correctly
This commit is contained in:
parent
7eb614c8aa
commit
1554b5a2ee
3 changed files with 20 additions and 20 deletions
|
@ -38,11 +38,6 @@ function editpost_content(&$a) {
|
|||
|
||||
$channel = $a->get_channel();
|
||||
|
||||
$o .= replace_macros(get_markup_template('edpost_head.tpl'), array(
|
||||
'$title' => t('Edit post')
|
||||
));
|
||||
|
||||
|
||||
$a->page['htmlhead'] .= replace_macros(get_markup_template('jot-header.tpl'), array(
|
||||
'$baseurl' => $a->get_baseurl(),
|
||||
'$editselect' => (($plaintext) ? 'none' : '/(profile-jot-text|prvmail-text)/'),
|
||||
|
@ -53,8 +48,6 @@ function editpost_content(&$a) {
|
|||
'$confirmdelete' => t('Delete item?'),
|
||||
));
|
||||
|
||||
|
||||
|
||||
if($itm[0]['item_flags'] & ITEM_OBSCURED) {
|
||||
$key = get_config('system','prvkey');
|
||||
if($itm[0]['title'])
|
||||
|
@ -107,7 +100,7 @@ function editpost_content(&$a) {
|
|||
$cipher = 'aes256';
|
||||
|
||||
|
||||
$o .= replace_macros($tpl,array(
|
||||
$editor .= replace_macros($tpl,array(
|
||||
'$return_path' => $_SESSION['return_url'],
|
||||
'$action' => 'item',
|
||||
'$share' => t('Edit'),
|
||||
|
@ -161,6 +154,11 @@ function editpost_content(&$a) {
|
|||
'$expiryModalCANCEL' => t('Cancel'),
|
||||
));
|
||||
|
||||
$o .= replace_macros(get_markup_template('edpost_head.tpl'), array(
|
||||
'$title' => t('Edit post'),
|
||||
'$editor' => $editor
|
||||
));
|
||||
|
||||
return $o;
|
||||
|
||||
}
|
||||
|
|
|
@ -1594,8 +1594,8 @@ img.mail-list-sender-photo {
|
|||
}
|
||||
|
||||
.jothidden > input {
|
||||
border: 1px solid $bgcolour;
|
||||
background-color: $bgcolour;
|
||||
border: 1px solid transparent;
|
||||
background-color: transparent;
|
||||
}
|
||||
.jothidden > input:hover,
|
||||
.jothidden > input:focus {
|
||||
|
|
|
@ -1,12 +1,14 @@
|
|||
<div class="section-title-wrapper">
|
||||
{{if $delete}}
|
||||
<div class="pull-right">
|
||||
<a href="item/drop/{{$id}}" id="delete-btn" class="btn btn-xs btn-danger" onclick="return confirmDelete();"><i class="icon-trash"></i> {{$delete}}</a>
|
||||
<div class="generic-content-wrapper">
|
||||
<div class="section-title-wrapper">
|
||||
{{if $delete}}
|
||||
<div class="pull-right">
|
||||
<a href="item/drop/{{$id}}" id="delete-btn" class="btn btn-xs btn-danger" onclick="return confirmDelete();"><i class="icon-trash"></i> {{$delete}}</a>
|
||||
</div>
|
||||
{{/if}}
|
||||
<h2>{{$title}}</h2>
|
||||
<div class="clear"></div>
|
||||
</div>
|
||||
<div id="webpage-editor" class="section-content-tools-wrapper">
|
||||
{{$editor}}
|
||||
</div>
|
||||
{{/if}}
|
||||
<h2>{{$title}}</h2>
|
||||
<div class="clear"></div>
|
||||
</div>
|
||||
<div id="webpage-editor" class="section-content-tools-wrapper">
|
||||
{{$editor}}
|
||||
</div>
|
||||
|
|
Loading…
Reference in a new issue