[frio] Fix wrongly removed content wrapper and fix CSS instead. (#5496) (#5505)

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

diff --git a/view/theme/vier/templates/profile_vcard.tpl b/view/theme/vier/templates/profile_vcard.tpl
index 61166ef9009ad83358a74ed1a5c62d697c5d5071..dfa341b2601c585f3c71a90a021c906e3f93f5c2 100644 (file)
--- a/view/theme/vier/templates/profile_vcard.tpl
+++ b/view/theme/vier/templates/profile_vcard.tpl
@@ -1,22 +1,10 @@
-
 <div class="vcard h-card">
 
        <div class="tool">
                <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>
-                       <ul id="profiles-menu" class="menu-popup">
-                               {{foreach $profile.menu.entries as $e}}
-                               <li>
-                                       <a href="profiles/{{$e.id}}"><img class="u-photo" src='{{$e.photo}}'>{{$e.profile_name}}</a>
-                               </li>
-                               {{/foreach}}
-                               <li><a href="profile_photo" >{{$profile.menu.chg_photo}}</a></li>
-                               <li><a href="profiles/new" id="profile-listing-new-link">{{$profile.menu.cr_new}}</a></li>
-                               <li><a href="profiles" >{{$profile.edit.3}}</a></li>
-                                                               
-                       </ul>
+                               <a class="icon s16 edit ttright" href="{{$profile.edit.0}}" title="{{$profile.edit.3}}"><span>{{$profile.edit.1}}</span></a>
                        </div>
                {{else}}
                        {{if $profile.menu}}
@@ -25,31 +13,46 @@
                {{/if}}
        </div>
 
+       {{if $profile.addr}}<div class="p-addr">{{$profile.addr}}</div>{{/if}}
+
+       {{if $profile.pdesc}}<div class="title">{{$profile.pdesc}}</div>{{/if}}
+
        {{if $profile.picdate}}
-               <div id="profile-photo-wrapper"><img class="photo" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name}}" /></div>
+               <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}}
-               <div id="profile-photo-wrapper"><img class="photo" src="{{$profile.photo}}" alt="{{$profile.name}}" /></div>
+               <div id="profile-photo-wrapper"><a href="{{$profile.url}}"><img class="photo u-photo" src="{{$profile.photo}}" alt="{{$profile.name}}"></a></div>
        {{/if}}
-       {{if $pdesc}}<div class="title">{{$profile.pdesc}}</div>{{/if}}
 
+       {{if $account_type}}<div class="account-type">{{$account_type}}</div>{{/if}}
        {{if $profile.network_name}}<dl class="network"><dt class="network-label">{{$network}}</dt><dd class="x-network">{{$profile.network_name}}</dd></dl>{{/if}}
        {{if $location}}
-               <dl class="location"><dt class="location-label">{{$location}}</dt><br> 
-               <dd class="adr">
+               <dl class="location"><dt class="location-label">{{$location}}</dt> 
+               <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 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}}
+       {{if $profile.pubkey}}<div class="key u-key" style="display:none;">{{$profile.pubkey}}</div>{{/if}}
+
+       {{if $contacts}}<div class="contacts" style="display:none;">{{$contacts}}</div>{{/if}}
+
+       {{if $updated}}<div class="updated" style="display:none;">{{$updated}}</div>{{/if}}
 
        {{if $marital}}<dl class="marital"><dt class="marital-label"><span class="heart">&hearts;</span>{{$marital}}</dt><dd class="marital-text">{{$profile.marital}}</dd></dl>{{/if}}
 
@@ -68,10 +71,14 @@
                                        <li><a id="dfrn-request-link" href="dfrn_request/{{$profile.nickname}}">{{$connect}}</a></li>
                                {{/if}}
                        {{/if}}
+                       {{if $wallmessage}}
+                               <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>
+                       {{/if}}
                </ul>
        </div>
 </div>
 
 {{$contact_block}}
-
-