Merge remote-tracking branch 'upstream/master'

1 files changed, 75 insertions, 24 deletions

diff --git a/view/tpl/abook_edit.tpl b/view/tpl/abook_edit.tpl
index 606e61b80..b8b01df4c 100644..100755
--- a/view/tpl/abook_edit.tpl
+++ b/view/tpl/abook_edit.tpl
@@ -1,50 +1,101 @@
+<div class="generic-content-wrapper">
+<h2>{{$header}}</h2>
 
-<h2>$header</h2>
-
-<h3>$addr</h3>
+<h3>{{$addr}}</h3>
 
+{{if $notself}}
 <div id="connection-flag-tabs">
-$tabs
+{{$tabs}}
 </div>
+{{/if}}
+
+{{if $self}}
+<div id="autoperm-desc" class="descriptive-paragraph">{{$autolbl}}</div>
+{{/if}}
+
 
 <div id="contact-edit-wrapper">
 
-{{ if $slide }}
-<h3>$lbl_slider</h3>
+{{if $last_update}}
+{{$lastupdtext}} {{$last_update}}
+{{/if}}
+
+{{if $notself}}
+{{if $slide}}
+<h3>{{$lbl_slider}}</h3>
+
+{{$slide}}
+
+{{/if}}
+{{/if}}
+
+
+<form id="abook-edit-form" action="connedit/{{$contact_id}}" method="post" >
+<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>
+
+{{if $is_pending}}
+<div class="abook-pending-contact">
+{{include file="field_checkbox.tpl" field=$unapproved}}
+</div>
+{{/if}}
+
+{{if $multiprofs }}
+<div>
+<h3>{{$lbl_vis1}}</h3>
+<div>{{$lbl_vis2}}</div>
+
+{{$profile_select}}
+</div>
+{{/if}}
+
+<h3>{{$permlbl}}</h3>
+<div id="perm-desc" class="descriptive-text">{{$permnote}}</div>
 
-$slide
 
-{{ endif }}
+{{* {{if $noperms}}
+<div id="noperm-msg" class="warning-text">{{$noperms}}</div>
+<div id="noperm-text" class="descriptive-text">{{$noperm_desc}}</div>
+{{/if}}
+*}}
 
-<h3>Permissions</h3>
 
-<form action="connections/$contact_id" method="post" >
-<input type="hidden" name="contact_id" value="$contact_id">
-<input id="contact-closeness-mirror" type="hidden" name="closeness" value="$close" />
 
 <br />
-<b>$quick</b>
+<h3>{{$quick}}</h3>
 <ul>
-<li><a href="#" onclick="connectFullShare(); return false;">$full</a></li>
-<li><a href="#" onclick="connectCautiousShare(); return false;">$cautious</a></li>
-<li><a href="#" onclick="connectFollowOnly(); return false;">$follow</a></li>
-<br />
+{{if $self}}
+<li><span class="fakelink" onclick="connectClear();">{{$clear}}</span></li>
+<li><span class="fakelink" onclick="connectForum();">{{$forum}}</span></li>
+<li><span class="fakelink" onclick="connectSoapBox();">{{$soapbox}}</span></li>
+{{/if}}
+<li><span class="fakelink" onclick="connectFullShare();">{{$full}}</span></li>
+<li><span class="fakelink" onclick="connectCautiousShare();">{{$cautious}}</span></li>
+<li><span class="fakelink" onclick="connectFollowOnly();">{{$follow}}</span></li>
+</ul>
+
+<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" class="fakelink" onclick="openClose('abook-advanced-panel');">{{$advanced}}</div>
 
-<div id="abook-advanced-panel" style="display: none;">
+<div id="abook-advanced-panel" style="display: block;">
 
-<span class="abook-them">$them</span><span class="abook-me">$me</span>
+<span class="abook-them">{{$them}}</span><span class="abook-me">{{$me}}</span>
 <br />
 <br />
-{{ for $perms as $prm }}
-{{inc field_acheckbox.tpl with $field=$prm }}{{endinc}}
-{{ endfor }}
+{{foreach $perms as $prm}}
+{{include file="field_acheckbox.tpl" field=$prm}}
+{{/foreach}}
 <br />
 
 </div>
 
-<input class="contact-edit-submit" type="submit" name="submit" value="$submit" />
+
+<input class="contact-edit-submit" type="submit" name="done" value="{{$submit}}" />
 
 </form>
 </div>
+</div>