Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge

Zotlabs/Module/Channel.php

@@ -133,6 +133,7 @@ class Channel extends \Zotlabs\Web\Controller {
 					'nickname' => \App::$profile['channel_address'],
 					'lockstate' => (((strlen(\App::$profile['channel_allow_cid'])) || (strlen(\App::$profile['channel_allow_gid'])) || (strlen(\App::$profile['channel_deny_cid'])) || (strlen(\App::$profile['channel_deny_gid']))) ? 'lock' : 'unlock'),
 					'acl' => (($is_owner) ? populate_acl($channel_acl,true, \Zotlabs\Lib\PermissionDescription::fromGlobalPermission('view_stream'), get_post_aclDialogDescription(), 'acl_dialog_post') : ''),
+					'permissions' => (($is_owner) ? $channel_acl : ''),
 					'showacl' => (($is_owner) ? 'yes' : ''),
 					'bang' => '',
 					'visitor' => (($is_owner || $observer) ? true : false),

Zotlabs/Module/Chat.php

@@ -219,7 +219,6 @@ class Chat extends \Zotlabs\Web\Controller {
 			return $o;
 		}
 
-	
 		$acl = new \Zotlabs\Access\AccessList($channel);
 		$channel_acl = $acl->get();
 
@@ -234,6 +233,10 @@ class Chat extends \Zotlabs\Web\Controller {
 				'$chat_expire' => array('chat_expire',t('Expiration of chats (minutes)'),120,''),
 				'$permissions' =>  t('Permissions'),
 				'$acl' => populate_acl($channel_acl,false),
+				'$allow_cid' => acl2json($channel_acl['allow_cid']),
+				'$allow_gid' => acl2json($channel_acl['allow_gid']),
+				'$deny_cid' => acl2json($channel_acl['deny_cid']),
+				'$deny_gid' => acl2json($channel_acl['deny_gid']),
 				'$lockstate' => $lockstate,
 				'$submit' => t('Submit')
 	

Zotlabs/Module/Display.php

@@ -65,6 +65,7 @@ class Display extends \Zotlabs\Web\Controller {
 				'lockstate' => (($group || $cid || $channel['channel_allow_cid'] || $channel['channel_allow_gid'] || $channel['channel_deny_cid'] || $channel['channel_deny_gid']) ? 'lock' : 'unlock'),
 	
 				'acl' => populate_acl($channel_acl),
+				'permissions' => $channel_acl,
 				'bang' => '',
 				'visitor' => true,
 				'profile_uid' => local_channel(),

Zotlabs/Module/Editwebpage.php

@@ -151,6 +151,7 @@ class Editwebpage extends \Zotlabs\Web\Controller {
 			'post_id' => $post_id,
 			'visitor' => ($is_owner) ? true : false,
 			'acl' => populate_acl($itm[0],false,\Zotlabs\Lib\PermissionDescription::fromGlobalPermission('view_pages')),
+			'permissions' => $itm[0],
 			'showacl' => ($is_owner) ? true : false,
 			'mimetype' => $mimetype,
 			'mimeselect' => true,

Zotlabs/Module/Events.php

@@ -436,6 +436,10 @@ class Events extends \Zotlabs\Web\Controller {
 			$acl = new \Zotlabs\Access\AccessList($channel);
 			$perm_defaults = $acl->get();
 
+			$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(
@@ -467,10 +471,16 @@ class Events extends \Zotlabs\Web\Controller {
 				'$sh_checked' => $sh_checked,
 				'$share' => array('share', t('Share this event'), $sh_checked, '', array(t('No'),t('Yes'))),
 				'$preview' => t('Preview'),
-				'$permissions' => t('Permission settings'),
+				'$perms_label' => t('Permission settings'),
 				// populating the acl dialog was a permission description from view_stream because Cal.php, which
 				// displays events, says "since we don't currently have an event permission - use the stream permission"
 				'$acl' => (($orig_event['event_xchan']) ? '' : populate_acl(((x($orig_event)) ? $orig_event : $perm_defaults), false, \Zotlabs\Lib\PermissionDescription::fromGlobalPermission('view_stream'))),
+
+				'$allow_cid' => acl2json($permissions['allow_cid']),
+				'$allow_gid' => acl2json($permissions['allow_gid']),
+				'$deny_cid' => acl2json($permissions['deny_cid']),
+				'$deny_gid' => acl2json($permissions['deny_gid']),
+
 				'$submit' => t('Submit'),
 				'$advanced' => t('Advanced Options')
 	

Zotlabs/Module/Filestorage.php

@@ -151,6 +151,10 @@ class Filestorage extends \Zotlabs\Web\Controller {
 				'$channelnick' => $channel['channel_address'],
 				'$permissions' => t('Permissions'),
 				'$aclselect' => $aclselect_e,
+				'$allow_cid' => acl2json($f['allow_cid']),
+				'$allow_gid' => acl2json($f['allow_gid']),
+				'$deny_cid' => acl2json($f['deny_cid']),
+				'$deny_gid' => acl2json($f['deny_gid']),
 				'$lockstate' => $lockstate,
 				'$permset' => t('Set/edit permissions'),
 				'$recurse' => array('recurse', t('Include all files and sub folders'), 0, '', array(t('No'), t('Yes'))),
@@ -161,7 +165,7 @@ class Filestorage extends \Zotlabs\Web\Controller {
 				'$submit' => t('Submit'),
 				'$attach_btn_title' => t('Share this file'),
 				'$link_btn_title' => t('Show URL to this file'),
-				'$notify' => array('notify', t('Notify your contacts about this file'), 0, '', array(t('No'), t('Yes')))
+				'$notify' => array('notify', t('Notify your contacts about this file'), 0, '', array(t('No'), t('Yes'))),
 			));
 	
 			echo $o;

Zotlabs/Module/Mitem.php

@@ -153,6 +153,10 @@ class Mitem extends \Zotlabs\Web\Controller {
 				'$permissions' => t('Menu Item Permissions'),
 				'$permdesc'    => t("\x28click to open/close\x29"),
 				'$aclselect'   => populate_acl($acl->get(),false),
+				'$allow_cid'   => acl2json($acl->get()['allow_cid']),
+				'$allow_gid'   => acl2json($acl->get()['allow_gid']),
+				'$deny_cid'    => acl2json($acl->get()['deny_cid']),
+				'$deny_gid'    => acl2json($acl->get()['deny_gid']),
 				'$mitem_desc'  => array('mitem_desc', t('Link Name'), '', 'Visible name of the link','*'),
 				'$mitem_link'  => array('mitem_link', t('Link or Submenu Target'), '', t('Enter URL of the link or select a menu name to create a submenu'), '*', 'list="menu-names"'),
 				'$usezid'      => array('usezid', t('Use magic-auth if available'), true, '', array(t('No'), t('Yes'))),
@@ -226,6 +230,10 @@ class Mitem extends \Zotlabs\Web\Controller {
 					'$permissions' => t('Menu Item Permissions'),
 					'$permdesc' => t("\x28click to open/close\x29"),
 					'$aclselect' => populate_acl($mitem,false),
+					'$allow_cid' => acl2json($mitem['allow_cid']),
+					'$allow_gid' => acl2json($mitem['allow_gid']),
+					'$deny_cid' => acl2json($mitem['deny_cid']),
+					'$deny_gid' => acl2json($mitem['deny_gid']),
 					'$mitem_id' => intval(argv(2)),
 					'$mitem_desc' => array('mitem_desc', t('Link text'), $mitem['mitem_desc'], '','*'),
 					'$mitem_link'  => array('mitem_link', t('Link or Submenu Target'), $mitem['mitem_link'], 'Enter URL of the link or select a menu name to create a submenu', '*', 'list="menu-names"'),

Zotlabs/Module/Network.php

@@ -170,6 +170,7 @@ class Network extends \Zotlabs\Web\Controller {
 				'nickname'         => $channel['channel_address'],
 				'lockstate'        => (($private_editing || $channel['channel_allow_cid'] || $channel['channel_allow_gid'] || $channel['channel_deny_cid'] || $channel['channel_deny_gid']) ? 'lock' : 'unlock'),
 				'acl'              => populate_acl((($private_editing) ? $def_acl : $channel_acl), true, \Zotlabs\Lib\PermissionDescription::fromGlobalPermission('view_stream'), get_post_aclDialogDescription(), 'acl_dialog_post'),
+				'permissions'      => (($private_editing) ? $def_acl : $channel_acl),
 				'bang'             => (($private_editing) ? '!' : ''),
 				'visitor'          => true,
 				'profile_uid'      => local_channel(),

Zotlabs/Module/Photos.php

@@ -668,6 +668,10 @@ class Photos extends \Zotlabs\Web\Controller {
 				'$selname' => $selname,
 				'$permissions' => t('Permissions'),
 				'$aclselect' => $aclselect,
+				'$allow_cid' => acl2json($channel_acl['allow_cid']),
+				'$allow_gid' => acl2json($channel_acl['allow_gid']),
+				'$deny_cid' => acl2json($channel_acl['deny_cid']),
+				'$deny_gid' => acl2json($channel_acl['deny_gid']),
 				'$lockstate' => $lockstate,
 				'$uploader' => $ret['addon_text'],
 				'$default' => (($ret['default_upload']) ? true : false),
@@ -1042,6 +1046,10 @@ class Photos extends \Zotlabs\Web\Controller {
 					'tag_label' => t('Add a Tag'),
 					'permissions' => t('Permissions'),
 					'aclselect' => $aclselect_e,
+					'allow_cid' => acl2json($ph[0]['allow_cid']),
+					'allow_gid' => acl2json($ph[0]['allow_gid']),
+					'deny_cid' => acl2json($ph[0]['deny_cid']),
+					'deny_gid' => acl2json($ph[0]['deny_gid']),
 					'lockstate' => $lockstate[0],
 					'help_tags' => t('Example: @bob, @Barbara_Jensen, @jim@example.com'),
 					'item_id' => ((count($linked_items)) ? $link_item['id'] : 0),

Zotlabs/Module/Rpost.php

@@ -116,6 +116,7 @@ class Rpost extends \Zotlabs\Web\Controller {
 			'nickname' => $channel['channel_address'],
 			'lockstate' => (($acl->is_private()) ? 'lock' : 'unlock'),
 			'acl' => populate_acl($channel_acl, true, \Zotlabs\Lib\PermissionDescription::fromGlobalPermission('view_stream'), get_post_aclDialogDescription(), 'acl_dialog_post'),
+			'permissions' => $channel_acl,
 			'bang' => '',
 			'visitor' => true,
 			'profile_uid' => local_channel(),

Zotlabs/Module/Settings.php

@@ -1220,6 +1220,10 @@ class Settings extends \Zotlabs\Web\Controller {
 				'$permissions' => t('Default Post and Publish Permissions'),
 				'$permdesc' => t("\x28click to open/close\x29"),
 				'$aclselect' => populate_acl($perm_defaults, false, \Zotlabs\Lib\PermissionDescription::fromDescription(t('Use my default audience setting for the type of object published'))),
+				'$allow_cid' => acl2json($perm_defaults['allow_cid']),
+				'$allow_gid' => acl2json($perm_defaults['allow_gid']),
+				'$deny_cid' => acl2json($perm_defaults['deny_cid']),
+				'$deny_gid' => acl2json($perm_defaults['deny_gid']),
 				'$suggestme' => $suggestme,
 				'$group_select' => $group_select,
 				'$role' => array('permissions_role' , t('Channel permissions category:'), $permissions_role, '', get_roles()),
@@ -1282,7 +1286,7 @@ class Settings extends \Zotlabs\Web\Controller {
 	
 			call_hooks('settings_form',$o);
 	
-			$o .= '</form>' . "\r\n";
+			//$o .= '</form>' . "\r\n";
 	
 			return $o;
 		}

Zotlabs/Module/Thing.php

@@ -312,6 +312,10 @@ class Thing extends \Zotlabs\Web\Controller {
 				'$imgurl' => $r[0]['obj_imgurl'],
 				'$permissions' => t('Permissions'),
 				'$aclselect' => populate_acl($channel_acl,false),
+				'$allow_cid' => acl2json($channel_acl['allow_cid']),
+				'$allow_gid' => acl2json($channel_acl['allow_gid']),
+				'$deny_cid' => acl2json($channel_acl['deny_cid']),
+				'$deny_gid' => acl2json($channel_acl['deny_gid']),
 				'$lockstate' => $lockstate,
 				'$submit' => t('Submit')
 			));
@@ -358,6 +362,10 @@ class Thing extends \Zotlabs\Web\Controller {
 			'$img_lbl' => t('URL for photo of thing (optional)'),
 			'$permissions' => t('Permissions'),
 			'$aclselect' => populate_acl($channel_acl,false),
+			'$allow_cid' => acl2json($channel_acl['allow_cid']),
+			'$allow_gid' => acl2json($channel_acl['allow_gid']),
+			'$deny_cid' => acl2json($channel_acl['deny_cid']),
+			'$deny_gid' => acl2json($channel_acl['deny_gid']),
 			'$lockstate' => $lockstate,
 			'$submit' => t('Submit')
 		));

Zotlabs/Module/Webpages.php

@@ -127,6 +127,7 @@ class Webpages extends \Zotlabs\Web\Controller {
 			'nickname' => \App::$profile['channel_address'],
 			'lockstate' => (($channel['channel_allow_cid'] || $channel['channel_allow_gid'] || $channel['channel_deny_cid'] || $channel['channel_deny_gid']) ? 'lock' : 'unlock'),
 			'acl' => (($is_owner) ? populate_acl($channel_acl,false, \Zotlabs\Lib\PermissionDescription::fromGlobalPermission('view_pages')) : ''),
+			'permissions' => (($is_owner) ? $channel_acl : ''),
 			'showacl' => (($is_owner) ? true : false),
 			'visitor' => true,
 			'hide_location' => true,

Zotlabs/Module/Wiki.php

@@ -77,8 +77,13 @@ class Wiki extends \Zotlabs\Web\Controller {
 						$local_observer['channel_allow_gid'] || 
 						$local_observer['channel_deny_cid'] || 
 						$local_observer['channel_deny_gid'])
-														? 'lock' : 'unlock'),
+						? 'lock' : 'unlock'
+					),
 					'acl' => populate_acl($channel_acl),
+					'allow_cid' => acl2json($channel_acl['allow_cid']),
+					'allow_gid' => acl2json($channel_acl['allow_gid']),
+					'deny_cid' => acl2json($channel_acl['deny_cid']),
+					'deny_gid' => acl2json($channel_acl['deny_gid']),
 					'bang' => ''
 			);
 		} else {
@@ -143,7 +148,7 @@ class Wiki extends \Zotlabs\Web\Controller {
 				$content = ($p['content'] !== '' ? htmlspecialchars_decode($p['content'],ENT_COMPAT) : '"# New page\n"');
 				// Render the Markdown-formatted page content in HTML
 				require_once('library/markdown.php');
-				$html = wiki_generate_toc(purify_html(Markdown(json_decode($content))));
+				$html = wiki_generate_toc(purify_html(Markdown(wiki_bbcode(json_decode($content)))));
 				$renderedContent = wiki_convert_links($html,argv(0).'/'.argv(1).'/'.$wikiUrlName);
 				$hide_editor = false;
 				$showPageControls = $wiki_editor;
@@ -186,6 +191,10 @@ class Wiki extends \Zotlabs\Web\Controller {
 			'$page' => $pageUrlName,
 			'$lockstate' => $x['lockstate'],
 			'$acl' => $x['acl'],
+			'$allow_cid' => $x['allow_cid'],
+			'$allow_gid' => $x['allow_gid'],
+			'$deny_cid' => $x['deny_cid'],
+			'$deny_gid' => $x['deny_gid'],
 			'$bang' => $x['bang'],
 			'$content' => $content,
 			'$renderedContent' => $renderedContent,
@@ -221,6 +230,7 @@ class Wiki extends \Zotlabs\Web\Controller {
 			$content = $_POST['content'];
 			$resource_id = $_POST['resource_id']; 
 			require_once('library/markdown.php');
+			$content = wiki_bbcode($content);
 			$html = wiki_generate_toc(purify_html(Markdown($content)));
 			$w = wiki_get_wiki($resource_id);
 			$wikiURL = argv(0).'/'.argv(1).'/'.$w['urlName'];

Zotlabs/Storage/Browser.php

@@ -324,6 +324,10 @@ class Browser extends DAV\Browser\Plugin {
 				'$quota' => $quota,
 				'$channick' => $this->auth->owner_nick,
 				'$aclselect' => $aclselect,
+				'$allow_cid' => acl2json($channel_acl['allow_cid']),
+				'$allow_gid' => acl2json($channel_acl['allow_gid']),
+				'$deny_cid' => acl2json($channel_acl['deny_cid']),
+				'$deny_gid' => acl2json($channel_acl['deny_gid']),
 				'$lockstate' => $lockstate,
 				'$return_url' => \App::$cmd,
 				'$dragdroptext' => t('Drop files here to immediately upload')

include/conversation.php

@@ -1253,6 +1253,10 @@ function status_editor($a, $x, $popup = false) {
 		'$visitor' => $x['visitor'],
 		'$lockstate' => $x['lockstate'],
 		'$acl' => $x['acl'],
+		'$allow_cid' => acl2json($x['permissions']['allow_cid']),
+		'$allow_gid' => acl2json($x['permissions']['allow_gid']),
+		'$deny_cid' => acl2json($x['permissions']['deny_cid']),
+		'$deny_gid' => acl2json($x['permissions']['deny_gid']),
 		'$mimeselect' => $mimeselect,
 		'$layoutselect' => $layoutselect,
 		'$showacl' => ((array_key_exists('showacl', $x)) ? $x['showacl'] : true),

include/text.php

@@ -2824,6 +2824,12 @@ function expand_acl($s) {
 	return $ret;
 }
 
+function acl2json($s) {
+	$s = expand_acl($s);
+	$s = json_encode($s);
+	return $s;
+}
+
 
 // When editing a webpage - a dropdown is needed to select a page layout
 // On submit, the pdl_select value (which is the mid of an item with item_type = ITEM_TYPE_PDL) is stored in 

include/wiki.php

@@ -495,6 +495,12 @@ function wiki_convert_links($s, $wikiURL) {
 	return $s;
 }
 
+/**
+ * Replace the instances of the string [toc] with a list element that will be populated by
+ * a table of contents by the JavaScript library
+ * @param string $s
+ * @return string
+ */
 function wiki_generate_toc($s) {
 	
 	if (strpos($s,'[toc]') !== false) {
@@ -505,6 +511,39 @@ function wiki_generate_toc($s) {
 	return $s;
 }
 
+/**
+ *  Converts a select set of bbcode tags. Much of the code is copied from include/bbcode.php
+ * @param string $s
+ * @return string
+ */
+function wiki_bbcode($s) {
+		
+		$s = str_replace(array('[baseurl]', '[sitename]'), array(z_root(), get_config('system', 'sitename')), $s);
+		
+		$observer = App::get_observer();
+		if ($observer) {
+				$s1 = '<span class="bb_observer" title="' . t('Different viewers will see this text differently') . '">';
+				$s2 = '</span>';
+				$obsBaseURL = $observer['xchan_connurl'];
+				$obsBaseURL = preg_replace("/\/poco\/.*$/", '', $obsBaseURL);
+				$s = str_replace('[observer.baseurl]', $obsBaseURL, $s);
+				$s = str_replace('[observer.url]', $observer['xchan_url'], $s);
+				$s = str_replace('[observer.name]', $s1 . $observer['xchan_name'] . $s2, $s);
+				$s = str_replace('[observer.address]', $s1 . $observer['xchan_addr'] . $s2, $s);
+				$s = str_replace('[observer.webname]', substr($observer['xchan_addr'], 0, strpos($observer['xchan_addr'], '@')), $s);
+				$s = str_replace('[observer.photo]', '', $s);
+		} else {
+				$s = str_replace('[observer.baseurl]', '', $s);
+				$s = str_replace('[observer.url]', '', $s);
+				$s = str_replace('[observer.name]', '', $s);
+				$s = str_replace('[observer.address]', '', $s);
+				$s = str_replace('[observer.webname]', '', $s);
+				$s = str_replace('[observer.photo]', '', $s);
+		}
+
+		return $s;
+}
+
 // This function is derived from 
 // http://stackoverflow.com/questions/32068537/generate-table-of-contents-from-markdown-in-php
 function wiki_toc($content) {

view/js/acl.js

@@ -1,15 +1,17 @@
-function ACL(backend_url, preset) {
+function ACL(backend_url) {
 	that = this;
 
 	that.url = backend_url;
 
 	that.kp_timer = null;
 
-	if (preset === undefined) preset = [];
+	that.self = [];
-	that.allow_cid = (preset[0] || []);
+
-	that.allow_gid = (preset[1] || []);
+	that.allow_cid = [];
-	that.deny_cid  = (preset[2] || []);
+	that.allow_gid = [];
-	that.deny_gid  = (preset[3] || []);
+	that.deny_cid  = [];
+	that.deny_gid  = [];
+
 	that.group_uids = [];
 
 	that.info         = $("#acl-info");
@@ -21,11 +23,8 @@ function ACL(backend_url, preset) {
 	that.showlimited  = $("#acl-showlimited");
 	that.acl_select   = $("#acl-select");
 
-	that.preset = preset;
-	that.self = [];
-
 	// set the initial ACL lists in case the enclosing form gets submitted before the ajax loader completes. 
-	that.on_submit();
+	//that.on_submit();
 
 	/*events*/
 
@@ -47,6 +46,10 @@ function ACL(backend_url, preset) {
 			}
 		});
 
+		$(document).on('focus', '.acl-form', that.get_form_data);
+		$(document).on('click', '.acl-form', that.get_form_data);
+		$(document).on('click', '.acl-form-trigger', that.get_form_data);
+
 		$(document).on('click','.acl-button-show',that.on_button_show);
 		$(document).on('click','.acl-button-hide',that.on_button_hide);
 
@@ -54,29 +57,44 @@ function ACL(backend_url, preset) {
 
 		/* startup! */
 		that.get(0,15000);
-		that.on_submit();
+		//that.on_submit();
 	});
 }
 
-// no longer called only on submit - call to update whenever a change occurs to the acl list. 
 
+ACL.prototype.get_form_data = function(event) { 
+
+		form_id = $(this).data('form_id');
+		that.form_id = $('#' + form_id);
+
+		that.allow_cid = (that.form_id.data('allow_cid') || []);
+		that.allow_gid = (that.form_id.data('allow_gid') || []);
+		that.deny_cid  = (that.form_id.data('deny_cid') || []);
+		that.deny_gid  = (that.form_id.data('deny_gid') || []);
+
+		that.update_view();
+		that.on_submit();
+
+}
+
+// no longer called only on submit - call to update whenever a change occurs to the acl list. 
 ACL.prototype.on_submit = function() {
-	aclfields = $("#acl-fields").html("");
+
+	$('.acl-field').remove();
+
 	$(that.allow_gid).each(function(i,v) {
-		aclfields.append("<input type='hidden' name='group_allow[]' value='"+v+"'>");
+		that.form_id.append("<input class='acl-field' type='hidden' name='group_allow[]' value='"+v+"'>");
 	});
 	$(that.allow_cid).each(function(i,v) {
-		aclfields.append("<input type='hidden' name='contact_allow[]' value='"+v+"'>");
+		that.form_id.append("<input class='acl-field' type='hidden' name='contact_allow[]' value='"+v+"'>");
 	});
 	$(that.deny_gid).each(function(i,v) {
-		aclfields.append("<input type='hidden' name='group_deny[]' value='"+v+"'>");
+		that.form_id.append("<input class='acl-field' type='hidden' name='group_deny[]' value='"+v+"'>");
 	});
 	$(that.deny_cid).each(function(i,v) {
-		aclfields.append("<input type='hidden' name='contact_deny[]' value='"+v+"'>");
+		that.form_id.append("<input class='acl-field' type='hidden' name='contact_deny[]' value='"+v+"'>");
 	});
 
-	//areYouSure jquery plugin: recheck the form here
-	$('form').trigger('checkform.areYouSure');
 };
 
 ACL.prototype.search = function() {
@@ -101,6 +119,7 @@ ACL.prototype.on_onlyme = function(event) {
 	that.deny_cid  = [];
 	that.deny_gid  = [];
 
+
 	that.update_view(event.target.value);
 	that.on_submit();
 
@@ -126,14 +145,14 @@ ACL.prototype.on_showlimited = function(event) {
 	// preventDefault() isn't called here as we want state changes from update_view() to be applied to the radiobutton
 	event.stopPropagation();
 
-	if(that.preset[0].length === 0 && that.preset[1].length === 0 && that.preset[2].length === 0 && that.preset[3].length === 0) {
+	if(that.allow_cid.length === 0 && that.allow_gid.length === 0 && that.deny_cid.length === 0 && that.deny_gid.length === 0) {
-		that.preset[0] = [that.self[0]];
+		that.allow_cid = [that.self[0]];
 	}
 
-	that.allow_cid = (that.preset[0] || []);
+	that.allow_cid = (that.allow_cid || []);
-	that.allow_gid = (that.preset[1] || []);
+	that.allow_gid = (that.allow_gid || []);
-	that.deny_cid  = (that.preset[2] || []);
+	that.deny_cid  = (that.deny_cid || []);
-	that.deny_gid  = (that.preset[3] || []);
+	that.deny_gid  = (that.deny_gid || []);
 
 	that.update_view(event.target.value);
 	that.on_submit();
@@ -239,13 +258,19 @@ ACL.prototype.set_deny = function(itemid) {
 	that.update_view();
 };
 
-ACL.prototype.update_select = function(preset) {
+ACL.prototype.update_select = function(set) {
-	that.showall.prop('selected', preset === 'public');
+	that.showall.prop('selected', set === 'public');
-	that.onlyme.prop('selected', preset === 'onlyme');
+	that.onlyme.prop('selected', set === 'onlyme');
-	that.showlimited.prop('selected', preset === 'limited');
+	that.showlimited.prop('selected', set === 'limited');
 };
 
 ACL.prototype.update_view = function(value) {
+	if(that.form_id) {
+		that.form_id.data('allow_cid', that.allow_cid);
+		that.form_id.data('allow_gid', that.allow_gid);
+		that.form_id.data('deny_cid', that.deny_cid);
+		that.form_id.data('deny_gid', that.deny_gid);
+	}
 
 	if (that.allow_gid.length === 0 && that.allow_cid.length === 0 && that.deny_gid.length === 0 && that.deny_cid.length === 0) {
 		that.list.hide(); //hide acl-list
@@ -259,8 +284,8 @@ ACL.prototype.update_view = function(value) {
 	}
 
 	// if value != 'onlyme' we should fall through this one
-	else if (that.allow_gid.length === 0 && that.allow_cid.length === 1 && that.allow_cid[0] === that.self[0] && that.deny_gid.length === 0 && that.deny_cid.length === 0 && value === 'onlyme') {
+	else if (that.allow_gid.length === 0 && that.allow_cid.length === 1 && that.allow_cid[0] === that.self[0] && that.deny_gid.length === 0 && that.deny_cid.length === 0 && value !== 'limited') {
-		that.list.hide(); //hide acl-list if
+		that.list.hide(); //hide acl-list
 		that.info.hide(); //show acl-info
 		that.update_select('onlyme');
 
@@ -363,5 +388,5 @@ ACL.prototype.populate = function(data) {
 		$(el).attr('src', $(el).data("src"));
 		$(el).removeAttr("data-src");
 	});
-	that.update_view();
+	//that.update_view();
 };

view/js/main.js

@@ -1015,8 +1015,6 @@ function filestorage(event, nick, id) {
 	$('#cloud-index-' + last_filestorage_id).removeClass('cloud-index-active');
 	$('#perms-panel-' + last_filestorage_id).hide().html('');
 	$('#file-edit-' + id).spin('tiny');
-	// What for do we need this here?
-	delete acl;
 	$.get('filestorage/' + nick + '/' + id + '/edit', function(data) {
 		$('#cloud-index-' + id).addClass('cloud-index-active');
 		$('#perms-panel-' + id).html(data).show();

view/js/mod_filestorage.js

@@ -1,17 +1,4 @@
 /**
  * JavaScript used by mod/filestorage
  */
-$(document).ready(function() {
+
-	$('#contact_allow, #contact_deny, #group_allow, #group_deny').change(function() {
-		var selstr;
-		$('#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected').each( function() {
-			selstr = $(this).text();
-			$('#jot-perms-icon').removeClass('fa-unlock').addClass('fa-lock');
-			$('#jot-public').hide();
-		});
-		if(selstr === null) {
-			$('#jot-perms-icon').removeClass('fa-lock').addClass('fa-unlock');
-			$('#jot-public').show();
-		}
-	}).trigger('change');
-});

view/tpl/acl_selector.tpl

@@ -1,3 +1,4 @@
+<form>
 <div class="modal" id="aclModal">
 	<div class="modal-dialog">
 		<div class="modal-content">
@@ -59,14 +60,13 @@
 		</div><!-- /.modal-content -->
 	</div><!-- /.modal-dialog -->
 </div><!-- /.modal -->
-
+</form>
 <script>
 	$('[data-toggle="popover"]').popover(); // Init the popover, if present
 
 	if(typeof acl=="undefined"){
 		acl = new ACL(
-			baseurl+"/acl",
+			baseurl+"/acl"
-			[ {{$allowcid}},{{$allowgid}},{{$denycid}},{{$denygid}} ]
 		);
 	}
 </script>

view/tpl/attach_edit.tpl

@@ -1,4 +1,4 @@
-<form action="filestorage/{{$channelnick}}/{{$file.id}}/edit" method="post" >
+<form id="attach_edit_form_{{$file.id}}" action="filestorage/{{$channelnick}}/{{$file.id}}/edit" method="post" class="acl-form" data-form_id="attach_edit_form_{{$file.id}}" data-allow_cid='{{$allow_cid}}' data-allow_gid='{{$allow_gid}}' data-deny_cid='{{$deny_cid}}' data-deny_gid='{{$deny_gid}}'>
 	<input type="hidden" name="channelnick" value="{{$channelnick}}" />
 	<input type="hidden" name="filehash" value="{{$file.hash}}" />
 	<input type="hidden" name="uid" value="{{$uid}}" />
@@ -16,15 +16,13 @@
 		</button>
 	</div>
 	<div id="attach-edit-perms" class="btn-group pull-right">
-		<button id="dbtn-acl" class="btn btn-default btn-xs" data-toggle="modal" data-target="#aclModal" title="{{$permset}}" onclick="return false;">
+		<button id="dbtn-acl" class="btn btn-default btn-xs" data-toggle="modal" data-target="#aclModal" title="{{$permset}}" type="button">
 			<i id="jot-perms-icon" class="fa fa-{{$lockstate}} jot-icons"></i>
 		</button>
 		<button id="dbtn-submit" class="btn btn-primary btn-xs" type="submit" name="submit">
 			{{$submit}}
 		</button>
 	</div>
-	{{$aclselect}}
-
 	<div id="link-code" class="form-group">
 		<label for="">{{$cpldesc}}</label>
 		<input type="text" class="form-control" id="linkpasteinput" name="cutpasteextlink" value="{{$cloudpath}}" onclick="this.select();"/>

view/tpl/chatroom_new.tpl

@@ -1,12 +1,12 @@
 <div id="chatroom-new" class="section-content-tools-wrapper">
-	<form action="chat" method="post" >
+	<form id="chatroom-new-form" action="chat" method="post" class="acl-form" data-form_id="chatroom-new-form" data-allow_cid='{{$allow_cid}}' data-allow_gid='{{$allow_gid}}' data-deny_cid='{{$deny_cid}}' data-deny_gid='{{$deny_gid}}'>
 		{{include file="field_input.tpl" field=$name}}
 		{{include file="field_input.tpl" field=$chat_expire}}
-		{{$acl}}
 		<div class="btn-group pull-right">
 			<button id="dbtn-acl" class="btn btn-default" data-toggle="modal" data-target="#aclModal" title="{{$permissions}}" onclick="return false;" ><i id="jot-perms-icon" class="fa fa-{{$lockstate}}"></i></button>
-			<button id="dbtn-submit" class="btn btn-primary" type="submit" name="submit" value="{{$submit}}">{{$submit}}</button>
+			<button id="dbtn-submit" class="acl-submit btn btn-primary" type="submit" name="submit" value="{{$submit}}" data-formid="chatroom-new-form">{{$submit}}</button>
 		</div>
 		<div class="clear"></div>
 	</form>
 </div>
+{{$acl}}

view/tpl/chatrooms.tpl

@@ -1,7 +1,7 @@
 <div class="generic-content-wrapper">
 	<div class="section-title-wrapper">
 		{{if $is_owner}}
-		<button type="button" class="btn btn-success btn-xs pull-right" onclick="openClose('chatroom-new');"><i class="fa fa-plus-circle"></i>&nbsp;{{$newroom}}</button>
+		<button type="button" class="btn btn-success btn-xs pull-right acl-form-trigger" onclick="openClose('chatroom-new');" data-form_id="chatroom-new-form"><i class="fa fa-plus-circle"></i>&nbsp;{{$newroom}}</button>
 		{{/if}}
 		<h2>{{$header}}</h2>
 	</div>

view/tpl/cloud_actionspanel.tpl

@@ -9,12 +9,12 @@
 </div>
 <div id="files-upload-tools" class="section-content-tools-wrapper">
   {{if $quota.limit || $quota.used}}<div class="{{if $quota.warning}}section-content-danger-wrapper{{else}}section-content-info-wrapper{{/if}}">{{if $quota.warning}}<strong>{{$quota.warning}} </strong>{{/if}}{{$quota.desc}}</div>{{/if}}
-  <form id="ajax-upload-files" method="post" action="" enctype="multipart/form-data">
+  <form id="ajax-upload-files" method="post" action="" enctype="multipart/form-data"  class="acl-form" data-form_id="ajax-upload-files" data-allow_cid='{{$allow_cid}}' data-allow_gid='{{$allow_gid}}' data-deny_cid='{{$deny_cid}}' data-deny_gid='{{$deny_gid}}'>
     <input type="hidden" name="sabreAction" value="put">
     <label for="files-upload">{{$upload_header}}</label>
-    <div class="clear"></div>
     <input class="form-group pull-left" id="files-upload" type="file" name="file">
     <button id="upload-submit" class="btn btn-primary btn-sm pull-right" type="submit" value="{{$upload_submit}}">{{$upload_submit}}</button>
   </form>
   <div class="clear"></div>
 </div>
+{{$aclselect}}

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}}

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-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}}
@@ -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" 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}}
-				<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">

view/tpl/mitemedit.tpl

@@ -5,7 +5,7 @@
 	</div>
 {{/if}}
 	<div id="menu-element-creator" class="section-content-tools-wrapper" style="display: {{$display}};">
-		<form id="mitemedit" action="mitem/{{$menu_id}}{{if $mitem_id}}/{{$mitem_id}}{{/if}}{{if $sys}}?f=&sys=1{{/if}}" method="post" >
+		<form id="mitemedit" action="mitem/{{$menu_id}}{{if $mitem_id}}/{{$mitem_id}}{{/if}}{{if $sys}}?f=&sys=1{{/if}}" method="post" class="acl-form" data-form_id="mitemedit" data-allow_cid='{{$allow_cid}}' data-allow_gid='{{$allow_gid}}' data-deny_cid='{{$deny_cid}}' data-deny_gid='{{$deny_gid}}'>
 			<input type="hidden" name="menu_id" value="{{$menu_id}}" />
 			{{if $mitem_id}}
 			<input type="hidden" name="mitem_id" value="{{$mitem_id}}" />
@@ -32,10 +32,10 @@
 					{{/if}}
 					<button class="btn btn-primary btn-sm" type="submit" name="submit" value="{{$submit}}">{{$submit}}</button>
 				</div>
-				{{$aclselect}}
 			</div>
 			<div class="clear"></div>
 		</form>
+		{{$aclselect}}
 	</div>
 {{if $header}}
 </div>

view/tpl/photo_view.tpl

@@ -23,7 +23,7 @@
 					{{/if}}
 					{{if $edit}}
 					<li class="nav-item">
-						<a class="nav-link" href="#"  title="" onclick="openClose('photo-edit'); return false;"><i class="fa fa-pencil"></i>&nbsp;{{$edit.edit}}</a>
+						<a class="nav-link acl-form-trigger" href="#"  title="" onclick="openClose('photo-edit'); return false;" data-form_id="photo_edit_form"><i class="fa fa-pencil"></i>&nbsp;{{$edit.edit}}</a>
 					</li>
 					{{/if}}
 				</ul>
@@ -53,7 +53,7 @@
 	{{$map}}
 	</div>
 	<div id="photo-edit" class="section-content-tools-wrapper">
-		<form action="photos/{{$edit.nickname}}/{{$edit.resource_id}}" method="post" id="photo_edit_form">
+		<form action="photos/{{$edit.nickname}}/{{$edit.resource_id}}" method="post" id="photo_edit_form" class="acl-form" data-form_id="photo_edit_form" data-allow_cid='{{$edit.allow_cid}}' data-allow_gid='{{$edit.allow_gid}}' data-deny_cid='{{$edit.deny_cid}}' data-deny_gid='{{$edit.deny_gid}}'>
 			<input type="hidden" name="item_id" value="{{$edit.item_id}}" />
 			{{* album renaming is not supported atm.
 			<div class="form-group">
@@ -88,8 +88,6 @@
 			</div>
 			{{/if}}
 
-			{{$edit.aclselect}}
-
 			<div class="form-group pull-left">
 				<button class="btn btn-danger btn-sm" id="photo-edit-delete-button" type="submit" name="delete" value="{{$edit.delete}}" onclick="return confirmDelete();" />{{$edit.delete}}</button>
 			</div>
@@ -102,6 +100,7 @@
 				<button id="dbtn-submit" class="btn btn-primary btn-sm" type="submit" name="submit" >{{$edit.submit}}</button>
 			</div>
 		</form>
+		{{$edit.aclselect}}
 		<div id="photo-edit-end" class="clear"></div>
 	</div>
 	<div id="photo-view-wrapper">

view/tpl/photos_recent.tpl

@@ -2,7 +2,7 @@
 	<div class="section-title-wrapper">
 		<div class="pull-right">
 			{{if $can_post}}
-			<button class="btn btn-xs btn-success" title="{{$usage}}" onclick="openClose('photo-upload-form');"><i class="fa fa-arrow-circle-o-up"></i>&nbsp;{{$upload.0}}</button>
+			<button class="btn btn-xs btn-success acl-form-trigger" title="{{$usage}}" onclick="openClose('photo-upload-form');" data-form_id="photos-upload-form"><i class="fa fa-arrow-circle-o-up"></i>&nbsp;{{$upload.0}}</button>
 			{{/if}}
 			<button id="fullscreen-btn" type="button" class="btn btn-default btn-xs" onclick="makeFullScreen();"><i class="fa fa-expand"></i></button>
 			<button id="inline-btn" type="button" class="btn btn-default btn-xs" onclick="makeFullScreen(false);"><i class="fa fa-compress"></i></button>

view/tpl/photos_upload.tpl

@@ -1,6 +1,6 @@
 <div id="photo-upload-form">
 	<div class="section-content-tools-wrapper">
-		<form action="photos/{{$nickname}}" enctype="multipart/form-data" method="post" name="photos-upload-form" id="photos-upload-form">
+		<form action="photos/{{$nickname}}" enctype="multipart/form-data" method="post" name="photos-upload-form" id="photos-upload-form" class="acl-form" data-form_id="photos-upload-form" data-allow_cid='{{$allow_cid}}' data-allow_gid='{{$allow_gid}}' data-deny_cid='{{$deny_cid}}' data-deny_gid='{{$deny_gid}}'>
 			<input type="hidden" id="photos-upload-source" name="source" value="photos" />
 
 			<div class="form-group">
@@ -14,9 +14,6 @@
 				{{/foreach}}
 				</datalist>
 			</div>
-
-			{{$aclselect}}
-
 			{{if $default}}
 			<div class="form-group">
 				<input id="photos-upload-choose" type="file" name="userfile" />
@@ -59,5 +56,6 @@
 			{{/if}}
 		</form>
 	</div>
+	{{$aclselect}}
 	<div id="photos-upload-end" class="clear"></div>
 </div>

view/tpl/settings.tpl

@@ -5,7 +5,7 @@
 		<div class="clear"></div>
 	</div>
 	{{$nickname_block}}
-	<form action="settings" id="settings-form" method="post" autocomplete="off" >
+	<form action="settings" id="settings-form" method="post" autocomplete="off" class="acl-form" data-form_id="settings-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='form_security_token' value='{{$form_security_token}}' />
 		<div class="panel-group" id="settings" role="tablist" aria-multiselectable="true">
 			<div class="panel">
@@ -72,7 +72,6 @@
 							{{/if}}
 							<div id="settings-default-perms" class="form-group" >
 								<button type="button" class="btn btn-default" data-toggle="modal" data-target="#aclModal"><i id="jot-perms-icon" class="fa"></i>&nbsp;{{$permissions}}</button>
-								{{$aclselect}}
 							</div>
 							{{$group_select}}
 							{{include file="field_checkbox.tpl" field=$hide_presence}}
@@ -174,4 +173,5 @@
 			</div>
 		</div>
 	</form>
+	{{$aclselect}}
 </div>

view/tpl/thing_edit.tpl

@@ -1,5 +1,5 @@
 <h2>{{$thing_hdr}}</h2>
-<form action="thing" method="post" >
+<form id="thing-edit-form" action="thing" method="post" class="acl-form" data-form_id="thing-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="term_hash" value="{{$thing_hash}}" />
 
 {{if $multiprof }}
@@ -29,8 +29,6 @@
 
 <div class="thing-end"></div> 
 
-{{$aclselect}}
-
 {{if $lockstate}}
 	<button id="dbtn-acl" class="btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" onclick="return false;">
 		<i id="jot-perms-icon" class="fa fa-{{$lockstate}}"></i>
@@ -40,3 +38,4 @@
 
 <input type="submit" class="thing-submit" name="submit" value="{{$submit}}" />
 </form>
+{{$aclselect}}

view/tpl/thing_input.tpl

@@ -1,5 +1,5 @@
 <h2>{{$thing_hdr}}</h2>
-<form action="thing" method="post" >
+<form id="thing-new-form" action="thing" method="post" class="acl-form" data-form_id="thing-new-form" data-allow_cid='{{$allow_cid}}' data-allow_gid='{{$allow_gid}}' data-deny_cid='{{$deny_cid}}' data-deny_gid='{{$deny_gid}}'>
 
 {{if $multiprof }}
 <div class="thing-profile-label">{{$profile_lbl}}</div>
@@ -29,8 +29,6 @@
 
 <div class="thing-end"></div> 
 
-{{$aclselect}}
-
 {{if $lockstate}}
 	<button id="dbtn-acl" class="btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" onclick="return false;">
 		<i id="jot-perms-icon" class="fa fa-{{$lockstate}}"></i>
@@ -40,3 +38,4 @@
 
 <input type="submit" class="thing-submit" name="submit" value="{{$submit}}" />
 </form>
+{{$aclselect}}

view/tpl/webpagelist.tpl

@@ -2,7 +2,7 @@
 	<div class="section-title-wrapper">
 		{{if $editor}}
 		<div class="pull-right">
-			<button id="webpage-create-btn" class="btn btn-xs btn-success" onclick="openClose('webpage-editor');"><i class="fa fa-pencil-square-o"></i>&nbsp;{{$create}}</button>
+			<button id="webpage-create-btn" class="btn btn-xs btn-success acl-form-trigger" onclick="openClose('webpage-editor');" data-form_id="profile-jot-form"><i class="fa fa-pencil-square-o"></i>&nbsp;{{$create}}</button>
 		</div>
 		{{/if}}
 		<h2>{{$listtitle}}</h2>

view/tpl/wiki.tpl

@@ -15,7 +15,7 @@
   <div class="section-title-wrapper">
     <div class="pull-right">
       {{if $showNewWikiButton}}
-      <button class="btn btn-primary btn-xs" onclick="$('#new-page-form-wrapper').hide(); openClose('new-wiki-form-wrapper');">New Wiki</button>
+      <button class="btn btn-primary btn-xs acl-form-trigger" onclick="$('#new-page-form-wrapper').hide(); openClose('new-wiki-form-wrapper');" data-form_id="new-wiki-form">New Wiki</button>
       {{/if}}
       {{if $showNewPageButton}}
       <button class="btn btn-success btn-xs" onclick="$('#new-wiki-form-wrapper').hide(); openClose('new-page-form-wrapper');">New Page</button>
@@ -29,7 +29,7 @@
     <div class="clear"></div>
   </div>
 	<div id="new-wiki-form-wrapper" class="section-content-tools-wrapper" style="display:none;">
-      <form id="new-wiki-form" action="wiki/{{$channel}}/create/wiki" method="post" >
+      <form id="new-wiki-form" action="wiki/{{$channel}}/create/wiki" method="post" class="acl-form" data-form_id="new-wiki-form" data-allow_cid='{{$allow_cid}}' data-allow_gid='{{$allow_gid}}' data-deny_cid='{{$deny_cid}}' data-deny_gid='{{$deny_gid}}'>
         <div class="clear"></div>
         {{include file="field_input.tpl" field=$wikiName}}
         
@@ -45,15 +45,15 @@
         </div>
         
         <div class="btn-group pull-right">
-            <div id="profile-jot-submit-right" class="btn-group" style="margin-right: 20px;">
+            <div id="profile-jot-submit-right" class="btn-group">
                 <button id="dbtn-acl" class="btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" title="Permission settings" onclick="return false;">
-                    <i id="jot-perms-icon" class="fa fa-{{$lockstate}} jot-icons">{{$bang}}</i>
+                    <i id="jot-perms-icon" class="fa fa-{{$lockstate}} jot-icons"></i>{{$bang}}
                 </button>
-            </div>
                 <button id="new-wiki-submit" class="btn btn-primary" type="submit" name="submit" >Create Wiki</button>
             </div>
-        <div>{{$acl}}</div>
+        </div>
       </form>        
+     {{$acl}}
      <div class="clear"></div>
      <hr>
     </div>