Merge remote-tracking branch 'upstream/develop' into no-author-link

[friendica.git] / view / theme / quattro / templates / profile_vcard.tpl

diff --git a/view/theme/quattro/templates/profile_vcard.tpl b/view/theme/quattro/templates/profile_vcard.tpl
index f4eae78d2b224af3045490983bd5773671b4712f..d25234b73340e9cf9b224ce4362e8179c8343143 100644 (file)
--- a/view/theme/quattro/templates/profile_vcard.tpl
+++ b/view/theme/quattro/templates/profile_vcard.tpl
@@ -1,7 +1,7 @@
-<div class="vcard">
+<div class="vcard h-card">
 
        <div class="tool">
-               <div class="fn label">{{$profile.name}}</div>
+               <div class="fn label p-name">{{$profile.name}}</div>
                {{if $profile.edit}}
                        <div class="action">
                        <a class="icon s16 edit ttright" href="#" rel="#profiles-menu" title="{{$profile.edit.3}}"><span>{{$profile.edit.1}}</span></a>
@@ -29,7 +29,7 @@
        {{if $profile.addr}}<div class="p-addr">{{$profile.addr}}</div>{{/if}}
 
        {{if $pdesc}}<div class="title">{{$profile.pdesc}}</div>{{/if}}
-       <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 u-photo" width="175" height="175" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name}}" /></div>
 
        {{if $account_type}}<div class="account-type">{{$account_type}}</div>{{/if}}
 
@@ -37,19 +37,26 @@
 
        {{if $location}}
                <dl class="location"><dt class="location-label">{{$location}}</dt> 
-               <dd class="adr">
-                       {{if $profile.address}}<div class="street-address">{{$profile.address}}</div>{{/if}}
+               <dd class="adr h-adr">
+                       {{if $profile.address}}<div class="street-address p-street-address">{{$profile.address}}</div>{{/if}}
                        <span class="city-state-zip">
-                               <span class="locality">{{$profile.locality}}</span>{{if $profile.locality}}, {{/if}}
-                               <span class="region">{{$profile.region}}</span>
-                               <span class="postal-code">{{$profile.postal_code}}</span>
+                               <span class="locality p-locality">{{$profile.locality}}</span>{{if $profile.locality}}, {{/if}}
+                               <span class="region p-region">{{$profile.region}}</span>
+                               <span class="postal-code p-postal-code">{{$profile.postal_code}}</span>
                        </span>
-                       {{if $profile.country_name}}<span class="country-name">{{$profile.country_name}}</span>{{/if}}
+                       {{if $profile.country_name}}<span class="country-name p-country-name">{{$profile.country_name}}</span>{{/if}}
                </dd>
                </dl>
        {{/if}}
 
-       {{if $gender}}<dl class="mf"><dt class="gender-label">{{$gender}}</dt> <dd class="x-gender">{{$profile.gender}}</dd></dl>{{/if}}
+        {{if $profile.xmpp}}
+                <dl class="xmpp">
+                        <dt class="xmpp-label">{{$xmpp}}</dt>
+                        <dd class="xmpp-data">{{$profile.xmpp}}</dd>
+                </dl>
+        {{/if}}
+
+       {{if $gender}}<dl class="mf"><dt class="gender-label">{{$gender}}</dt> <dd class="p-gender">{{$profile.gender}}</dd></dl>{{/if}}
        
        {{if $profile.pubkey}}<div class="key" style="display:none;">{{$profile.pubkey}}</div>{{/if}}
 
@@ -57,7 +64,7 @@
 
        {{if $homepage}}
        <dl class="homepage"><dt class="homepage-label">{{$homepage}}</dt>
-               <dd class="homepage-url"><a href="{{$profile.homepage}}" target="external-link">{{$profile.homepage}}</a></dd>
+               <dd class="homepage-url"><a href="{{$profile.homepage}}" class="u-url" rel="me" target="external-link">{{$profile.homepage}}</a></dd>
        </dl>
        {{/if}}
 
@@ -73,7 +80,7 @@
                                {{/if}}
                        {{/if}}
                        {{if $wallmessage}}
-                               <li><a id="wallmessage-link" href="wallmessage/{{$profile.nickname}}">{{$wallmessage}}</a></li>
+                               <li><a id="wallmessage-link" href="{{$wallmessage_link}}">{{$wallmessage}}</a></li>
                        {{/if}}
                        {{if $subscribe_feed}}
                                <li><a id="subscribe-feed-link" href="dfrn_poll/{{$profile.nickname}}">{{$subscribe_feed}}</a></li>