strk/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

unify hcard and vcard: make $pdesc available in hcard&vcard

Browse source
This commit is contained in:
rabuzarus 2015-12-01 19:47:23 +01:00
parent 39b37281a7
commit cd7ec72b20
10 changed files with 29 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/identity.php
View file

@ -190,7 +190,7 @@ if(! function_exists('profile_sidebar')) {
$o = ''; $o = '';
$location = false; $location = false;
$address = false; $address = false;
$pdesc = true; // $pdesc = true;
if((! is_array($profile)) && (! count($profile))) if((! is_array($profile)) && (! count($profile)))
return $o; return $o;
@ -371,7 +371,7 @@ if(! function_exists('profile_sidebar')) {
'$account_type' => $account_type, '$account_type' => $account_type,
'$location' => $location, '$location' => $location,
'$gender' => $gender, '$gender' => $gender,
'$pdesc' => $pdesc, // '$pdesc' => $pdesc,
'$marital' => $marital, '$marital' => $marital,
'$homepage' => $homepage, '$homepage' => $homepage,
'$about' => $about, '$about' => $about,

15
mod/photos.php
View file

@ -37,18 +37,23 @@ function photos_init(&$a) {
$profile = get_profiledata_by_nick($nick, $a->profile_uid); $profile = get_profiledata_by_nick($nick, $a->profile_uid);
if((x($profile['page-flags']) == 1) if((x($profile['page-flags']) == 1)
|| (x($profile['page-flags']) == 2) || (x($profile['page-flags']) == 2)
|| (x($profile['page-flags']) == 5)) || (x($profile['page-flags']) == 5)) {
$account_type = page_type_translate($profile['page-flags']); $account_type = page_type_translate($profile['page-flags']);
}
else {
$account_type = "";
}
$tpl = get_markup_template("vcard-widget.tpl"); $tpl = get_markup_template("vcard-widget.tpl");
$vcard_widget .= replace_macros($tpl, array( $vcard_widget .= replace_macros($tpl, array(
'$name' => $profile[name], '$name' => $profile['name'],
'$photo' => $profile[photo], '$photo' => $profile['photo'],
'$addr' => (($profile['addr'] != "") ? $profile['addr'] : ''), '$addr' => (($profile['addr'] != "") ? $profile['addr'] : ""),
'$account_type' => $account_type, '$account_type' => $account_type,
'$pdesc' => (($profile['pdesc'] != "") ? $profile['pdesc'] : ""),
)); ));

15
mod/videos.php
View file

@ -33,18 +33,23 @@ function videos_init(&$a) {
$profile = get_profiledata_by_nick($nick, $a->profile_uid); $profile = get_profiledata_by_nick($nick, $a->profile_uid);
if((x($profile['page-flags']) == 1) if((x($profile['page-flags']) == 1)
|| (x($profile['page-flags']) == 2) || (x($profile['page-flags']) == 2)
|| (x($profile['page-flags']) == 5)) || (x($profile['page-flags']) == 5)) {
$account_type = page_type_translate($profile['page-flags']); $account_type = page_type_translate($profile['page-flags']);
}
else {
$account_type = "";
}
$tpl = get_markup_template("vcard-widget.tpl"); $tpl = get_markup_template("vcard-widget.tpl");
$vcard_widget .= replace_macros($tpl, array( $vcard_widget .= replace_macros($tpl, array(
'$name' => $profile[name], '$name' => $profile['name'],
'$photo' => $profile[photo], '$photo' => $profile['photo'],
'$addr' => (($profile['addr'] != "") ? $profile['addr'] : ''), '$addr' => (($profile['addr'] != "") ? $profile['addr'] : ""),
'$account_type' => $account_type, '$account_type' => $account_type,
'$pdesc' => (($profile['pdesc'] != "") ? $profile['pdesc'] : ""),
)); ));

2
view/templates/profile_vcard.tpl
View file

@ -5,7 +5,7 @@
{{if $profile.addr}}<div class="p-addr">{{$profile.addr}}</div>{{/if}} {{if $profile.addr}}<div class="p-addr">{{$profile.addr}}</div>{{/if}}
{{if $pdesc}}<div class="title">{{$profile.pdesc}}</div>{{/if}} {{if $profile.pdesc}}<div class="title">{{$profile.pdesc}}</div>{{/if}}
{{if $profile.picdate}} {{if $profile.picdate}}
<div id="profile-photo-wrapper"><a href="{{$profile.url}}"><img class="photo u-photo" width="175" height="175" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name}}"></a></div> <div id="profile-photo-wrapper"><a href="{{$profile.url}}"><img class="photo u-photo" width="175" height="175" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name}}"></a></div>

2
view/templates/vcard-widget.tpl
View file

@ -2,7 +2,7 @@
<div class="vcard"> <div class="vcard">
<div class="fn">{{$name}}</div> <div class="fn">{{$name}}</div>
{{if $addr}}<div class="p-addr">{{$addr}}</div>{{/if}} {{if $addr}}<div class="p-addr">{{$addr}}</div>{{/if}}
{{if $pdesc}}<div class="title">{{$profile.pdesc}}</div>{{/if}} {{if $pdesc}}<div class="title">{{$pdesc}}</div>{{/if}}
{{if $url}} {{if $url}}
<div id="profile-photo-wrapper"><a href="{{$url}}"><img class="vcard-photo photo" style="width: 175px; height: 175px;" src="{{$photo}}" alt="{{$name}}" /></a></div> <div id="profile-photo-wrapper"><a href="{{$url}}"><img class="vcard-photo photo" style="width: 175px; height: 175px;" src="{{$photo}}" alt="{{$name}}" /></a></div>
{{else}} {{else}}

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

@ -5,7 +5,7 @@
{{if $profile.addr}}<div class="p-addr">{{$profile.addr}}</div>{{/if}} {{if $profile.addr}}<div class="p-addr">{{$profile.addr}}</div>{{/if}}
{{if $pdesc}}<div class="title">{{$profile.pdesc}}</div>{{/if}} {{if $profile.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>
{{if $account_type}}<div class="account-type">{{$account_type}}</div>{{/if}} {{if $account_type}}<div class="account-type">{{$account_type}}</div>{{/if}}

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

@ -5,7 +5,7 @@
{{if $profile.addr}}<div class="p-addr">{{$profile.addr}}</div>{{/if}} {{if $profile.addr}}<div class="p-addr">{{$profile.addr}}</div>{{/if}}
{{if $pdesc}}<div class="title">{{$profile.pdesc}}</div>{{/if}} {{if $profile.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>
{{if $account_type}}<div class="account-type">{{$account_type}}</div>{{/if}} {{if $account_type}}<div class="account-type">{{$account_type}}</div>{{/if}}

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

@ -5,7 +5,7 @@
{{if $profile.addr}}<div class="p-addr">{{$profile.addr}}</div>{{/if}} {{if $profile.addr}}<div class="p-addr">{{$profile.addr}}</div>{{/if}}
{{if $pdesc}}<div class="title">{{$profile.pdesc}}</div>{{/if}} {{if $profile.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>
{{if $account_type}}<div class="account-type">{{$account_type}}</div>{{/if}} {{if $account_type}}<div class="account-type">{{$account_type}}</div>{{/if}}

1
view/theme/vier/style.css
View file

@ -993,6 +993,7 @@ aside .vcard .fn {
} }
aside .vcard .title { aside .vcard .title {
margin-bottom: 5px; margin-bottom: 5px;
float: left;
} }
aside .vcard dl { aside .vcard dl {
height: auto; height: auto;

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

@ -15,7 +15,7 @@
{{if $profile.addr}}<div class="p-addr">{{$profile.addr}}</div>{{/if}} {{if $profile.addr}}<div class="p-addr">{{$profile.addr}}</div>{{/if}}
{{if $pdesc}}<div class="title">{{$profile.pdesc}}</div>{{/if}} {{if $profile.pdesc}}<div class="title">{{$profile.pdesc}}</div>{{/if}}
{{if $profile.picdate}} {{if $profile.picdate}}
<div id="profile-photo-wrapper"><a href="{{$profile.url}}"><img class="photo u-photo" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name}}"></a></div> <div id="profile-photo-wrapper"><a href="{{$profile.url}}"><img class="photo u-photo" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name}}"></a></div>