harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add generic content wrapper to post/webpage editor and make editpost render correctly

Browse Source
This commit is contained in:
Mario Vavti 2015-07-10 12:46:20 +02:00
parent 7eb614c8aa
commit 1554b5a2ee
3 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
mod/editpost.php
View File

@ -38,11 +38,6 @@ function editpost_content(&$a) {
$channel = $a->get_channel(); $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( $a->page['htmlhead'] .= replace_macros(get_markup_template('jot-header.tpl'), array(
'$baseurl' => $a->get_baseurl(), '$baseurl' => $a->get_baseurl(),
'$editselect' => (($plaintext) ? 'none' : '/(profile-jot-text|prvmail-text)/'), '$editselect' => (($plaintext) ? 'none' : '/(profile-jot-text|prvmail-text)/'),
@ -53,8 +48,6 @@ function editpost_content(&$a) {
'$confirmdelete' => t('Delete item?'), '$confirmdelete' => t('Delete item?'),
)); ));
if($itm[0]['item_flags'] & ITEM_OBSCURED) { if($itm[0]['item_flags'] & ITEM_OBSCURED) {
$key = get_config('system','prvkey'); $key = get_config('system','prvkey');
if($itm[0]['title']) if($itm[0]['title'])
@ -107,7 +100,7 @@ function editpost_content(&$a) {
$cipher = 'aes256'; $cipher = 'aes256';
$o .= replace_macros($tpl,array( $editor .= replace_macros($tpl,array(
'$return_path' => $_SESSION['return_url'], '$return_path' => $_SESSION['return_url'],
'$action' => 'item', '$action' => 'item',
'$share' => t('Edit'), '$share' => t('Edit'),
@ -161,6 +154,11 @@ function editpost_content(&$a) {
'$expiryModalCANCEL' => t('Cancel'), '$expiryModalCANCEL' => t('Cancel'),
)); ));
$o .= replace_macros(get_markup_template('edpost_head.tpl'), array(
'$title' => t('Edit post'),
'$editor' => $editor
));
return $o; return $o;
} }

4
view/theme/redbasic/css/style.css
View File

@ -1594,8 +1594,8 @@ img.mail-list-sender-photo {
} }
.jothidden > input { .jothidden > input {
border: 1px solid $bgcolour; border: 1px solid transparent;
background-color: $bgcolour; background-color: transparent;
} }
.jothidden > input:hover, .jothidden > input:hover,
.jothidden > input:focus { .jothidden > input:focus {

22
view/tpl/edpost_head.tpl
View File

@ -1,12 +1,14 @@
<div class="section-title-wrapper"> <div class="generic-content-wrapper">
{{if $delete}} <div class="section-title-wrapper">
<div class="pull-right"> {{if $delete}}
<a href="item/drop/{{$id}}" id="delete-btn" class="btn btn-xs btn-danger" onclick="return confirmDelete();"><i class="icon-trash"></i>&nbsp;{{$delete}}</a> <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>&nbsp;{{$delete}}</a>
</div>
{{/if}}
<h2>{{$title}}</h2>
<div class="clear"></div>
</div>
<div id="webpage-editor" class="section-content-tools-wrapper">
{{$editor}}
</div> </div>
{{/if}}
<h2>{{$title}}</h2>
<div class="clear"></div>
</div>
<div id="webpage-editor" class="section-content-tools-wrapper">
{{$editor}}
</div> </div>