Merge remote-tracking branch 'upstream/master'

[friendica.git] / view / templates / diaspora_vcard.tpl

diff --git a/view/templates/diaspora_vcard.tpl b/view/templates/diaspora_vcard.tpl
index 5ea6335a87df0b8acaa9603f7fafec254339cfd5..58419bd13d0f181a8de17fbba08220d8e45b01b2 100644 (file)
--- a/view/templates/diaspora_vcard.tpl
+++ b/view/templates/diaspora_vcard.tpl
@@ -1,38 +1,45 @@
-{{*
- *     AUTOMATICALLY GENERATED TEMPLATE
- *     DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
+
 <div style="display:none;">
+       <dl class="entity_uid">
+               <dt>Uid</dt>
+               <dd>
+                       <span class="uid">{{$diaspora.guid}}</span>
+               </dd>
+       </dl>
        <dl class='entity_nickname'>
                <dt>Nickname</dt>
                <dd>            
-                       <a class="nickname url uid" href="{{$diaspora.podloc}}/" rel="me">{{$diaspora.nickname}}</a>
+                       <span class="nickname">{{$diaspora.nickname}}</span>
                </dd>
        </dl>
-       <dl class='entity_fn'>
-               <dt>Full name</dt>
+       <dl class='entity_full_name'>
+               <dt>Full_name</dt>
                <dd>
                        <span class='fn'>{{$diaspora.fullname}}</span>
                </dd>
        </dl>
-
-       <dl class='entity_given_name'>
-               <dt>First name</dt>
+       <dl class="entity_searchable">
+               <dt>Searchable</dt>
+               <dd>
+                       <span class="searchable">{{$diaspora.searchable}}</span>
+               </dd>
+       </dl>
+       <dl class='entity_first_name'>
+               <dt>First_name</dt>
                <dd>
                <span class='given_name'>{{$diaspora.firstname}}</span>
                </dd>
        </dl>
        <dl class='entity_family_name'>
-               <dt>Family name</dt>
+               <dt>Family_name</dt>
                <dd>
                <span class='family_name'>{{$diaspora.lastname}}</span>
                </dd>
        </dl>
        <dl class="entity_url">
-               <dt>URL</dt>
+               <dt>Url</dt>
                <dd>
-                       <a class="url" href="{{$diaspora.podloc}}/" id="pod_location" rel="me">{{$diaspora.podloc}}/</a>
+                       <a id="pod_location" class="url" rel="me" href="{{$diaspora.podloc}}/">{{$diaspora.podloc}}/</a>
                </dd>
        </dl>
        <dl class="entity_photo">
@@ -42,21 +49,15 @@
                </dd>
        </dl>
        <dl class="entity_photo_medium">
-               <dt>Photo</dt>
+               <dt>Photo_medium</dt>
                <dd> 
                        <img class="photo avatar" height="100" width="100" src="{{$diaspora.photo100}}">
                </dd>
        </dl>
        <dl class="entity_photo_small">
-               <dt>Photo</dt>
+               <dt>Photo_small</dt>
                <dd>
                        <img class="photo avatar" height="50" width="50" src="{{$diaspora.photo50}}">
                </dd>
        </dl>
-       <dl class="entity_searchable">
-               <dt>Searchable</dt>
-               <dd>
-                       <span class="searchable">{{$diaspora.searchable}}</span>
-               </dd>
-       </dl>
 </div>