diff options
| -rwxr-xr-x | include/conversation.php | 12 | ||||
| -rwxr-xr-x | mod/display.php | 4 | ||||
| -rwxr-xr-x | view/jot-header.tpl | 3 |
3 files changed, 16 insertions, 3 deletions
diff --git a/include/conversation.php b/include/conversation.php index 6defefc73..947a9b040 100755 --- a/include/conversation.php +++ b/include/conversation.php @@ -494,7 +494,7 @@ function conversation(&$a, $items, $mode, $update, $preview = false) { } $likebuttons = ''; - $shareable = ((($profile_owner == local_user()) && ($mode != 'display') && (! $item['private'])) ? true : false); + $shareable = ((($profile_owner == local_user()) && (! $item['private'])) ? true : false); //($mode != 'display') && if($page_writeable) { if($toplevelpost) { @@ -832,7 +832,7 @@ function format_like($cnt,$arr,$type,$id) { }} -function status_editor($a,$x, $notes_cid = 0) { +function status_editor($a,$x, $notes_cid = 0, $popup=false) { $o = ''; @@ -896,7 +896,7 @@ function status_editor($a,$x, $notes_cid = 0) { $o .= replace_macros($tpl,array( '$return_path' => $a->cmd, - '$action' => 'item', + '$action' => $a->get_baseurl().'/item', '$share' => (($x['button']) ? $x['button'] : t('Share')), '$upload' => t('Upload photo'), '$shortupload' => t('upload photo'), @@ -935,6 +935,12 @@ function status_editor($a,$x, $notes_cid = 0) { '$preview' => t('Preview'), )); + + if ($popup==true){ + $o = '<div id="jot-popup" style="display: none;">'.$o.'</div>'; + + } + return $o; } diff --git a/mod/display.php b/mod/display.php index 02f080a79..79eaf3717 100755 --- a/mod/display.php +++ b/mod/display.php @@ -66,6 +66,10 @@ function display_content(&$a) { notice( t('Access to this profile has been restricted.') . EOL); return; } + + if ($is_owner) + $o .= status_editor($a,$x,0,true); + $sql_extra = permissions_sql($a->profile['uid'],$remote_contact,$groups); diff --git a/view/jot-header.tpl b/view/jot-header.tpl index 22b434916..482fb0e0d 100755 --- a/view/jot-header.tpl +++ b/view/jot-header.tpl @@ -215,6 +215,9 @@ function enableOnUser(){ initEditor(function(){ addeditortext(data); $('#like-rotator-' + id).hide(); + if ($('#jot-popup').length != 0){ + $('#jot-popup').show(); + } $(window).scrollTop(0); }); |