mirror of
https://github.com/friendica/friendica
synced 2024-12-22 22:00:16 +00:00
show members of locked conversations
This commit is contained in:
parent
d2ecdd0668
commit
dda5195418
8 changed files with 135 additions and 13 deletions
|
@ -135,9 +135,9 @@
|
||||||
$(node).css('height',16);
|
$(node).css('height',16);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Since ajax is asynchronous, we will give a few seconds for
|
// Since our ajax calls are asynchronous, we will give a few
|
||||||
// the first ajax call (setting like/dislike), then run the
|
// seconds for the first ajax call (setting like/dislike), then
|
||||||
// updater to pick up any changes and display on the page.
|
// run the updater to pick up any changes and display on the page.
|
||||||
// The updater will turn any rotators off when it's done.
|
// The updater will turn any rotators off when it's done.
|
||||||
// This function will have returned long before any of these
|
// This function will have returned long before any of these
|
||||||
// events have completed and therefore there won't be any
|
// events have completed and therefore there won't be any
|
||||||
|
@ -151,3 +151,48 @@
|
||||||
if(timer) clearTimeout(timer);
|
if(timer) clearTimeout(timer);
|
||||||
timer = setTimeout(NavUpdate,3000);
|
timer = setTimeout(NavUpdate,3000);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function getPosition(e) {
|
||||||
|
e = e || window.event;
|
||||||
|
var cursor = {x:0, y:0};
|
||||||
|
if ( e.pageX > 0 || e.pageY > 0 ) {
|
||||||
|
cursor.x = e.pageX;
|
||||||
|
cursor.y = e.pageY;
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
if( e.clientX > 0 || e.clientY > 0 ) {
|
||||||
|
cursor.x = e.clientX;
|
||||||
|
cursor.y = e.clientY;
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
if( e.x > 0 || e.y > 0 ) {
|
||||||
|
cursor.x = e.x;
|
||||||
|
cursor.y = e.y;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return cursor;
|
||||||
|
}
|
||||||
|
|
||||||
|
var lockvisible = false;
|
||||||
|
|
||||||
|
function lockview(event,id) {
|
||||||
|
if(lockvisible) {
|
||||||
|
lockviewhide();
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
lockvisible = true;
|
||||||
|
$.get('lockview/' + id, function(data) {
|
||||||
|
cursor = getPosition(event);
|
||||||
|
$('#panel').html(data);
|
||||||
|
$('#panel').css({ 'left': cursor.x + 5 , 'top': cursor.y + 5});
|
||||||
|
$('#panel').show();
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function lockviewhide() {
|
||||||
|
lockvisible = false;
|
||||||
|
$('#panel').hide();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,7 @@
|
||||||
<?php
|
<?php
|
||||||
|
|
||||||
|
$a->page['nav'] .= '<div id="panel" style="display: none;"></div>' ;
|
||||||
|
|
||||||
if(x($_SESSION['uid'])) {
|
if(x($_SESSION['uid'])) {
|
||||||
$a->page['nav'] .= '<a id="nav-logout-link" class="nav-link" href="logout">' . t('Logout') . "</a>\r\n";
|
$a->page['nav'] .= '<a id="nav-logout-link" class="nav-link" href="logout">' . t('Logout') . "</a>\r\n";
|
||||||
}
|
}
|
||||||
|
|
|
@ -86,7 +86,8 @@ if(x($_SESSION,'sysmsg')) {
|
||||||
|
|
||||||
// Feel free to comment out this line on production sites.
|
// Feel free to comment out this line on production sites.
|
||||||
$a->page['content'] .= $debug_text;
|
$a->page['content'] .= $debug_text;
|
||||||
$a->page['content'] .= '<div id="pause"></div>';
|
|
||||||
|
$a->page['content'] .= '<div id="pause"></div>';
|
||||||
// build page
|
// build page
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -151,10 +151,9 @@ function display_content(&$a) {
|
||||||
|
|
||||||
$lock = (($item['uid'] == get_uid()) && (strlen($item['allow_cid']) || strlen($item['allow_gid'])
|
$lock = (($item['uid'] == get_uid()) && (strlen($item['allow_cid']) || strlen($item['allow_gid'])
|
||||||
|| strlen($item['deny_cid']) || strlen($item['deny_gid']))
|
|| strlen($item['deny_cid']) || strlen($item['deny_gid']))
|
||||||
? '<div class="wall-item-lock"><img src="images/lock_icon.gif" alt="Private Message" /></div>'
|
? '<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="' . t('Private Message') . '" onclick="lockview(event,' . $item['id'] . ');" /></div>'
|
||||||
: '<div class="wall-item-lock"></div>');
|
: '<div class="wall-item-lock"></div>');
|
||||||
|
|
||||||
|
|
||||||
if(can_write_wall($a,$a->profile['uid'])) {
|
if(can_write_wall($a,$a->profile['uid'])) {
|
||||||
if($item['last-child']) {
|
if($item['last-child']) {
|
||||||
$comment = replace_macros($cmnt_tpl,array(
|
$comment = replace_macros($cmnt_tpl,array(
|
||||||
|
|
67
mod/lockview.php
Normal file
67
mod/lockview.php
Normal file
|
@ -0,0 +1,67 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
|
||||||
|
function lockview_content(&$a) {
|
||||||
|
|
||||||
|
$item_id = (($a->argc > 1) ? intval($a->argv[1]) : 0);
|
||||||
|
if(! $item_id)
|
||||||
|
killme();
|
||||||
|
|
||||||
|
$r = q("SELECT * FROM `item` WHERE `id` = %d LIMIT 1",
|
||||||
|
intval($item_id)
|
||||||
|
);
|
||||||
|
if(! count($r))
|
||||||
|
killme();
|
||||||
|
$item = $r[0];
|
||||||
|
if($item['uid'] != local_user())
|
||||||
|
killme();
|
||||||
|
|
||||||
|
|
||||||
|
$allowed_users = expand_acl($item['allow_cid']);
|
||||||
|
$allowed_groups = expand_acl($item['allow_gid']);
|
||||||
|
$deny_users = expand_acl($item['deny_cid']);
|
||||||
|
$deny_groups = expand_acl($item['deny_gid']);
|
||||||
|
|
||||||
|
$o = t('Visible to:') . '<br />';
|
||||||
|
$l = array();
|
||||||
|
|
||||||
|
if(count($allowed_groups)) {
|
||||||
|
$r = q("SELECT `name` FROM `group` WHERE `id` IN ( %s )",
|
||||||
|
dbesc(implode(', ', $allowed_groups))
|
||||||
|
);
|
||||||
|
if(count($r))
|
||||||
|
foreach($r as $rr)
|
||||||
|
$l[] = '<b>' . $rr['name'] . '</b>';
|
||||||
|
}
|
||||||
|
if(count($allowed_users)) {
|
||||||
|
$r = q("SELECT `name` FROM `contact` WHERE `id` IN ( %s )",
|
||||||
|
dbesc(implode(', ',$allowed_users))
|
||||||
|
);
|
||||||
|
if(count($r))
|
||||||
|
foreach($r as $rr)
|
||||||
|
$l[] = $rr['name'];
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
if(count($deny_groups)) {
|
||||||
|
$r = q("SELECT `name` FROM `group` WHERE `id` IN ( %s )",
|
||||||
|
dbesc(implode(', ', $deny_groups))
|
||||||
|
);
|
||||||
|
if(count($r))
|
||||||
|
foreach($r as $rr)
|
||||||
|
$l[] = '<b><strike>' . $rr['name'] . '</strike></b>';
|
||||||
|
}
|
||||||
|
if(count($deny_users)) {
|
||||||
|
$r = q("SELECT `name` FROM `contact` WHERE `id` IN ( %s )",
|
||||||
|
dbesc(implode(', ',$deny_users))
|
||||||
|
);
|
||||||
|
if(count($r))
|
||||||
|
foreach($r as $rr)
|
||||||
|
$l[] = '<strike>' . $rr['name'] . '</strike>';
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
echo $o . implode(', ', $l);
|
||||||
|
killme();
|
||||||
|
|
||||||
|
}
|
|
@ -173,13 +173,11 @@ function network_content(&$a, $update = 0) {
|
||||||
if((($item['verb'] == ACTIVITY_LIKE) || ($item['verb'] == ACTIVITY_DISLIKE)) && ($item['id'] != $item['parent']))
|
if((($item['verb'] == ACTIVITY_LIKE) || ($item['verb'] == ACTIVITY_DISLIKE)) && ($item['id'] != $item['parent']))
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
|
|
||||||
$lock = (($item['uid'] == get_uid()) && (strlen($item['allow_cid']) || strlen($item['allow_gid'])
|
$lock = (($item['uid'] == get_uid()) && (strlen($item['allow_cid']) || strlen($item['allow_gid'])
|
||||||
|| strlen($item['deny_cid']) || strlen($item['deny_gid']))
|
|| strlen($item['deny_cid']) || strlen($item['deny_gid']))
|
||||||
? '<div class="wall-item-lock"><img src="images/lock_icon.gif" alt="Private Message" /></div>'
|
? '<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="' . t('Private Message') . '" onclick="lockview(event,' . $item['id'] . ');" /></div>'
|
||||||
: '<div class="wall-item-lock"></div>');
|
: '<div class="wall-item-lock"></div>');
|
||||||
|
|
||||||
|
|
||||||
// Top-level wall post not written by the wall owner (wall-to-wall)
|
// Top-level wall post not written by the wall owner (wall-to-wall)
|
||||||
// First figure out who owns it.
|
// First figure out who owns it.
|
||||||
|
|
||||||
|
|
|
@ -309,12 +309,9 @@ function profile_content(&$a, $update = 0) {
|
||||||
|
|
||||||
$lock = (($item['uid'] == get_uid()) && (strlen($item['allow_cid']) || strlen($item['allow_gid'])
|
$lock = (($item['uid'] == get_uid()) && (strlen($item['allow_cid']) || strlen($item['allow_gid'])
|
||||||
|| strlen($item['deny_cid']) || strlen($item['deny_gid']))
|
|| strlen($item['deny_cid']) || strlen($item['deny_gid']))
|
||||||
? '<div class="wall-item-lock"><img src="images/lock_icon.gif" alt="Private Message" /></div>'
|
? '<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="' . t('Private Message') . '" onclick="lockview(event,' . $item['id'] . ');" /></div>'
|
||||||
: '<div class="wall-item-lock"></div>');
|
: '<div class="wall-item-lock"></div>');
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
if(can_write_wall($a,$a->profile['profile_uid'])) {
|
if(can_write_wall($a,$a->profile['profile_uid'])) {
|
||||||
if($item['id'] == $item['parent']) {
|
if($item['id'] == $item['parent']) {
|
||||||
$likebuttons = replace_macros($like_tpl,array('$id' => $item['id']));
|
$likebuttons = replace_macros($like_tpl,array('$id' => $item['id']));
|
||||||
|
|
|
@ -16,6 +16,9 @@ a:hover {
|
||||||
margin-top: 15px;
|
margin-top: 15px;
|
||||||
margin-bottom: 15px;
|
margin-bottom: 15px;
|
||||||
}
|
}
|
||||||
|
.lockview {
|
||||||
|
cursor: pointer;
|
||||||
|
}
|
||||||
|
|
||||||
.fakelink:hover {
|
.fakelink:hover {
|
||||||
color: #0000FF;
|
color: #0000FF;
|
||||||
|
@ -46,6 +49,16 @@ img {
|
||||||
top: 12px;
|
top: 12px;
|
||||||
left: 42%;
|
left: 42%;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#panel {
|
||||||
|
background-color: ivory;
|
||||||
|
position: absolute;
|
||||||
|
z-index: 2;
|
||||||
|
width: 30%;
|
||||||
|
padding: 25px;
|
||||||
|
border: 1px solid #444;
|
||||||
|
}
|
||||||
|
|
||||||
code {
|
code {
|
||||||
font-family: monospace;
|
font-family: monospace;
|
||||||
white-space: pre;
|
white-space: pre;
|
||||||
|
|
Loading…
Reference in a new issue