5 files changed, 24 insertions, 9 deletions
diff --git a/view/tpl/abook_edit.tpl b/view/tpl/abook_edit.tpl
index bb20312fa..03b7e2440 100755
--- a/view/tpl/abook_edit.tpl
+++ b/view/tpl/abook_edit.tpl
@@ -17,12 +17,15 @@
 <div id="contact-edit-wrapper">
 <form id="abook-edit-form" action="connedit/{{$contact_id}}" method="post" >
 
-<div class="abook-permschange" style="display: none;">
-<div class="abook-perms-steps"><i class="icon-check"></i><br />{{$perms_step1}}</div>
-<div class="abook-perms-steps"><i class="icon-check-empty"></i><br />{{$perms_step2}}</div>
-<div class="abook-perms-steps"><i class="icon-check-empty"></i><br />{{$perms_step3}}</div>
+<div class="abook-permsnew" style="display: none;">
+<div class="abook-perms-msg">{{$perms_step1}}</div>
 </div>
 
+<div class="abook-permsmsg" style="display: none;">
+<div class="abook-perms-msg">{{$perms_new}}</div>
+</div>
+
+
 <div class="abook-permssave" style="display: none;">
 <input class="contact-edit-submit" type="submit" name="done" value="{{$submit}}" />
 </div>
@@ -88,6 +91,16 @@
 
 <input class="contact-edit-submit" type="submit" name="done" value="{{$submit}}" />
 
+{{if $self && $noperms}}
+<script>		
+	if(typeof(connectDefaultShare) !== 'undefined')
+		connectDefaultShare();
+	else
+		connectFullShare();
+	abook_perms_msg();
+</script>
+{{/if}}
+
 </form>
 </div>
 </div>
diff --git a/view/tpl/build_query.tpl b/view/tpl/build_query.tpl
index 8110b70b1..62f81b618 100755
--- a/view/tpl/build_query.tpl
+++ b/view/tpl/build_query.tpl
@@ -26,6 +26,7 @@
 	var bParam_dend = "{{$dend}}";
 	var bParam_dbegin = "{{$dbegin}}";
 	var bParam_mid = "{{$mid}}";
+	var bParam_verb = "{{$verb}}";
 
 	function buildCmd() {
 		var udargs = ((page_load) ? "/load" : "");
@@ -51,6 +52,7 @@
 		if(bParam_dend != "") bCmd = bCmd + "&dend=" + bParam_dend;
 		if(bParam_dbegin != "") bCmd = bCmd + "&dbegin=" + bParam_dbegin;
 		if(bParam_mid != "") bCmd = bCmd + "&mid=" + bParam_mid;
+		if(bParam_verb != "") bCmd = bCmd + "&verb=" + bParam_verb;
 		if(bParam_page != 1) bCmd = bCmd + "&page=" + bParam_page;
 		return(bCmd);
 	}
diff --git a/view/tpl/display-head.tpl b/view/tpl/display-head.tpl
index 007d33fe8..913784d98 100755
--- a/view/tpl/display-head.tpl
+++ b/view/tpl/display-head.tpl
@@ -1,8 +1,8 @@
 <script>
 $(document).ready(function() {
-	$(".comment-edit-wrapper textarea").contact_autocomplete(baseurl+"/acl?f=&n=1");
+	$(".comment-edit-wrapper textarea").editor_autocomplete(baseurl+"/acl?f=&n=1");
 	// make auto-complete work in more places
-	$(".wall-item-comment-wrapper textarea").contact_autocomplete(baseurl+"/acl?f=&n=1");
+	$(".wall-item-comment-wrapper textarea").editor_autocomplete(baseurl+"/acl?f=&n=1");
 });
 </script>
 
diff --git a/view/tpl/jot-header.tpl b/view/tpl/jot-header.tpl
index 8d26fc653..678d16a71 100755
--- a/view/tpl/jot-header.tpl
+++ b/view/tpl/jot-header.tpl
@@ -11,9 +11,9 @@ function initEditor(cb){
 			$("#profile-jot-text-loading").spin(false).hide();
 			$("#profile-jot-text").css({ 'height': 200, 'color': '#000' });
 			if(typeof channelId === 'undefined')
-				$("#profile-jot-text").contact_autocomplete(baseurl+"/acl");
+				$("#profile-jot-text").editor_autocomplete(baseurl+"/acl");
 			else
-				$("#profile-jot-text").contact_autocomplete(baseurl+"/acl",[channelId]); // Also gives suggestions from current channel's connections
+				$("#profile-jot-text").editor_autocomplete(baseurl+"/acl",[channelId]); // Also gives suggestions from current channel's connections
 			editor = true;
 			  $("a#jot-perms-icon").colorbox({ 
 				  'inline' : true, 
diff --git a/view/tpl/msg-header.tpl b/view/tpl/msg-header.tpl
index 85fa51b0a..e1d1c6d23 100755
--- a/view/tpl/msg-header.tpl
+++ b/view/tpl/msg-header.tpl
@@ -41,7 +41,7 @@ if(plaintext != 'none') {
 	});
 }
 else
-	$("#prvmail-text").contact_autocomplete(baseurl+"/acl");
+	$("#prvmail-text").editor_autocomplete(baseurl+"/acl");
 
 
 </script>