mirror of
https://github.com/friendica/friendica
synced 2024-11-18 07:43:51 +00:00
Merge pull request #2131 from rabuzarus/3011_hcard_vcard
unify hcard and vcard
This commit is contained in:
Michael Vogel
commit
1f9644bded
23 changed files with 238 additions and 154 deletions
|
|
@ -45,39 +45,9 @@ if(! function_exists('profile_load')) {
|
|||
return;
|
||||
}
|
||||
|
||||
if(remote_user() && count($_SESSION['remote'])) {
|
||||
foreach($_SESSION['remote'] as $visitor) {
|
||||
if($visitor['uid'] == $user[0]['uid']) {
|
||||
$r = q("SELECT `profile-id` FROM `contact` WHERE `id` = %d LIMIT 1",
|
||||
intval($visitor['cid'])
|
||||
);
|
||||
if(count($r))
|
||||
$profile = $r[0]['profile-id'];
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
$pdata = get_profiledata_by_nick($nickname, $user[0]['uid'], $profile);
|
||||
|
||||
$r = null;
|
||||
|
||||
if($profile) {
|
||||
$profile_int = intval($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`
|
||||
WHERE `user`.`nickname` = '%s' AND `profile`.`id` = %d AND `contact`.`self` = 1 LIMIT 1",
|
||||
dbesc($nickname),
|
||||
intval($profile_int)
|
||||
);
|
||||
}
|
||||
if((!$r) && (!count($r))) {
|
||||
$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`
|
||||
WHERE `user`.`nickname` = '%s' AND `profile`.`is-default` = 1 AND `contact`.`self` = 1 LIMIT 1",
|
||||
dbesc($nickname)
|
||||
);
|
||||
}
|
||||
|
||||
if(($r === false) || (!count($r)) && !count($profiledata)) {
|
||||
if(($pdata === false) || (!count($pdata)) && !count($profiledata)) {
|
||||
logger('profile error: ' . $a->query_string, LOGGER_DEBUG);
|
||||
notice( t('Requested profile is not available.') . EOL );
|
||||
$a->error = 404;
|
||||
|
|
@ -86,16 +56,16 @@ if(! function_exists('profile_load')) {
|
|||
|
||||
// fetch user tags if this isn't the default profile
|
||||
|
||||
if(!$r[0]['is-default']) {
|
||||
if(!$pdata['is-default']) {
|
||||
$x = q("SELECT `pub_keywords` FROM `profile` WHERE `uid` = %d AND `is-default` = 1 LIMIT 1",
|
||||
intval($r[0]['profile_uid'])
|
||||
intval($pdata['profile_uid'])
|
||||
);
|
||||
if($x && count($x))
|
||||
$r[0]['pub_keywords'] = $x[0]['pub_keywords'];
|
||||
$pdata['pub_keywords'] = $x[0]['pub_keywords'];
|
||||
}
|
||||
|
||||
$a->profile = $r[0];
|
||||
$a->profile_uid = $r[0]['profile_uid'];
|
||||
$a->profile = $pdata;
|
||||
$a->profile_uid = $pdata['profile_uid'];
|
||||
|
||||
$a->profile['mobile-theme'] = get_pconfig($a->profile['profile_uid'], 'system', 'mobile_theme');
|
||||
$a->profile['network'] = NETWORK_DFRN;
|
||||
|
|
@ -147,6 +117,58 @@ if(! function_exists('profile_load')) {
|
|||
}
|
||||
|
||||
|
||||
/**
|
||||
* @brief Get all profil data of a local user
|
||||
* If the viewer is an authenticated remote viewer, the profile displayed is the
|
||||
* one that has been configured for his/her viewing in the Contact manager.
|
||||
* Passing a non-zero profile ID can also allow a preview of a selected profile
|
||||
* by the owner
|
||||
*
|
||||
* @param string $nickname
|
||||
* @param int $uid
|
||||
* @param int $profile
|
||||
* ID of the profile
|
||||
* @returns array
|
||||
* Includes all available profile data
|
||||
*/
|
||||
function get_profiledata_by_nick($nickname, $uid = 0, $profile = 0) {
|
||||
if(remote_user() && count($_SESSION['remote'])) {
|
||||
foreach($_SESSION['remote'] as $visitor) {
|
||||
if($visitor['uid'] == $uid) {
|
||||
$r = q("SELECT `profile-id` FROM `contact` WHERE `id` = %d LIMIT 1",
|
||||
intval($visitor['cid'])
|
||||
);
|
||||
if(count($r))
|
||||
$profile = $r[0]['profile-id'];
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
$r = null;
|
||||
|
||||
if($profile) {
|
||||
$profile_int = intval($profile);
|
||||
$r = q("SELECT `profile`.`uid` AS `profile_uid`, `profile`.* , `contact`.`avatar-date` AS picdate, `contact`.`addr`, `user`.* FROM `profile`
|
||||
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",
|
||||
dbesc($nickname),
|
||||
intval($profile_int)
|
||||
);
|
||||
}
|
||||
if((!$r) && (!count($r))) {
|
||||
$r = q("SELECT `profile`.`uid` AS `profile_uid`, `profile`.* , `contact`.`avatar-date` AS picdate, `contact`.`addr`, `user`.* FROM `profile`
|
||||
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",
|
||||
dbesc($nickname)
|
||||
);
|
||||
}
|
||||
|
||||
return $r[0];
|
||||
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
*
|
||||
* Function: profile_sidebar
|
||||
|
|
@ -161,8 +183,6 @@ if(! function_exists('profile_load')) {
|
|||
* Exceptions: Returns empty string if passed $profile is wrong type or not populated
|
||||
*
|
||||
*/
|
||||
|
||||
|
||||
if(! function_exists('profile_sidebar')) {
|
||||
function profile_sidebar($profile, $block = 0) {
|
||||
$a = get_app();
|
||||
|
|
@ -170,7 +190,7 @@ if(! function_exists('profile_sidebar')) {
|
|||
$o = '';
|
||||
$location = false;
|
||||
$address = false;
|
||||
$pdesc = true;
|
||||
// $pdesc = true;
|
||||
|
||||
if((! is_array($profile)) && (! count($profile)))
|
||||
return $o;
|
||||
|
|
@ -178,12 +198,8 @@ if(! function_exists('profile_sidebar')) {
|
|||
$profile['picdate'] = urlencode($profile['picdate']);
|
||||
|
||||
if (($profile['network'] != "") AND ($profile['network'] != NETWORK_DFRN)) {
|
||||
require_once('include/contact_selectors.php');
|
||||
if ($profile['url'] != "")
|
||||
$profile['network_name'] = '<a href="'.$profile['url'].'">'.network_to_name($profile['network'], $profile['url'])."</a>";
|
||||
else
|
||||
$profile['network_name'] = network_to_name($profile['network']);
|
||||
} else
|
||||
$profile['network_name'] = format_network_name($profile['network'],$profile['url']);
|
||||
} else
|
||||
$profile['network_name'] = "";
|
||||
|
||||
call_hooks('profile_sidebar_enter', $profile);
|
||||
|
|
@ -270,6 +286,16 @@ if(! function_exists('profile_sidebar')) {
|
|||
);
|
||||
}
|
||||
|
||||
// check if profile is a forum
|
||||
if((x($profile['page-flags']) == 2)
|
||||
|| (x($profile['page-flags']) == 5)
|
||||
|| (x($profile['forum']))
|
||||
|| (x($profile['prv']))
|
||||
|| (x($profile['community'])))
|
||||
$account_type = t('Forum');
|
||||
else
|
||||
$account_type = "";
|
||||
|
||||
if((x($profile,'address') == 1)
|
||||
|| (x($profile,'locality') == 1)
|
||||
|| (x($profile,'region') == 1)
|
||||
|
|
@ -344,9 +370,10 @@ if(! function_exists('profile_sidebar')) {
|
|||
'$remoteconnect' => $remoteconnect,
|
||||
'$subscribe_feed' => $subscribe_feed,
|
||||
'$wallmessage' => $wallmessage,
|
||||
'$account_type' => $account_type,
|
||||
'$location' => $location,
|
||||
'$gender' => $gender,
|
||||
'$pdesc' => $pdesc,
|
||||
// '$pdesc' => $pdesc,
|
||||
'$marital' => $marital,
|
||||
'$homepage' => $homepage,
|
||||
'$about' => $about,
|
||||
|
|
|
|||
|
|
@ -2289,32 +2289,23 @@ function formatBytes($bytes, $precision = 2) {
|
|||
}
|
||||
|
||||
/**
|
||||
* @brief Translate the PAGE type flags in human readable string
|
||||
* @brief translate and format the networkname of a contact
|
||||
*
|
||||
* @param int $page_type
|
||||
* @return string $trans_type
|
||||
* @param string $network
|
||||
* Networkname of the contact (e.g. dfrn, rss and so on)
|
||||
* @param sting $url
|
||||
* The contact url
|
||||
* @return string
|
||||
*/
|
||||
function page_type_translate($page_type) {
|
||||
function format_network_name($network, $url = 0) {
|
||||
if ($network != "") {
|
||||
require_once('include/contact_selectors.php');
|
||||
if ($url != "")
|
||||
$network_name = '<a href="'.$url.'">'.network_to_name($network, $url)."</a>";
|
||||
else
|
||||
$network_name = network_to_name($network);
|
||||
|
||||
// ToDo: we need a good interpretable translation for PAGE_SOAPBOX
|
||||
// and PAGE_PRVGROUP
|
||||
switch ($page_type) {
|
||||
case PAGE_NORMAL:
|
||||
$trans_type = t('Normal Account');
|
||||
break;
|
||||
case PAGE_SOAPBOX:
|
||||
$trans_type = t('Fan Page');
|
||||
break;
|
||||
case PAGE_COMMUNITY:
|
||||
$trans_type = t('Community Forum');
|
||||
break;
|
||||
case PAGE_FREELOVE:
|
||||
$trans_type = t('Open Forum');
|
||||
break;
|
||||
case PAGE_PRVGROUP:
|
||||
$trans_type = t('Private Forum');
|
||||
break;
|
||||
return $network_name;
|
||||
}
|
||||
|
||||
return $trans_type;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -35,10 +35,20 @@ function contacts_init(&$a) {
|
|||
|
||||
if($contact_id) {
|
||||
$a->data['contact'] = $r[0];
|
||||
|
||||
if (($a->data['contact']['network'] != "") AND ($a->data['contact']['network'] != NETWORK_DFRN)) {
|
||||
$networkname = format_network_name($a->data['contact']['network'],$a->data['contact']['url']);
|
||||
} else
|
||||
$networkname = '';
|
||||
|
||||
$vcard_widget = replace_macros(get_markup_template("vcard-widget.tpl"),array(
|
||||
'$name' => htmlentities($a->data['contact']['name']),
|
||||
'$photo' => $a->data['contact']['photo'],
|
||||
'$url' => ($a->data['contact']['network'] == NETWORK_DFRN) ? z_root()."/redir/".$a->data['contact']['id'] : $a->data['contact']['url']
|
||||
'$url' => ($a->data['contact']['network'] == NETWORK_DFRN) ? z_root()."/redir/".$a->data['contact']['id'] : $a->data['contact']['url'],
|
||||
'$addr' => (($a->data['contact']['addr'] != "") ? ($a->data['contact']['addr']) : ""),
|
||||
'$network_name' => $networkname,
|
||||
'$network' => t('Network:'),
|
||||
'account_type' => (($a->data['contact']['forum'] || $a->data['contact']['prv']) ? t('Forum') : '')
|
||||
));
|
||||
$finpeople_widget = '';
|
||||
$follow_widget = '';
|
||||
|
|
@ -570,16 +580,8 @@ function contacts_content(&$a) {
|
|||
$follow = $a->get_baseurl(true)."/follow?url=".urlencode($contact["url"]);
|
||||
|
||||
|
||||
$header = $contact["name"];
|
||||
|
||||
if ($contact["addr"] != "")
|
||||
$header .= " <".$contact["addr"].">";
|
||||
|
||||
$header .= " (".network_to_name($contact['network'], $contact['url']).")";
|
||||
|
||||
$o .= replace_macros($tpl, array(
|
||||
//'$header' => t('Contact Editor'),
|
||||
'$header' => htmlentities($header),
|
||||
'$tab_str' => $tab_str,
|
||||
'$submit' => t('Submit'),
|
||||
'$lbl_vis1' => t('Profile Visibility'),
|
||||
|
|
@ -905,18 +907,6 @@ function contact_posts($a, $contact_id) {
|
|||
|
||||
$tab_str = contact_tabs($a, $contact_id, 1);
|
||||
|
||||
$header = $contact["name"];
|
||||
|
||||
if ($contact["addr"] != "")
|
||||
$header .= " <".$contact["addr"].">";
|
||||
|
||||
$header .= " (".network_to_name($contact['network'], $contact['url']).")";
|
||||
|
||||
$tpl = get_markup_template("section_title.tpl");
|
||||
$o = replace_macros($tpl,array(
|
||||
'$title' => htmlentities($header)
|
||||
));
|
||||
|
||||
$o .= $tab_str;
|
||||
|
||||
$o .= conversation($a,$r,'community',false);
|
||||
|
|
|
|||
|
|
@ -24,11 +24,22 @@ function crepair_init(&$a) {
|
|||
|
||||
if($contact_id) {
|
||||
$a->data['contact'] = $r[0];
|
||||
$tpl = get_markup_template("vcard-widget.tpl");
|
||||
$vcard_widget .= replace_macros($tpl, array(
|
||||
'$name' => htmlentities($a->data['contact']['name']),
|
||||
'$photo' => $a->data['contact']['photo']
|
||||
));
|
||||
|
||||
if (($a->data['contact']['network'] != "") AND ($a->data['contact']['network'] != NETWORK_DFRN)) {
|
||||
$networkname = format_network_name($a->data['contact']['network'],$a->data['contact']['url']);
|
||||
} else
|
||||
$networkname = '';
|
||||
|
||||
$vcard_widget = replace_macros(get_markup_template("vcard-widget.tpl"),array(
|
||||
'$name' => htmlentities($a->data['contact']['name']),
|
||||
'$photo' => $a->data['contact']['photo'],
|
||||
'$url' => ($a->data['contact']['network'] == NETWORK_DFRN) ? z_root()."/redir/".$a->data['contact']['id'] : $a->data['contact']['url'],
|
||||
'$addr' => (($a->data['contact']['addr'] != "") ? ($a->data['contact']['addr']) : ""),
|
||||
'$network_name' => $networkname,
|
||||
'$network' => t('Network:'),
|
||||
'account_type' => (($a->data['contact']['forum'] || $a->data['contact']['prv']) ? t('Forum') : '')
|
||||
));
|
||||
|
||||
$a->page['aside'] .= $vcard_widget;
|
||||
|
||||
}
|
||||
|
|
@ -161,17 +172,10 @@ function crepair_content(&$a) {
|
|||
|
||||
$tab_str = contact_tabs($a, $contact['id'], 3);
|
||||
|
||||
$header = $contact["name"];
|
||||
|
||||
if ($contact["addr"] != "")
|
||||
$header .= " <".$contact["addr"].">";
|
||||
|
||||
$header .= " (".network_to_name($contact['network'], $contact['url']).")";
|
||||
|
||||
$tpl = get_markup_template('crepair.tpl');
|
||||
$o .= replace_macros($tpl, array(
|
||||
//'$title' => t('Repair Contact Settings'),
|
||||
'$title' => htmlentities($header),
|
||||
'$tab_str' => $tab_str,
|
||||
'$warning' => $warning,
|
||||
'$info' => $info,
|
||||
|
|
|
|||
|
|
@ -86,7 +86,7 @@ function directory_content(&$a) {
|
|||
$limit = intval($a->pager['start']).",".intval($a->pager['itemspage']);
|
||||
|
||||
$r = $db->q("SELECT `profile`.*, `profile`.`uid` AS `profile_uid`, `user`.`nickname`, `user`.`timezone` , `user`.`page-flags`,
|
||||
`contact`.`addr` AS faddr, `contact`.`url` AS profile_url FROM `profile`
|
||||
`contact`.`addr`, `contact`.`url` AS profile_url FROM `profile`
|
||||
LEFT JOIN `user` ON `user`.`uid` = `profile`.`uid`
|
||||
LEFT JOIN `contact` ON `contact`.`uid` = `user`.`uid`
|
||||
WHERE `is-default` = 1 $publish AND `user`.`blocked` = 0 AND `contact`.`self` $sql_extra $order LIMIT ".$limit);
|
||||
|
|
@ -102,7 +102,7 @@ function directory_content(&$a) {
|
|||
$community = '';
|
||||
$itemurl= '';
|
||||
|
||||
$itemurl = (($rr['faddr'] != "") ? $rr['faddr'] : $rr['profile_url']);
|
||||
$itemurl = (($rr['addr'] != "") ? $rr['addr'] : $rr['profile_url']);
|
||||
|
||||
$profile_link = z_root() . '/profile/' . ((strlen($rr['nickname'])) ? $rr['nickname'] : $rr['profile_uid']);
|
||||
|
||||
|
|
|
|||
|
|
@ -24,24 +24,32 @@ function photos_init(&$a) {
|
|||
|
||||
if($a->argc > 1) {
|
||||
$nick = $a->argv[1];
|
||||
$r = q("SELECT * FROM `user` WHERE `nickname` = '%s' AND `blocked` = 0 LIMIT 1",
|
||||
$user = q("SELECT * FROM `user` WHERE `nickname` = '%s' AND `blocked` = 0 LIMIT 1",
|
||||
dbesc($nick)
|
||||
);
|
||||
|
||||
if(! count($r))
|
||||
if(! count($user))
|
||||
return;
|
||||
|
||||
$a->data['user'] = $r[0];
|
||||
$a->profile_uid = $r[0]['uid'];
|
||||
$a->data['user'] = $user[0];
|
||||
$a->profile_uid = $user[0]['uid'];
|
||||
$is_owner = (local_user() && (local_user() == $a->profile_uid));
|
||||
|
||||
$profilephoto = $a->get_cached_avatar_image($a->get_baseurl() . '/photo/profile/' . $a->data['user']['uid'] . '.jpg');
|
||||
$profile = get_profiledata_by_nick($nick, $a->profile_uid);
|
||||
|
||||
if((x($profile['page-flags']) == 2) || (x($profile['page-flags']) == 5))
|
||||
$account_type = t('Forum');
|
||||
else
|
||||
$account_type = "";
|
||||
|
||||
$tpl = get_markup_template("vcard-widget.tpl");
|
||||
|
||||
$vcard_widget .= replace_macros($tpl, array(
|
||||
'$name' => $a->data['user']['username'],
|
||||
'$photo' => $profilephoto
|
||||
'$name' => $profile['name'],
|
||||
'$photo' => $profile['photo'],
|
||||
'$addr' => (($profile['addr'] != "") ? $profile['addr'] : ""),
|
||||
'$account_type' => $account_type,
|
||||
'$pdesc' => (($profile['pdesc'] != "") ? $profile['pdesc'] : ""),
|
||||
));
|
||||
|
||||
|
||||
|
|
@ -89,7 +97,7 @@ function photos_init(&$a) {
|
|||
$photo_albums_widget = replace_macros(get_markup_template('photo_albums.tpl'),array(
|
||||
'$nick' => $a->data['user']['nickname'],
|
||||
'$title' => t('Photo Albums'),
|
||||
'recent' => t('Recent Photos'),
|
||||
'$recent' => t('Recent Photos'),
|
||||
'$albums' => $albums['albums'],
|
||||
'$baseurl' => z_root(),
|
||||
'$upload' => array( t('Upload New Photos'), $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '/upload'),
|
||||
|
|
|
|||
|
|
@ -21,23 +21,31 @@ function videos_init(&$a) {
|
|||
|
||||
if($a->argc > 1) {
|
||||
$nick = $a->argv[1];
|
||||
$r = q("SELECT * FROM `user` WHERE `nickname` = '%s' AND `blocked` = 0 LIMIT 1",
|
||||
$user = q("SELECT * FROM `user` WHERE `nickname` = '%s' AND `blocked` = 0 LIMIT 1",
|
||||
dbesc($nick)
|
||||
);
|
||||
|
||||
if(! count($r))
|
||||
if(! count($user))
|
||||
return;
|
||||
|
||||
$a->data['user'] = $r[0];
|
||||
$a->profile_uid = $r[0]['uid'];
|
||||
$a->data['user'] = $user[0];
|
||||
$a->profile_uid = $user[0]['uid'];
|
||||
|
||||
$profilephoto = $a->get_cached_avatar_image($a->get_baseurl() . '/photo/profile/' . $a->data['user']['uid'] . '.jpg');
|
||||
$profile = get_profiledata_by_nick($nick, $a->profile_uid);
|
||||
|
||||
if((x($profile['page-flags']) == 2) || (x($profile['page-flags']) == 5))
|
||||
$account_type = t('Forum');
|
||||
else
|
||||
$account_type = "";
|
||||
|
||||
$tpl = get_markup_template("vcard-widget.tpl");
|
||||
|
||||
$vcard_widget = replace_macros($tpl, array(
|
||||
'$name' => $a->data['user']['username'],
|
||||
'$photo' => $profilephoto
|
||||
$vcard_widget .= replace_macros($tpl, array(
|
||||
'$name' => $profile['name'],
|
||||
'$photo' => $profile['photo'],
|
||||
'$addr' => (($profile['addr'] != "") ? $profile['addr'] : ""),
|
||||
'$account_type' => $account_type,
|
||||
'$pdesc' => (($profile['pdesc'] != "") ? $profile['pdesc'] : ""),
|
||||
));
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -3,15 +3,16 @@
|
|||
|
||||
<div class="fn label p-name">{{$profile.name}}</div>
|
||||
|
||||
{{if $profile.faddr}}<div class="p-faddr">{{$profile.faddr}}</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}}
|
||||
<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>
|
||||
{{else}}
|
||||
<div id="profile-photo-wrapper"><a href="{{$profile.url}}"><img class="photo u-photo" width="175" height="175" src="{{$profile.photo}}" alt="{{$profile.name}}"></a></div>
|
||||
{{/if}}
|
||||
{{if $account_type}}<div class="account-type">{{$account_type}}</div>{{/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}}
|
||||
<dl class="location"><dt class="location-label">{{$location}}</dt>
|
||||
|
|
|
|||
|
|
@ -1,9 +1,14 @@
|
|||
|
||||
<div class="vcard">
|
||||
<div class="fn">{{$name}}</div>
|
||||
{{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>
|
||||
{{else}}
|
||||
<div id="profile-photo-wrapper"><img class="vcard-photo photo" style="width: 175px; height: 175px;" src="{{$photo}}" alt="{{$name}}" /></div>
|
||||
{{/if}}
|
||||
<div class="fn">{{$name}}</div>
|
||||
{{if $addr}}<div class="p-addr">{{$addr}}</div>{{/if}}
|
||||
{{if $pdesc}}<div class="title">{{$pdesc}}</div>{{/if}}
|
||||
{{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>
|
||||
{{else}}
|
||||
<div id="profile-photo-wrapper"><img class="vcard-photo photo" style="width: 175px; height: 175px;" src="{{$photo}}" alt="{{$name}}" /></div>
|
||||
{{/if}}
|
||||
{{if $account_type}}<div class="account-type">{{$account_type}}</div>{{/if}}
|
||||
{{if $network_name}}<dl class="network"><dt class="network-label">{{$network}}</dt><dd class="x-network">{{$network_name}}</dd></dl>{{/if}}
|
||||
<div id="profile-vcard-break"></div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -2492,14 +2492,14 @@ aside input[type='text'] {
|
|||
margin-bottom: 25px;
|
||||
}
|
||||
|
||||
.location-label, .gender-label, .marital-label, .homepage-label {
|
||||
.location-label, .gender-label, .marital-label, .homepage-label, .network-label {
|
||||
float: left;
|
||||
text-align: right;
|
||||
display: block;
|
||||
width: 65px;
|
||||
}
|
||||
|
||||
.adr, .x-gender, .marital-text, .homepage-url {
|
||||
.adr, .x-gender, .marital-text, .homepage-url, .x-network {
|
||||
float: left;
|
||||
display: block;
|
||||
margin-left: 8px;
|
||||
|
|
@ -2538,11 +2538,16 @@ aside input[type='text'] {
|
|||
}
|
||||
|
||||
.vcard .title,
|
||||
.vcard .p-faddr {
|
||||
.vcard .p-addr {
|
||||
margin-bottom: 5px;
|
||||
margin-left: 12px;
|
||||
}
|
||||
|
||||
.vcard .account-type {
|
||||
font-size: 120%;
|
||||
margin-bottom: 13px;
|
||||
}
|
||||
|
||||
.vcard dl {
|
||||
clear: both;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,12 +3,14 @@
|
|||
|
||||
<div class="fn label">{{$profile.name}}</div>
|
||||
|
||||
{{if $profile.faddr}}<div class="p-faddr">{{$profile.faddr}}</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>
|
||||
|
||||
{{if $account_type}}<div class="account-type">{{$account_type}}</div>{{/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}}
|
||||
<dl class="location"><dt class="location-label">{{$location}}</dt>
|
||||
|
|
|
|||
|
|
@ -3081,14 +3081,14 @@ aside input[type='text'] {
|
|||
margin-bottom: 25px;
|
||||
}
|
||||
|
||||
.location-label, .gender-label, .marital-label, .homepage-label {
|
||||
.location-label, .gender-label, .marital-label, .homepage-label, .network-label {
|
||||
float: left;
|
||||
text-align: right;
|
||||
display: block;
|
||||
width: 65px;
|
||||
}
|
||||
|
||||
.adr, .x-gender, .marital-text, .homepage-url {
|
||||
.adr, .x-gender, .marital-text, .homepage-url, .x-network {
|
||||
float: left;
|
||||
display: block;
|
||||
margin-left: 8px;
|
||||
|
|
@ -3127,11 +3127,17 @@ aside input[type='text'] {
|
|||
}
|
||||
|
||||
.vcard .title,
|
||||
.vcard .p-faddr {
|
||||
.vcard .p-addr,
|
||||
.vcard .account-type {
|
||||
margin-bottom: 5px;
|
||||
margin-left: 12px;
|
||||
}
|
||||
|
||||
.vcard .account-type {
|
||||
font-size: 120%;
|
||||
margin-bottom: 13px;
|
||||
}
|
||||
|
||||
.vcard dl {
|
||||
clear: both;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,12 +3,14 @@
|
|||
|
||||
<div class="fn label">{{$profile.name}}</div>
|
||||
|
||||
{{if $profile.faddr}}<div class="p-faddr">{{$profile.faddr}}</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>
|
||||
|
||||
{{if $account_type}}<div class="account-type">{{$account_type}}</div>{{/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}}
|
||||
<dl class="location"><dt class="location-label">{{$location}}</dt>
|
||||
|
|
|
|||
|
|
@ -2867,14 +2867,14 @@ aside input[type='text'] {
|
|||
margin-bottom: 25px;
|
||||
}
|
||||
|
||||
.location-label, .gender-label, .marital-label, .homepage-label {
|
||||
.location-label, .gender-label, .marital-label, .homepage-label, .network-label {
|
||||
float: left;
|
||||
text-align: right;
|
||||
display: block;
|
||||
width: 65px;
|
||||
}
|
||||
|
||||
.adr, .x-gender, .marital-text, .homepage-url {
|
||||
.adr, .x-gender, .marital-text, .homepage-url, .x-network {
|
||||
float: left;
|
||||
display: block;
|
||||
margin-left: 8px;
|
||||
|
|
@ -2913,10 +2913,15 @@ aside input[type='text'] {
|
|||
}
|
||||
|
||||
.vcard .title,
|
||||
.vcard .p-faddr {
|
||||
.vcard .p-addr,
|
||||
.vcard .account-type {
|
||||
margin-bottom: 5px;
|
||||
margin-left: 12px;
|
||||
}
|
||||
.vcard .account-type {
|
||||
font-size: 120%;
|
||||
margin-bottom: 13px;
|
||||
}
|
||||
|
||||
.vcard dl {
|
||||
clear: both;
|
||||
|
|
|
|||
|
|
@ -3,12 +3,14 @@
|
|||
|
||||
<div class="fn label">{{$profile.name}}</div>
|
||||
|
||||
{{if $profile.faddr}}<div class="p-faddr">{{$profile.faddr}}</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>
|
||||
|
||||
{{if $account_type}}<div class="account-type">{{$account_type}}</div>{{/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}}
|
||||
<dl class="location"><dt class="location-label">{{$location}}</dt>
|
||||
|
|
|
|||
|
|
@ -833,9 +833,13 @@ aside .vcard .fn {
|
|||
aside .vcard .title {
|
||||
margin-bottom: 5px;
|
||||
}
|
||||
aside .vcard .p-faddr {
|
||||
aside .vcard .p-addr {
|
||||
margin-bottom: 5px;
|
||||
}
|
||||
aside .vcard .account-type {
|
||||
font-size: 14px;
|
||||
margin-bottom: 13px;
|
||||
}
|
||||
aside .vcard dl {
|
||||
height: auto;
|
||||
overflow: auto;
|
||||
|
|
|
|||
|
|
@ -833,9 +833,13 @@ aside .vcard .fn {
|
|||
aside .vcard .title {
|
||||
margin-bottom: 5px;
|
||||
}
|
||||
aside .vcard .p-faddr {
|
||||
aside .vcard .p-addr {
|
||||
margin-bottom: 5px;
|
||||
}
|
||||
aside .vcard .account-type {
|
||||
font-size: 14px;
|
||||
margin-bottom: 13px;
|
||||
}
|
||||
aside .vcard dl {
|
||||
height: auto;
|
||||
overflow: auto;
|
||||
|
|
|
|||
|
|
@ -833,9 +833,13 @@ aside .vcard .fn {
|
|||
aside .vcard .title {
|
||||
margin-bottom: 5px;
|
||||
}
|
||||
aside .vcard .p-faddr {
|
||||
aside .vcard .p-addr {
|
||||
margin-bottom: 5px;
|
||||
}
|
||||
aside .vcard .account-type {
|
||||
font-size: 14px;
|
||||
margin-bottom: 13px;
|
||||
}
|
||||
aside .vcard dl {
|
||||
height: auto;
|
||||
overflow: auto;
|
||||
|
|
|
|||
|
|
@ -332,7 +332,8 @@ aside {
|
|||
.vcard {
|
||||
.fn { font-size: 16px; font-weight: bold; margin-bottom: 5px; }
|
||||
.title { margin-bottom: 5px; }
|
||||
.p-faddr{ margin-bottom: 5px; }
|
||||
.p-addr { margin-bottom: 5px; }
|
||||
.account-type { font-size: 14px; margin-bottom: 13px; }
|
||||
dl { height: auto; overflow: auto; }
|
||||
dt {float: left; margin-left: 0px; width: 35%; text-align: right; color: @VCardLabelColor; }
|
||||
dd {float: left; margin-left: 4px; width: 60%;}
|
||||
|
|
|
|||
|
|
@ -26,12 +26,14 @@
|
|||
{{/if}}
|
||||
</div>
|
||||
|
||||
{{if $profile.faddr}}<div class="p-faddr">{{$profile.faddr}}</div>{{/if}}
|
||||
{{if $profile.addr}}<div class="p-addr">{{$profile.addr}}</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>
|
||||
|
||||
{{if $account_type}}<div class="account-type">{{$account_type}}</div>{{/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}}
|
||||
<dl class="location"><dt class="location-label">{{$location}}</dt>
|
||||
|
|
|
|||
|
|
@ -665,6 +665,10 @@ aside h4 {
|
|||
font-size: 1em;
|
||||
}
|
||||
|
||||
.vcard .account-type {
|
||||
font-size: 1.2em;
|
||||
}
|
||||
|
||||
.vcard dd {
|
||||
font-size: 12px;
|
||||
font-variant: normal;
|
||||
|
|
@ -4554,7 +4558,8 @@ hr.line-dots {
|
|||
.location-label,
|
||||
.gender-label,
|
||||
.marital-label,
|
||||
.homepage-label {
|
||||
.homepage-label,
|
||||
.network-label {
|
||||
float: left;
|
||||
text-align: left;
|
||||
display: block;
|
||||
|
|
@ -4564,7 +4569,8 @@ hr.line-dots {
|
|||
.adr,
|
||||
.x-gender,
|
||||
.marital-text,
|
||||
.homepage-url {
|
||||
.homepage-url,
|
||||
.x-network {
|
||||
float: left;
|
||||
display: block;
|
||||
margin-left: 8px;
|
||||
|
|
|
|||
|
|
@ -1000,11 +1000,17 @@ aside .vcard .fn {
|
|||
}
|
||||
aside .vcard .title {
|
||||
margin-bottom: 5px;
|
||||
float: left;
|
||||
}
|
||||
aside .vcard dl {
|
||||
height: auto;
|
||||
overflow: auto;
|
||||
}
|
||||
aside .vcard .account-type {
|
||||
margin-bottom: 13px;
|
||||
font-size: 14px;
|
||||
font-weight: bold;
|
||||
}
|
||||
|
||||
aside select {
|
||||
background-color: white;
|
||||
|
|
|
|||
|
|
@ -13,16 +13,17 @@
|
|||
{{/if}}
|
||||
</div>
|
||||
|
||||
{{if $profile.faddr}}<div class="p-faddr">{{$profile.faddr}}</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}}
|
||||
<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>
|
||||
{{else}}
|
||||
<div id="profile-photo-wrapper"><a href="{{$profile.url}}"><img class="photo u-photo" src="{{$profile.photo}}" alt="{{$profile.name}}"></a></div>
|
||||
{{/if}}
|
||||
|
||||
|
||||
{{if $account_type}}<div class="account-type">{{$account_type}}</div>{{/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}}
|
||||
<dl class="location"><dt class="location-label">{{$location}}</dt>
|
||||
|
|
|
|||
Loading…
Reference in a new issue