Merge https://github.com/friendica/friendica into pull

[friendica.git] / view / theme / diabook / profile_vcard.tpl

diff --git a/view/theme/diabook/profile_vcard.tpl b/view/theme/diabook/profile_vcard.tpl
index 3a545f9ba624ca3f60cafc6556f867f1c3ef6e3b..825145825748ac8e06371e05e2486952822ced17 100644 (file)
--- a/view/theme/diabook/profile_vcard.tpl
+++ b/view/theme/diabook/profile_vcard.tpl
@@ -21,9 +21,9 @@
        </div>
                                
        
-       {{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }}
-       <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 $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }}
 
 
        {{ if $location }}
@@ -33,9 +33,9 @@
                        <span class="city-state-zip">
                                <span class="locality">$profile.locality</span>{{ if $profile.locality }}, {{ endif }}
                                <span class="region">$profile.region</span>
-                               <span class="postal-code">$profile.postal-code</span>
+                               <span class="postal-code">$profile.postal_code</span>
                        </span>
-                       {{ if $profile.country-name }}<span class="country-name">$profile.country-name</span>{{ endif }}
+                       {{ if $profile.country_name }}<span class="country-name">$profile.country_name</span>{{ endif }}
                </dd>
                </dl>
        {{ endif }}