diff options
| -rw-r--r-- | include/acl_selectors.php | 3 | ||||
| -rwxr-xr-x | mod/events.php | 1 | ||||
| -rwxr-xr-x | view/tpl/event_form.tpl | 3 | ||||
| -rwxr-xr-x | view/tpl/event_head.tpl | 4 |
4 files changed, 6 insertions, 5 deletions
diff --git a/include/acl_selectors.php b/include/acl_selectors.php index 0b68ba227..5adafff2c 100644 --- a/include/acl_selectors.php +++ b/include/acl_selectors.php @@ -248,8 +248,7 @@ function populate_acl($defaults = null,$show_jotnets = true) { '$aclModalTitle' => t('Permissions'), '$aclModalDismiss' => t('Close') )); - - + return $o; } diff --git a/mod/events.php b/mod/events.php index c80d1dd39..d24f84d44 100755 --- a/mod/events.php +++ b/mod/events.php @@ -582,6 +582,7 @@ function events_content(&$a) { '$t_orig' => $t_orig, '$sh_text' => t('Share this event'), '$sh_checked' => $sh_checked, + '$permissions' => t('Permissions'), '$acl' => (($orig_event['event_xchan']) ? '' : populate_acl(((x($orig_event)) ? $orig_event : $perm_defaults),false)), '$submit' => t('Submit') diff --git a/view/tpl/event_form.tpl b/view/tpl/event_form.tpl index 2a580e3b8..d91e44458 100755 --- a/view/tpl/event_form.tpl +++ b/view/tpl/event_form.tpl @@ -66,7 +66,8 @@ <input type="checkbox" name="share" value="1" id="event-share-checkbox" {{$sh_checked}} /> <div id="event-share-text">{{$sh_text}}</div> <div id="event-share-break"></div> -{{$acl}} +<button id="event-permissions-button" class="btn btn-default btn-xs" data-toggle="modal" data-target="#aclModal" onclick="return false;">{{$permissions}}</button> + {{$acl}} <div class="clear"></div> <input id="event-submit" type="submit" name="submit" value="{{$submit}}" /> diff --git a/view/tpl/event_head.tpl b/view/tpl/event_head.tpl index 8388187d1..6f1d2f22c 100755 --- a/view/tpl/event_head.tpl +++ b/view/tpl/event_head.tpl @@ -115,10 +115,10 @@ $('#event-share-checkbox').change(function() { if ($('#event-share-checkbox').is(':checked')) { - $('#acl-wrapper').show(); + $('#event-permissions-button').show(); } else { - $('#acl-wrapper').hide(); + $('#event-permissions-button').hide(); } }).trigger('change'); |