diff options
Diffstat (limited to 'view/tpl')
| -rwxr-xr-x | view/tpl/profile_advanced.tpl | 18 | ||||
| -rwxr-xr-x | view/tpl/profile_edit.tpl | 6 | ||||
| -rwxr-xr-x | view/tpl/profile_vcard.tpl | 4 |
3 files changed, 18 insertions, 10 deletions
diff --git a/view/tpl/profile_advanced.tpl b/view/tpl/profile_advanced.tpl index c617e6c14..a4c98b1d0 100755 --- a/view/tpl/profile_advanced.tpl +++ b/view/tpl/profile_advanced.tpl @@ -33,6 +33,7 @@ <div class="section-content-wrapper"> {{foreach $fields as $f}} + {{if $f == 'name'}} <dl id="aprofile-fullname" class="aprofile"> <dt>{{$profile.fullname.0}}</dt> @@ -40,6 +41,13 @@ </dl> {{/if}} + {{if $f == 'fullname'}} + <dl id="aprofile-fullname" class="aprofile"> + <dt>{{$profile.fullname.0}}</dt> + <dd>{{$profile.fullname.1}}</dd> + </dl> + {{/if}} + {{if $f == 'gender'}} {{if $profile.gender}} <dl id="aprofile-gender" class="aprofile"> @@ -72,7 +80,7 @@ {{if $profile.marital}} <dl id="aprofile-marital" class="aprofile"> <dt><span class="heart"><i class="fa fa-heart"></i> </span>{{$profile.marital.0}}</dt> - <dd>{{$profile.marital.1}}{{if in_array('with',$fields)}}{{if $profile.marital.with}} ({{$profile.marital.with}}){{/if}}{{/if}}{{if in_array('howlong',$fields)}}{{if $profile.howlong}} {{$profile.howlong}}{{/if}}{{/if}}</dd> + <dd>{{$profile.marital.1}}{{if in_array('partner',$fields)}}{{if $profile.marital.partner}} ({{$profile.marital.partner}}){{/if}}{{/if}}{{if in_array('howlong',$fields)}}{{if $profile.howlong}} {{$profile.howlong}}{{/if}}{{/if}}</dd> </dl> {{/if}} {{/if}} @@ -237,11 +245,11 @@ {{/if}} - {{if $f == 'work'}} - {{if $profile.work}} + {{if $f == 'employment'}} + {{if $profile.employment}} <dl id="aprofile-work" class="aprofile"> - <dt>{{$profile.work.0}}</dt> - <dd>{{$profile.work.1}}</dd> + <dt>{{$profile.employment.0}}</dt> + <dd>{{$profile.employment.1}}</dd> </dl> {{/if}} {{/if}} diff --git a/view/tpl/profile_edit.tpl b/view/tpl/profile_edit.tpl index deabc2795..b0211d697 100755 --- a/view/tpl/profile_edit.tpl +++ b/view/tpl/profile_edit.tpl @@ -173,7 +173,7 @@ </div> <div class="clear"></div> - {{if $fields.with}} + {{if $fields.partner}} {{include file="field_input.tpl" field=$with}} {{/if}} @@ -198,7 +198,7 @@ </div> </div> {{/if}} - {{if $fields.keywords || $fields.politic || $fields.religion || $fields.about || $fields.contact || $fields.homepage || $fields.interest || $fields.likes || $fields.dislikes || $fields.channels || $fields.music || $fields.book || $fields.tv || $fields.romance || $fields.education || $extra_fields}} + {{if $fields.keywords || $fields.politic || $fields.religion || $fields.about || $fields.contact || $fields.homepage || $fields.interest || $fields.likes || $fields.dislikes || $fields.channels || $fields.music || $fields.book || $fields.tv || $fields.film || $fields.romance || $fields.employment || $fields.education || $extra_fields}} <div class="panel"> <div class="section-subtitle-wrapper" role="tab" id="miscellaneous"> <h3> @@ -269,7 +269,7 @@ {{include file="field_textarea.tpl" field=$romance}} {{/if}} - {{if $fields.work}} + {{if $fields.employment}} {{include file="field_textarea.tpl" field=$work}} {{/if}} diff --git a/view/tpl/profile_vcard.tpl b/view/tpl/profile_vcard.tpl index b4d21b6e7..7d7d2019a 100755 --- a/view/tpl/profile_vcard.tpl +++ b/view/tpl/profile_vcard.tpl @@ -1,6 +1,6 @@ <div class="vcard"> {{if ! $zcard}} - <div id="profile-photo-wrapper"><img class="photo" 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.fullname}}"></div> {{/if}} {{if $connect}} <div class="connect-btn-wrapper"><a href="{{$connect_url}}" class="btn btn-block btn-success btn-sm"><i class="fa fa-plus"></i> {{$connect}}</a></div> @@ -25,7 +25,7 @@ {{/if}} {{if ! $zcard}} - <div class="fn">{{$profile.name}}{{if $profile.online}} <i class="fa fa-asterisk online-now" title="{{$profile.online}}"></i>{{/if}}</div> + <div class="fn">{{$profile.fullname}}{{if $profile.online}} <i class="fa fa-asterisk online-now" title="{{$profile.online}}"></i>{{/if}}</div> {{if $reddress}}<div class="reddress" oncopy="return false;">{{$profile.reddress}}</div>{{/if}} {{/if}} {{if $pdesc}}<div class="title">{{$profile.pdesc}}</div>{{/if}} |