aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-07-15 17:50:24 -0700
committerredmatrix <redmatrix@redmatrix.me>2015-07-15 17:50:24 -0700
commit6046fe9c9ebed8ae2ad7507fdf75c53e0cad3f2b (patch)
tree99dbd1fa88324e091bc05da833b9d12249a1bae3 /view
parent0d1a541e888060b6b0b82868986b670c579ae2d0 (diff)
parent99dfd2f5b1c587b441941e72fccf684bc63a9090 (diff)
downloadvolse-hubzilla-6046fe9c9ebed8ae2ad7507fdf75c53e0cad3f2b.tar.gz
volse-hubzilla-6046fe9c9ebed8ae2ad7507fdf75c53e0cad3f2b.tar.bz2
volse-hubzilla-6046fe9c9ebed8ae2ad7507fdf75c53e0cad3f2b.zip
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Diffstat (limited to 'view')
-rwxr-xr-xview/tpl/abook_edit.tpl7
-rwxr-xr-xview/tpl/field_acheckbox.tpl6
2 files changed, 8 insertions, 5 deletions
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>