harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make jotnets modal

Browse Source
This commit is contained in:
redmatrix 2015-11-08 17:48:43 -08:00
parent 5c2692a8ea
commit 4e1c308162
3 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/acl_selectors.php
View File

@ -231,6 +231,7 @@ function populate_acl($defaults = null,$show_jotnets = true) {
$jotnets = ''; $jotnets = '';
if($show_jotnets) { if($show_jotnets) {
logger('jot_networks');
call_hooks('jot_networks', $jotnets); call_hooks('jot_networks', $jotnets);
} }
@ -243,6 +244,7 @@ function populate_acl($defaults = null,$show_jotnets = true) {
'$allowgid' => json_encode($allow_gid), '$allowgid' => json_encode($allow_gid),
'$denycid' => json_encode($deny_cid), '$denycid' => json_encode($deny_cid),
'$denygid' => json_encode($deny_gid), '$denygid' => json_encode($deny_gid),
'$jnetModalTitle' => t('Other networks and post services'),
'$jotnets' => $jotnets, '$jotnets' => $jotnets,
'$aclModalTitle' => t('Permissions'), '$aclModalTitle' => t('Permissions'),
'$aclModalDismiss' => t('Close') '$aclModalDismiss' => t('Close')

9
view/theme/redbasic/css/style.css
View File

@ -1382,6 +1382,15 @@ a.rconnect:hover, a.rateme:hover, div.rateme:hover {
border-radius: $radiuspx; 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 { .acl-list-item {
width: 48%; /* fallback if browser does not support calc() */ width: 48%; /* fallback if browser does not support calc() */
width: calc(50% - 10px); width: calc(50% - 10px);

13
view/tpl/acl_selector.tpl
View File

@ -6,13 +6,20 @@
<h4 class="modal-title">{{$aclModalTitle}}</h4> <h4 class="modal-title">{{$aclModalTitle}}</h4>
</div> </div>
<div class="modal-body"> <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"> <div id="acl-wrapper">
<button id="acl-showall" class="btn btn-block btn-default"><i class="icon-globe"></i> {{$showall}}</button> <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;"> <input type="text" id="acl-search" placeholder="&#xf002;">
{{if $jotnets}}
{{$jotnets}}
{{/if}}
<div id="acl-list"> <div id="acl-list">
<div id="acl-list-content"></div> <div id="acl-list-content"></div>