From c50bfa07ca3a456d69d73988f42e58e3282879e9 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Wed, 3 Aug 2016 21:16:57 +0200
Subject: multiple acl work

---
 view/tpl/jot.tpl | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'view/tpl/jot.tpl')

diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl
index 490349a04..a207989fb 100755
--- a/view/tpl/jot.tpl
+++ b/view/tpl/jot.tpl
@@ -1,4 +1,4 @@
-<form id="profile-jot-form" action="{{$action}}" method="post">
+<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}}'>
 	{{$mimeselect}}
 	{{$layoutselect}}
 	{{if $id_select}}
@@ -23,7 +23,6 @@
 		<input type="hidden" name="webpage" value="{{$webpage}}" />
 		<input type="hidden" name="preview" id="jot-preview" value="0" />
 		<input type="hidden" id="jot-consensus" name="consensus" value="{{if $consensus}}{{$consensus}}{{else}}0{{/if}}" />
-		{{if $showacl}}{{$acl}}{{/if}}
 
 		{{if $webpage}}
 		<div id="jot-pagetitle-wrap" class="jothidden">
@@ -166,11 +165,11 @@
 				</button>
 				{{/if}}
 				{{if $showacl}}
-				<button id="dbtn-acl" class="btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" title="{{$permset}}" onclick="return false;">
+				<button id="dbtn-acl" class="acl-select btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" title="{{$permset}}" type="button">
 					<i id="jot-perms-icon" class="fa fa-{{$lockstate}} jot-icons"></i>{{if $bang}}&nbsp;<i class="fa fa-exclamation jot-icons"></i>{{/if}}
 				</button>
 				{{/if}}
-				<button id="dbtn-submit" class="btn btn-primary btn-sm" type="submit" tabindex=3 name="button-submit" >{{$share}}</button>
+				<button id="dbtn-submit" class="acl-submit btn btn-primary btn-sm" type="submit" tabindex=3 name="button-submit">{{$share}}</button>
 			</div>
 			<div id="profile-jot-perms-end"></div>
 			<div id="profile-jot-plugin-wrapper">
@@ -184,6 +183,8 @@
 
 <div id="jot-preview-content" style="display:none;"></div>
 
+{{if $showacl}}{{$acl}}{{/if}}
+
 {{if $feature_expire}}
 <!-- Modal for item expiry-->
 <div class="modal" id="expiryModal" tabindex="-1" role="dialog" aria-labelledby="expiryModalLabel" aria-hidden="true">
-- 
cgit v1.2.3


From 908e15bc9041f757217ba8d3635a8d83a5544c46 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Wed, 3 Aug 2016 23:57:41 +0200
Subject: multi acl: port events

---
 view/tpl/jot.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'view/tpl/jot.tpl')

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}}
-- 
cgit v1.2.3


From bed0a5773fe2300979969b46ef633f28ab84bf43 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Fri, 5 Aug 2016 13:20:03 +0200
Subject: multi acl: port /rpost

---
 view/tpl/jot.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'view/tpl/jot.tpl')

diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl
index 661954623..a91c81ea9 100755
--- a/view/tpl/jot.tpl
+++ b/view/tpl/jot.tpl
@@ -165,7 +165,7 @@
 				</button>
 				{{/if}}
 				{{if $showacl}}
-				<button id="dbtn-acl" class="acl-select btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" title="{{$permset}}" type="button">
+				<button id="dbtn-acl" class="acl-select btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" title="{{$permset}}" type="button" data-form_id="profile-jot-form">
 					<i id="jot-perms-icon" class="fa fa-{{$lockstate}} jot-icons"></i>{{if $bang}}&nbsp;<i class="fa fa-exclamation jot-icons"></i>{{/if}}
 				</button>
 				{{/if}}
-- 
cgit v1.2.3