diff --git a/boot.php b/boot.php
index edad6e70f3..73cfe6e064 100644
--- a/boot.php
+++ b/boot.php
@@ -878,6 +878,7 @@ function profile_sidebar($profile, $block = 0) {
'podloc' => $a->get_baseurl(),
'searchable' => (($profile['publish'] && $profile['net-publish']) ? 'true' : 'false' ),
'nickname ' => $profile['nickname'],
+ 'fullname' => $profile['name'],
'photo300 ' => $a->get_baseurl() . '/photo/custom/300/' . $profile['uid'] . '.jpg',
'photo100 ' => $a->get_baseurl() . '/photo/custom/100/' . $profile['uid'] . '.jpg',
'photo50 ' => $a->get_baseurl() . '/photo/custom/50/' . $profile['uid'] . '.jpg',
diff --git a/images/connect-bg.png b/images/connect-bg.png
new file mode 100644
index 0000000000..0611c73e56
Binary files /dev/null and b/images/connect-bg.png differ
diff --git a/view/profile_vcard.tpl b/view/profile_vcard.tpl
index 01238ed5af..88111b0f14 100644
--- a/view/profile_vcard.tpl
+++ b/view/profile_vcard.tpl
@@ -4,17 +4,11 @@
{{ if $pdesc }}
$profile.pdesc
{{ endif }}
-
+
{{ if $location }}
- $location
-
+
- $location
+ -
{{ if $profile.address }}
$profile.address
{{ endif }}
$profile.locality{{ if $profile.locality }}, {{ endif }}
@@ -22,20 +16,27 @@
$profile.postal-code
{{ if $profile.country-name }}$profile.country-name{{ endif }}
-
-
+
+
{{ endif }}
- {{ if $gender }}
$gender $profile.gender
{{ endif }}
+ {{ if $gender }}
- $gender
- $profile.gender
{{ endif }}
{{ if $profile.pubkey }}
$profile.pubkey
{{ endif }}
- {{ if $marital }}
♥$marital$profile.marital
{{ endif }}
+ {{ if $marital }}
- ♥$marital
- $profile.marital
{{ endif }}
- {{ if $homepage }}
{{ endif }}
+ {{ if $homepage }}
- $homepage
- $profile.homepage
{{ endif }}
{{ inc diaspora_vcard.tpl }}{{ endinc }}
-
+
+
$contact_block
diff --git a/view/theme/quattro/colors.less b/view/theme/quattro/colors.less
index d79dbca689..6015c61ee4 100644
--- a/view/theme/quattro/colors.less
+++ b/view/theme/quattro/colors.less
@@ -55,6 +55,9 @@
@MenuItemDetail: @Metalic2;
@AsideBorder: @Metalic1;
+@AsideConnect: @Grey1;
+@AsideConnectBg: @Blue3;
+@AsideConnectHoverBg: @Blue1;
diff --git a/view/theme/quattro/quattro.less b/view/theme/quattro/quattro.less
index f83cce3ce5..d21c3c1826 100644
--- a/view/theme/quattro/quattro.less
+++ b/view/theme/quattro/quattro.less
@@ -203,8 +203,38 @@ aside {
width: 200px;
padding:0px 10px 0px 20px;
border-right: 1px solid @AsideBorder;
+
+ .vcard {
+ .fn { font-size: 16px; font-weight: bold; margin-bottom: 5px; }
+ .title { margin-bottom: 5px; }
+ dl { height: auto; overflow: auto; }
+ dt {float: left; margin-left: 0px; width: 35%; }
+ dd {float: left; margin-left: 4px; width: 60%;}
+
+ }
+
+ #profile-extra-links {
+ ul { padding: 0px; margin: 0px; }
+ li { padding: 0px; margin: 0px; list-style: none; }
+ }
+
+ #dfrn-request-link {
+ display: block;
+ .rounded();
+ color: @AsideConnect;
+ background: @AsideConnectBg url('../../../images/connect-bg.png') no-repeat left center;
+ font-weight: bold;
+ text-transform:uppercase;
+ padding: 4px 2px 2px 35px;
+
+ &:hover { text-decoration: none; background-color: @AsideConnectHoverBg; }
+ }
+
}
+
+
+
/* section */
section {
display: table-cell;
diff --git a/view/theme/quattro/style.css b/view/theme/quattro/style.css
index e0d22a007b..28e6f5fa18 100644
--- a/view/theme/quattro/style.css
+++ b/view/theme/quattro/style.css
@@ -250,6 +250,52 @@ aside {
padding: 0px 10px 0px 20px;
border-right: 1px solid #bdcdd4;
}
+aside .vcard .fn {
+ font-size: 16px;
+ font-weight: bold;
+ margin-bottom: 5px;
+}
+aside .vcard .title {
+ margin-bottom: 5px;
+}
+aside .vcard dl {
+ height: auto;
+ overflow: auto;
+}
+aside .vcard dt {
+ float: left;
+ margin-left: 0px;
+ width: 35%;
+}
+aside .vcard dd {
+ float: left;
+ margin-left: 4px;
+ width: 60%;
+}
+aside #profile-extra-links ul {
+ padding: 0px;
+ margin: 0px;
+}
+aside #profile-extra-links li {
+ padding: 0px;
+ margin: 0px;
+ list-style: none;
+}
+aside #dfrn-request-link {
+ display: block;
+ -moz-border-radius: 5px 5px 5px 5px;
+ -webkit-border-radius: 5px 5px 5px 5px;
+ border-radius: 5px 5px 5px 5px;
+ color: #ffffff;
+ background: #005c94 url('../../../images/connect-bg.png') no-repeat left center;
+ font-weight: bold;
+ text-transform: uppercase;
+ padding: 4px 2px 2px 35px;
+}
+aside #dfrn-request-link:hover {
+ text-decoration: none;
+ background-color: #19aeff;
+}
/* section */
section {
display: table-cell;