From 6a646d68c5117afc84db0d4552c335fe1e9c0aba Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Sun, 12 Jul 2015 20:27:54 +0200 Subject: [PATCH] Updated templates for "vier" (See issue 1733) --- view/templates/profile-hide-friends.tpl | 20 +++----------- view/templates/profile_vcard.tpl | 16 ++++++------ .../vier/templates/profile-hide-friends.tpl | 3 --- view/theme/vier/templates/profile_vcard.tpl | 26 +++++++++---------- 4 files changed, 24 insertions(+), 41 deletions(-) delete mode 100644 view/theme/vier/templates/profile-hide-friends.tpl diff --git a/view/templates/profile-hide-friends.tpl b/view/templates/profile-hide-friends.tpl index e2873b01a..80e6dcb94 100644 --- a/view/templates/profile-hide-friends.tpl +++ b/view/templates/profile-hide-friends.tpl @@ -1,17 +1,3 @@ - -

-{{$desc}} -

- -
- - - -
-
-
- - - -
-
+
+ {{include file="field_yesno.tpl" field=$yesno}} +
diff --git a/view/templates/profile_vcard.tpl b/view/templates/profile_vcard.tpl index 056aabc96..fe5762973 100644 --- a/view/templates/profile_vcard.tpl +++ b/view/templates/profile_vcard.tpl @@ -9,9 +9,9 @@ {{if $profile.picdate}}
{{$profile.name}}
- {{else}} + {{else}}
{{$profile.name}}
- {{/if}} + {{/if}} {{if $profile.network_name}}
{{$network}}
{{$profile.network_name}}
{{/if}} {{if $location}}
{{$location}}
@@ -46,12 +46,12 @@ - - {{if $profile.picdate}} -
{{$profile.name}}
- {{else}} -
{{$profile.name}}
- {{/if}} {{if $pdesc}}
{{$profile.pdesc}}
{{/if}} + {{if $profile.picdate}} +
{{$profile.name}}
+ {{else}} +
{{$profile.name}}
+ {{/if}} {{if $profile.network_name}}
{{$network}}
{{$profile.network_name}}
{{/if}} {{if $location}} -
{{$location}}

+
{{$location}}
{{if $profile.address}}
{{$profile.address}}
{{/if}} @@ -31,14 +30,14 @@ {{$profile.region}} {{$profile.postal_code}} - {{if $profile.country_name}}{{$profile.country_name}}{{/if}} + {{if $profile.country_name}}{{$profile.country_name}}{{/if}}
{{/if}} - {{if $gender}}
{{$gender}}
{{$profile.gender}}
{{/if}} + {{if $gender}}
{{$gender}}
{{$profile.gender}}
{{/if}} - {{if $profile.pubkey}}{{/if}} + {{if $profile.pubkey}}{{/if}} {{if $contacts}}{{/if}} @@ -46,7 +45,7 @@ {{if $marital}}
{{$marital}}
{{$profile.marital}}
{{/if}} - {{if $homepage}}
{{$homepage}}
{{$profile.homepage}}
{{/if}} + {{if $homepage}}
{{$homepage}}
{{$profile.homepage}}
{{/if}} {{if $about}}
{{$about}}
{{$profile.about}}
{{/if}} @@ -61,10 +60,11 @@
  • {{$connect}}
  • {{/if}} {{/if}} + {{if $wallmessage}} +
  • {{$wallmessage}}
  • + {{/if}} {{$contact_block}} - -