From 058e329dfbc2678fa7e3cb2ce130fb9ffd69b84d Mon Sep 17 00:00:00 2001 From: Fabio Comuni Date: Thu, 1 Sep 2011 12:37:30 +0200 Subject: [PATCH] Fix profile vcard and style --- boot.php | 1 + images/connect-bg.png | Bin 0 -> 689 bytes view/profile_vcard.tpl | 31 ++++++++++----------- view/theme/quattro/colors.less | 3 +++ view/theme/quattro/quattro.less | 30 +++++++++++++++++++++ view/theme/quattro/style.css | 46 ++++++++++++++++++++++++++++++++ 6 files changed, 96 insertions(+), 15 deletions(-) create mode 100644 images/connect-bg.png diff --git a/boot.php b/boot.php index edad6e70f..73cfe6e06 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 0000000000000000000000000000000000000000..0611c73e56f93658fc925521d68bb70aaecba21e GIT binary patch literal 689 zcmV;i0#5yjP)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2ipk& z3K};AhM8Ib00J>dL_t(Y$Gz1*XcJK!!13?9q%mzOshS8?5k&=;3awzlL9qB|aO&dF zQJw18y_=hZi&JqFK}JN_NamV|- z-@V`aof@7O;orjnHQ*UA+wEnKgM|ki1!i`^L&f%D0GI|A{s#uo2i)rfCZitYRfCI^ z5GOe2u-1lm=Rh3R8k`86hN0H*>5FkDzUW`u0!s z)*{?`+%?0t*z%|MsJla8Eh3tx))*UrXgtqQT(7Z`*v2@)|J9&YYcSY(4<{qBN@)$M zE8su@Gan{+T^u7E0YfR0fdLfS*tkVAnT&Oq(ixK3{6VX9J{IPiKB~bHP+?~2lqD&; zS8zNQHg~#IZk%Cx=j7j> zQ_19U2ui|*#DE?|R-*`L4aOu8CA?c3WnuFgC{QABLP!M-P=d8O78HqX`B^Hp-&h+i zUHb+V)DZ!}fe0cF5kbo9cxT7DLXquC{3`bOeeN9lf>Ofg@+pe-T$nNveqIq=;FF$s z$iVGKU7<*9KiWAIDxGQViEn_Zp1MAON)Pr@b$iWs>ahQ3ZM%F=nZ-DM2516H-5`KJ XgSZjcYNoow00000NkvXXu0mjf`9mx7 literal 0 HcmV?d00001 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 }}
$profile.pdesc
{{ endif }}
$profile.name
- + {{ 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 }}{{ endif }} - {{ if $marital }}
♥$marital$profile.marital
{{ endif }} + {{ if $marital }}
♥$marital
$profile.marital
{{ endif }} - {{ if $homepage }}
$homepage$profile.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 d79dbca68..6015c61ee 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 f83cce3ce..d21c3c182 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 e0d22a007..28e6f5fa1 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;