From 8b615133d528eb074a23746afef6201f474a4e3f Mon Sep 17 00:00:00 2001
From: Fabio Comuni <fabrix.xm@gmail.com>
Date: Wed, 31 Aug 2011 17:31:44 +0200
Subject: remove html from profile vcard code

---
 view/profile_vcard.tpl | 40 +++++++++++++++++++++++++++-------------
 1 file changed, 27 insertions(+), 13 deletions(-)

(limited to 'view/profile_vcard.tpl')

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
 
 
-- 
cgit v1.2.3


From 058e329dfbc2678fa7e3cb2ce130fb9ffd69b84d Mon Sep 17 00:00:00 2001
From: Fabio Comuni <fabrix.xm@gmail.com>
Date: Thu, 1 Sep 2011 12:37:30 +0200
Subject: Fix profile vcard and style

---
 view/profile_vcard.tpl | 31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

(limited to 'view/profile_vcard.tpl')

diff --git a/view/profile_vcard.tpl b/view/profile_vcard.tpl
index 01238ed5a..88111b0f1 100644
--- a/view/profile_vcard.tpl
+++ b/view/profile_vcard.tpl
@@ -4,17 +4,11 @@
 	{{ 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>
-			{{ 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 +16,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
-- 
cgit v1.2.3


From 2c1aca7ffe628ab2a455fc7abf730b6d01d288ea Mon Sep 17 00:00:00 2001
From: Fabio Comuni <fabrix.xm@gmail.com>
Date: Mon, 5 Sep 2011 11:16:08 +0200
Subject: fix aside contact block, add edit profiles icon

---
 view/profile_vcard.tpl | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'view/profile_vcard.tpl')

diff --git a/view/profile_vcard.tpl b/view/profile_vcard.tpl
index 88111b0f1..08e2e2e3a 100644
--- a/view/profile_vcard.tpl
+++ b/view/profile_vcard.tpl
@@ -1,6 +1,10 @@
 <div class="vcard">
 
-	<div class="fn">$profile.name</div>
+	<div class="tool">
+		<div class="fn label">$profile.name</div>
+		{{ if $profile.edit }}<a class="icon s16 edit" href="$profile.edit.0" title="$profile.edit.3"><span>$profile.edit.1</span></a>{{ 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>
 
-- 
cgit v1.2.3


From 14125ce67bb27b024d082738c8065e1bc7f2d377 Mon Sep 17 00:00:00 2001
From: Fabio Comuni <fabrix.xm@gmail.com>
Date: Mon, 5 Sep 2011 11:32:40 +0200
Subject: Add tipTip js tooltips

---
 view/profile_vcard.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'view/profile_vcard.tpl')

diff --git a/view/profile_vcard.tpl b/view/profile_vcard.tpl
index 08e2e2e3a..ecdb5280f 100644
--- a/view/profile_vcard.tpl
+++ b/view/profile_vcard.tpl
@@ -2,7 +2,7 @@
 
 	<div class="tool">
 		<div class="fn label">$profile.name</div>
-		{{ if $profile.edit }}<a class="icon s16 edit" href="$profile.edit.0" title="$profile.edit.3"><span>$profile.edit.1</span></a>{{ endif }}
+		{{ if $profile.edit }}<a class="icon s16 edit ttright" href="$profile.edit.0" title="$profile.edit.3"><span>$profile.edit.1</span></a>{{ endif }}
 	</div>
 	
 	{{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }}
-- 
cgit v1.2.3


From 08e54234e30c10e3130b7d71caba9fd43e3593e3 Mon Sep 17 00:00:00 2001
From: Fabio Comuni <fabrix.xm@gmail.com>
Date: Mon, 5 Sep 2011 16:55:40 +0200
Subject: profiles popup menu in sidebar

---
 view/profile_vcard.tpl | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

(limited to 'view/profile_vcard.tpl')

diff --git a/view/profile_vcard.tpl b/view/profile_vcard.tpl
index ecdb5280f..cab732cc1 100644
--- a/view/profile_vcard.tpl
+++ b/view/profile_vcard.tpl
@@ -2,8 +2,21 @@
 
 	<div class="tool">
 		<div class="fn label">$profile.name</div>
-		{{ if $profile.edit }}<a class="icon s16 edit ttright" href="$profile.edit.0" title="$profile.edit.3"><span>$profile.edit.1</span></a>{{ endif }}
+		{{ 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>
-- 
cgit v1.2.3


From 7e806429cca6ac39a9ef1bd1fd400d03e626389b Mon Sep 17 00:00:00 2001
From: Fabio Comuni <fabrix.xm@gmail.com>
Date: Thu, 15 Sep 2011 10:38:37 +0200
Subject: quattro

---
 view/profile_vcard.tpl | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'view/profile_vcard.tpl')

diff --git a/view/profile_vcard.tpl b/view/profile_vcard.tpl
index cab732cc1..d65b65784 100644
--- a/view/profile_vcard.tpl
+++ b/view/profile_vcard.tpl
@@ -7,7 +7,9 @@
 			<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>
+				<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>
-- 
cgit v1.2.3