diff options
| author | redmatrix <redmatrix@redmatrix.me> | 2015-07-15 16:51:01 -0700 |
|---|---|---|
| committer | redmatrix <redmatrix@redmatrix.me> | 2015-07-15 16:51:01 -0700 |
| commit | bfcdf5bd9e57dfd7c1bc32c8fcc5d8c2b4d45653 (patch) | |
| tree | 440ba6ff651578e99b534bf285226781ff4d586a /view | |
| parent | 86ad41a2db6dae0f27eb0a2ec305593c942c1876 (diff) | |
| parent | 99dfd2f5b1c587b441941e72fccf684bc63a9090 (diff) | |
| download | volse-hubzilla-bfcdf5bd9e57dfd7c1bc32c8fcc5d8c2b4d45653.tar.gz volse-hubzilla-bfcdf5bd9e57dfd7c1bc32c8fcc5d8c2b4d45653.tar.bz2 volse-hubzilla-bfcdf5bd9e57dfd7c1bc32c8fcc5d8c2b4d45653.zip | |
Merge https://github.com/redmatrix/redmatrix into pending_merge
Diffstat (limited to 'view')
| -rwxr-xr-x | view/tpl/abook_edit.tpl | 7 | ||||
| -rwxr-xr-x | view/tpl/field_acheckbox.tpl | 6 |
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> |