remove html from profile vcard code

1 files changed, 27 insertions, 13 deletions

diff --git a/view/profile_vcard.tpl b/view/profile_vcard.tpl
index 34f265ee6..01238ed5a 100644
--- a/view/profile_vcard.tpl
+++ b/view/profile_vcard.tpl
@@ -1,29 +1,43 @@
 <div class="vcard">
 
-	$fullname
-	$pdesc
-	$tabs
-
-	$photo
+	<div class="fn">$profile.name</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-extra-links">
 		<ul>
-			$connect
+			{{ if $connect }}
+				<li><a id="dfrn-request-link" href="dfrn_request/$profile['nickname']">$connect</a></li>
+			{{ endif }}
 		</ul>
 	</div>
 
-	$location
+	{{ if $location }}
+		<div class="location"><span class="location-label">$location</span> 
+		<div 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 }}
+				<span class="region">$profile.region</span>
+				<span class="postal-code">$profile.postal-code</span>
+			</span>
+			{{ if $profile.country-name }}<span class="country-name">$profile.country-name</span>{{ endif }}
+		</div>
+	
+	{{ endif }}
 
-	$gender
+	{{ if $gender }}<div class="mf"><span class="gender-label">$gender</span> <span class="x-gender">$profile.gender</span></div>{{ endif }}
+	
+	{{ if $profile.pubkey }}<div class="key" style="display:none;">$profile.pubkey</div>{{ endif }}
 
-	$pubkey
+	{{ 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 }}
 
-$diaspora
+	{{ 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 }}
 
-</div>
+	{{ inc diaspora_vcard.tpl }}{{ endinc }}
 
-$marital
+</div>
 
-$homepage
+$contact_block