diff options
| author | Mario Vavti <mario@mariovavti.com> | 2016-10-22 20:44:41 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2016-10-22 20:44:41 +0200 |
| commit | 5fb173149a53361f9b91b0aa46323b9d4dbada7f (patch) | |
| tree | 9484f89678911652a6cf034b4aa944e6e33884d4 | |
| parent | 6bf92979a2afe6769e572846e344ffaf3b0c7d85 (diff) | |
| download | volse-hubzilla-5fb173149a53361f9b91b0aa46323b9d4dbada7f.tar.gz volse-hubzilla-5fb173149a53361f9b91b0aa46323b9d4dbada7f.tar.bz2 volse-hubzilla-5fb173149a53361f9b91b0aa46323b9d4dbada7f.zip | |
provide lockstate for events and remove obsolete code
| -rw-r--r-- | Zotlabs/Module/Events.php | 7 | ||||
| -rwxr-xr-x | view/tpl/event_form.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/event_head.tpl | 11 |
3 files changed, 3 insertions, 17 deletions
diff --git a/Zotlabs/Module/Events.php b/Zotlabs/Module/Events.php index faa46881f..26455cf8e 100644 --- a/Zotlabs/Module/Events.php +++ b/Zotlabs/Module/Events.php @@ -440,8 +440,6 @@ class Events extends \Zotlabs\Web\Controller { $permissions = ((x($orig_event)) ? $orig_event : $perm_defaults); - //print_r(acl2json($permissions['allow_gid'])); killme(); - $tpl = get_markup_template('event_form.tpl'); $form = replace_macros($tpl,array( @@ -469,9 +467,6 @@ class Events extends \Zotlabs\Web\Controller { '$l_text' => (($event_id) ? t('Edit Location') : t('Location')), '$l_orig' => $l_orig, '$t_orig' => $t_orig, - '$sh_text' => t('Share this event'), - '$sh_checked' => $sh_checked, - '$share' => array('distr', t('Share this event'), $sh_checked, '', array(t('No'),t('Yes'))), '$preview' => t('Preview'), '$perms_label' => t('Permission settings'), // populating the acl dialog was a permission description from view_stream because Cal.php, which @@ -483,6 +478,8 @@ class Events extends \Zotlabs\Web\Controller { '$deny_cid' => acl2json($permissions['deny_cid']), '$deny_gid' => acl2json($permissions['deny_gid']), + '$lockstate' => (($acl->is_private()) ? 'lock' : 'unlock'), + '$submit' => t('Submit'), '$advanced' => t('Advanced Options') diff --git a/view/tpl/event_form.tpl b/view/tpl/event_form.tpl index 0f37d8287..2c1fc762c 100755 --- a/view/tpl/event_form.tpl +++ b/view/tpl/event_form.tpl @@ -111,7 +111,7 @@ <div class="btn-group pull-right"> <button id="event-edit-preview-btn" class="btn btn-default" type="button" title="{{$preview}}" onclick="doEventPreview();"><i class="fa fa-eye" ></i></button> {{if ! $eid}} - <button id="dbtn-acl" class="btn btn-default" type="button" data-toggle="modal" data-target="#aclModal" title="{{$perms_label}}"><i id="jot-perms-icon" class="fa"></i></button> + <button id="dbtn-acl" class="btn btn-default" type="button" data-toggle="modal" data-target="#aclModal" title="{{$perms_label}}"><i id="jot-perms-icon" class="fa fa-{{$lockstate}}"></i></button> {{/if}} <button id="event-submit" class="btn btn-primary" type="submit" name="submit">{{$submit}}</button> </div> diff --git a/view/tpl/event_head.tpl b/view/tpl/event_head.tpl index 646c68564..1d1b6f15b 100755 --- a/view/tpl/event_head.tpl +++ b/view/tpl/event_head.tpl @@ -153,17 +153,6 @@ } }); - // ACL - $('#id_distr').change(function() { - - if ($('#id_distr').is(':checked')) { - $('#dbtn-acl').show(); - } - else { - $('#dbtn-acl').hide(); - } - }).trigger('change'); - }); </script> |