diff options
| author | Mario Vavti <mario@mariovavti.com> | 2015-07-10 12:46:20 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2015-07-10 12:46:20 +0200 |
| commit | 1554b5a2eea889284ed2e13111d72029dfc96963 (patch) | |
| tree | 58b4f1d0dc729653ca9f7c65f3f53ab63bc61f77 | |
| parent | 7eb614c8aafc2f830479e1026e6a4924bda657cb (diff) | |
| download | volse-hubzilla-1554b5a2eea889284ed2e13111d72029dfc96963.tar.gz volse-hubzilla-1554b5a2eea889284ed2e13111d72029dfc96963.tar.bz2 volse-hubzilla-1554b5a2eea889284ed2e13111d72029dfc96963.zip | |
add generic content wrapper to post/webpage editor and make editpost render correctly
| -rw-r--r-- | mod/editpost.php | 14 | ||||
| -rw-r--r-- | view/theme/redbasic/css/style.css | 4 | ||||
| -rwxr-xr-x | view/tpl/edpost_head.tpl | 22 |
3 files changed, 20 insertions, 20 deletions
diff --git a/mod/editpost.php b/mod/editpost.php index 81bb91b2a..db0a86df1 100644 --- a/mod/editpost.php +++ b/mod/editpost.php @@ -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; } diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 5b65226ca..b2d52c8a6 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -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 { diff --git a/view/tpl/edpost_head.tpl b/view/tpl/edpost_head.tpl index 20e597909..3be40e978 100755 --- a/view/tpl/edpost_head.tpl +++ b/view/tpl/edpost_head.tpl @@ -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> |