mirror of
https://codeberg.org/streams/streams.git
synced 2024-09-19 22:35:18 +00:00
Merge branch 'dev' of codeberg.org:streams/streams into dev
This commit is contained in:
Mike Macgirvin
commit
15e446458d
3 changed files with 84 additions and 21 deletions
|
|
@ -24,7 +24,7 @@ class Libprofile
|
|||
* The channel default theme is also selected for use, unless over-riden elsewhere.
|
||||
*
|
||||
* @param string $nickname
|
||||
* @param string $profile_guid
|
||||
* @param string $profile (guid)
|
||||
*/
|
||||
|
||||
public static function load($nickname, $profile = '')
|
||||
|
|
@ -112,7 +112,7 @@ class Libprofile
|
|||
$profile_fields_basic = Channel::get_profile_fields_basic();
|
||||
$profile_fields_advanced = Channel::get_profile_fields_advanced();
|
||||
|
||||
$advanced = ((Features::enabled(local_channel(), 'advanced_profiles')) ? true : false);
|
||||
$advanced = (bool)Features::enabled(local_channel(), 'advanced_profiles');
|
||||
if ($advanced) {
|
||||
$fields = $profile_fields_advanced;
|
||||
} else {
|
||||
|
|
@ -388,18 +388,22 @@ class Libprofile
|
|||
$clones = Libzot::encode_locations($profile);
|
||||
}
|
||||
if (($ids && $pconfigs) || $clones) {
|
||||
$identities .= '<table style="border: 1px solid #ccc; width=100%; display:table;">';
|
||||
$identities .= '<table class="identity-table">';
|
||||
// style="">';
|
||||
}
|
||||
if ($clones) {
|
||||
foreach ($clones as $clone) {
|
||||
if (str_starts_with($clone['id_url'], z_root())) {
|
||||
continue;
|
||||
}
|
||||
$identities .= '<tr><td style="border: 1px solid #ccc; padding:3px;">' . escape_tags($clone['host'])
|
||||
. '</td><td style="border: 1px solid #ccc; padding:3px;">'
|
||||
. '<a href="' . $clone['id_url'] . '">' . $clone['id_url'] . '</a>'
|
||||
. '</td><td style="border: 1px solid #ccc; padding:3px;">'
|
||||
. '<i class="fa fa-check" title="' . t('Verified') . '"></i></td></tr>';
|
||||
$identities .= replace_macros(Theme::get_template('identity.tpl'), [
|
||||
'$identity' => [
|
||||
escape_tags($clone['host']),
|
||||
$clone['id_url'],
|
||||
'check',
|
||||
t('Verified'),
|
||||
]
|
||||
]);
|
||||
}
|
||||
}
|
||||
if ($ids && $pconfigs) {
|
||||
|
|
@ -408,19 +412,25 @@ class Libprofile
|
|||
foreach ($ids as $id) {
|
||||
if ($pconfig[1] === $id['link']) {
|
||||
$matched = true;
|
||||
$identities .= '<tr><td style="border: 1px solid #ccc; padding:3px;">' . escape_tags($pconfig[0])
|
||||
. '</td><td style="border: 1px solid #ccc; padding:3px;">'
|
||||
. '<a href="' . $pconfig[1] . '">' . $pconfig[1] . '</a>'
|
||||
. '</td><td style="border: 1px solid #ccc; padding:3px;">'
|
||||
. '<i class="fa fa-check" title="' . t('Verified') . '"></i></td></tr>';
|
||||
$identities .= replace_macros(Theme::get_template('identity.tpl'), [
|
||||
'$identity' => [
|
||||
escape_tags($pconfig[0]),
|
||||
$pconfig[1],
|
||||
'check',
|
||||
t('Verified'),
|
||||
]
|
||||
]);
|
||||
}
|
||||
}
|
||||
if (!$matched) {
|
||||
$identities .= '<tr><td style="border: 1px solid #ccc; padding:3px;">' . escape_tags($pconfig[0])
|
||||
. '</td><td style="border: 1px solid #ccc; padding:3px;">'
|
||||
. '<a href="' . $pconfig[1] . '">' . $pconfig[1] . '</a>'
|
||||
. '</td><td style="border: 1px solid #ccc; padding:3px;">'
|
||||
. '<i class="fa fa-close" title="' . t('Not verified') . '"></i></td></tr>';
|
||||
$identities .= replace_macros(Theme::get_template('identity.tpl'), [
|
||||
'$identity' => [
|
||||
escape_tags($pconfig[0]),
|
||||
$pconfig[1],
|
||||
'close',
|
||||
t('Not verified'),
|
||||
]
|
||||
]);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -538,7 +548,7 @@ class Libprofile
|
|||
$profile_fields_basic = Channel::get_profile_fields_basic();
|
||||
$profile_fields_advanced = Channel::get_profile_fields_advanced();
|
||||
|
||||
$advanced = ((Features::enabled(App::$profile['profile_uid'], 'advanced_profiles')) ? true : false);
|
||||
$advanced = (bool)Features::enabled(App::$profile['profile_uid'], 'advanced_profiles');
|
||||
if ($advanced) {
|
||||
$fields = $profile_fields_advanced;
|
||||
} else {
|
||||
|
|
@ -605,7 +615,7 @@ class Libprofile
|
|||
$profile['birthday'] = [t('Birthday:'), $val];
|
||||
}
|
||||
|
||||
if ($age = age(App::$profile['dob'], App::$profile['timezone'], '')) {
|
||||
if ($age = age(App::$profile['dob'], App::$profile['timezone'])) {
|
||||
$profile['age'] = [t('Age:'), $age];
|
||||
}
|
||||
|
||||
|
|
@ -732,7 +742,7 @@ class Libprofile
|
|||
|
||||
return replace_macros($tpl, [
|
||||
'$title' => t('Profile'),
|
||||
'$canlike' => (($profile['canlike']) ? true : false),
|
||||
'$canlike' => (bool)$profile['canlike'],
|
||||
'$likethis' => t('Like this thing'),
|
||||
'$export' => t('Export'),
|
||||
'$exportlink' => '', // $exportlink,
|
||||
|
|
|
|||
|
|
@ -232,6 +232,35 @@ a:focus,
|
|||
color: #FFA500 !important;
|
||||
}
|
||||
|
||||
.identity-table {
|
||||
border: 1px solid #ccc;
|
||||
width: 100%;
|
||||
display:table;
|
||||
}
|
||||
|
||||
.identity-table td {
|
||||
border: 1px dotted black;
|
||||
vertical-align: top;
|
||||
}
|
||||
|
||||
.identity-name-inner, .identity-url-inner {
|
||||
white-space: nowrap;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
position: absolute;
|
||||
width: 100%;
|
||||
}
|
||||
.identity-name-td {
|
||||
width: 25%;
|
||||
}
|
||||
|
||||
.identity-name-outer, .identity-url-outer {
|
||||
position: relative;
|
||||
}
|
||||
.identity-checked-td {
|
||||
width: 10%;
|
||||
}
|
||||
|
||||
input, optgroup, select, textarea {
|
||||
font-size: 0.9rem !important;
|
||||
}
|
||||
|
|
@ -330,6 +359,11 @@ nav {
|
|||
|
||||
.nav-channel-select { margin-left: 8px; }
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
/* spinner */
|
||||
|
||||
.spinner-wrapper {
|
||||
|
|
|
|||
19
view/tpl/identity.tpl
Normal file
19
view/tpl/identity.tpl
Normal file
|
|
@ -0,0 +1,19 @@
|
|||
<tr>
|
||||
<td class="identity-name-td">
|
||||
<div class="identity-name-outer">
|
||||
<div class="identity-name-inner">
|
||||
{{$identity.0}}
|
||||
</div>
|
||||
</div>
|
||||
</td>
|
||||
<td class="identity-url-td">
|
||||
<div class="identity-url-outer">
|
||||
<div class="identity-url-inner">
|
||||
<a href="{{$identity.1}}" title="{{$identity.1}}">{{$identity.1}}</a>
|
||||
</div>
|
||||
</div>
|
||||
</td>
|
||||
<td class="identity-checked-td" title="{{$identity.3}}">
|
||||
<i class="fa fa-{{$identity.2}}" title="{{$identity.3}}"></i>
|
||||
</td>
|
||||
</tr>
|
||||
Loading…
Reference in a new issue