diff --git a/view/templates/profile/vcard.tpl b/view/templates/profile/vcard.tpl index c4e9ea1d1..b989923b7 100644 --- a/view/templates/profile/vcard.tpl +++ b/view/templates/profile/vcard.tpl @@ -1,7 +1,7 @@
-
{{$profile.name}}
+
{{$profile.name}}
{{if $profile.addr}}
{{$profile.addr}}
{{/if}} @@ -13,7 +13,7 @@ {{if $account_type}}
{{$account_type}}
{{/if}} {{if $profile.network_link}}
{{$network}}
{{$profile.network_link nofilter}}
{{/if}} {{if $location}} -
+
{{$location}}
{{if $profile.address}}

{{$profile.address nofilter}}

{{/if}} @@ -37,7 +37,7 @@ {{if $homepage}}
{{$homepage}}
{{$profile.homepage}}
{{/if}} - {{if $about}}
{{$about}}
{{$profile.about nofilter}}
{{/if}} + {{if $about}}
{{$about}}
{{$profile.about nofilter}}
{{/if}} {{include file="diaspora_vcard.tpl"}} diff --git a/view/templates/widget/vcard.tpl b/view/templates/widget/vcard.tpl index 1bd0690a2..2cd8d9bb7 100644 --- a/view/templates/widget/vcard.tpl +++ b/view/templates/widget/vcard.tpl @@ -1,8 +1,8 @@
-
{{$name}}
+
{{$name}}
{{if $addr}}
{{$addr}}
{{/if}} - {{if $about}}
{{$about nofilter}}
{{/if}} + {{if $about}}
{{$about nofilter}}
{{/if}} {{if $url}}
{{$name}}
{{else}} diff --git a/view/theme/duepuntozero/templates/profile/vcard.tpl b/view/theme/duepuntozero/templates/profile/vcard.tpl index ed6d52249..cba78da6a 100644 --- a/view/theme/duepuntozero/templates/profile/vcard.tpl +++ b/view/theme/duepuntozero/templates/profile/vcard.tpl @@ -1,7 +1,7 @@
-
{{$profile.name}}
+
{{$profile.name}}
{{if $profile.addr}}
{{$profile.addr}}
{{/if}} @@ -12,7 +12,7 @@ {{if $profile.network_link}}
{{$network}}
{{$profile.network_link nofilter}}
{{/if}} {{if $location}} -
+
{{$location}}
{{if $profile.address}}

{{$profile.address nofilter}}

{{/if}} @@ -21,7 +21,7 @@
{{/if}} - {{if $profile.about}}
{{$profile.about nofilter}}
{{/if}} + {{if $profile.about}}
{{$profile.about nofilter}}
{{/if}} {{if $profile.upubkey}}{{/if}} diff --git a/view/theme/frio/templates/profile/vcard.tpl b/view/theme/frio/templates/profile/vcard.tpl index b1d4ada2d..deecd7543 100644 --- a/view/theme/frio/templates/profile/vcard.tpl +++ b/view/theme/frio/templates/profile/vcard.tpl @@ -37,11 +37,11 @@
-

{{$profile.name}}

+

{{$profile.name}}

{{if $profile.addr}}
{{include file="sub/punct_wrap.tpl" text=$profile.addr}}
{{/if}} - {{if $profile.about}}
{{$profile.about nofilter}}
{{/if}} + {{if $profile.about}}
{{$profile.about nofilter}}
{{/if}} {{if $account_type}}{{/if}}
diff --git a/view/theme/frio/templates/widget/vcard.tpl b/view/theme/frio/templates/widget/vcard.tpl index 210edbe44..9c89ace8c 100644 --- a/view/theme/frio/templates/widget/vcard.tpl +++ b/view/theme/frio/templates/widget/vcard.tpl @@ -16,7 +16,7 @@
-

{{$name}}

+

{{$name}}

{{if $addr}}
{{$addr}}
{{/if}}
@@ -24,13 +24,13 @@
-

{{$name}}

+

{{$name}}

{{if $addr}}
{{$addr}}
{{/if}} {{if $account_type}}{{/if}} - {{if $about}}
{{$about nofilter}}
{{/if}} + {{if $about}}
{{$about nofilter}}
{{/if}} {{if $network_link}}
{{$network}}
{{$network_link nofilter}}
{{/if}}
diff --git a/view/theme/quattro/templates/profile/vcard.tpl b/view/theme/quattro/templates/profile/vcard.tpl index 992700f10..a0f0f2502 100644 --- a/view/theme/quattro/templates/profile/vcard.tpl +++ b/view/theme/quattro/templates/profile/vcard.tpl @@ -1,7 +1,7 @@
-
{{$profile.name}}
+
{{$profile.name}}
{{if $profile.edit}}
{{$profile.edit.1}} @@ -24,23 +24,23 @@ {{if $profile.network_link}}
{{$network}}
{{$profile.network_link nofilter}}
{{/if}} {{if $location}} -
-
{{$location}}
-
- {{if $profile.address}}

{{$profile.address nofilter}}

{{/if}} - {{if $profile.location}}

{{$profile.location}}

{{/if}} -
-
+
+
{{$location}}
+
+ {{if $profile.address}}

{{$profile.address nofilter}}

{{/if}} + {{if $profile.location}}

{{$profile.location}}

{{/if}} +
+
{{/if}} - {{if $about}}
{{$profile.about nofilter}}
{{/if}} + {{if $about}}
{{$profile.about nofilter}}
{{/if}} - {{if $profile.xmpp}} -
-
{{$xmpp}}
-
{{$profile.xmpp}}
-
- {{/if}} + {{if $profile.xmpp}} +
+
{{$xmpp}}
+
{{$profile.xmpp}}
+
+ {{/if}} {{if $profile.upubkey}}{{/if}} diff --git a/view/theme/vier/templates/profile/vcard.tpl b/view/theme/vier/templates/profile/vcard.tpl index 06c7a0235..13e41fcb5 100644 --- a/view/theme/vier/templates/profile/vcard.tpl +++ b/view/theme/vier/templates/profile/vcard.tpl @@ -1,7 +1,7 @@
-
{{$profile.name}}
+
{{$profile.name}}
{{if $profile.edit}}
{{$profile.edit.1}} @@ -20,7 +20,7 @@ {{if $account_type}}{{/if}} {{if $profile.network_link}}
{{$network}}
{{$profile.network_link nofilter}}
{{/if}} {{if $location}} -
+
{{$location}}
{{if $profile.address}}

{{$profile.address nofilter}}

{{/if}} @@ -44,7 +44,7 @@ {{if $homepage}}
{{$homepage}}
{{$profile.homepage}}
{{/if}} - {{if $about}}
{{$about}}
{{$profile.about nofilter}}
{{/if}} + {{if $about}}
{{$about}}
{{$profile.about nofilter}}
{{/if}} {{include file="diaspora_vcard.tpl"}}