From 864cf0f70d26b82b20ff07c975ca05d3fca7341d Mon Sep 17 00:00:00 2001 From: Ben Roberts Date: Tue, 21 Jun 2016 10:23:43 -0400 Subject: [PATCH] update MF2 and vcard data for issue #2629 --- view/templates/diaspora_vcard.tpl | 18 ++++++------ view/templates/profile_vcard.tpl | 4 +-- view/templates/vcard-widget.tpl | 10 +++---- view/templates/wall_thread.tpl | 20 ++++++------- .../decaf-mobile/templates/profile_vcard.tpl | 22 +++++++-------- .../decaf-mobile/templates/wall_thread.tpl | 20 +++++++------ .../diabook/templates/directory_item.tpl | 2 +- .../theme/diabook/templates/profile_vcard.tpl | 22 +++++++-------- view/theme/diabook/templates/wall_thread.tpl | 16 ++++++----- view/theme/dispy/templates/profile_vcard.tpl | 22 +++++++-------- view/theme/dispy/templates/wall_thread.tpl | 20 ++++++------- .../duepuntozero/templates/profile_vcard.tpl | 22 +++++++-------- .../facepark/templates/profile_vcard.tpl | 22 +++++++-------- view/theme/frio/templates/profile_vcard.tpl | 2 +- view/theme/frio/templates/vcard-widget.tpl | 8 +++--- view/theme/frio/templates/wall_thread.tpl | 28 +++++++++---------- .../frost-mobile/templates/profile_vcard.tpl | 22 +++++++-------- .../frost-mobile/templates/wall_thread.tpl | 18 ++++++------ view/theme/frost/templates/profile_vcard.tpl | 22 +++++++-------- view/theme/frost/templates/wall_thread.tpl | 20 ++++++------- .../theme/quattro/templates/profile_vcard.tpl | 22 +++++++-------- .../templates/threaded_conversation.tpl | 2 +- view/theme/quattro/templates/wall_thread.tpl | 20 ++++++------- view/theme/smoothly/templates/wall_thread.tpl | 20 ++++++------- .../testbubble/templates/profile_vcard.tpl | 22 +++++++-------- .../testbubble/templates/wall_thread.tpl | 16 +++++------ view/theme/vier/templates/profile_vcard.tpl | 6 ++-- .../vier/templates/threaded_conversation.tpl | 2 +- view/theme/vier/templates/wall_thread.tpl | 22 +++++++-------- 29 files changed, 239 insertions(+), 233 deletions(-) diff --git a/view/templates/diaspora_vcard.tpl b/view/templates/diaspora_vcard.tpl index 45b9fa4ff..c71577aee 100644 --- a/view/templates/diaspora_vcard.tpl +++ b/view/templates/diaspora_vcard.tpl @@ -3,19 +3,19 @@
Uid
- {{$diaspora.guid}} + {{$diaspora.guid}}
Nickname
- {{$diaspora.nickname}} + {{$diaspora.nickname}}
Full_name
- {{$diaspora.fullname}} + {{$diaspora.fullname}}
@@ -27,37 +27,37 @@
First_name
- {{$diaspora.firstname}} + {{$diaspora.firstname}}
Family_name
- {{$diaspora.lastname}} + {{$diaspora.lastname}}
Url
- {{$diaspora.podloc}}/ + {{$diaspora.podloc}}/
Photo
- +
Photo_medium
- +
Photo_small
- +
diff --git a/view/templates/profile_vcard.tpl b/view/templates/profile_vcard.tpl index 0f1cf070c..558daf26d 100644 --- a/view/templates/profile_vcard.tpl +++ b/view/templates/profile_vcard.tpl @@ -16,7 +16,7 @@ {{if $profile.network_name}}
{{$network}}
{{$profile.network_name}}
{{/if}} {{if $location}}
{{$location}}
-
+
{{if $profile.address}}
{{$profile.address}}
{{/if}} {{$profile.locality}}{{if $profile.locality}}, {{/if}} @@ -28,7 +28,7 @@
{{/if}} - {{if $gender}}
{{$gender}}
{{$profile.gender}}
{{/if}} + {{if $gender}}
{{$gender}}
{{$profile.gender}}
{{/if}} {{if $profile.pubkey}}{{/if}} diff --git a/view/templates/vcard-widget.tpl b/view/templates/vcard-widget.tpl index ec59fa46d..47b64b68d 100644 --- a/view/templates/vcard-widget.tpl +++ b/view/templates/vcard-widget.tpl @@ -1,12 +1,12 @@ -
-
{{$name}}
+
+
{{$name}}
{{if $addr}}
{{$addr}}
{{/if}} - {{if $pdesc}}
{{$pdesc}}
{{/if}} + {{if $pdesc}}
{{$pdesc}}
{{/if}} {{if $url}} -
{{$name}}
+
{{$name}}
{{else}} -
{{$name}}
+
{{$name}}
{{/if}} {{if $account_type}}{{/if}} {{if $network_name}}
{{$network}}
{{$network_name}}
{{/if}} diff --git a/view/templates/wall_thread.tpl b/view/templates/wall_thread.tpl index ae360adff..335d54f41 100644 --- a/view/templates/wall_thread.tpl +++ b/view/templates/wall_thread.tpl @@ -5,7 +5,7 @@
{{/if}} - {{if $gender}}
{{$gender}}
{{$profile.gender}}
{{/if}} + {{if $gender}}
{{$gender}}
{{$profile.gender}}
{{/if}}
{{if $marital}}
{{$marital}}
{{$profile.marital}}
{{/if}} diff --git a/view/theme/diabook/templates/profile_vcard.tpl b/view/theme/diabook/templates/profile_vcard.tpl index 71e32d3e3..7628fb8d5 100644 --- a/view/theme/diabook/templates/profile_vcard.tpl +++ b/view/theme/diabook/templates/profile_vcard.tpl @@ -1,8 +1,8 @@ -
+
-
{{$profile.name}}
+
{{$profile.name}}
{{if $profile.edit}}
{{$profile.edit.1}} @@ -23,31 +23,31 @@ -
{{$profile.name}}
+
{{$profile.name}}
{{if $pdesc}}
{{$profile.pdesc}}
{{/if}} {{if $location}}
{{$location}}

-
- {{if $profile.address}}
{{$profile.address}}
{{/if}} +
+ {{if $profile.address}}
{{$profile.address}}
{{/if}} - {{$profile.locality}}{{if $profile.locality}}, {{/if}} - {{$profile.region}} - {{$profile.postal_code}} + {{$profile.locality}}{{if $profile.locality}}, {{/if}} + {{$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 $marital}}
{{$marital}}
{{$profile.marital}}
{{/if}} - {{if $homepage}}
{{$homepage}}
{{$profile.homepage}}
{{/if}} + {{if $homepage}}
{{$homepage}}
{{$profile.homepage}}
{{/if}} {{include file="diaspora_vcard.tpl"}} diff --git a/view/theme/diabook/templates/wall_thread.tpl b/view/theme/diabook/templates/wall_thread.tpl index 1d921935f..e7a3ccd18 100644 --- a/view/theme/diabook/templates/wall_thread.tpl +++ b/view/theme/diabook/templates/wall_thread.tpl @@ -5,7 +5,7 @@