clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

reshare in "display" view

This commit is contained in:
Fabio Comuni 2012-02-13 09:33:20 +01:00
parent ed38808aae
commit 3e664dbdfe
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
mod/display.php
View File

@ -11,6 +11,7 @@ function display_content(&$a) {
require_once("include/bbcode.php"); require_once("include/bbcode.php");
require_once('include/security.php'); require_once('include/security.php');
require_once('include/conversation.php'); require_once('include/conversation.php');
require_once('include/acl_selectors.php');
$o = '<div id="live-display"></div>' . "\r\n"; $o = '<div id="live-display"></div>' . "\r\n";
@ -68,6 +69,19 @@ function display_content(&$a) {
} }
if ($is_owner) if ($is_owner)
$celeb = ((($a->user['page-flags'] == PAGE_SOAPBOX) || ($a->user['page-flags'] == PAGE_COMMUNITY)) ? true : false);
$x = array(
'is_owner' => true,
'allow_location' => $a->user['allow_location'],
'default_location' => $a->user['default_location'],
'nickname' => $a->user['nickname'],
'lockstate' => ((($group) || (is_array($a->user) && ((strlen($a->user['allow_cid'])) || (strlen($a->user['allow_gid'])) || (strlen($a->user['deny_cid'])) || (strlen($a->user['deny_gid']))))) ? 'lock' : 'unlock'),
'acl' => populate_acl((($group || $cid) ? $def_acl : $a->user), $celeb),
'bang' => (($group || $cid) ? '!' : ''),
'visitor' => 'block',
'profile_uid' => local_user()
);
$o .= status_editor($a,$x,0,true); $o .= status_editor($a,$x,0,true);

5
view/jot-header.tpl
View File

@ -209,15 +209,14 @@ function enableOnUser(){
} }
function jotShare(id) { function jotShare(id) {
if ($('#jot-popup').length != 0) $('#jot-popup').show();
$('#like-rotator-' + id).show(); $('#like-rotator-' + id).show();
$.get('share/' + id, function(data) { $.get('share/' + id, function(data) {
if (!editor) $("#profile-jot-text").val(""); if (!editor) $("#profile-jot-text").val("");
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);
}); });