profile cleanup and fixes

6 files changed, 94 insertions, 140 deletions

diff --git a/Zotlabs/Widget/Fullprofile.php b/Zotlabs/Widget/Fullprofile.php
index d7340ef40..e8ed13811 100644
--- a/Zotlabs/Widget/Fullprofile.php
+++ b/Zotlabs/Widget/Fullprofile.php
@@ -11,6 +11,6 @@ class Fullprofile {
 
 		$block = observer_prohibited();
 
-		return profile_sidebar(\App::$profile, $block);
+		return profile_sidebar(\App::$profile, $block, true, true);
 	}
 }
diff --git a/Zotlabs/Widget/Profile.php b/Zotlabs/Widget/Profile.php
index bffd910b6..8bd624c0f 100644
--- a/Zotlabs/Widget/Profile.php
+++ b/Zotlabs/Widget/Profile.php
@@ -7,7 +7,7 @@ class Profile {
 
 	function widget($args) {
 		$block = observer_prohibited();
-		return profile_sidebar(\App::$profile, $block, true);
+		return profile_sidebar(\App::$profile, $block, true, false);
 	}
 
-}
\ No newline at end of file
+}
diff --git a/include/channel.php b/include/channel.php
index 927da3dcd..102a03489 100644
--- a/include/channel.php
+++ b/include/channel.php
@@ -1566,7 +1566,7 @@ function profile_edit_menu($uid) {
  * @return string (HTML) suitable for sidebar inclusion
  * Exceptions: Returns empty string if passed $profile is wrong type or not populated
  */
-function profile_sidebar($profile, $block = 0, $show_connect = true, $zcard = false) {
+function profile_sidebar($profile, $block = 0, $show_connect = true, $details = false) {
 
 	$observer = App::get_observer();
 
@@ -1622,6 +1622,7 @@ function profile_sidebar($profile, $block = 0, $show_connect = true, $zcard = fa
 	$gender   = ((x($profile,'gender')   == 1) ? t('Gender:')   : False);
 	$marital  = ((x($profile,'marital')  == 1) ? t('Status:')   : False);
 	$homepage = ((x($profile,'homepage') == 1) ? t('Homepage:') : False);
+	$hometown = ((x($profile,'hometown') == 1) ? t('Hometown:') : False);
 	$profile['online']   = (($profile['online_status'] === 'online') ? t('Online Now') : False);
 
 //	logger('online: ' . $profile['online']);
@@ -1662,18 +1663,18 @@ function profile_sidebar($profile, $block = 0, $show_connect = true, $zcard = fa
 		$tpl = get_markup_template('profile_vcard.tpl');
 
 	$o .= replace_macros($tpl, array(
-		'$zcard'         => $zcard,
+		'$details'       => $details,
 		'$profile'       => $profile,
 		'$connect'       => $connect,
 		'$connect_url'   => $connect_url,
 		'$location'      => $location,
+		'$hometown'      => $hometown,
 		'$gender'        => $gender,
 		'$pdesc'         => $pdesc,
 		'$marital'       => $marital,
 		'$homepage'      => $homepage,
 		'$chanmenu'      => $channel_menu,
 		'$reddress'      => $reddress,
-		'$rating'        => '',
 		'$contact_block' => $contact_block,
 		'$change_photo'  => t('Change your profile photo'),
 		'$editmenu'      => profile_edit_menu($profile['uid'])
diff --git a/view/css/mod_profile_photo.css b/view/css/mod_profile_photo.css
index 1b7e15194..98fdd4e91 100644
--- a/view/css/mod_profile_photo.css
+++ b/view/css/mod_profile_photo.css
@@ -10,11 +10,3 @@
 #profile-photo-submit-wrapper {
 	clear: both;
 }
-
-#profile-photo-wrapper {
-	height: 300px;
-	width: 300px;
-	max-width: 300px;
-	max-height: 300px;
-	overflow: hidden;
-}
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index aad17698b..16a7624f8 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -421,15 +421,6 @@ footer {
 #profile-photo-wrapper img {
 	width: 100%;
 	height: 100%;
-	max-width: 300px;
-	max-height: 300px;
-}
-
-#profile-photo-wrapper {
-	width: 251px;
-	height: 251px;
-	margin-bottom: 10px;
-	border-radius: $radius;
 }
 
 #hide-friends-yes-label,
diff --git a/view/tpl/profile_vcard.tpl b/view/tpl/profile_vcard.tpl
index 487fa3959..8ebc9a311 100644
--- a/view/tpl/profile_vcard.tpl
+++ b/view/tpl/profile_vcard.tpl
@@ -1,137 +1,107 @@
-{{if !$zcard}}
-
 <div  class="rounded mb-3 vcard-card h-card">
-<div  class="card">
-	<div class="row">
-		<div class="col-4" style="width: 7rem;">
-			{{if $editmenu}}
-			<a href="profile_photo" title="{{$change_photo}}">
-			{{/if}}
-				<img class="rounded-start u-photo" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.fullname}}" style="width: 6rem; height:6rem;">
-			{{if $editmenu}}
-			{{/if}}
-			</a>
-		</div>
-		<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  class="card">
+		<div class="row">
+			<div class="col-4" style="width: 7rem;">
+				{{if $editmenu}}
+				<a href="profile_photo" title="{{$change_photo}}">
+				{{/if}}
+					<div id="profile-photo-wrapper">
+						<img class="rounded-start u-photo" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.fullname}}" style="width: 6rem; height:6rem;">
+					</div>
+				{{if $editmenu}}
+				</a>
+				{{/if}}
 			</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}}
+			<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}}
 
-			<div class="text-truncate">
-				<strong class="fn p-name">{{$profile.fullname}}{{if $profile.online}}<i class="fa fa-fw fa-asterisk text-danger ps-2" 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 class="text-truncate">
+					<strong class="fn p-name">{{$profile.fullname}}{{if $profile.online}}<i class="fa fa-fw fa-asterisk text-danger ps-2" 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>
-			{{/if}}
 		</div>
 	</div>
-</div>
-<div class="vcard ps-2 pe-2">
-	{{if $profile.pdesc}}
-	<div class="pb-3 pt-2">{{$profile.pdesc}}</div>
-	{{/if}}
-	{{if $location}}
-	<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">
-				<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="">
-		<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="pb-2">
-		<dt class="homepage-label">{{$homepage}}</dt>
-		<dd class="homepage-url u-url">{{$profile.homepage}}</dd>
-	</dl>
-	{{/if}}
-
-	<div class="hcard-addon"></div>
-</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">
+	{{if $details}}
+	<div class="vcard ps-2 pe-2">
+		{{if $profile.pdesc}}
+		<div class="pb-3 pt-2">{{$profile.pdesc}}</div>
+		{{/if}}
+		{{if $location}}
+		<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">
-					<span class="locality p-locality">{{$profile.locality}}</span>{{if $profile.locality}}, {{/if}}
-					<span class="region p-region">{{$profile.region}}</span>
+				{{if $profile.address}}
+				<div class="street-address p-street-address">{{$profile.address}}</div>
+				{{/if}}
+				<div class="city-state-zip">
 					<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}}
+					<span class="locality p-locality">{{$profile.locality}}</span>
+				</div>
+				{{if $profile.region}}
+				<div class="region p-region">{{$profile.region}}</div>
+				{{/if}}
+				{{if $profile.country_name}}
+				<div class="country-name p-country-name">{{$profile.country_name}}</div>
+				{{/if}}
 			</dd>
 		</dl>
-	{{/if}}
-
-	{{if $gender}}
-		<dl class="mf">
+		{{/if}}
+		{{if $hometown}}
+		<dl class="">
+			<dt class="hometown-label">{{$hometown}}</dt>
+			<dd class="p-hometown">{{$profile.hometown}}</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="pb-2">
+			<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 $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>
-{{/if}}
-
-<div class="clear"></div>
-
+{{if $details}}
 {{$chanmenu}}
 {{$contact_block}}
+{{/if}}