hidden jot in "display" to allow reshare
This commit is contained in:
parent
8480550144
commit
ed38808aae
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
|
@ -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);
|
||||
|
||||
|
|
|
@ -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);
|
||||
});
|
||||
|
||||
|
|
Loading…
Reference in a new issue