aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/acl_selectors.php2
-rw-r--r--view/theme/redbasic/css/style.css9
-rwxr-xr-xview/tpl/acl_selector.tpl13
3 files changed, 21 insertions, 3 deletions
diff --git a/include/acl_selectors.php b/include/acl_selectors.php
index cb2266473..4d44ec12e 100644
--- a/include/acl_selectors.php
+++ b/include/acl_selectors.php
@@ -231,6 +231,7 @@ function populate_acl($defaults = null,$show_jotnets = true) {
$jotnets = '';
if($show_jotnets) {
+logger('jot_networks');
call_hooks('jot_networks', $jotnets);
}
@@ -243,6 +244,7 @@ function populate_acl($defaults = null,$show_jotnets = true) {
'$allowgid' => json_encode($allow_gid),
'$denycid' => json_encode($deny_cid),
'$denygid' => json_encode($deny_gid),
+ '$jnetModalTitle' => t('Other networks and post services'),
'$jotnets' => $jotnets,
'$aclModalTitle' => t('Permissions'),
'$aclModalDismiss' => t('Close')
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index e83610f51..17cc833ed 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -1382,6 +1382,15 @@ a.rconnect:hover, a.rateme:hover, div.rateme:hover {
border-radius: $radiuspx;
}
+#jotnets-wrapper {
+ background-color: rgb(238, 238, 238);
+ font-size: 120%;
+ border-radius: 4px;
+ padding: 7px 10px;
+ cursor: pointer;
+ margin-bottom: 10px;
+}
+
.acl-list-item {
width: 48%; /* fallback if browser does not support calc() */
width: calc(50% - 10px);
diff --git a/view/tpl/acl_selector.tpl b/view/tpl/acl_selector.tpl
index c7e039cd5..63a2900f4 100755
--- a/view/tpl/acl_selector.tpl
+++ b/view/tpl/acl_selector.tpl
@@ -6,13 +6,20 @@
<h4 class="modal-title">{{$aclModalTitle}}</h4>
</div>
<div class="modal-body">
+ {{if $jotnets}}
+ <div class="jotnets-wrapper" role="tab" id="jotnets-wrapper">
+ <a data-toggle="collapse" href="#jotnets-collapse" aria-expanded="false" aria-controls="jotnets-collapse">{{$jnetModalTitle}} <span class="caret"></span></a>
+ </div>
+ <div id="jotnets-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="acl-select">
+ {{$jotnets}}
+ <div class="clear"></div>
+ </div>
+ {{/if}}
+
<div id="acl-wrapper">
<button id="acl-showall" class="btn btn-block btn-default"><i class="icon-globe"></i> {{$showall}}</button>
<input type="text" id="acl-search" placeholder="&#xf002;">
- {{if $jotnets}}
- {{$jotnets}}
- {{/if}}
<div id="acl-list">
<div id="acl-list-content"></div>