another attempt to explain default permissions on connedit page

3 files changed, 42 insertions, 14 deletions

diff --git a/view/css/mod_connedit.css b/view/css/mod_connedit.css
index 82cc6bc9d..98c53602b 100644
--- a/view/css/mod_connedit.css
+++ b/view/css/mod_connedit.css
@@ -21,6 +21,13 @@
 	padding: 20px 5px 10px;
 }
 
+.abook-perms-msg {
+	background: orange;
+	font-weight: bold;
+	margin: 10px;
+	padding: 20px 5px 10px;
+}
+
 .abook-permschange {
 	width: 100%;
 }
diff --git a/view/js/mod_connedit.js b/view/js/mod_connedit.js
index 15b768929..765cbcc30 100644
--- a/view/js/mod_connedit.js
+++ b/view/js/mod_connedit.js
@@ -1,16 +1,23 @@
 
 function abook_perms_msg() {
-	$('.abook-permschange').show();
+	$('.abook-permsmsg').show();
 //	$('.abook-permschange').html(aStr['permschange']);
 	$('.abook-permssave').show();
 }
 
+function abook_perms_new() {
+	$('.abook-permsnew').show();
+	$('.abook-permssave').show();
+}
+
+
 $(document).ready(function() {
 	if(typeof(after_following) !== 'undefined' && after_following) {
 		if(typeof(connectDefaultShare) !== 'undefined')
 			connectDefaultShare();
 		else
 			connectFullShare();
+		abook_perms_new();
 	}
 
 	$('#id_pending').click(function() {
@@ -18,11 +25,12 @@ $(document).ready(function() {
 			connectDefaultShare();
 		else
 			connectFullShare();
+		abook_perms_new();
 	});
 
-	$('.abook-edit-me').click(function() {
-		abook_perms_msg();
-	});
+//	$('.abook-edit-me').click(function() {
+//		abook_perms_msg();
+//	});
 
 });
 
@@ -46,7 +54,7 @@ function connectFullShare() {
 	$('#me_id_perms_view_storage').attr('checked','checked');
 	$('#me_id_perms_republish').attr('checked','checked');
 	$('#me_id_perms_post_like').attr('checked','checked');
-	abook_perms_msg();
+//	abook_perms_msg();
 }
 
 function connectCautiousShare() {
@@ -64,7 +72,7 @@ function connectCautiousShare() {
 	$('#me_id_perms_post_comments').attr('checked','checked');
 	$('#me_id_perms_post_mail').attr('checked','checked');
 	$('#me_id_perms_post_like').attr('checked','checked');
-	abook_perms_msg();
+//	abook_perms_msg();
 
 }
 
@@ -87,7 +95,7 @@ function connectForum() {
 	$('#me_id_perms_tag_deliver').attr('checked','checked');
 	$('#me_id_perms_republish').attr('checked','checked');
 	$('#me_id_perms_post_like').attr('checked','checked');
-	abook_perms_msg();
+//	abook_perms_msg();
 
 }
 
@@ -96,7 +104,7 @@ function connectClear() {
 		if(! $(this).is(':disabled'))
 			$(this).removeAttr('checked');
 	});
-	abook_perms_msg();
+//	abook_perms_msg();
 
 }
 
@@ -112,7 +120,7 @@ function connectSoapBox() {
 	$('#me_id_perms_view_contacts').attr('checked','checked');
 	$('#me_id_perms_view_storage').attr('checked','checked');
 	$('#me_id_perms_view_pages').attr('checked','checked');
-	abook_perms_msg();
+//	abook_perms_msg();
 
 }
 
@@ -124,7 +132,7 @@ function connectFollowOnly() {
 	});
 
 	$('#me_id_perms_send_stream').attr('checked','checked');
-	abook_perms_msg();
+//	abook_perms_msg();
 
 }
 
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>