Revert "Merge branch '1.12RC'"

This reverts commit b89c869e7ce2586852607a55717f5388c88e275d, reversing
changes made to fbb357ac47f0c5823dd30aa9b955982035cef8ba.

27 files changed, 102 insertions, 427 deletions

diff --git a/view/tpl/acl_selector.tpl b/view/tpl/acl_selector.tpl
index ddeb25a39..60fae0a29 100755
--- a/view/tpl/acl_selector.tpl
+++ b/view/tpl/acl_selector.tpl
@@ -1,4 +1,3 @@
-<form>
 <div class="modal" id="aclModal">
 	<div class="modal-dialog">
 		<div class="modal-content">
@@ -60,13 +59,14 @@
 		</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>
diff --git a/view/tpl/attach_edit.tpl b/view/tpl/attach_edit.tpl
index 1d58004e5..965fb4819 100644
--- a/view/tpl/attach_edit.tpl
+++ b/view/tpl/attach_edit.tpl
@@ -1,4 +1,4 @@
-<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}}'>
+<form action="filestorage/{{$channelnick}}/{{$file.id}}/edit" method="post" >
 	<input type="hidden" name="channelnick" value="{{$channelnick}}" />
 	<input type="hidden" name="filehash" value="{{$file.hash}}" />
 	<input type="hidden" name="uid" value="{{$uid}}" />
@@ -16,13 +16,15 @@
 		</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}}" type="button">
+		<button id="dbtn-acl" class="btn btn-default btn-xs" data-toggle="modal" data-target="#aclModal" title="{{$permset}}" onclick="return false;">
 			<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();"/>
diff --git a/view/tpl/chatroom_new.tpl b/view/tpl/chatroom_new.tpl
index 1b7e0501a..a40313934 100644
--- a/view/tpl/chatroom_new.tpl
+++ b/view/tpl/chatroom_new.tpl
@@ -1,12 +1,12 @@
 <div id="chatroom-new" class="section-content-tools-wrapper">
-	<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}}'>
+	<form action="chat" method="post" >
 		{{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="acl-submit btn btn-primary" type="submit" name="submit" value="{{$submit}}" data-formid="chatroom-new-form">{{$submit}}</button>
+			<button id="dbtn-submit" class="btn btn-primary" type="submit" name="submit" value="{{$submit}}">{{$submit}}</button>
 		</div>
 		<div class="clear"></div>
 	</form>
 </div>
-{{$acl}}
diff --git a/view/tpl/chatrooms.tpl b/view/tpl/chatrooms.tpl
index 64f6e8d0f..04ebbcae4 100644
--- a/view/tpl/chatrooms.tpl
+++ b/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 acl-form-trigger" onclick="openClose('chatroom-new');" data-form_id="chatroom-new-form"><i class="fa fa-plus-circle"></i>&nbsp;{{$newroom}}</button>
+		<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>
 		{{/if}}
 		<h2>{{$header}}</h2>
 	</div>
diff --git a/view/tpl/cloud_actionspanel.tpl b/view/tpl/cloud_actionspanel.tpl
index b851e391e..81a586e75 100644
--- a/view/tpl/cloud_actionspanel.tpl
+++ b/view/tpl/cloud_actionspanel.tpl
@@ -1,43 +1,20 @@
 <div id="files-mkdir-tools" class="section-content-tools-wrapper">
 	<label for="files-mkdir">{{$folder_header}}</label>
-	<form id="mkdir-form" method="post" action="file_upload" class="acl-form" data-form_id="mkdir-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="sabreAction" value="mkcol"-->
-		<input type="hidden" name="folder" value="{{$folder}}" />
-		<input type="hidden" name="channick" value="{{$channick}}" />
-		<input type="hidden" name="return_url" value="{{$return_url}}" />
-		<input id="files-mkdir" type="text" name="filename" class="form-control form-group">
-		<div class="pull-right btn-group">
-			<div class="btn-group">
-				{{if $lockstate}}
-				<button class="btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" type="button">
-					<i class="jot-perms-icon fa fa-{{$lockstate}}"></i>
-				</button>
-				{{/if}}
-				<button class="btn btn-primary btn-sm pull-right" type="submit" value="{{$folder_submit}}">{{$folder_submit}}</button>
-			</div>
-		</div>
+	<form method="post" action="">
+		<input type="hidden" name="sabreAction" value="mkcol">
+		<input id="files-mkdir" type="text" name="name" class="form-control form-group">
+		<button class="btn btn-primary btn-sm pull-right" type="submit" value="{{$folder_submit}}">{{$folder_submit}}</button>
 	</form>
 	<div class="clear"></div>
 </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="file_upload" 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="directory" value="{{$path}}" />
-		<input type="hidden" name="channick" value="{{$channick}}" />
-		<input type="hidden" name="return_url" value="{{$return_url}}" />
-		<label for="files-upload">{{$upload_header}}</label>
-		<input class="form-group pull-left" id="files-upload" type="file" name="userfile">
-		<div class="pull-right btn-group">
-			<div class="btn-group">
-				{{if $lockstate}}
-				<button class="btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" type="button">
-					<i class="jot-perms-icon fa fa-{{$lockstate}}"></i>
-				</button>
-				{{/if}}
-				<button id="upload-submit" class="btn btn-primary btn-sm pull-right" type="submit" name="submit" value="{{$upload_submit}}">{{$upload_submit}}</button>
-			</div>
-		</div>
+	<label for="files-upload">{{$upload_header}}</label>
+	<form method="post" action="" enctype="multipart/form-data">
+		<input type="hidden" name="sabreAction" value="put">
+		<input class="form-group" id="files-upload" type="file" name="file">
+		<button class="btn btn-primary btn-sm pull-right" type="submit" value="{{$upload_submit}}">{{$upload_submit}}</button>
+		<!-- Name (optional): <input type="text" name="name"> we should rather provide a rename action in edit form-->
 	</form>
 	<div class="clear"></div>
 </div>
-{{$aclselect}}
diff --git a/view/tpl/cloud_directory.tpl b/view/tpl/cloud_directory.tpl
index 27dc8d03b..870f7e9e1 100644
--- a/view/tpl/cloud_directory.tpl
+++ b/view/tpl/cloud_directory.tpl
@@ -18,7 +18,6 @@
 			<td class="hidden-xs"></td>
 		</tr>
 	{{/if}}
-		<tr id="new-upload-progress-bar--1"></tr> {{* this is needed to append the upload files in the right order *}}
 	{{foreach $entries as $item}}
 		<tr id="cloud-index-{{$item.attachId}}">
 			<td><i class="fa {{$item.iconFromType}}" title="{{$item.type}}"></i></td>
@@ -39,7 +38,6 @@
 		<tr id="cloud-tools-{{$item.attachId}}">
 			<td id="perms-panel-{{$item.attachId}}" colspan="9"></td>
 		</tr>
-
 	{{/foreach}}
 	</table>
 </div>
diff --git a/view/tpl/comment_item.tpl b/view/tpl/comment_item.tpl
index 5920efafa..1d8bd671d 100755
--- a/view/tpl/comment_item.tpl
+++ b/view/tpl/comment_item.tpl
@@ -10,7 +10,7 @@
 				<input type="hidden" name="return" value="{{$return_path}}" />
 				<input type="hidden" name="jsreload" value="{{$jsreload}}" />
 				<input type="hidden" name="preview" id="comment-preview-inp-{{$id}}" value="0" />
-				<textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty" name="body" onFocus="commentOpenUI(this,{{$id}});" onBlur="commentCloseUI(this,{{$id}});" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" >{{$comment}}</textarea>
+				<textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty" name="body" onFocus="commentOpenUI(this,{{$id}});" onBlur="commentCloseUI(this,{{$id}});" >{{$comment}}</textarea>
 				{{if $qcomment}}
 					<select id="qcomment-select-{{$id}}" name="qcomment-{{$id}}" class="qcomment" onchange="qCommentInsert(this,{{$id}});" >
 					<option value=""></option>
@@ -71,4 +71,3 @@
 				<div class="clear"></div>
 			</form>
 		</div>
-		<div id="comment-edit-preview-{{$id}}" class="comment-edit-preview"></div>
diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl
index add80885b..903a23eed 100755
--- a/view/tpl/conv_item.tpl
+++ b/view/tpl/conv_item.tpl
@@ -225,6 +225,7 @@
 		<div class="wall-item-comment-wrapper{{if $item.children}} wall-item-comment-wrapper-wc{{/if}}" >
 			{{$item.comment}}
 		</div>
+		<div id="comment-edit-preview-{{$item.id}}" class="comment-edit-preview"></div>
 		<div class="clear"></div>
 		{{/if}}
 	</div>
diff --git a/view/tpl/diaspora_vcard.tpl b/view/tpl/diaspora_vcard.tpl
index 017eb555c..3812823da 100644
--- a/view/tpl/diaspora_vcard.tpl
+++ b/view/tpl/diaspora_vcard.tpl
@@ -8,7 +8,7 @@
 	<dl class='entity_nickname'>
 		<dt>Nickname</dt>
 		<dd>		
-			<span class="nickname p-nickname">{{$diaspora.nickname}}</span>
+			<a class="nickname p-nickname">{{$diaspora.nickname}}</a>
 		</dd>
 	</dl>
 	<dl class='entity_full_name'>
@@ -33,25 +33,25 @@
 	<dl class="entity_url">
 		<dt>URL</dt>
 		<dd>
-			<a href="{{$diaspora.podloc}}/" id="pod_location" class="url" rel="me" >{{$diaspora.podloc}}/</a>
+			<a href="{{$diaspora.podloc}}/" id="pod_location" >{{$diaspora.podloc}}/</a>
 		</dd>
 	</dl>
 	<dl class="entity_photo">
 		<dt>Photo</dt>
 		<dd>
-			<img class="photo u-photo avatar" height="300" width="300" src="{{$diaspora.photo300}}" />
+			<img class="photo u-photo avatar" height="300" width="300" src="{{$diaspora.photo300}}">
 		</dd>
 	</dl>
 	<dl class="entity_photo_medium">
 		<dt>Photo</dt>
 		<dd> 
-			<img class="photo u-photo avatar" height="100" width="100" src="{{$diaspora.photo100}}" />
+			<img class="photo u-photo avatar" height="100" width="100" src="{{$diaspora.photo100}}">
 		</dd>
 	</dl>
 	<dl class="entity_photo_small">
 		<dt>Photo</dt>
 		<dd>
-			<img class="photo u-photo avatar" height="50" width="50" src="{{$diaspora.photo50}}" />
+			<img class="photo u-photo avatar" height="50" width="50" src="{{$diaspora.photo50}}">
 		</dd>
 	</dl>
 	<dl class="entity_searchable">
@@ -60,10 +60,4 @@
 			<span class="searchable">{{$diaspora.searchable}}</span>
 		</dd>
 	</dl>
-	<dl class="entity_key">
-		<dt>Key</dt>
-		<dd>
-		<pre class="key">{{$diaspora.pubkey}}</pre>
-		</dd>
-	</dl>
 </div>
diff --git a/view/tpl/event_form.tpl b/view/tpl/event_form.tpl
index a2bb1f112..fbeec9aa3 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" 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}}'>
+<form id="event-edit-form" action="{{$post}}" method="post" >
 
 	<input type="hidden" name="event_id" value="{{$eid}}" />
 	<input type="hidden" name="event_hash" value="{{$event_hash}}" />
@@ -107,6 +107,7 @@
 
 	{{if ! $eid}}
 	{{include file="field_checkbox.tpl" field=$share}}
+	{{$acl}}
 	{{/if}}
 
 	<div class="clear"></div>
@@ -115,12 +116,8 @@
 	<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="{{$permissions}}"><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/field_acheckbox.tpl b/view/tpl/field_acheckbox.tpl
index c87b9ac79..b54a4f3c3 100755
--- a/view/tpl/field_acheckbox.tpl
+++ b/view/tpl/field_acheckbox.tpl
@@ -9,7 +9,7 @@
 	</td>
 	{{/if}}
 	<td class="abook-me">
-		{{if $self || !$field.5 || $twocol }}
+		{{if $self || !$field.5}}
 		<input type="checkbox" name='{{$field.0}}' class='abook-edit-me' id='me_id_{{$field.0}}' value="{{$field.4}}" {{if $field.3}}checked="checked"{{/if}} />
 		{{/if}}
 		{{if $notself && $field.5}}
diff --git a/view/tpl/jot-header.tpl b/view/tpl/jot-header.tpl
index 63691f842..e58278a85 100755
--- a/view/tpl/jot-header.tpl
+++ b/view/tpl/jot-header.tpl
@@ -164,12 +164,6 @@ function enableOnUser(){
 			});
 		} catch(e) {
 		}
-        
-        
-        // call initialization file
-        if (window.File && window.FileList && window.FileReader) {
-          DragDropUploadInit();
-        }
 	});
 
 	function deleteCheckedItems() {
@@ -268,32 +262,17 @@ function enableOnUser(){
 
 	function linkdrop(event) {
 		var reply = event.dataTransfer.getData("text/uri-list");
+		event.target.textContent = reply;
 		event.preventDefault();
-		var editwin = '#' + event.target.id;
-		var commentwin = false;
-		if(editwin) {
-			commentwin = ((editwin.indexOf('comment') >= 0) ? true : false);
-			if(commentwin) {
-				var commentid = editwin.substring(editwin.lastIndexOf('-') + 1);
-				commentOpen(document.getElementById(event.target.id),commentid);
-			}
-		}
-
 		if(reply && reply.length) {
 			reply = bin2hex(reply);
 			$('#profile-rotator').spin('tiny');
 			$.get('{{$baseurl}}/linkinfo?f=&binurl=' + reply, function(data) {
-				if(commentwin) {
-					$(editwin).val( $(editwin).val() + data );
-					$('#profile-rotator').spin(false);
-				}
-				else {
-					if (!editor) $("#profile-jot-text").val("");
-					initEditor(function(){
+				if (!editor) $("#profile-jot-text").val("");
+				initEditor(function(){
 					addeditortext(data);
 					$('#profile-rotator').spin(false);
-					});
-				}
+				});
 			});
 		}
 	}
@@ -467,82 +446,7 @@ function enableOnUser(){
             },
         'json');
     };
-
-    //
-    // initialize
-    function DragDropUploadInit() {
-
-      var filedrag = $("#profile-jot-text");
-
-      // is XHR2 available?
-      var xhr = new XMLHttpRequest();
-      if (xhr.upload) {
-
-        // file drop
-        filedrag.on("dragover", DragDropUploadFileHover);
-        filedrag.on("dragleave", DragDropUploadFileHover);
-        filedrag.on("drop", DragDropUploadFileSelectHandler);
-
-      }
-
-      window.filesToUpload = 0;
-      window.fileUploadsCompleted = 0;
-
-
-    }
-
-    // file drag hover
-    function DragDropUploadFileHover(e) {
-      e.stopPropagation();
-      e.preventDefault();
-      e.target.className = (e.type == "dragover" ? "hover" : "");
-    }
-
-    // file selection
-    function DragDropUploadFileSelectHandler(e) {
-
-      // cancel event and hover styling
-      DragDropUploadFileHover(e);
-
-
-      // fetch FileList object
-      var files = e.target.files || e.originalEvent.dataTransfer.files;
-      // process all File objects
-      for (var i = 0, f; f = files[i]; i++) {
-        DragDropUploadFile(f, i);
-      }
-
-    }
-
-    // upload  files
-    function DragDropUploadFile(file, idx) {
-
-      window.filesToUpload = window.filesToUpload + 1;
-
-      var xhr = new XMLHttpRequest();
-      xhr.withCredentials = true;   // Include the SESSION cookie info for authentication
-      (xhr.upload || xhr).addEventListener('progress', function (e) {
-         $('#profile-rotator').spin('tiny');
-      });
-      xhr.addEventListener('load', function (e) {
-        //console.log('xhr upload complete', e);
-        window.fileUploadsCompleted = window.fileUploadsCompleted + 1;
-		addeditortext(xhr.responseText);
-		$('#jot-media').val($('#jot-media').val() + xhr.responseText);
-        // When all the uploads have completed, refresh the page
-        if (window.filesToUpload > 0 && window.fileUploadsCompleted === window.filesToUpload) {  
-          $('#profile-rotator').spin(false);
-          window.fileUploadsCompleted = window.filesToUpload = 0;
-        }
-      });
-      // POST to the wall_upload endpoint
-      xhr.open('post', '{{$baseurl}}/wall_attach/{{$nickname}}', true);
-
-      var data = new FormData();
-      data.append('userfile', file);
-      xhr.send(data);
-    }
-
+    
 </script>
 
 <script>
diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl
index 692cf129d..490349a04 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-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}}'>
+<form id="profile-jot-form" action="{{$action}}" method="post">
 	{{$mimeselect}}
 	{{$layoutselect}}
 	{{if $id_select}}
@@ -23,6 +23,7 @@
 		<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">
@@ -38,7 +39,7 @@
 		</div>
 		{{/if}}
 		<div id="jot-text-wrap">
-			<textarea class="profile-jot-text" id="profile-jot-text" name="body" tabindex=2 placeholder="{{$share}}" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" >{{$content}}</textarea>
+			<textarea class="profile-jot-text" id="profile-jot-text" name="body" tabindex=2 placeholder="{{$share}}">{{$content}}</textarea>
 		</div>
 		{{if $attachment}}
 		<div id="jot-attachment-wrap">
@@ -165,11 +166,11 @@
 				</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" data-form_id="profile-jot-form">
+				<button id="dbtn-acl" class="btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" title="{{$permset}}" onclick="return false;">
 					<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="acl-submit btn btn-primary btn-sm" type="submit" tabindex=3 name="button-submit">{{$share}}</button>
+				<button id="dbtn-submit" class="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">
@@ -183,8 +184,6 @@
 
 <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">
diff --git a/view/tpl/mitemedit.tpl b/view/tpl/mitemedit.tpl
index a06203244..865c587ec 100644
--- a/view/tpl/mitemedit.tpl
+++ b/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" 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}}'>
+		<form id="mitemedit" action="mitem/{{$menu_id}}{{if $mitem_id}}/{{$mitem_id}}{{/if}}{{if $sys}}?f=&sys=1{{/if}}" method="post" >
 			<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>
diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl
index 5be6d21bd..c0e17d6b5 100755
--- a/view/tpl/nav.tpl
+++ b/view/tpl/nav.tpl
@@ -12,7 +12,7 @@
 				<i class="fa fa-arrow-circle-right" id="expand-aside-icon"></i>
 			</button>
 			{{if $nav.help.6}}
-			<button id="context-help-btn" class="navbar-toggle" type="button" onclick="contextualHelp(); return false;">
+			<button id="context-help-btn"class="navbar-toggle" type="button" onclick="contextualHelp(); return false;">
 				<i class="fa fa-question-circle"></i>
 			</button>
 			{{/if}}
@@ -56,7 +56,7 @@
 			{{if !$userinfo}}
 			{{if $nav.loginmenu}}
 				<li class="{{$nav.loginmenu.0.2}} hidden-xs">
-					<a data-toggle="dropdown" href="{{$nav.loginmenu.0.0}}" title="{{$nav.loginmenu.0.3}}" id="{{$nav.loginmenu.0.4}}">{{$nav.loginmenu.0.1}} <span class="caret" id="loginmenu-caret"></span></a>
+					<a data-toggle="dropdown" data-target="#" href="{{$nav.loginmenu.0.0}}" title="{{$nav.loginmenu.0.3}}" id="{{$nav.loginmenu.0.4}}">{{$nav.loginmenu.0.1}} <span class="caret" id="loginmenu-caret"></span></a>
 					<ul class="dropdown-menu" role="menu">
 						{{foreach $nav.loginmenu as $loginmenu}}
 						<li role="presentation"><a class="{{$loginmenu.2}}" href="{{$loginmenu.0}}" title="{{$loginmenu.3}}" role="menuitem" id="{{$loginmenu.4}}">{{$loginmenu.1}}</a></li>
diff --git a/view/tpl/photo_view.tpl b/view/tpl/photo_view.tpl
index ec827d990..76259a8be 100755
--- a/view/tpl/photo_view.tpl
+++ b/view/tpl/photo_view.tpl
@@ -23,7 +23,7 @@
 					{{/if}}
 					{{if $edit}}
 					<li class="nav-item">
-						<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>
+						<a class="nav-link" href="#"  title="" onclick="openClose('photo-edit'); return false;"><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" 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}}'>
+		<form action="photos/{{$edit.nickname}}/{{$edit.resource_id}}" method="post" id="photo_edit_form">
 			<input type="hidden" name="item_id" value="{{$edit.item_id}}" />
 			{{* album renaming is not supported atm.
 			<div class="form-group">
@@ -88,6 +88,8 @@
 			</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>
@@ -100,7 +102,6 @@
 				<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">
diff --git a/view/tpl/photos_recent.tpl b/view/tpl/photos_recent.tpl
index 4cb1bc306..139f27a23 100755
--- a/view/tpl/photos_recent.tpl
+++ b/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 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>
+			<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>
 			{{/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>
diff --git a/view/tpl/photos_upload.tpl b/view/tpl/photos_upload.tpl
index 90cd0e84a..6b98a8ac4 100755
--- a/view/tpl/photos_upload.tpl
+++ b/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" 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}}'>
+		<form action="photos/{{$nickname}}" enctype="multipart/form-data" method="post" name="photos-upload-form" id="photos-upload-form">
 			<input type="hidden" id="photos-upload-source" name="source" value="photos" />
 
 			<div class="form-group">
@@ -14,6 +14,9 @@
 				{{/foreach}}
 				</datalist>
 			</div>
+
+			{{$aclselect}}
+
 			{{if $default}}
 			<div class="form-group">
 				<input id="photos-upload-choose" type="file" name="userfile" />
@@ -56,6 +59,5 @@
 			{{/if}}
 		</form>
 	</div>
-	{{$aclselect}}
 	<div id="photos-upload-end" class="clear"></div>
 </div>
diff --git a/view/tpl/profile_advanced.tpl b/view/tpl/profile_advanced.tpl
index 59490ccc1..947bdd51c 100755
--- a/view/tpl/profile_advanced.tpl
+++ b/view/tpl/profile_advanced.tpl
@@ -1,38 +1,32 @@
 <div id="profile-content-wrapper" class="generic-content-wrapper">
 	<div class="section-title-wrapper">
-		<div class="pull-right">
+		<div class="pull-right dropdown">
+			{{if $editmenu.multi}}
+			<a class="btn btn-primary btn-xs dropdown-toggle" data-toggle="dropdown" href="#" ><i class="fa fa-pencil"></i>&nbsp;{{$editmenu.edit.3}}</a>
+			<ul class="dropdown-menu" role="menu">
+				{{foreach $editmenu.menu.entries as $e}}
+				<li>
+					<a href="profiles/{{$e.id}}"><img class="dropdown-menu-img-xs" src='{{$e.photo}}'>{{$e.profile_name}}<div class='clear'></div></a>
+				</li>
+				{{/foreach}}
+				<li><a href="profile_photo" >{{$editmenu.menu.chg_photo}}</a></li>
+				{{if $editmenu.menu.cr_new}}<li><a href="profiles/new" id="profile-listing-new-link">{{$editmenu.menu.cr_new}}</a></li>{{/if}}
+			</ul>
+			{{elseif $editmenu}}
+			<a class="btn btn-primary btn-xs" href="{{$editmenu.edit.0}}" ><i class="fa fa-pencil"></i>&nbsp;{{$editmenu.edit.3}}</a>
+			{{/if}}
+		</div>
+		<div class="pull-right dropdown">
 			{{if $profile.like_count}}
-			<div class="btn-group">
-				<button type="button" class="btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown" id="profile-like">{{$profile.like_count}} {{$profile.like_button_label}}</button>
-				{{if $profile.likers}}
-				<ul class="dropdown-menu dropdown-menu-right" role="menu" aria-labelledby="profile-like">{{foreach $profile.likers as $liker}}<li role="presentation"><a href="{{$liker.url}}"><img class="dropdown-menu-img-xs" src="{{$liker.photo}}" alt="{{$liker.name}}" /> {{$liker.name}}</a></li>{{/foreach}}</ul>
-				{{/if}}
-			</div>
+			<button type="button" class="btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown" id="profile-like">{{$profile.like_count}} {{$profile.like_button_label}}</button>
+			{{if $profile.likers}}
+			<ul class="dropdown-menu" role="menu" aria-labelledby="profile-like">{{foreach $profile.likers as $liker}}<li role="presentation"><a href="{{$liker.url}}"><img class="dropdown-menu-img-xs" src="{{$liker.photo}}" alt="{{$liker.name}}" /> {{$liker.name}}</a></li>{{/foreach}}</ul>
 			{{/if}}
-			{{if $profile.canlike}}
-			<div class="btn-group">
-				<button type="button" class="btn btn-success btn-xs" onclick="doprofilelike('profile/' + '{{$profile.profile_guid}}','like'); return false;" title="{{$profile.likethis}}" >
-					<i class="fa fa-thumbs-o-up" title="{{$profile.likethis}}"></i>
-				</button>
-			</div>
 			{{/if}}
-			{{if $editmenu.multi}}
-			<div class="btn-group">
-				<a class="btn btn-primary btn-xs dropdown-toggle" data-toggle="dropdown" href="#" ><i class="fa fa-pencil"></i>&nbsp;{{$editmenu.edit.3}}</a>
-				<ul class="dropdown-menu dropdown-menu-right" role="menu">
-					{{foreach $editmenu.menu.entries as $e}}
-					<li>
-						<a href="profiles/{{$e.id}}"><img class="dropdown-menu-img-xs" src='{{$e.photo}}'>{{$e.profile_name}}<div class='clear'></div></a>
-					</li>
-					{{/foreach}}
-					<li><a href="profile_photo" >{{$editmenu.menu.chg_photo}}</a></li>
-					{{if $editmenu.menu.cr_new}}<li><a href="profiles/new" id="profile-listing-new-link">{{$editmenu.menu.cr_new}}</a></li>{{/if}}
-				</ul>
-			</div>
-			{{elseif $editmenu}}
-			<div class="btn-group">
-				<a class="btn btn-primary btn-xs" href="{{$editmenu.edit.0}}" ><i class="fa fa-pencil"></i>&nbsp;{{$editmenu.edit.3}}</a>
-			</div>
+			{{if $profile.canlike}}
+			<button type="button" class="btn btn-success btn-xs" onclick="doprofilelike('profile/' + '{{$profile.profile_guid}}','like'); return false;" title="{{$profile.likethis}}" >
+				<i class="fa fa-thumbs-o-up" title="{{$profile.likethis}}"></i>
+			</button>
 			{{/if}}
 		</div>
 		<h2>{{$title}}</h2>
diff --git a/view/tpl/settings.tpl b/view/tpl/settings.tpl
index 0ec44e9ff..8157196ac 100755
--- a/view/tpl/settings.tpl
+++ b/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" 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}}'>
+	<form action="settings" id="settings-form" method="post" autocomplete="off" >
 		<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,6 +72,7 @@
 							{{/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}}
@@ -173,5 +174,4 @@
 			</div>
 		</div>
 	</form>
-	{{$aclselect}}
 </div>
diff --git a/view/tpl/settings_tokens.tpl b/view/tpl/settings_tokens.tpl
index 6f08ce971..22af381e9 100644
--- a/view/tpl/settings_tokens.tpl
+++ b/view/tpl/settings_tokens.tpl
@@ -17,45 +17,13 @@
 			<div class="settings-submit-wrapper form-group">
 				<button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button>
 			</div>
+		</form>
+		<div class="descriptive-text">{{$desc2}}</div>
+		<ul>
+			<li>{{$url1}}<span class="zat-example">?f=&zat=<span class="token-mirror"></span></span></li>
+			<li>{{$url2}}<span class="zat-example">?f=&zat=<span class="token-mirror"></span></span></li>
+		</ul>
 	</div>
-
-	<div class="panel">
-		<div class="section-subtitle-wrapper" role="tab" id="perms-tool">
-			<h3>
-				<a data-toggle="collapse" data-parent="#contact-edit-tools" href="#perms-tool-collapse" aria-expanded="true" aria-controls="perms-tool-collapse">
-				{{$permlbl}}
-				</a>
-			</h3>
-		</div>
-		<div id="perms-tool-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="perms-tool">
-			<div class="section-content-tools-wrapper">
-				<div class="section-content-warning-wrapper">
-				{{$permnote}}
-				</div>
-
-				<table id="perms-tool-table" class=form-group>
-					<tr>
-						<td></td><td class="abook-them">{{$them}}</td><td colspan="2" class="abook-me">{{$me}}</td>
-					</tr>
-						{{foreach $perms as $prm}}
-						{{include file="field_acheckbox.tpl" field=$prm}}
-						{{/foreach}}
-				</table>
-
-				<div class="settings-submit-wrapper" >
-					<button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button>
-				</div>
-			</div>
-		</div>
-	</div>
-	</form>
-
-	<div class="descriptive-text">{{$desc2}}</div>
-	<ul>
-		<li>{{$url1}}<span class="zat-example">?f=&zat=<span class="token-mirror"></span></span></li>
-		<li>{{$url2}}<span class="zat-example">?f=&zat=<span class="token-mirror"></span></span></li>
-	</ul>
-
 	{{if $tokens}}
 	<div class="section-content-wrapper-np">
 		<table id="atoken-index">
diff --git a/view/tpl/thing_edit.tpl b/view/tpl/thing_edit.tpl
index b23584fe1..356693782 100644
--- a/view/tpl/thing_edit.tpl
+++ b/view/tpl/thing_edit.tpl
@@ -1,5 +1,5 @@
 <h2>{{$thing_hdr}}</h2>
-<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}}'>
+<form action="thing" method="post" >
 <input type="hidden" name="term_hash" value="{{$thing_hash}}" />
 
 {{if $multiprof }}
@@ -29,6 +29,8 @@
 
 <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>
@@ -38,4 +40,3 @@
 
 <input type="submit" class="thing-submit" name="submit" value="{{$submit}}" />
 </form>
-{{$aclselect}}
diff --git a/view/tpl/thing_input.tpl b/view/tpl/thing_input.tpl
index 3e178925c..75497e878 100644
--- a/view/tpl/thing_input.tpl
+++ b/view/tpl/thing_input.tpl
@@ -1,5 +1,5 @@
 <h2>{{$thing_hdr}}</h2>
-<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}}'>
+<form action="thing" method="post" >
 
 {{if $multiprof }}
 <div class="thing-profile-label">{{$profile_lbl}}</div>
@@ -29,6 +29,8 @@
 
 <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>
@@ -38,4 +40,3 @@
 
 <input type="submit" class="thing-submit" name="submit" value="{{$submit}}" />
 </form>
-{{$aclselect}}
diff --git a/view/tpl/webpage_import.tpl b/view/tpl/webpage_import.tpl
deleted file mode 100644
index fdc983932..000000000
--- a/view/tpl/webpage_import.tpl
+++ /dev/null
@@ -1,126 +0,0 @@
-<div class="generic-content-wrapper">
-		<form action="" method="post" autocomplete="on" >
-		<input type="hidden" name="action" value="importselected">
-		<div class="section-title-wrapper">
-			<div class="pull-right">				
-					<button class="btn btn-md btn-success" type="submit" name="submit" value="{{$importbtn}}">{{$importbtn}}</button>
-			</div>
-			<h2>{{$title}}</h2>
-			<div class="clear"></div>
-		</div>
-		<div id="import-website-content-wrapper" class="section-content-wrapper">
-						<div class="pull-left">
-								<button id="toggle-select-all" class="btn btn-xs btn-primary" onclick="checkedAll(window.isChecked); return false;"><i class="fa fa-check"></i>&nbsp;Toggle Select All</button>
-						</div>
-						<div class="clear"></div>
-						<h4>Scanned Pages</h4>
-						<div>
-						<table class="table-striped table-responsive table-hover" style="width: 100%;">
-							<tr><td>Import?</td><td>Page</td><!--<td>Existing Page</td>--></tr>
-						{{foreach $pages as $page}}
-								<tr>
-									<td>
-										<div class='squaredTwo'>
-										<input type="checkbox" id="page_{{$page.pagelink}}" name="page[]" value="{{$page.pagelink}}">
-										<label for="page_{{$page.pagelink}}"></label>
-										</div>
-									</td>
-									<td>
-										<div class='desc'>
-											Page Link: {{$page.pagelink}}<br>
-											Layout: {{$page.layout}}<br>
-											Title: {{$page.title}}<br>
-											Content File: {{$page.contentfile}}<br>
-											Type: {{$page.type}}<br>
-										</div>
-									</td>
-								<!-- TODO: Retrieve existing element information to avoid accidental overwriting
-									<td>
-										<div class='desc'>
-											Name: {{$page.curpage.pagelink}}<br>
-											Layout: {{$page.curpage.layout}}<br>
-											Title: {{$page.curpage.title}}<br>
-											Last edit: {{$page.curpage.edited}}<br>
-											Type: {{$page.curpage.type}}<br>
-										</div>
-									</td>
-								-->
-								</tr>
-						{{/foreach}}
-						</table>
-						</div>
-
-
-						<h4>Scanned Layouts</h4>
-						<div>
-						<table class="table-striped table-responsive table-hover" style="width: 100%;">
-								<tr><td>Import?</td><td>Layout</td><!--<td>Existing Layout</td>--></tr>
-						{{foreach $layouts as $layout}}
-										<tr>
-												<td>
-														<div class='squaredTwo'>
-														<input type="checkbox" id="layout_{{$layout.name}}" name="layout[]" value="{{$layout.name}}">
-														<label for="layout_{{$layout.name}}"></label>
-														</div>
-												</td>
-												<td>
-														<div class='desc'>
-																Name: {{$layout.name}}<br>
-																Description: {{$layout.description}}<br>
-																Content File: {{$layout.contentfile}}<br>
-														</div>
-												</td>
-												<!-- TODO: Retrieve existing element information to avoid accidental overwriting
-												<td>
-														<div class='desc'>
-																Name: {{$layout.curblock.name}}<br>
-																Title: {{$layout.curblock.description}}<br>
-																Last edit: {{$layout.curblock.edited}}<br>
-														</div>
-												</td>
-												-->
-										</tr>
-						{{/foreach}}
-						</table>
-						</div>
-
-						<h4>Scanned Blocks</h4>
-						<div>
-						<table class="table-striped table-responsive table-hover" style="width: 100%;">
-								<tr><td>Import?</td><td>Block</td><!--<td>Existing Block</td>--></tr>
-						{{foreach $blocks as $block}}
-										<tr>
-												<td>
-														<div class='squaredTwo'>
-														<input type="checkbox" id="block_{{$block.name}}" name="block[]" value="{{$block.name}}">
-														<label for="block_{{$block.name}}"></label>
-														</div>
-												</td>
-												<td>
-														<div class='desc'>
-																Name: {{$block.name}}<br>
-																Title: {{$block.title}}<br>
-																Content File: {{$block.contentfile}}<br>
-																Type: {{$block.type}}<br>
-														</div>
-												</td>
-												<!-- TODO: Retrieve existing element information to avoid accidental overwriting
-												<td>
-														<div class='desc'>
-																Name: {{$block.curblock.name}}<br>
-																Title: {{$block.curblock.title}}<br>
-																Last edit: {{$block.curblock.edited}}<br>
-																Type: {{$block.curblock.type}}<br>
-														</div>
-												</td>
-												-->
-										</tr>
-						{{/foreach}}
-						</table>
-						</div>
-				
-		</div>
-		<div class="clear"></div>
-		</form>
-</div>
-
diff --git a/view/tpl/webpagelist.tpl b/view/tpl/webpagelist.tpl
index 4dec7518f..524460408 100644
--- a/view/tpl/webpagelist.tpl
+++ b/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 acl-form-trigger" onclick="openClose('webpage-editor');" data-form_id="profile-jot-form"><i class="fa fa-pencil-square-o"></i>&nbsp;{{$create}}</button>
+			<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>
 		</div>
 		{{/if}}
 		<h2>{{$listtitle}}</h2>
diff --git a/view/tpl/website_import_tools.tpl b/view/tpl/website_import_tools.tpl
deleted file mode 100644
index cb3e6b524..000000000
--- a/view/tpl/website_import_tools.tpl
+++ /dev/null
@@ -1,37 +0,0 @@
-<div id="website-import-tools" class="widget">
-		<h3>{{$title}}</h3>
-		<ul class="nav nav-pills nav-stacked">
-				<li>
-						<a href="#" onclick="openClose('import-form');
-					return false;"><i class="fa fa-cloud-upload generic-icons"></i> {{$import_label}}</a>
-				</li>
-				<li>
-						<form id="import-form" enctype="multipart/form-data" method="post" action="" style="display: none;" class="sub-menu">
-
-								<input type="hidden" name="action" value="scan">
-								
-								<p style="margin-top: 20px;" class="descriptive-text">{{$file_import_text}}</p>
-								<div class="form-group">
-										<div class="input-group">
-												<input class="widget-input" type="text" name="path" title="{{$hint}}" placeholder="{{$desc}}" />
-												<div class="input-group-btn">
-														<button class="btn btn-default btn-sm" type="submit" name="cloudsubmit" value="{{$select}}"><i class="fa fa-folder-open generic-icons"></i></button>
-												</div>
-										</div>
-								</div>
-
-								<!-- Or upload a zipped file containing the website -->
-								<p class="descriptive-text">{{$file_upload_text}}</p>
-								<div class="form-group">
-
-										<div class="input-group">
-												<input class="widget-input" type="file" name="zip_file" />
-												<div class="input-group-btn">
-														<button class="btn btn-default btn-sm" type="submit" name="w_upload" value="w_upload"><i class="fa fa-file-archive-o generic-icons"></i></button>
-												</div>
-										</div>
-								</div>
-						</form>
-				</li>
-		</ul>
-</div>
diff --git a/view/tpl/wiki.tpl b/view/tpl/wiki.tpl
index c05b33a61..d9a4f8be3 100644
--- a/view/tpl/wiki.tpl
+++ b/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 acl-form-trigger" onclick="$('#new-page-form-wrapper').hide(); openClose('new-wiki-form-wrapper');" data-form_id="new-wiki-form">New Wiki</button>
+      <button class="btn btn-primary btn-xs" onclick="$('#new-page-form-wrapper').hide(); openClose('new-wiki-form-wrapper');">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" 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}}'>
+      <form id="new-wiki-form" action="wiki/{{$channel}}/create/wiki" method="post" >
         <div class="clear"></div>
         {{include file="field_input.tpl" field=$wikiName}}
         
@@ -45,17 +45,17 @@
         </div>
         
         <div class="btn-group pull-right">
-            <div id="profile-jot-submit-right" class="btn-group">
+            <div id="profile-jot-submit-right" class="btn-group" style="margin-right: 20px;">
                 <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"></i>{{$bang}}
+                    <i id="jot-perms-icon" class="fa fa-{{$lockstate}} jot-icons">{{$bang}}</i>
                 </button>
-                <button id="new-wiki-submit" class="btn btn-primary" type="submit" name="submit" >Create Wiki</button>
             </div>
+            <button id="new-wiki-submit" class="btn btn-primary" type="submit" name="submit" >Create Wiki</button>
         </div>
+        <div>{{$acl}}</div>
       </form>        
-     {{$acl}}
-     <div class="clear"></div>
-     <hr>
+      <div class="clear"></div>
+      <hr>
     </div>
   
 	<div id="new-page-form-wrapper" class="section-content-tools-wrapper" style="display:none;">