From 0c77a127f2e10bcea23e49d5eef61ce444046b31 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Wed, 15 Jul 2015 14:03:34 +0200
Subject: show inherited state in Connection Default Permissions

---
 view/tpl/abook_edit.tpl      | 7 +++++--
 view/tpl/field_acheckbox.tpl | 6 +++---
 2 files changed, 8 insertions(+), 5 deletions(-)

(limited to 'view')

diff --git a/view/tpl/abook_edit.tpl b/view/tpl/abook_edit.tpl
index 71693a553..93f52be8d 100755
--- a/view/tpl/abook_edit.tpl
+++ b/view/tpl/abook_edit.tpl
@@ -176,7 +176,8 @@
 				<div id="perms-tool-collapse" class="panel-collapse collapse{{if $self}} in{{/if}}" role="tabpanel" aria-labelledby="perms-tool">
 					<div class="section-content-tools-wrapper">
 						<div class="section-content-warning-wrapper">
-						{{$permnote}}
+						{{if $notself}}{{$permnote}}{{/if}}
+						{{if $self}}{{$permnote_self}}{{/if}}
 						</div>
 
 						<table id="perms-tool-table" class=form-group>
@@ -194,7 +195,9 @@
 
 						{{if $self}}
 						<div>
-							<div>{{$autolbl}}</div>
+							<div class="section-content-info-wrapper">
+								{{$autolbl}}
+							</div>
 							{{include file="field_checkbox.tpl" field=$autoperms}}
 						</div>
 						{{/if}}
diff --git a/view/tpl/field_acheckbox.tpl b/view/tpl/field_acheckbox.tpl
index d2aad3875..f96fd5fd6 100755
--- a/view/tpl/field_acheckbox.tpl
+++ b/view/tpl/field_acheckbox.tpl
@@ -1,6 +1,6 @@
 <tr class="highlight">
 	<td>
-		<label class="mainlabel" for='id_{{$field.0}}'>{{$field.1}}</label><br>
+		<label class="mainlabel" for='me_id_{{$field.0}}'>{{$field.1}}</label><br>
 		<span class='field_abook_help'>{{$field.6}}</span>
 	</td>
 	{{if $notself}}
@@ -9,9 +9,9 @@
 	</td>
 	{{/if}}
 	<td class="abook-me">
-		<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 $field.5 && $notself}} disabled="disabled"{{/if}}/>
+		<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 $notself && $field.5}} disabled="disabled"{{/if}}/>
 	</td>
 	<td>
-		{{if $field.5}}<span class="permission-inherited">{{$inherited}}</span>{{/if}}
+		{{if $field.5}}<span class="permission-inherited">{{$inherited}}{{if $self}}{{if $field.7}} <i class="icon-check"></i>{{else}} <i class="icon-check-empty"></i>{{/if}}{{/if}}</span>{{/if}}
 	</td>
 </tr>
-- 
cgit v1.2.3