remove html from profile vcard code

3 files changed, 80 insertions, 13 deletions

diff --git a/view/contact_block.tpl b/view/contact_block.tpl
new file mode 100644
index 000000000..00b97a6d8
--- /dev/null
+++ b/view/contact_block.tpl
@@ -0,0 +1,9 @@
+<h4 class="contact-h4">$contacts</h4>
+{{ if $micropro }}
+	<div id="contact-block">
+		{{ for $micropro as $m }}
+			$m
+		{{ endfor }}
+	</div>
+	<div id="viewcontacts"><a id="viewcontacts-link" href="viewcontacts/$nickname">$viewcontacts</a></div>
+{{ endif }}
diff --git a/view/diaspora_vcard.tpl b/view/diaspora_vcard.tpl
new file mode 100644
index 000000000..aa2c9eded
--- /dev/null
+++ b/view/diaspora_vcard.tpl
@@ -0,0 +1,44 @@
+<div style="display:none;">
+	<dl class='entity_nickname'>
+		<dt>Nickname</dt>
+		<dd>		
+			<a class="nickname url uid" href="$podloc/" rel="me">$diaspora.nickname</a>
+		</dd>
+	</dl>
+	<dl class='entity_fn'>
+		<dt>Full name</dt>
+		<dd>
+			<span class='fn'>$diaspora.fullname</span>
+		</dd>
+	</dl>
+	<dl class="entity_url">
+		<dt>URL</dt>
+		<dd>
+			<a class="url" href="$diaspora.podloc/" id="pod_location" rel="me">$diaspora.podloc/</a>
+		</dd>
+	</dl>
+	<dl class="entity_photo">
+		<dt>Photo</dt>
+		<dd>
+			<img class="photo avatar" height="300px" width="300px" src="$diaspora.photo300">
+		</dd>
+	</dl>
+	<dl class="entity_photo_medium">
+		<dt>Photo</dt>
+		<dd> 
+			<img class="photo avatar" height="100px" width="100px" src="$diaspora.photo100">
+		</dd>
+	</dl>
+	<dl class="entity_photo_small">
+		<dt>Photo</dt>
+		<dd>
+			<img class="photo avatar" height="50px" width="50px" src="$diaspora.photo50">
+		</dd>
+	</dl>
+	<dl class="entity_searchable">
+		<dt>Searchable</dt>
+		<dd>
+			<span class="searchable">$diaspora.searchable</span>
+		</dd>
+	</dl>
+</div>
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