aboutsummaryrefslogtreecommitdiffstats
path: root/view/tpl
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-07-21 17:13:48 -0700
committerredmatrix <redmatrix@redmatrix.me>2015-07-21 17:13:48 -0700
commitc90f14c066d0f289bd2220bb66325db12700aa57 (patch)
tree6c915ad03936d479d1d807540bbc0e7ae0f854ad /view/tpl
parent24ec104819bbc3778a159ea4790398988a6e2fd7 (diff)
parent3ec6a431b62c20952f07f889acfeedd0ac456d04 (diff)
downloadvolse-hubzilla-c90f14c066d0f289bd2220bb66325db12700aa57.tar.gz
volse-hubzilla-c90f14c066d0f289bd2220bb66325db12700aa57.tar.bz2
volse-hubzilla-c90f14c066d0f289bd2220bb66325db12700aa57.zip
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts: doc/to_do_code.bb
Diffstat (limited to 'view/tpl')
-rwxr-xr-xview/tpl/field_acheckbox.tpl9
-rwxr-xr-xview/tpl/profile_vcard.tpl2
2 files changed, 8 insertions, 3 deletions
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}}
diff --git a/view/tpl/profile_vcard.tpl b/view/tpl/profile_vcard.tpl
index 9eac48c6d..bea0d894f 100755
--- a/view/tpl/profile_vcard.tpl
+++ b/view/tpl/profile_vcard.tpl
@@ -1,5 +1,5 @@
<div class="vcard">
- <div id="profile-photo-wrapper"><img class="photo" width="175" height="175" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name}}"></div>
+ <div id="profile-photo-wrapper"><img class="photo" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name}}"></div>
{{if $profile.edit}}
<div class="dropdown">
<a class="profile-edit-side-link dropdown-toggle" data-toggle="dropdown" title="{{$profile.edit.3}}" href="#" ><i class="icon-pencil" title="{{$profile.edit.1}}" ></i></a>