Fix profile vcard and style

This commit is contained in:
Fabio Comuni 2011-09-01 12:37:30 +02:00
parent 8b615133d5
commit 058e329dfb
6 changed files with 96 additions and 15 deletions

View file

@ -878,6 +878,7 @@ function profile_sidebar($profile, $block = 0) {
'podloc' => $a->get_baseurl(), 'podloc' => $a->get_baseurl(),
'searchable' => (($profile['publish'] && $profile['net-publish']) ? 'true' : 'false' ), 'searchable' => (($profile['publish'] && $profile['net-publish']) ? 'true' : 'false' ),
'nickname ' => $profile['nickname'], 'nickname ' => $profile['nickname'],
'fullname' => $profile['name'],
'photo300 ' => $a->get_baseurl() . '/photo/custom/300/' . $profile['uid'] . '.jpg', 'photo300 ' => $a->get_baseurl() . '/photo/custom/300/' . $profile['uid'] . '.jpg',
'photo100 ' => $a->get_baseurl() . '/photo/custom/100/' . $profile['uid'] . '.jpg', 'photo100 ' => $a->get_baseurl() . '/photo/custom/100/' . $profile['uid'] . '.jpg',
'photo50 ' => $a->get_baseurl() . '/photo/custom/50/' . $profile['uid'] . '.jpg', 'photo50 ' => $a->get_baseurl() . '/photo/custom/50/' . $profile['uid'] . '.jpg',

BIN
images/connect-bg.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 689 B

View file

@ -4,17 +4,11 @@
{{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }} {{ 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-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 }} {{ if $location }}
<div class="location"><span class="location-label">$location</span> <dl class="location"><dt class="location-label">$location</dt>
<div class="adr"> <dd class="adr">
{{ if $profile.address }}<div class="street-address">$profile.address</div>{{ endif }} {{ if $profile.address }}<div class="street-address">$profile.address</div>{{ endif }}
<span class="city-state-zip"> <span class="city-state-zip">
<span class="locality">$profile.locality</span>{{ if $profile.locality }}, {{ endif }} <span class="locality">$profile.locality</span>{{ if $profile.locality }}, {{ endif }}
@ -22,20 +16,27 @@
<span class="postal-code">$profile.postal-code</span> <span class="postal-code">$profile.postal-code</span>
</span> </span>
{{ if $profile.country-name }}<span class="country-name">$profile.country-name</span>{{ endif }} {{ if $profile.country-name }}<span class="country-name">$profile.country-name</span>{{ endif }}
</div> </dd>
</dl>
{{ endif }} {{ 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 $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 }} {{ 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> </div>
$contact_block $contact_block

View file

@ -55,6 +55,9 @@
@MenuItemDetail: @Metalic2; @MenuItemDetail: @Metalic2;
@AsideBorder: @Metalic1; @AsideBorder: @Metalic1;
@AsideConnect: @Grey1;
@AsideConnectBg: @Blue3;
@AsideConnectHoverBg: @Blue1;

View file

@ -203,8 +203,38 @@ aside {
width: 200px; width: 200px;
padding:0px 10px 0px 20px; padding:0px 10px 0px 20px;
border-right: 1px solid @AsideBorder; 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 */
section { section {
display: table-cell; display: table-cell;

View file

@ -250,6 +250,52 @@ aside {
padding: 0px 10px 0px 20px; padding: 0px 10px 0px 20px;
border-right: 1px solid #bdcdd4; 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 */
section { section {
display: table-cell; display: table-cell;