nupplaPhil/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

hidden jot in "display" to allow reshare

Browse source
This commit is contained in:
Fabio Comuni 2012-02-10 17:30:22 +01:00
parent 8480550144
commit ed38808aae
3 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
include/conversation.php
View file

@ -494,7 +494,7 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
} }
$likebuttons = ''; $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($page_writeable) {
if($toplevelpost) { 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 = ''; $o = '';
@ -896,7 +896,7 @@ function status_editor($a,$x, $notes_cid = 0) {
$o .= replace_macros($tpl,array( $o .= replace_macros($tpl,array(
'$return_path' => $a->cmd, '$return_path' => $a->cmd,
'$action' => 'item', '$action' => $a->get_baseurl().'/item',
'$share' => (($x['button']) ? $x['button'] : t('Share')), '$share' => (($x['button']) ? $x['button'] : t('Share')),
'$upload' => t('Upload photo'), '$upload' => t('Upload photo'),
'$shortupload' => t('upload photo'), '$shortupload' => t('upload photo'),
@ -935,6 +935,12 @@ function status_editor($a,$x, $notes_cid = 0) {
'$preview' => t('Preview'), '$preview' => t('Preview'),
)); ));
if ($popup==true){
$o = '<div id="jot-popup" style="display: none;">'.$o.'</div>';
}
return $o; return $o;
} }

4
mod/display.php
View file

@ -67,6 +67,10 @@ function display_content(&$a) {
return; return;
} }
if ($is_owner)
$o .= status_editor($a,$x,0,true);
$sql_extra = permissions_sql($a->profile['uid'],$remote_contact,$groups); $sql_extra = permissions_sql($a->profile['uid'],$remote_contact,$groups);
$r = q("SELECT `item`.*, `item`.`id` AS `item_id`, $r = q("SELECT `item`.*, `item`.`id` AS `item_id`,

3
view/jot-header.tpl
View file

@ -215,6 +215,9 @@ function enableOnUser(){
initEditor(function(){ initEditor(function(){
addeditortext(data); addeditortext(data);
$('#like-rotator-' + id).hide(); $('#like-rotator-' + id).hide();
if ($('#jot-popup').length != 0){
$('#jot-popup').show();
}
$(window).scrollTop(0); $(window).scrollTop(0);
}); });