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

provide lockstate for events and remove obsolete code

Browse Source
This commit is contained in:
Mario Vavti 2016-10-22 20:44:41 +02:00
parent 6bf92979a2
commit 5fb173149a
3 changed files with 3 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Zotlabs/Module/Events.php
View File

@ -440,8 +440,6 @@ class Events extends \Zotlabs\Web\Controller {
$permissions = ((x($orig_event)) ? $orig_event : $perm_defaults); $permissions = ((x($orig_event)) ? $orig_event : $perm_defaults);
//print_r(acl2json($permissions['allow_gid'])); killme();
$tpl = get_markup_template('event_form.tpl'); $tpl = get_markup_template('event_form.tpl');
$form = replace_macros($tpl,array( $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_text' => (($event_id) ? t('Edit Location') : t('Location')),
'$l_orig' => $l_orig, '$l_orig' => $l_orig,
'$t_orig' => $t_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'), '$preview' => t('Preview'),
'$perms_label' => t('Permission settings'), '$perms_label' => t('Permission settings'),
// populating the acl dialog was a permission description from view_stream because Cal.php, which // 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_cid' => acl2json($permissions['deny_cid']),
'$deny_gid' => acl2json($permissions['deny_gid']), '$deny_gid' => acl2json($permissions['deny_gid']),
'$lockstate' => (($acl->is_private()) ? 'lock' : 'unlock'),
'$submit' => t('Submit'), '$submit' => t('Submit'),
'$advanced' => t('Advanced Options') '$advanced' => t('Advanced Options')

2
view/tpl/event_form.tpl
View File

@ -111,7 +111,7 @@
<div class="btn-group pull-right"> <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> <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}} {{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}} {{/if}}
<button id="event-submit" class="btn btn-primary" type="submit" name="submit">{{$submit}}</button> <button id="event-submit" class="btn btn-primary" type="submit" name="submit">{{$submit}}</button>
</div> </div>

11
view/tpl/event_head.tpl
View File

@ -153,17 +153,6 @@
} }
}); });
// ACL
$('#id_distr').change(function() {
if ($('#id_distr').is(':checked')) {
$('#dbtn-acl').show();
}
else {
$('#dbtn-acl').hide();
}
}).trigger('change');
}); });
</script> </script>