Normalize vcard across themes display after profile fields reorganization

diff --git a/view/templates/profile/vcard.tpl b/view/templates/profile/vcard.tpl
index 521738107ff42c534252f9dac777db4cf37a6594..32f7e0fcfa9f2669e56cd1391ccae4aa6d529136 100644 (file)
--- a/view/templates/profile/vcard.tpl
+++ b/view/templates/profile/vcard.tpl
@@ -1,12 +1,10 @@
 
 <div class="vcard h-card">
 
-       <div class="fn label p-name">{{$profile.name}}</div>
+       <div class="fn p-name">{{$profile.name}}</div>
        
        {{if $profile.addr}}<div class="p-addr">{{$profile.addr}}</div>{{/if}}
        
-       {{if $profile.about}}<div class="title">{{$profile.about nofilter}}</div>{{/if}}
-
        {{if $profile.picdate}}
                <div id="profile-photo-wrapper"><a href="{{$profile.url}}"><img class="photo u-photo" width="175" height="175" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name}}"></a></div>
        {{else}}

diff --git a/view/theme/duepuntozero/templates/profile/vcard.tpl b/view/theme/duepuntozero/templates/profile/vcard.tpl
index 983d8faa5ccdc4f6e4f71cb17e41b54ee96fca76..1ea91f197f17c941fb9c032249c54380ce947655 100644 (file)
--- a/view/theme/duepuntozero/templates/profile/vcard.tpl
+++ b/view/theme/duepuntozero/templates/profile/vcard.tpl
@@ -1,11 +1,10 @@
 
 <div class="vcard h-card">
 
-       <div class="fn label p-name">{{$profile.name}}</div>
+       <div class="fn p-name">{{$profile.name}}</div>
        
        {{if $profile.addr}}<div class="p-addr">{{$profile.addr}}</div>{{/if}}
        
-       {{if $profile.about}}<div class="title">{{$profile.about nofilter}}</div>{{/if}}
        <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}}
@@ -26,6 +25,8 @@
                </dl>
        {{/if}}
 
+       {{if $profile.about}}<div class="title">{{$profile.about nofilter}}</div>{{/if}}
+
        {{if $profile.pubkey}}<div class="key" style="display:none;">{{$profile.pubkey}}</div>{{/if}}
 
        {{if $homepage}}<dl class="homepage"><dt class="homepage-label">{{$homepage}}</dt><dd class="homepage-url"><a href="{{$profile.homepage}}" class="u-url" rel="me" target="external-link">{{$profile.homepage}}</a></dd></dl>{{/if}}

diff --git a/view/theme/quattro/templates/profile/vcard.tpl b/view/theme/quattro/templates/profile/vcard.tpl
index 605574bf805a0ba9c5abe2f4bd127890602ae95c..3bbb9e09fbb116c0162cea8d79069170ef6cd1d0 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 h-card">
 
        <div class="tool">
-               <div class="fn label p-name">{{$profile.name}}</div>
+               <div class="fn 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>
@@ -17,7 +17,6 @@
 
        {{if $profile.addr}}<div class="p-addr">{{$profile.addr}}</div>{{/if}}
 
-       {{if $about}}<div class="title">{{$profile.about nofilter}}</div>{{/if}}
        <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}}
@@ -38,6 +37,8 @@
                </dl>
        {{/if}}
 
+       {{if $about}}<div class="title">{{$profile.about nofilter}}</div>{{/if}}
+
         {{if $profile.xmpp}}
                 <dl class="xmpp">
                         <dt class="xmpp-label">{{$xmpp}}</dt>

diff --git a/view/theme/vier/templates/profile/vcard.tpl b/view/theme/vier/templates/profile/vcard.tpl
index 35f9099ab2172e83c9ab9bbc50686ab63d369e80..c263ccde099b6b3aff776dbda724f95dd00fc8be 100644 (file)
--- a/view/theme/vier/templates/profile/vcard.tpl
+++ b/view/theme/vier/templates/profile/vcard.tpl
@@ -1,7 +1,7 @@
 <div class="vcard h-card">
 
        <div class="tool">
-               <div class="fn label p-name">{{$profile.name}}</div>
+               <div class="fn p-name">{{$profile.name}}</div>
                {{if $profile.edit}}
                        <div class="action">
                                <a class="icon s16 edit ttright" href="{{$profile.edit.0}}" title="{{$profile.edit.3}}"><span>{{$profile.edit.1}}</span></a>
@@ -11,8 +11,6 @@
 
        {{if $profile.addr}}<div class="p-addr">{{$profile.addr}}</div>{{/if}}
 
-       {{if $profile.about}}<div class="title">{{$profile.about nofilter}}</div>{{/if}}
-
        {{if $profile.picdate}}
                <div id="profile-photo-wrapper"><a href="{{$profile.url}}"><img class="photo u-photo" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name}}"></a></div>
        {{else}}