some work on the edit connection workflow explanation and connedit page. This needs a lot more attention, but it was screaming for any improvement in documenting why we tell you that the permissions have been changed but not saved.

3 files changed, 35 insertions, 17 deletions

diff --git a/view/css/mod_connedit.css b/view/css/mod_connedit.css
index e7b93a088..82cc6bc9d 100644
--- a/view/css/mod_connedit.css
+++ b/view/css/mod_connedit.css
@@ -14,15 +14,31 @@
 	margin-bottom: 5px !important;
 }
 
-.abook-pending-contact, .abook-permschange, .abook-autotext {
+.abook-pending-contact, .abook-autotext {
 	background: orange;
 	font-weight: bold;
 	margin: 10px;
 	padding: 20px 5px 10px;
 }
 
+.abook-permschange {
+	width: 100%;
+}
+
+.abook-perms-steps {
+	float: left;
+	width: 200px;
+	height: 210px;
+	background: orange;
+	font-weight: bold;
+	margin: 10px;
+	padding: 20px 5px 10px;
+
+}
+
 .abook-permssave {
 	margin-left: 10px;
+	clear: both;
 }
 
 #contact-slider {
diff --git a/view/js/mod_connedit.js b/view/js/mod_connedit.js
index fabf24e95..15b768929 100644
--- a/view/js/mod_connedit.js
+++ b/view/js/mod_connedit.js
@@ -1,7 +1,7 @@
 
 function abook_perms_msg() {
 	$('.abook-permschange').show();
-	$('.abook-permschange').html(aStr['permschange']);
+//	$('.abook-permschange').html(aStr['permschange']);
 	$('.abook-permssave').show();
 }
 
diff --git a/view/tpl/abook_edit.tpl b/view/tpl/abook_edit.tpl
index c2c11e4b1..bb20312fa 100755
--- a/view/tpl/abook_edit.tpl
+++ b/view/tpl/abook_edit.tpl
@@ -7,11 +7,27 @@
 <div id="connection-flag-tabs">
 {{$tabs}}
 </div>
+<div id="connection-edit-buttons">
+{{foreach $buttons as $b }}
+<button class="btn btn-sm btn-default" title="{{$b.title}}" onclick="window.location.href='{{$b.url}}'; return false;">{{$b.label}}</button>
+{{/foreach}}
 {{/if}}
 
 
-
 <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>
+
+<div class="abook-permssave" style="display: none;">
+<input class="contact-edit-submit" type="submit" name="done" value="{{$submit}}" />
+</div>
+
+
 
 {{if $last_update}}
 {{$lastupdtext}} {{$last_update}}
@@ -27,7 +43,6 @@
 {{/if}}
 
 
-<form id="abook-edit-form" action="connedit/{{$contact_id}}" method="post" >
 
 {{if $self}}
 <div class="abook-autotext">
@@ -40,10 +55,6 @@
 <input type="hidden" name="contact_id" value="{{$contact_id}}">
 <input id="contact-closeness-mirror" type="hidden" name="closeness" value="{{$close}}" />
 
-<div class="abook-permschange" style="display: none;"></div>
-<div class="abook-permssave" style="display: none;">
-<input class="contact-edit-submit" type="submit" name="done" value="{{$submit}}" />
-</div>
 
 
 {{if $is_pending}}
@@ -63,15 +74,6 @@
 
 <h3>{{$permlbl}}</h3>
 <div id="perm-desc" class="descriptive-text">{{$permnote}}</div>
-
-<br />
-
-<input class="contact-edit-submit" type="submit" name="done" value="{{$submit}}" />
-
-<div id="abook-advanced" class="fakelink" onclick="openClose('abook-advanced-panel');">{{$advanced}}</div>
-
-<div id="abook-advanced-panel" style="display: block;">
-
 <table>
 <tr><td></td><td class="abook-them">{{$them}}</td><td colspan="2" class="abook-me">{{$me}}</td><td></td></tr>
 <tr><td colspan="5"><hr /></td></tr>