tobias/friendica
1
0
Fork 0
Code Pull requests Activity

include friendica address in hcard

Browse source
This commit is contained in:
rabuzarus 2015-11-26 17:46:38 +01:00
parent 84ec36d52c
commit 620299dc25
14 changed files with 60 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/identity.php
View file

@ -62,7 +62,7 @@ if(! function_exists('profile_load')) {
if($profile) { if($profile) {
$profile_int = intval($profile); $profile_int = intval($profile);
$r = q("SELECT `profile`.`uid` AS `profile_uid`, `profile`.* , `contact`.`avatar-date` AS picdate, `user`.* FROM `profile` $r = q("SELECT `profile`.`uid` AS `profile_uid`, `profile`.* , `contact`.`avatar-date` AS picdate, `contact`.`addr` AS faddr, `user`.* FROM `profile`
INNER JOIN `contact` on `contact`.`uid` = `profile`.`uid` INNER JOIN `user` ON `profile`.`uid` = `user`.`uid` INNER JOIN `contact` on `contact`.`uid` = `profile`.`uid` INNER JOIN `user` ON `profile`.`uid` = `user`.`uid`
WHERE `user`.`nickname` = '%s' AND `profile`.`id` = %d AND `contact`.`self` = 1 LIMIT 1", WHERE `user`.`nickname` = '%s' AND `profile`.`id` = %d AND `contact`.`self` = 1 LIMIT 1",
dbesc($nickname), dbesc($nickname),
@ -70,7 +70,7 @@ if(! function_exists('profile_load')) {
); );
} }
if((!$r) && (!count($r))) { if((!$r) && (!count($r))) {
$r = q("SELECT `profile`.`uid` AS `profile_uid`, `profile`.* , `contact`.`avatar-date` AS picdate, `user`.* FROM `profile` $r = q("SELECT `profile`.`uid` AS `profile_uid`, `profile`.* , `contact`.`avatar-date` AS picdate, `contact`.`addr` AS faddr, `user`.* FROM `profile`
INNER JOIN `contact` ON `contact`.`uid` = `profile`.`uid` INNER JOIN `user` ON `profile`.`uid` = `user`.`uid` INNER JOIN `contact` ON `contact`.`uid` = `profile`.`uid` INNER JOIN `user` ON `profile`.`uid` = `user`.`uid`
WHERE `user`.`nickname` = '%s' AND `profile`.`is-default` = 1 AND `contact`.`self` = 1 LIMIT 1", WHERE `user`.`nickname` = '%s' AND `profile`.`is-default` = 1 AND `contact`.`self` = 1 LIMIT 1",
dbesc($nickname) dbesc($nickname)

2
view/templates/profile_vcard.tpl
View file

@ -3,7 +3,7 @@
<div class="fn label p-name">{{$profile.name}}</div> <div class="fn label p-name">{{$profile.name}}</div>
{{if $profile.faddr}}<div class="p-faddr">{{$profile.faddr}}</div>{{/if}}
{{if $pdesc}}<div class="title">{{$profile.pdesc}}</div>{{/if}} {{if $pdesc}}<div class="title">{{$profile.pdesc}}</div>{{/if}}

3
view/theme/duepuntozero/style.css
View file

@ -2507,7 +2507,8 @@ aside input[type='text'] {
font-weight: bold; font-weight: bold;
} }
.vcard .title { .vcard .title,
.vcard .p-faddr {
margin-bottom: 5px; margin-bottom: 5px;
margin-left: 12px; margin-left: 12px;
} }

14
view/theme/duepuntozero/templates/profile_vcard.tpl
View file

@ -3,7 +3,7 @@
<div class="fn label">{{$profile.name}}</div> <div class="fn label">{{$profile.name}}</div>
{{if $profile.faddr}}<div class="p-faddr">{{$profile.faddr}}</div>{{/if}}
{{if $pdesc}}<div class="title">{{$profile.pdesc}}</div>{{/if}} {{if $pdesc}}<div class="title">{{$profile.pdesc}}</div>{{/if}}
<div id="profile-photo-wrapper"><img class="photo" width="175" height="175" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name}}"></div> <div id="profile-photo-wrapper"><img class="photo" width="175" height="175" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name}}"></div>
@ -38,12 +38,12 @@
<div id="profile-extra-links"> <div id="profile-extra-links">
<ul> <ul>
{{if $connect}} {{if $connect}}
{{if $remoteconnect}} {{if $remoteconnect}}
<li><a id="dfrn-request-link" href="{{$remoteconnect}}">{{$connect}}</a></li> <li><a id="dfrn-request-link" href="{{$remoteconnect}}">{{$connect}}</a></li>
{{else}} {{else}}
<li><a id="dfrn-request-link" href="dfrn_request/{{$profile.nickname}}">{{$connect}}</a></li> <li><a id="dfrn-request-link" href="dfrn_request/{{$profile.nickname}}">{{$connect}}</a></li>
{{/if}} {{/if}}
{{/if}} {{/if}}
{{if $wallmessage}} {{if $wallmessage}}
<li><a id="wallmessage-link" href="wallmessage/{{$profile.nickname}}">{{$wallmessage}}</a></li> <li><a id="wallmessage-link" href="wallmessage/{{$profile.nickname}}">{{$wallmessage}}</a></li>
{{/if}} {{/if}}

3
view/theme/frost-mobile/style.css
View file

@ -3105,7 +3105,8 @@ aside input[type='text'] {
font-weight: bold; font-weight: bold;
} }
.vcard .title { .vcard .title,
.vcard .p-faddr {
margin-bottom: 5px; margin-bottom: 5px;
margin-left: 12px; margin-left: 12px;
} }

2
view/theme/frost-mobile/templates/profile_vcard.tpl
View file

@ -3,7 +3,7 @@
<div class="fn label">{{$profile.name}}</div> <div class="fn label">{{$profile.name}}</div>
{{if $profile.faddr}}<div class="p-faddr">{{$profile.faddr}}</div>{{/if}}
{{if $pdesc}}<div class="title">{{$profile.pdesc}}</div>{{/if}} {{if $pdesc}}<div class="title">{{$profile.pdesc}}</div>{{/if}}
<div id="profile-photo-wrapper"><img class="photo" width="175" height="175" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name}}"></div> <div id="profile-photo-wrapper"><img class="photo" width="175" height="175" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name}}"></div>

3
view/theme/frost/style.css
View file

@ -2880,7 +2880,8 @@ aside input[type='text'] {
font-weight: bold; font-weight: bold;
} }
.vcard .title { .vcard .title,
.vcard .p-faddr {
margin-bottom: 5px; margin-bottom: 5px;
margin-left: 12px; margin-left: 12px;
} }

2
view/theme/frost/templates/profile_vcard.tpl
View file

@ -3,7 +3,7 @@
<div class="fn label">{{$profile.name}}</div> <div class="fn label">{{$profile.name}}</div>
{{if $profile.faddr}}<div class="p-faddr">{{$profile.faddr}}</div>{{/if}}
{{if $pdesc}}<div class="title">{{$profile.pdesc}}</div>{{/if}} {{if $pdesc}}<div class="title">{{$profile.pdesc}}</div>{{/if}}
<div id="profile-photo-wrapper"><img class="photo" width="175" height="175" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name}}"></div> <div id="profile-photo-wrapper"><img class="photo" width="175" height="175" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name}}"></div>

5
view/theme/quattro/dark/style.css
View file

@ -463,7 +463,7 @@ a:hover {
text-decoration: underline; text-decoration: underline;
} }
blockquote { blockquote {
background: #FFFFFF; background: #ffffff;
padding: 1em; padding: 1em;
margin-left: 1em; margin-left: 1em;
border-left: 1em solid #e6e6e6; border-left: 1em solid #e6e6e6;
@ -810,6 +810,9 @@ aside .vcard .fn {
aside .vcard .title { aside .vcard .title {
margin-bottom: 5px; margin-bottom: 5px;
} }
aside .vcard .p-faddr {
margin-bottom: 5px;
}
aside .vcard dl { aside .vcard dl {
height: auto; height: auto;
overflow: auto; overflow: auto;

5
view/theme/quattro/green/style.css
View file

@ -463,7 +463,7 @@ a:hover {
text-decoration: underline; text-decoration: underline;
} }
blockquote { blockquote {
background: #FFFFFF; background: #ffffff;
padding: 1em; padding: 1em;
margin-left: 1em; margin-left: 1em;
border-left: 1em solid #e6e6e6; border-left: 1em solid #e6e6e6;
@ -810,6 +810,9 @@ aside .vcard .fn {
aside .vcard .title { aside .vcard .title {
margin-bottom: 5px; margin-bottom: 5px;
} }
aside .vcard .p-faddr {
margin-bottom: 5px;
}
aside .vcard dl { aside .vcard dl {
height: auto; height: auto;
overflow: auto; overflow: auto;

11
view/theme/quattro/lilac/style.css
View file

@ -420,7 +420,7 @@
body { body {
font-family: Liberation Sans, helvetica, arial, clean, sans-serif; font-family: Liberation Sans, helvetica, arial, clean, sans-serif;
font-size: 11px; font-size: 11px;
background-color: #F6ECF9; background-color: #f6ecf9;
color: #2d2d2d; color: #2d2d2d;
margin: 50px 0px 0px 0px; margin: 50px 0px 0px 0px;
display: table; display: table;
@ -463,7 +463,7 @@ a:hover {
text-decoration: underline; text-decoration: underline;
} }
blockquote { blockquote {
background: #FFFFFF; background: #ffffff;
padding: 1em; padding: 1em;
margin-left: 1em; margin-left: 1em;
border-left: 1em solid #e6e6e6; border-left: 1em solid #e6e6e6;
@ -810,6 +810,9 @@ aside .vcard .fn {
aside .vcard .title { aside .vcard .title {
margin-bottom: 5px; margin-bottom: 5px;
} }
aside .vcard .p-faddr {
margin-bottom: 5px;
}
aside .vcard dl { aside .vcard dl {
height: auto; height: auto;
overflow: auto; overflow: auto;
@ -1704,7 +1707,7 @@ span[id^="showmore-wrap"] {
height: 20px; height: 20px;
width: 500px; width: 500px;
font-weight: bold; font-weight: bold;
border: 1px solid #F6ECF9; border: 1px solid #f6ecf9;
} }
#jot #jot-title:-webkit-input-placeholder { #jot #jot-title:-webkit-input-placeholder {
font-weight: normal; font-weight: normal;
@ -1731,7 +1734,7 @@ span[id^="showmore-wrap"] {
margin: 0px; margin: 0px;
height: 20px; height: 20px;
width: 200px; width: 200px;
border: 1px solid #F6ECF9; border: 1px solid #f6ecf9;
} }
#jot #jot-category:hover { #jot #jot-category:hover {
border: 1px solid #999999; border: 1px solid #999999;

1
view/theme/quattro/quattro.less
View file

@ -317,6 +317,7 @@ aside {
.vcard { .vcard {
.fn { font-size: 16px; font-weight: bold; margin-bottom: 5px; } .fn { font-size: 16px; font-weight: bold; margin-bottom: 5px; }
.title { margin-bottom: 5px; } .title { margin-bottom: 5px; }
.p-faddr{ margin-bottom: 5px; }
dl { height: auto; overflow: auto; } dl { height: auto; overflow: auto; }
dt {float: left; margin-left: 0px; width: 35%; text-align: right; color: @VCardLabelColor; } dt {float: left; margin-left: 0px; width: 35%; text-align: right; color: @VCardLabelColor; }
dd {float: left; margin-left: 4px; width: 60%;} dd {float: left; margin-left: 4px; width: 60%;}

43
view/theme/quattro/templates/profile_vcard.tpl
View file

@ -6,17 +6,17 @@
<div class="action"> <div class="action">
<a class="icon s16 edit ttright" href="#" rel="#profiles-menu" title="{{$profile.edit.3}}"><span>{{$profile.edit.1}}</span></a> <a class="icon s16 edit ttright" href="#" rel="#profiles-menu" title="{{$profile.edit.3}}"><span>{{$profile.edit.1}}</span></a>
<ul id="profiles-menu" class="menu-popup"> <ul id="profiles-menu" class="menu-popup">
{{if $profile.menu.entries}} {{if $profile.menu.entries}}
{{foreach $profile.menu.entries as $e}} {{foreach $profile.menu.entries as $e}}
<li> <li>
<a href="profiles/{{$e.id}}"><img src='{{$e.photo}}'>{{$e.profile_name}}</a> <a href="profiles/{{$e.id}}"><img src='{{$e.photo}}'>{{$e.profile_name}}</a>
</li> </li>
{{/foreach}} {{/foreach}}
{{else}} {{else}}
<li> <li>
<a href="{{$profile.edit.0}}">{{$profile.edit.1}}</a> <a href="{{$profile.edit.0}}">{{$profile.edit.1}}</a>
</li> </li>
{{/if}} {{/if}}
<li><a href="profile_photo" >{{$profile.menu.chg_photo}}</a></li> <li><a href="profile_photo" >{{$profile.menu.chg_photo}}</a></li>
{{if $profile.menu.cr_new }} {{if $profile.menu.cr_new }}
<li><a href="profiles/new" id="profile-listing-new-link">{{$profile.menu.cr_new}}</a></li> <li><a href="profiles/new" id="profile-listing-new-link">{{$profile.menu.cr_new}}</a></li>
@ -26,6 +26,7 @@
{{/if}} {{/if}}
</div> </div>
{{if $profile.faddr}}<div class="p-faddr">{{$profile.faddr}}</div>{{/if}}
{{if $pdesc}}<div class="title">{{$profile.pdesc}}</div>{{/if}} {{if $pdesc}}<div class="title">{{$profile.pdesc}}</div>{{/if}}
<div id="profile-photo-wrapper"><img class="photo" width="175" height="175" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name}}" /></div> <div id="profile-photo-wrapper"><img class="photo" width="175" height="175" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name}}" /></div>
@ -52,21 +53,23 @@
{{if $marital}}<dl class="marital"><dt class="marital-label"><span class="heart">&hearts;</span>{{$marital}}</dt><dd class="marital-text">{{$profile.marital}}</dd></dl>{{/if}} {{if $marital}}<dl class="marital"><dt class="marital-label"><span class="heart">&hearts;</span>{{$marital}}</dt><dd class="marital-text">{{$profile.marital}}</dd></dl>{{/if}}
{{if $homepage}}<dl class="homepage"><dt {{if $homepage}}
class="homepage-label">{{$homepage}}</dt><dd class="homepage-url"><a <dl class="homepage"><dt class="homepage-label">{{$homepage}}</dt>
href="{{$profile.homepage}}" target="external-link">{{$profile.homepage}}</a></dd></dl>{{/if}} <dd class="homepage-url"><a href="{{$profile.homepage}}" target="external-link">{{$profile.homepage}}</a></dd>
</dl>
{{/if}}
{{include file="diaspora_vcard.tpl"}} {{include file="diaspora_vcard.tpl"}}
<div id="profile-extra-links"> <div id="profile-extra-links">
<ul> <ul>
{{if $connect}} {{if $connect}}
{{if $remoteconnect}} {{if $remoteconnect}}
<li><a id="dfrn-request-link" href="{{$remoteconnect}}">{{$connect}}</a></li> <li><a id="dfrn-request-link" href="{{$remoteconnect}}">{{$connect}}</a></li>
{{else}} {{else}}
<li><a id="dfrn-request-link" href="dfrn_request/{{$profile.nickname}}">{{$connect}}</a></li> <li><a id="dfrn-request-link" href="dfrn_request/{{$profile.nickname}}">{{$connect}}</a></li>
{{/if}} {{/if}}
{{/if}} {{/if}}
{{if $wallmessage}} {{if $wallmessage}}
<li><a id="wallmessage-link" href="wallmessage/{{$profile.nickname}}">{{$wallmessage}}</a></li> <li><a id="wallmessage-link" href="wallmessage/{{$profile.nickname}}">{{$wallmessage}}</a></li>
{{/if}} {{/if}}

3
view/theme/vier/templates/profile_vcard.tpl
View file

@ -13,6 +13,8 @@
{{/if}} {{/if}}
</div> </div>
{{if $profile.faddr}}<div class="p-faddr">{{$profile.faddr}}</div>{{/if}}
{{if $pdesc}}<div class="title">{{$profile.pdesc}}</div>{{/if}} {{if $pdesc}}<div class="title">{{$profile.pdesc}}</div>{{/if}}
{{if $profile.picdate}} {{if $profile.picdate}}
@ -20,6 +22,7 @@
{{else}} {{else}}
<div id="profile-photo-wrapper"><a href="{{$profile.url}}"><img class="photo u-photo" src="{{$profile.photo}}" alt="{{$profile.name}}"></a></div> <div id="profile-photo-wrapper"><a href="{{$profile.url}}"><img class="photo u-photo" src="{{$profile.photo}}" alt="{{$profile.name}}"></a></div>
{{/if}} {{/if}}
{{if $profile.network_name}}<dl class="network"><dt class="network-label">{{$network}}</dt><dd class="x-network">{{$profile.network_name}}</dd></dl>{{/if}} {{if $profile.network_name}}<dl class="network"><dt class="network-label">{{$network}}</dt><dd class="x-network">{{$profile.network_name}}</dd></dl>{{/if}}
{{if $location}} {{if $location}}
<dl class="location"><dt class="location-label">{{$location}}</dt> <dl class="location"><dt class="location-label">{{$location}}</dt>