aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
Diffstat (limited to 'view')
-rw-r--r--view/js/acl.js5
-rwxr-xr-xview/tpl/event_form.tpl9
-rwxr-xr-xview/tpl/jot.tpl2
3 files changed, 9 insertions, 7 deletions
diff --git a/view/js/acl.js b/view/js/acl.js
index 0006bcfca..175462250 100644
--- a/view/js/acl.js
+++ b/view/js/acl.js
@@ -64,13 +64,12 @@ function ACL(backend_url) {
ACL.prototype.get_form_data = function(event) {
-//event.preventDefault()
- form_id = $(this).data('formid');
+ form_id = $(this).data('form_id');
that.form_id = $('#' + form_id);
- console.log(event);
+ console.log(form_id);
that.allow_cid = ($(this).data('allow_cid') || []);
that.allow_gid = ($(this).data('allow_gid') || []);
diff --git a/view/tpl/event_form.tpl b/view/tpl/event_form.tpl
index fbeec9aa3..a2bb1f112 100755
--- a/view/tpl/event_form.tpl
+++ b/view/tpl/event_form.tpl
@@ -1,4 +1,4 @@
-<form id="event-edit-form" action="{{$post}}" method="post" >
+<form id="event-edit-form" action="{{$post}}" method="post" class="acl-form" data-form_id="event-edit-form" data-allow_cid='{{$allow_cid}}' data-allow_gid='{{$allow_gid}}' data-deny_cid='{{$deny_cid}}' data-deny_gid='{{$deny_gid}}'>
<input type="hidden" name="event_id" value="{{$eid}}" />
<input type="hidden" name="event_hash" value="{{$event_hash}}" />
@@ -107,7 +107,6 @@
{{if ! $eid}}
{{include file="field_checkbox.tpl" field=$share}}
- {{$acl}}
{{/if}}
<div class="clear"></div>
@@ -116,8 +115,12 @@
<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="{{$permissions}}"><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"></i></button>
{{/if}}
<button id="event-submit" class="btn btn-primary" type="submit" name="submit">{{$submit}}</button>
</div>
</form>
+
+{{if ! $eid}}
+ {{$acl}}
+{{/if}}
diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl
index a207989fb..661954623 100755
--- a/view/tpl/jot.tpl
+++ b/view/tpl/jot.tpl
@@ -1,4 +1,4 @@
-<form id="profile-jot-form" action="{{$action}}" method="post" class="acl-form" data-formid="profile-jot-form" data-allow_cid='{{$allow_cid}}' data-allow_gid='{{$allow_gid}}' data-deny_cid='{{$deny_cid}}' data-deny_gid='{{$deny_gid}}'>
+<form id="profile-jot-form" action="{{$action}}" method="post" class="acl-form" data-form_id="profile-jot-form" data-allow_cid='{{$allow_cid}}' data-allow_gid='{{$allow_gid}}' data-deny_cid='{{$deny_cid}}' data-deny_gid='{{$deny_gid}}'>
{{$mimeselect}}
{{$layoutselect}}
{{if $id_select}}