diff --git a/images/default_cover_photos/bggenerator/1200.png b/images/default_cover_photos/bggenerator/1200.png deleted file mode 100644 index 53aaafd7f..000000000 Binary files a/images/default_cover_photos/bggenerator/1200.png and /dev/null differ diff --git a/images/default_cover_photos/bggenerator/425.png b/images/default_cover_photos/bggenerator/425.png deleted file mode 100644 index 5dbfe1e2b..000000000 Binary files a/images/default_cover_photos/bggenerator/425.png and /dev/null differ diff --git a/images/default_cover_photos/bggenerator/850.png b/images/default_cover_photos/bggenerator/850.png deleted file mode 100644 index e9f476f86..000000000 Binary files a/images/default_cover_photos/bggenerator/850.png and /dev/null differ diff --git a/images/default_cover_photos/hubzilla/1200.png b/images/default_cover_photos/hubzilla/1200.png new file mode 100644 index 000000000..25a265d3a Binary files /dev/null and b/images/default_cover_photos/hubzilla/1200.png differ diff --git a/images/default_cover_photos/hubzilla/425.png b/images/default_cover_photos/hubzilla/425.png new file mode 100644 index 000000000..a5380db24 Binary files /dev/null and b/images/default_cover_photos/hubzilla/425.png differ diff --git a/images/default_cover_photos/hubzilla/850.png b/images/default_cover_photos/hubzilla/850.png new file mode 100644 index 000000000..b09791839 Binary files /dev/null and b/images/default_cover_photos/hubzilla/850.png differ diff --git a/images/default_cover_photos/hubzilla/cover.svg b/images/default_cover_photos/hubzilla/cover.svg new file mode 100644 index 000000000..9e9003983 --- /dev/null +++ b/images/default_cover_photos/hubzilla/cover.svg @@ -0,0 +1,67 @@ + + + + + + + + + + + + diff --git a/images/default_cover_photos/pexels-94622/1200.jpg b/images/default_cover_photos/pexels-94622/1200.jpg deleted file mode 100644 index 509f4f051..000000000 Binary files a/images/default_cover_photos/pexels-94622/1200.jpg and /dev/null differ diff --git a/images/default_cover_photos/pexels-94622/425.jpg b/images/default_cover_photos/pexels-94622/425.jpg deleted file mode 100644 index 02b2fdbee..000000000 Binary files a/images/default_cover_photos/pexels-94622/425.jpg and /dev/null differ diff --git a/images/default_cover_photos/pexels-94622/850.jpg b/images/default_cover_photos/pexels-94622/850.jpg deleted file mode 100644 index 946a7a85b..000000000 Binary files a/images/default_cover_photos/pexels-94622/850.jpg and /dev/null differ diff --git a/include/channel.php b/include/channel.php index bb213f102..01302a1b9 100644 --- a/include/channel.php +++ b/include/channel.php @@ -1583,6 +1583,10 @@ function profile_sidebar($profile, $block = 0, $show_connect = true, $details = $reddress = true; $connect_url = ''; $connect = ''; + $default_cover = get_config('system', 'default_cover_photo', 'hubzilla'); + $default_cover_url = z_root() . '/images/default_cover_photos/' . $default_cover . '/425.png'; + + if(! perm_is_allowed($profile['uid'], $observer_hash, 'view_profile')) { $block = true; @@ -1681,9 +1685,11 @@ function profile_sidebar($profile, $block = 0, $show_connect = true, $details = '$homepage' => $homepage, '$chanmenu' => $channel_menu, '$reddress' => $reddress, + '$no_pdesc' => t('This channel has not added a profile description yet'), '$contact_block' => $contact_block, '$change_photo' => t('Change your profile photo'), - '$editmenu' => profile_edit_menu($profile['uid']) + '$editmenu' => profile_edit_menu($profile['uid']), + '$cover' => get_cover_photo($profile['uid'], 'array', PHOTO_RES_COVER_425) ?: ['url' => $default_cover_url] )); $arr = [ @@ -2404,7 +2410,7 @@ function get_zcard($channel, $observer_hash = '', $args = array()) { $cover = $r[0]; $cover['href'] = z_root() . '/photo/' . $r[0]['resource_id'] . '-' . $r[0]['imgscale']; } else { - $default_cover = get_config('system','default_cover_photo','bggenerator'); + $default_cover = get_config('system', 'default_cover_photo', 'hubzilla'); $cover = [ 'href' => z_root() . '/images/default_cover_photos/' . $default_cover . '/' . $cover_width . '.png' ]; } @@ -2478,7 +2484,7 @@ function get_zcard_embed($channel, $observer_hash = '', $args = array()) { $cover['href'] = z_root() . '/photo/' . $r[0]['resource_id'] . '-' . $r[0]['imgscale']; } else { - $default_cover = get_config('system','default_cover_photo','bggenerator'); + $default_cover = get_config('system', 'default_cover_photo', 'hubzilla'); $cover = [ 'href' => z_root() . '/images/default_cover_photos/' . $default_cover . '/' . $cover_width . '.png' ]; } diff --git a/view/css/widgets.css b/view/css/widgets.css index 6b5ef3986..6f5a90aa5 100644 --- a/view/css/widgets.css +++ b/view/css/widgets.css @@ -231,6 +231,30 @@ a.wikilist { display: none !important; } +/* vcard */ + +.vcard-card { + background-color: rgba(var(--bs-body-bg-rgb), .7); +} + +.vcard { + word-wrap: break-word; +} + +.profile-edit-side-link { + opacity: 0; + filter:alpha(opacity=0); +} + +.card:hover .profile-edit-side-link { + opacity: 1; + filter:alpha(opacity=100); +} + +#profile-cover-text { + background: linear-gradient(to top, rgba(0, 0, 0, 0.3), transparent); +} + /* contact block */ .contact-block-div .oneway-overlay { font-size: .9rem; diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index fc5416eaa..18973e30c 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -404,29 +404,6 @@ footer { margin-bottom: 10px; } -.fn { - font-weight: bold; - font-size: 1rem; -} - -.vcard-card { - background-color: rgba(var(--bs-body-bg-rgb), .7); -} - -.vcard { - word-wrap: break-word; -} - -.profile-edit-side-link { - opacity: 0; - filter:alpha(opacity=0); -} - -.card:hover .profile-edit-side-link { - opacity: 1; - filter:alpha(opacity=100); -} - #hide-friends-yes-label, #hide-friends-no-label { margin-left: 125px; diff --git a/view/tpl/profile_vcard.tpl b/view/tpl/profile_vcard.tpl index beec6b3a0..4c3875fa7 100644 --- a/view/tpl/profile_vcard.tpl +++ b/view/tpl/profile_vcard.tpl @@ -1,49 +1,53 @@
-
-
-
- {{$profile.fullname}} -
-
-
- {{if $editmenu.multi}} -
- - -
- {{elseif $editmenu}} - - {{/if}} - -
- {{$profile.fullname}}{{if $profile.online}}{{/if}} +
+ + {{if $connect}} + + {{$connect}} + + {{/if}} +
+
+ {{$profile.fullname}}{{if $profile.online}}{{/if}}
- {{$profile.reddress}} + {{$profile.reddress}}
- {{if $connect}} -
- - {{$connect}} - -
- {{/if}}
+ {{if $editmenu.multi}} +
+ + +
+ {{elseif $editmenu}} +
+ +
+ {{/if}} +
+
+
+ {{$profile.fullname}} +
+ {{if $profile.pdesc}} +
{{$profile.pdesc}}
+ {{else}} +
+ {{$no_pdesc}} +
+ {{/if}}
{{if $details}}
- {{if $profile.pdesc}} -
{{$profile.pdesc}}
- {{/if}} {{if $location}}
{{$location}}