diff options
| -rw-r--r-- | Zotlabs/Module/Channel.php | 2 | ||||
| -rw-r--r-- | Zotlabs/Module/Network.php | 2 | ||||
| -rw-r--r-- | doc/acl_dialog_post.html | 13 | ||||
| -rw-r--r-- | include/acl_selectors.php | 6 | ||||
| -rw-r--r-- | view/theme/redbasic/css/style.css | 10 | ||||
| -rwxr-xr-x | view/tpl/acl_selector.tpl | 6 |
6 files changed, 32 insertions, 7 deletions
diff --git a/Zotlabs/Module/Channel.php b/Zotlabs/Module/Channel.php index ee7140475..d0c6d83d8 100644 --- a/Zotlabs/Module/Channel.php +++ b/Zotlabs/Module/Channel.php @@ -132,7 +132,7 @@ function get($update = 0, $load = false) { // the "Show" button on a group does not post it to the feed of people in that group, it // mearly allows those people to view the post if they are viewing/following this channel. $aclDesc = t('Post permissions <b>cannot be changed</b> after a post is sent.</br />These permissions set who is allowed to view the post.'); - $aclContextHelpCmd = ''; + $aclContextHelpCmd = 'acl_dialog_post'; $x = array( 'is_owner' => $is_owner, diff --git a/Zotlabs/Module/Network.php b/Zotlabs/Module/Network.php index a6b36ad3c..e4b936dc2 100644 --- a/Zotlabs/Module/Network.php +++ b/Zotlabs/Module/Network.php @@ -161,7 +161,7 @@ class Network extends \Zotlabs\Web\Controller { // the "Show" button on a group does not post it to the feed of people in that group, it // mearly allows those people to view the post if they are viewing/following this channel. $aclDesc = t('Post permissions <b>cannot be changed</b> after a post is sent.</br />These permissions set who is allowed to view the post.'); - $aclContextHelpCmd = ''; + $aclContextHelpCmd = 'acl_dialog_post'; $channel_acl = array( 'allow_cid' => $channel['channel_allow_cid'], diff --git a/doc/acl_dialog_post.html b/doc/acl_dialog_post.html new file mode 100644 index 000000000..19c366419 --- /dev/null +++ b/doc/acl_dialog_post.html @@ -0,0 +1,13 @@ +<!-- Network and channel posts cannot change their permissions after being sent, this help + file is for items of that nature. Files and photos etc should use a different help file. --> + +<h2>Post Permissions</h2> + +<p>Sometimes called Access Control List, or ACL, the permissions set who is able to see your new post.</p> + +<p>Pressing the ACL button (<i class="fa fa-lock"></i> or <i class="fa fa-unlock"></i>) beside the Submit button will display a dialog in which you can select what channels and/or privacy groups can see the post. You can also select who is explicitly denied access. For example, say you are planning a surprise party for a friend. You can send an invitation post to everyone in your <b>Friends</b> group <i>except</i> the friend you are surprising. In this case you "Show" the <b>Friends</b> group but "Don't show" that one person. + +<h3>Why can't I edit a post's permissions after I saved it?</h3> + +<p>You are able to change permissons to your files, photos and the likes, but not to posts after you have saved them. The main reason is: Once you have saved a post it is being distributed either to the public channel and from there to other Hubzilla servers or to those you intended it to go. Just like you cannot reclaim something you gave to another person, you cannot change permissions to Hubzilla posts. We would need to track everywhere your posting goes, keep track of everyone you allowed to see it and then keep track of from whom to delete it.</p> +<p>If a posting is public this is even harder, as the Hubzilla is a global network and there is no way to follow a post, let alone reclaim it reliably. Other networks that may receive your post have no reliable way to delete or reclaim the post.</p>
\ No newline at end of file diff --git a/include/acl_selectors.php b/include/acl_selectors.php index c22055848..584a70142 100644 --- a/include/acl_selectors.php +++ b/include/acl_selectors.php @@ -217,7 +217,7 @@ function fixacl(&$item) { * @param boolean $show_jotnets Whether plugins for federated networks should be included in the permissions dialog * @param string $showall_caption An optional caption to describe the scope of an unrestricted post. e.g. "Public" * @param string $dialog_description Optional message to include at the top of the dialog. E.g. "Warning: Post permissions cannot be changed once sent". -* @param string $context_help Allows the dialog to present a context sensitive help icon. E.g. "photos/permissions" +* @param string $context_help Allows the dialog to present a help icon. E.g. "acl_dialog_post" * @param boolean $readonly Not implemented yet. When implemented, the dialog will use acl_readonly.tpl instead, so that permissions may be viewed for posts that can no longer have their permissions changed. * * @return string html modal dialog build from acl_selector.tpl @@ -253,7 +253,7 @@ function populate_acl($defaults = null,$show_jotnets = true, $showall_caption = $o = replace_macros($tpl, array( '$showall' => $showall_caption, '$showlimited' => t("Limit access:"), - '$showlimitedDesc' => t('Select "Show" to allow access. "Don\'t show" lets you override and limit the scope of "Show".'), + '$showlimitedDesc' => t('Select "Show" to allow viewing. "Don\'t show" lets you override and limit the scope of "Show".'), '$show' => t("Show"), '$hide' => t("Don't show"), '$search' => t("Search"), @@ -266,7 +266,7 @@ function populate_acl($defaults = null,$show_jotnets = true, $showall_caption = '$aclModalTitle' => t('Permissions'), '$aclModalDesc' => $dialog_description, '$aclModalDismiss' => t('Close'), - '$helpUrl' => (($context_help == '') ? '' : (z_root() . '/help?f=&cmd=' . $context_help)) + '$helpUrl' => (($context_help == '') ? '' : (z_root() . '/help/' . $context_help)) )); return $o; diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 4dd3488e5..48d93025b 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -940,10 +940,19 @@ a.rconnect:hover, a.rateme:hover, div.rateme:hover { font-family: FontAwesome, sans-serif, arial, freesans; } +#aclModal .modal-body { + padding-top: 10px; +} + #acl-dialog-description { font-size: 90%; color: #888; + padding-bottom: 4px; +} +#acl-dialog-description b { + color: black; } + #acl-showlimited-description { font-size: 90%; color: #888; @@ -1026,6 +1035,7 @@ a.rconnect:hover, a.rateme:hover, div.rateme:hover { } #acl-radiowrapper-showall { + margin-top: 20px; margin-bottom: 20px; } #acl-radiowrapper-showlimited { diff --git a/view/tpl/acl_selector.tpl b/view/tpl/acl_selector.tpl index 49d90cd3e..a3fe73d0c 100755 --- a/view/tpl/acl_selector.tpl +++ b/view/tpl/acl_selector.tpl @@ -4,12 +4,14 @@ <div class="modal-header"> <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button> {{if $helpUrl}} - <a type="button" target="hubzilla-help" href="{{$helpUrl}}" class="contextual-help-tool" title="Help and documentation"><i class="fa fa-question-circle-o"></i></a> + <a type="button" target="hubzilla-help" href="{{$helpUrl}}" class="contextual-help-tool" title="Help and documentation"><i class="fa fa-question"></i></a> {{/if}} <h4 class="modal-title"><i id="dialog-perms-icon" class="fa fa-fw"></i> {{$aclModalTitle}}</h4> </div> <div class="modal-body"> - <div id="acl-dialog-description">{{$aclModalDesc}}</div> + {{if $aclModalDesc}} + <div id="acl-dialog-description">{{$aclModalDesc}}</div> + {{/if}} {{if $jotnets}} <div class="jotnets-wrapper" role="tab" id="jotnets-wrapper"> <a data-toggle="collapse" class="btn btn-block btn-default" href="#jotnets-collapse" aria-expanded="false" aria-controls="jotnets-collapse">{{$jnetModalTitle}} <span class="caret"></span></a> |