Merge branch 'master' of https://github.com/friendica/friendica

[friendica.git] / view / diaspora_vcard.tpl

diff --git a/view/diaspora_vcard.tpl b/view/diaspora_vcard.tpl
index aa2c9eded952d248149e10fa09c7ab8204d10876..de3981a94ba24e1b610ca5ed3c1b32c5e199fdd2 100644 (file)
--- a/view/diaspora_vcard.tpl
+++ b/view/diaspora_vcard.tpl
@@ -2,7 +2,7 @@
        <dl class='entity_nickname'>
                <dt>Nickname</dt>
                <dd>            
-                       <a class="nickname url uid" href="$podloc/" rel="me">$diaspora.nickname</a>
+                       <a class="nickname url uid" href="$diaspora.podloc/" rel="me">$diaspora.nickname</a>
                </dd>
        </dl>
        <dl class='entity_fn'>
@@ -11,6 +11,19 @@
                        <span class='fn'>$diaspora.fullname</span>
                </dd>
        </dl>
+
+       <dl class='entity_given_name'>
+               <dt>First name</dt>
+               <dd>
+               <span class='given_name'>$diaspora.firstname</span>
+               </dd>
+       </dl>
+       <dl class='entity_family_name'>
+               <dt>Family name</dt>
+               <dd>
+               <span class='family_name'>$diaspora.lastname</span>
+               </dd>
+       </dl>
        <dl class="entity_url">
                <dt>URL</dt>
                <dd>
@@ -20,19 +33,19 @@
        <dl class="entity_photo">
                <dt>Photo</dt>
                <dd>
-                       <img class="photo avatar" height="300px" width="300px" src="$diaspora.photo300">
+                       <img class="photo avatar" height="300" width="300" src="$diaspora.photo300">
                </dd>
        </dl>
        <dl class="entity_photo_medium">
                <dt>Photo</dt>
                <dd> 
-                       <img class="photo avatar" height="100px" width="100px" src="$diaspora.photo100">
+                       <img class="photo avatar" height="100" width="100" src="$diaspora.photo100">
                </dd>
        </dl>
        <dl class="entity_photo_small">
                <dt>Photo</dt>
                <dd>
-                       <img class="photo avatar" height="50px" width="50px" src="$diaspora.photo50">
+                       <img class="photo avatar" height="50" width="50" src="$diaspora.photo50">
                </dd>
        </dl>
        <dl class="entity_searchable">