From 7f712973831212694de824a2e63961b98ef53959 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Tue, 14 Jul 2015 12:46:40 +0200
Subject: cleanup connedit

---
 view/tpl/field_acheckbox.tpl | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'view/tpl/field_acheckbox.tpl')

diff --git a/view/tpl/field_acheckbox.tpl b/view/tpl/field_acheckbox.tpl
index 816af2a65..a4f271f1a 100755
--- a/view/tpl/field_acheckbox.tpl
+++ b/view/tpl/field_acheckbox.tpl
@@ -1,17 +1,17 @@
-<tr>
+<tr class="highlight">
 	<td>
-		<label class="mainlabel" for='id_{{$field.0}}'>{{$field.1}}</label>
+		<label class="mainlabel" for='id_{{$field.0}}'>{{$field.1}}</label><br>
+		<span class='field_abook_help'>{{$field.6}}</span>
 	</td>
+	{{if $notself}}
 	<td class="abook-them">
 		<input type="checkbox" name='them_{{$field.0}}' id='them_id_{{$field.0}}' value="1" disabled="disabled" {{if $field.2}}checked="checked"{{/if}} />
 	</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}} />
+		<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}} disabled="disabled"{{/if}} />
 	</td>
 	<td>
 		{{if $field.5}}<span class="permission-inherited">{{$inherited}}</span> {{/if}}
 	</td>
-	<td>
-		<span class='field_abook_help'>{{$field.6}}</span>
-	</td>
-</tr>
\ No newline at end of file
+</tr>
-- 
cgit v1.2.3


From f267bd55d68f6d3c63c33b1d307728e4ed12ddd5 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Tue, 14 Jul 2015 14:20:23 +0200
Subject: revert this until further investigation

---
 view/tpl/field_acheckbox.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'view/tpl/field_acheckbox.tpl')

diff --git a/view/tpl/field_acheckbox.tpl b/view/tpl/field_acheckbox.tpl
index a4f271f1a..2b5195322 100755
--- a/view/tpl/field_acheckbox.tpl
+++ b/view/tpl/field_acheckbox.tpl
@@ -9,7 +9,7 @@
 	</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}} 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}} />
 	</td>
 	<td>
 		{{if $field.5}}<span class="permission-inherited">{{$inherited}}</span> {{/if}}
-- 
cgit v1.2.3


From cc1764989f70b28654b47fd58fd59b12b270b470 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Tue, 14 Jul 2015 17:37:33 +0200
Subject: fix mod_connedit.js after cleanup

---
 view/tpl/field_acheckbox.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'view/tpl/field_acheckbox.tpl')

diff --git a/view/tpl/field_acheckbox.tpl b/view/tpl/field_acheckbox.tpl
index 2b5195322..5b03a7848 100755
--- a/view/tpl/field_acheckbox.tpl
+++ b/view/tpl/field_acheckbox.tpl
@@ -12,6 +12,6 @@
 		<input type="checkbox" name='{{$field.0}}' class='abook-edit-me' id='me_id_{{$field.0}}' value="{{$field.4}}" {{if $field.3}}checked="checked"{{/if}} />
 	</td>
 	<td>
-		{{if $field.5}}<span class="permission-inherited">{{$inherited}}</span> {{/if}}
+		{{if $field.5}}<span class="permission-inherited">{{$inherited}}</span>{{/if}}
 	</td>
 </tr>
-- 
cgit v1.2.3


From 4fe64179c8c99dbcbabd1580ddf760288d049547 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Tue, 14 Jul 2015 19:29:49 +0200
Subject: disable the inherited checkboxes for notself

---
 view/tpl/field_acheckbox.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'view/tpl/field_acheckbox.tpl')

diff --git a/view/tpl/field_acheckbox.tpl b/view/tpl/field_acheckbox.tpl
index 5b03a7848..d2aad3875 100755
--- a/view/tpl/field_acheckbox.tpl
+++ b/view/tpl/field_acheckbox.tpl
@@ -9,7 +9,7 @@
 	</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}} />
+		<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}}/>
 	</td>
 	<td>
 		{{if $field.5}}<span class="permission-inherited">{{$inherited}}</span>{{/if}}
-- 
cgit v1.2.3


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/field_acheckbox.tpl | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'view/tpl/field_acheckbox.tpl')

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


From 464625cd9107a82785bca40eb771a5c1149d8f2d Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Mon, 20 Jul 2015 15:03:55 +0200
Subject: show icons instead of disabled checkboxes

---
 view/tpl/field_acheckbox.tpl | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'view/tpl/field_acheckbox.tpl')

diff --git a/view/tpl/field_acheckbox.tpl b/view/tpl/field_acheckbox.tpl
index f96fd5fd6..e99128bbb 100755
--- a/view/tpl/field_acheckbox.tpl
+++ b/view/tpl/field_acheckbox.tpl
@@ -5,11 +5,16 @@
 	</td>
 	{{if $notself}}
 	<td class="abook-them">
-		<input type="checkbox" name='them_{{$field.0}}' id='them_id_{{$field.0}}' value="1" disabled="disabled" {{if $field.2}}checked="checked"{{/if}} />
+		{{if $field.2}}<i class="icon-check"></i>{{else}}<i class="icon-check-empty"></i>{{/if}}
 	</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 $notself && $field.5}} disabled="disabled"{{/if}}/>
+		{{if $self || !$field.5}}
+		<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}}
+		{{if $notself && $field.5}}
+		{{if $field.3}}<i class="icon-check"></i>{{else}}<i class="icon-check-empty"></i>{{/if}}
+		{{/if}}
 	</td>
 	<td>
 		{{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}}
-- 
cgit v1.2.3