Add connector collapsible panel in permission

- Replace HTML string by structured array in jot_networks hook
- Add collapsed panel when there are more than two connectors

diff --git a/src/Core/ACL.php b/src/Core/ACL.php
index 19015714e9c7b48148700c0f414153330aa9cc75..e6c82fd4bfdfb2b45a9ac41abaf97e27ef4a37a4 100644 (file)
--- a/src/Core/ACL.php
+++ b/src/Core/ACL.php
@@ -266,14 +266,12 @@ class ACL extends BaseObject
                        $default_permissions = self::getDefaultUserPermissions($user);
                }
 
-               $jotnets = '';
+               $jotnets_fields = [];
                if ($show_jotnets) {
-                       $imap_disabled = !function_exists('imap_open') || Config::get('system', 'imap_disabled');
-
                        $mail_enabled = false;
                        $pubmail_enabled = false;
 
-                       if (!$imap_disabled) {
+                       if (function_exists('imap_open') && !Config::get('system', 'imap_disabled')) {
                                $mailacct = DBA::selectFirst('mailacct', ['pubmail'], ['`uid` = ? AND `server` != ""', local_user()]);
                                if (DBA::isResult($mailacct)) {
                                        $mail_enabled = true;
@@ -283,17 +281,20 @@ class ACL extends BaseObject
 
                        if (empty($default_permissions['hidewall'])) {
                                if ($mail_enabled) {
-                                       $selected = $pubmail_enabled ? ' checked="checked"' : '';
-                                       $jotnets .= '<div class="profile-jot-net"><input type="checkbox" name="pubmail_enable"' . $selected . ' value="1" /> ' . L10n::t("Post to Email") . '</div>';
+                                       $jotnets_fields[] = [
+                                               'type' => 'checkbox',
+                                               'field' => [
+                                                       'pubmail_enable',
+                                                       L10n::t('Post to Email'),
+                                                       $pubmail_enabled
+                                               ]
+                                       ];
                                }
 
-                               Hook::callAll('jot_networks', $jotnets);
-                       } else {
-                               $jotnets .= L10n::t('Connectors disabled, since "%s" is enabled.',
-                                               L10n::t('Hide your profile details from unknown viewers?'));
+                               Hook::callAll('jot_networks', $jotnets_fields);
                        }
                }
-               
+
                $tpl = Renderer::getMarkupTemplate('acl_selector.tpl');
                $o = Renderer::replaceMacros($tpl, [
                        '$showall' => L10n::t('Visible to everybody'),
@@ -306,7 +307,10 @@ class ACL extends BaseObject
                        '$networks' => $show_jotnets,
                        '$emailcc' => L10n::t('CC: email addresses'),
                        '$emtitle' => L10n::t('Example: bob@example.com, mary@example.com'),
-                       '$jotnets' => $jotnets,
+                       '$jotnets_enabled' => empty($default_permissions['hidewall']),
+                       '$jotnets_summary' => L10n::t('Connectors'),
+                       '$jotnets_fields' => $jotnets_fields,
+                       '$jotnets_disabled_label' => L10n::t('Connectors disabled, since "%s" is enabled.', L10n::t('Hide your profile details from unknown viewers?')),
                        '$aclModalTitle' => L10n::t('Permissions'),
                        '$aclModalDismiss' => L10n::t('Close'),
                        '$features' => [

diff --git a/view/global.css b/view/global.css
index afab5d9032e6839f2b615d26c821302c50a704ea..b48fa1a24abd3986a4047a57947350eb7ad198bf 100644 (file)
--- a/view/global.css
+++ b/view/global.css
@@ -1,6 +1,10 @@
 /* General style rules .*/
 .pull-right { float: right }
 
+details > summary {
+  cursor: pointer;
+}
+
 /* General designing elements */
 .btn {
   outline: none;

diff --git a/view/templates/acl_selector.tpl b/view/templates/acl_selector.tpl
index 48706535f4a0c34d0fd70ae79dbf7e50ec7cc943..6755f2a198fd13eab1af641a84eec303d647f420 100644 (file)
--- a/view/templates/acl_selector.tpl
+++ b/view/templates/acl_selector.tpl
@@ -19,9 +19,30 @@
 <hr style="clear:both"/>
 <div id="profile-jot-email-label">{{$emailcc}}</div><input type="text" name="emailcc" id="profile-jot-email" title="{{$emtitle}}" />
 <div id="profile-jot-email-end"></div>
-{{if $jotnets}}
-{{$jotnets nofilter}}
-{{/if}}{{/if}}
+
+       {{if $jotnets_fields}}
+               {{if $jotnets_fields|count < 3}}
+<div class="profile-jot-net">
+               {{else}}
+<details class="profile-jot-net">
+       <summary>{{$jotnets_summary}}</summary>
+               {{/if}}
+
+               {{foreach $jotnets_fields as $jotnets_field}}
+                       {{if $jotnets_field.type == 'checkbox'}}
+                               {{include file="field_checkbox.tpl" field=$jotnets_field.field}}
+                       {{elseif $jotnets_field.type == 'select'}}
+                               {{include file="field_select.tpl" field=$jotnets_field.field}}
+                       {{/if}}
+               {{/foreach}}
+
+               {{if $jotnets_fields|count >= 3}}
+</details>
+               {{else}}
+</div>
+               {{/if}}
+       {{/if}}
+{{/if}}
 
 <script>
 $(document).ready(function() {

diff --git a/view/theme/frio/templates/acl_selector.tpl b/view/theme/frio/templates/acl_selector.tpl
index 49a7226eca31c752ad3196ee96975d04223f4556..a96271671b20cea3fe91e15e1364ab6c14a1a258 100644 (file)
--- a/view/theme/frio/templates/acl_selector.tpl
+++ b/view/theme/frio/templates/acl_selector.tpl
@@ -26,9 +26,29 @@
 </div>
 <div id="profile-jot-email-end"></div>
 
-{{if $jotnets}}
-{{$jotnets nofilter}}
-{{/if}}{{/if}}
+       {{if $jotnets_fields}}
+               {{if $jotnets_fields|count < 3}}
+<div class="profile-jot-net">
+               {{else}}
+<details class="profile-jot-net">
+       <summary>{{$jotnets_summary}}</summary>
+               {{/if}}
+
+               {{foreach $jotnets_fields as $jotnets_field}}
+                       {{if $jotnets_field.type == 'checkbox'}}
+                               {{include file="field_checkbox.tpl" field=$jotnets_field.field}}
+                       {{elseif $jotnets_field.type == 'select'}}
+                               {{include file="field_select.tpl" field=$jotnets_field.field}}
+                       {{/if}}
+               {{/foreach}}
+
+               {{if $jotnets_fields|count >= 3}}
+</details>
+               {{else}}
+</div>
+               {{/if}}
+       {{/if}}
+{{/if}}
 
 <script type="text/javascript">
 $(document).ready(function() {