add render_location hook to both sets of conversations

[friendica.git] / view / profile_vcard.tpl

diff --git a/view/profile_vcard.tpl b/view/profile_vcard.tpl
old mode 100644 (file)
new mode 100755 (executable)
index 01238ed..5bcbfd0
--- a/view/profile_vcard.tpl
+++ b/view/profile_vcard.tpl
@@ -1,20 +1,33 @@
 <div class="vcard">
 
-       <div class="fn">$profile.name</div>
+       <div class="tool">
+               <div class="fn label">$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">
+                               {{ for $profile.menu.entries as $e }}
+                               <li>
+                                       <a href="profiles/$e.id"><img src='$e.photo'>$e.profile_name</a>
+                               </li>
+                               {{ endfor }}
+                               <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>
+                               
+                       </ul>
+                       </div>
+               {{ endif }}
+       </div>
+                               
+       
        {{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }}
-       <div id="profile-photo-wrapper"><img class="photo" width="175" height="175" src="$profile.photo" alt="$profile.name"></div>
+       <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-extra-links">
-               <ul>
-                       {{ if $connect }}
-                               <li><a id="dfrn-request-link" href="dfrn_request/$profile['nickname']">$connect</a></li>
-                       {{ endif }}
-               </ul>
-       </div>
 
        {{ if $location }}
-               <div class="location"><span class="location-label">$location</span> 
-               <div class="adr">
+               <dl class="location"><dt class="location-label">$location</dt> 
+               <dd class="adr">
                        {{ if $profile.address }}<div class="street-address">$profile.address</div>{{ endif }}
                        <span class="city-state-zip">
                                <span class="locality">$profile.locality</span>{{ if $profile.locality }}, {{ endif }}
@@ -22,20 +35,27 @@
                                <span class="postal-code">$profile.postal-code</span>
                        </span>
                        {{ if $profile.country-name }}<span class="country-name">$profile.country-name</span>{{ endif }}
-               </div>
-       
+               </dd>
+               </dl>
        {{ endif }}
 
-       {{ if $gender }}<div class="mf"><span class="gender-label">$gender</span> <span class="x-gender">$profile.gender</span></div>{{ endif }}
+       {{ if $gender }}<dl class="mf"><dt class="gender-label">$gender</dt> <dd class="x-gender">$profile.gender</dd></dl>{{ endif }}
        
        {{ if $profile.pubkey }}<div class="key" style="display:none;">$profile.pubkey</div>{{ endif }}
 
-       {{ if $marital }}<div class="marital"><span class="marital-label"><span class="heart">&hearts;</span>$marital</span><span class="marital-text">$profile.marital</span></div>{{ endif }}
+       {{ if $marital }}<dl class="marital"><dt class="marital-label"><span class="heart">&hearts;</span>$marital</dt><dd class="marital-text">$profile.marital</dd></dl>{{ endif }}
 
-       {{ if $homepage }}<div class="homepage"><span class="homepage-label">$homepage</span><span class="homepage-url"><a href="$profile.homepage" target="external-link">$profile.homepage</a></span></div>{{ endif }}
+       {{ 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></dl>{{ endif }}
 
        {{ inc diaspora_vcard.tpl }}{{ endinc }}
-
+       
+       <div id="profile-extra-links">
+               <ul>
+                       {{ if $connect }}
+                               <li><a id="dfrn-request-link" href="dfrn_request/$profile.nickname">$connect</a></li>
+                       {{ endif }}
+               </ul>
+       </div>
 </div>
 
 $contact_block