streamline profile vcard with xchan vcard

2 files changed, 110 insertions, 49 deletions

diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 346e46c6b..a4641b68e 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -400,34 +400,26 @@ footer {
 	color: #444444;
 }
 
+.vcard-card {
+	border-bottom-left-radius: 0;
+	border-bottom-right-radius: 0;
+}
+
 .vcard {
 	margin-bottom: 10px;
 	padding: 0px 10px 10px 10px;
 	background-color: rgba(254,254,254,0.5);
 	border: 1px solid rgba(254,254,254,0.5);
-	border-radius: $radius;
+	border-top: 0px;
 	word-wrap: break-word;
 }
 
-.vcard dl,
-.vcard .title {
-	margin-top: 10px;
-	margin-bottom: 0px;
-}
-
-.connect-btn-wrapper {
-	margin-bottom: 10px;
-
-}
-
 .profile-edit-side-link {
-	padding: 3px 0px;
 	opacity: 0;
-	filter:alpha(opacity=30);
-	float: right;
+	filter:alpha(opacity=0);
 }
 
-.vcard:hover .profile-edit-side-link {
+.card:hover .profile-edit-side-link {
 	opacity: 1;
 	filter:alpha(opacity=100);
 }
diff --git a/view/tpl/profile_vcard.tpl b/view/tpl/profile_vcard.tpl
index 13caf5603..1778ae78b 100644
--- a/view/tpl/profile_vcard.tpl
+++ b/view/tpl/profile_vcard.tpl
@@ -1,34 +1,52 @@
-<div class="vcard h-card">
-	{{if ! $zcard}}
-	<div id="profile-photo-wrapper">{{if $editmenu}}<a href="profile_photo" title="{{$change_photo}}">{{/if}}<img class="photo u-photo" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.fullname}}">{{if $editmenu}}</a>{{/if}}</div>
-	{{/if}}
-	{{if $connect}}
-	<div class="connect-btn-wrapper"><a href="{{$connect_url}}" class="btn btn-block btn-success btn-sm"><i class="fa fa-plus"></i> {{$connect}}</a></div>
-	{{/if}}
-	{{if ! $zcard}}
-	{{if $editmenu.multi}}
-	<div class="dropdown float-end">
-		<a class="dropdown-toggle" data-bs-toggle="dropdown" href="#" ><i class="fa fa-pencil" title="{{$editmenu.edit.1}}"></i></a>
-		<div class="dropdown-menu dropdown-menu-end" role="menu">
-			{{foreach $editmenu.menu.entries as $e}}
-			<a href="profiles/{{$e.id}}" class="dropdown-item"><img class="menu-img-1" src='{{$e.photo}}'> {{$e.profile_name}}</a>
-			{{/foreach}}
-			<a href="profile_photo" class="dropdown-item">{{$editmenu.menu.chg_photo}}</a>
-			{{if $editmenu.menu.cr_new}}<a href="profiles/new" id="profile-listing-new-link" class="dropdown-item">{{$editmenu.menu.cr_new}}</a>{{/if}}
+{{if !$zcard}}
+<div class="card h-card vcard-card">
+	<div class="row">
+		<div class="col-4">
+			<a href="{{$link}}">
+				<img class="u-photo" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.fullname}}" width="80px" height="80px">
+			</a>
 		</div>
-	</div>
-	{{elseif $editmenu}}
-	<a class="profile-edit-side-link" href="{{$editmenu.edit.0}}" ><i class="fa fa-pencil" title="{{$editmenu.edit.1}}"></i></a>
-	{{/if}}
-	{{/if}}
+		<div class="col-7 m-1 p-0">
+			{{if $editmenu.multi}}
+			<div class="dropdown float-end">
+				<a class="profile-edit-side-link float-end" data-bs-toggle="dropdown" href="#" ><i class="fa fa-pencil" title="{{$editmenu.edit.1}}"></i></a>
+				<div class="dropdown-menu dropdown-menu-end" role="menu">
+					{{foreach $editmenu.menu.entries as $e}}
+					<a href="profiles/{{$e.id}}" class="dropdown-item"><img class="menu-img-1" src='{{$e.photo}}'> {{$e.profile_name}}</a>
+					{{/foreach}}
+					<a href="profile_photo" class="dropdown-item">{{$editmenu.menu.chg_photo}}</a>
+					{{if $editmenu.menu.cr_new}}
+					<a href="profiles/new" id="profile-listing-new-link" class="dropdown-item">{{$editmenu.menu.cr_new}}</a>
+					{{/if}}
+				</div>
+			</div>
+			{{elseif $editmenu}}
+			<a class="profile-edit-side-link float-end" href="{{$editmenu.edit.0}}" ><i class="fa fa-pencil" title="{{$editmenu.edit.1}}"></i></a>
+			{{/if}}
 
-	{{if ! $zcard}}
-	<div class="fn p-name">{{$profile.fullname}}{{if $profile.online}} <i class="fa fa-asterisk online-now" title="{{$profile.online}}"></i>{{/if}}</div>
-	{{if $reddress}}<div class="reddress">{{$profile.reddress}}</div>{{/if}}		
+			<div class="text-truncate">
+				<strong class="fn p-name">{{$profile.fullname}}{{if $profile.online}} <i class="fa fa-asterisk online-now" title="{{$profile.online}}"></i>{{/if}}</strong>
+			</div>
+			<div class="text-truncate">
+				<small class="text-muted p-adr">{{$profile.reddress}}</small>
+			</div>
+			{{if $connect}}
+			<div class="mt-1">
+				<a href="{{$connect_url}}" class="btn btn-success btn-sm" rel="nofollow">
+					<i class="fa fa-plus"></i> {{$connect}}
+				</a>
+			</div>
+			{{/if}}
+		</div>
+	</div>
+</div>
+<div class="vcard h-card rounded-bottom">
+	{{if $profile.pdesc}}
+	<div class="pt-2 pb-3">{{$profile.pdesc}}</div>
 	{{/if}}
-	{{if $pdesc}}<div class="title">{{$profile.pdesc}}</div>{{/if}}
 	{{if $location}}
-		<dl class="location"><dt class="location-label">{{$location}}</dt> 
+	<dl class="">
+		<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">
@@ -36,25 +54,76 @@
 				<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 p-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="">
+		<dt class="gender-label">{{$gender}}</dt>
+		<dd class="p-gender">{{if $profile.gender_icon}}<i class="fa fa-{{$profile.gender_icon}}"></i>&nbsp;{{/if}}{{$profile.gender}}</dd>
+	</dl>
+	{{/if}}
+	{{if $marital}}
+	<dl class="">
+		<dt class="marital-label"><span class="heart"><i class="fa fa-heart"></i>&nbsp;</span>{{$marital}}</dt>
+		<dd class="marital-text">{{$profile.marital}}</dd>
+	</dl>
+	{{/if}}
+	{{if $homepage}}
+	<dl class="">
+		<dt class="homepage-label">{{$homepage}}</dt>
+		<dd class="homepage-url u-url">{{$profile.homepage}}</dd>
+	</dl>
+	{{/if}}
+
+	<div class="hcard-addon"></div>
+</div>
+{{/if}}
+
+{{if $zcard}}
+<div class="vcard h-card">
+	{{if $connect}}
+	<div class="connect-btn-wrapper"><a href="{{$connect_url}}" class="btn btn-block btn-success btn-sm"><i class="fa fa-plus"></i> {{$connect}}</a></div-->
+	{{/if}}
+	{{if $reddress}}<div class="reddress">{{$profile.reddress}}</div>{{/if}}
+
+	{{if $pdesc}}<div class="title">{{$profile.pdesc}}</div>{{/if}}
+	{{if $location}}
+		<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 p-country-name">{{$profile.country_name}}</span>{{/if}}
+			</dd>
 		</dl>
 	{{/if}}
 
-	{{if $gender}}<dl class="mf"><dt class="gender-label">{{$gender}}</dt> <dd class="p-gender">{{if $profile.gender_icon}}<i class="fa fa-{{$profile.gender_icon}}"></i>&nbsp;{{/if}}{{$profile.gender}}</dd></dl>{{/if}}
+	{{if $gender}}
+		<dl class="mf">
+			<dt class="gender-label">{{$gender}}</dt>
+			<dd class="p-gender">{{if $profile.gender_icon}}<i class="fa fa-{{$profile.gender_icon}}"></i>&nbsp;{{/if}}{{$profile.gender}}</dd>
+		</dl>
+	{{/if}}
 
 	{{if $marital}}<dl class="marital"><dt class="marital-label"><span class="heart"><i class="fa fa-heart"></i>&nbsp;</span>{{$marital}}</dt><dd class="marital-text">{{$profile.marital}}</dd></dl>{{/if}}
 
 	{{if $homepage}}<dl class="homepage"><dt class="homepage-label">{{$homepage}}</dt><dd class="homepage-url u-url">{{$profile.homepage}}</dd></dl>{{/if}}
 
-<div class="hcard-addon"></div>
+	<div class="hcard-addon"></div>
 </div>
-<div class="clear"></div>
+{{/if}}
 
-{{$rating}}
+<div class="clear"></div>
 
 {{$chanmenu}}
-
 {{$contact_block}}