jakob/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

our implementation of "aspects" functionally complete

Browse source
This commit is contained in:
Mike Macgirvin 2010-09-17 03:43:03 -07:00
parent a50947a4bc
commit 4eb1c1eb1a
4 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
mod/network.php
View file

@ -20,9 +20,10 @@ function network_content(&$a, $update = false) {
if(! $update) { if(! $update) {
// pull out the group here because the updater might have different args // pull out the group here because the updater might have different args
if($a->argc > 1) if($a->argc > 1) {
$group = intval($a->argv[1]); $group = intval($a->argv[1]);
$group_acl = array('allow_gid' => '<' . $group . '>');
}
$_SESSION['return_url'] = $a->cmd; $_SESSION['return_url'] = $a->cmd;
$tpl = file_get_contents('view/jot-header.tpl'); $tpl = file_get_contents('view/jot-header.tpl');
@ -32,14 +33,20 @@ function network_content(&$a, $update = false) {
require_once('view/acl_selectors.php'); require_once('view/acl_selectors.php');
$tpl = file_get_contents("view/jot.tpl"); $tpl = file_get_contents("view/jot.tpl");
if(($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'])))))
$lockstate = 'lock';
else
$lockstate = 'unlock';
$o .= replace_macros($tpl,array( $o .= replace_macros($tpl,array(
'$return_path' => $a->cmd, '$return_path' => $a->cmd,
'$baseurl' => $a->get_baseurl(), '$baseurl' => $a->get_baseurl(),
'$defloc' => $a->user['default-location'], '$defloc' => $a->user['default-location'],
'$visitor' => 'block', '$visitor' => 'block',
'$lockstate' => 'unlock', '$lockstate' => $lockstate,
'$acl' => populate_acl($a->user), '$acl' => populate_acl(($group) ? $group_acl : $a->user),
'$bang' => (($group) ? '!' : ''),
'$profile_uid' => $_SESSION['uid'] '$profile_uid' => $_SESSION['uid']
)); ));

1
mod/profile.php
View file

@ -144,6 +144,7 @@ function profile_content(&$a, $update = false) {
'$return_path' => $a->cmd, '$return_path' => $a->cmd,
'$visitor' => (($_SESSION['uid'] == $a->profile['profile_uid']) ? 'block' : 'none'), '$visitor' => (($_SESSION['uid'] == $a->profile['profile_uid']) ? 'block' : 'none'),
'$lockstate' => $lockstate, '$lockstate' => $lockstate,
'$bang' => '',
'$acl' => (($_SESSION['uid'] == $a->profile['profile_uid']) ? populate_acl($a->user) : ''), '$acl' => (($_SESSION['uid'] == $a->profile['profile_uid']) ? populate_acl($a->user) : ''),
'$profile_uid' => $a->profile['profile_uid'] '$profile_uid' => $a->profile['profile_uid']
)); ));

2
view/jot.tpl
View file

@ -31,7 +31,7 @@
<div id="profile-rotator-wrapper" style="display: $visitor;" > <div id="profile-rotator-wrapper" style="display: $visitor;" >
<img id="profile-rotator" src="images/rotator.gif" alt="Please wait" title="Please wait" style="display: none;" /> <img id="profile-rotator" src="images/rotator.gif" alt="Please wait" title="Please wait" style="display: none;" />
</div> </div>
<div id="profile-jot-perms" class="profile-jot-perms" style="display: $visitor;" ><img src="images/$lockstate_icon.gif" alt="Permission Settings" title="Permission Settings" onClick="openClose('profile-jot-acl-wrapper');" /></div> <div id="profile-jot-perms" class="profile-jot-perms" style="display: $visitor;" ><img src="images/$lockstate_icon.gif" alt="Permission Settings" title="Permission Settings" onClick="openClose('profile-jot-acl-wrapper');" />$bang</div>
<div id="profile-jot-perms-end"></div> <div id="profile-jot-perms-end"></div>
<div id="profile-jot-acl-wrapper" style="display: none;" >$acl</div> <div id="profile-jot-acl-wrapper" style="display: none;" >$acl</div>
</div> </div>

2
view/theme/default/style.css
View file

@ -776,6 +776,8 @@ input#dfrn-url {
#profile-jot-perms { #profile-jot-perms {
float: left; float: left;
margin-left: 200px; margin-left: 200px;
font-weight: bold;
font-size: 1.2em;
} }
#profile-jot-perms-end { #profile-jot-perms-end {