diff options
| author | Mike Macgirvin <mike@macgirvin.com> | 2010-09-17 03:43:03 -0700 |
|---|---|---|
| committer | Mike Macgirvin <mike@macgirvin.com> | 2010-09-17 03:43:03 -0700 |
| commit | 4eb1c1eb1a9d830151aa6437fefb4e7a590064e8 (patch) | |
| tree | dd4afea97334f63ba1c3801a5dc7da7289f64b5a | |
| parent | a50947a4bc3f779df8fa4e6777bc025fcefc8d21 (diff) | |
| download | volse-hubzilla-4eb1c1eb1a9d830151aa6437fefb4e7a590064e8.tar.gz volse-hubzilla-4eb1c1eb1a9d830151aa6437fefb4e7a590064e8.tar.bz2 volse-hubzilla-4eb1c1eb1a9d830151aa6437fefb4e7a590064e8.zip | |
our implementation of "aspects" functionally complete
| -rw-r--r-- | mod/network.php | 15 | ||||
| -rw-r--r-- | mod/profile.php | 1 | ||||
| -rw-r--r-- | view/jot.tpl | 2 | ||||
| -rw-r--r-- | view/theme/default/style.css | 2 |
4 files changed, 15 insertions, 5 deletions
diff --git a/mod/network.php b/mod/network.php index 7eb93f435..afe44dabf 100644 --- a/mod/network.php +++ b/mod/network.php @@ -20,9 +20,10 @@ function network_content(&$a, $update = false) { if(! $update) { // 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_acl = array('allow_gid' => '<' . $group . '>'); + } $_SESSION['return_url'] = $a->cmd; $tpl = file_get_contents('view/jot-header.tpl'); @@ -32,14 +33,20 @@ function network_content(&$a, $update = false) { require_once('view/acl_selectors.php'); $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( '$return_path' => $a->cmd, '$baseurl' => $a->get_baseurl(), '$defloc' => $a->user['default-location'], '$visitor' => 'block', - '$lockstate' => 'unlock', - '$acl' => populate_acl($a->user), + '$lockstate' => $lockstate, + '$acl' => populate_acl(($group) ? $group_acl : $a->user), + '$bang' => (($group) ? '!' : ''), '$profile_uid' => $_SESSION['uid'] )); diff --git a/mod/profile.php b/mod/profile.php index 18201e821..5efb28ea7 100644 --- a/mod/profile.php +++ b/mod/profile.php @@ -144,6 +144,7 @@ function profile_content(&$a, $update = false) { '$return_path' => $a->cmd, '$visitor' => (($_SESSION['uid'] == $a->profile['profile_uid']) ? 'block' : 'none'), '$lockstate' => $lockstate, + '$bang' => '', '$acl' => (($_SESSION['uid'] == $a->profile['profile_uid']) ? populate_acl($a->user) : ''), '$profile_uid' => $a->profile['profile_uid'] )); diff --git a/view/jot.tpl b/view/jot.tpl index ec11f2861..e10c9a8eb 100644 --- a/view/jot.tpl +++ b/view/jot.tpl @@ -31,7 +31,7 @@ <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;" /> </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-acl-wrapper" style="display: none;" >$acl</div> </div> diff --git a/view/theme/default/style.css b/view/theme/default/style.css index 6176f84ff..0e7882b30 100644 --- a/view/theme/default/style.css +++ b/view/theme/default/style.css @@ -776,6 +776,8 @@ input#dfrn-url { #profile-jot-perms { float: left; margin-left: 200px; + font-weight: bold; + font-size: 1.2em; } #profile-jot-perms-end { |