use $showacl to show/hide acl in jot.tpl - remove $pvisit and repair editblock and editlayout which still depended on it.

This commit is contained in:
marijus
2014-04-09 18:29:22 +02:00
parent 74bd772a5b
commit b88a7fc23a
8 changed files with 5 additions and 8 deletions

View File

@@ -60,6 +60,7 @@ require_once ('include/conversation.php');
'nickname' => $a->profile['channel_address'],
'lockstate' => (($group || $cid || $channel['channel_allow_cid'] || $channel['channel_allow_gid'] || $channel['channel_deny_cid'] || $channel['channel_deny_gid']) ? 'lock' : 'unlock'),
'bang' => (($group || $cid) ? '!' : ''),
'showacl' => false,
'visitor' => true,
'mimetype' => 'choose',
'ptlabel' => t('Block Name'),

View File

@@ -126,7 +126,6 @@ function editblock_content(&$a) {
'$baseurl' => $a->get_baseurl(),
'$defloc' => $channel['channel_location'],
'$visitor' => false,
'$pvisit' => 'none',
'$public' => t('Public post'),
'$jotnets' => $jotnets,
'$title' => htmlspecialchars($itm[0]['title'],ENT_COMPAT,'UTF-8'),

View File

@@ -120,7 +120,6 @@ function editlayout_content(&$a) {
'$baseurl' => $a->get_baseurl(),
'$defloc' => $channel['channel_location'],
'$visitor' => false,
'$pvisit' => 'none',
'$public' => t('Public post'),
'$jotnets' => $jotnets,
'$title' => htmlspecialchars($itm[0]['title'],ENT_COMPAT,'UTF-8'),

View File

@@ -126,7 +126,6 @@ function editpost_content(&$a) {
'$baseurl' => $a->get_baseurl(),
'$defloc' => $channel['channel_location'],
'$visitor' => false,
'$pvisit' => 'none',
'$public' => t('Public post'),
'$jotnets' => $jotnets,
'$title' => htmlspecialchars($itm[0]['title'],ENT_COMPAT,'UTF-8'),

View File

@@ -158,8 +158,7 @@ function editwebpage_content(&$a) {
'$defloc' => $itm[0]['location'],
'$visitor' => ($is_owner) ? true : false,
'$acl' => populate_acl($itm[0]),
'$showacl' => true,
'$pvisit' => ($is_owner) ? 'block' : 'none',
'$showacl' => ($is_owner) ? true : false,
'$public' => t('Public post'),
'$jotnets' => $jotnets,
'$mimeselect' => $mimeselect,

View File

@@ -78,6 +78,7 @@ function layouts_content(&$a) {
'nickname' => $a->profile['channel_address'],
'lockstate' => (($group || $cid || $channel['channel_allow_cid'] || $channel['channel_allow_gid'] || $channel['channel_deny_cid'] || $channel['channel_deny_gid']) ? 'lock' : 'unlock'),
'bang' => (($group || $cid) ? '!' : ''),
'showacl' => false,
'visitor' => false,
'nopreview' => 1,
'ptlabel' => t('Layout Name'),