Skip to content

Refine profile related user experience #30183

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Pytal wants to merge 1 commit into from
Closed

Refine profile related user experience #30183

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions apps/settings/css/settings.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1749,3 +1749,7 @@ doesnotexist:-o-prefocus, .strengthify-wrapper {
}
}
}

div:last-of-type {
margin-bottom: 30vh;
}
2 changes: 1 addition & 1 deletion apps/settings/src/constants/AccountPropertyConstants.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ export const ACCOUNT_PROPERTY_ENUM = Object.freeze({

/** Enum of account properties to human readable account property names */
export const ACCOUNT_PROPERTY_READABLE_ENUM = Object.freeze({
ADDRESS: t('settings', 'Address'),
ADDRESS: t('settings', 'Location'),
AVATAR: t('settings', 'Avatar'),
BIOGRAPHY: t('settings', 'About'),
DISPLAYNAME: t('settings', 'Full name'),
Expand Down
10 changes: 5 additions & 5 deletions core/src/views/Profile.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,12 @@
{{ t('core', 'Edit Profile') }}
</a>
</h2>
<div v-if="status.icon || status.message"
<button v-if="status.icon || status.message"
class="profile__header__container__status-text"
:class="{ interactive: isCurrentUser }"
@click.prevent.stop="openStatusModal">
{{ status.icon }} {{ status.message }}
</div>
</button>
</div>
</div>

Expand Down Expand Up @@ -93,8 +93,7 @@
</ActionLink>
</Actions>
<template v-if="otherActions">
<Actions
:force-menu="true">
<Actions>
<ActionLink v-for="action in otherActions"
:key="action.id"
:class="{ 'icon-invert': colorMainBackground === '#181818' }"
Expand Down Expand Up @@ -384,6 +383,7 @@ $content-max-width: 640px;

&__status-text {
width: max-content;
height: 44px;
max-width: $content-max-width;
padding: 5px 10px;
margin-left: -12px;
Expand Down Expand Up @@ -463,7 +463,7 @@ $content-max-width: 640px;
}

&__blocks {
margin: 18px 0 80px 0;
margin: 18px 0 30vh 0;
display: grid;
gap: 16px 0;
width: $content-max-width;
Expand Down
11 changes: 10 additions & 1 deletion lib/private/Profile/Actions/WebsiteAction.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,9 @@
use OCP\L10N\IFactory;
use OCP\Profile\ILinkAction;

use function Safe\parse_url;
use function Safe\substr;

class WebsiteAction implements ILinkAction {

/** @var string */
Expand Down Expand Up @@ -74,7 +77,13 @@ public function getDisplayId(): string {
}

public function getTitle(): string {
return $this->l10nFactory->get('lib')->t('Visit %s', [$this->value]);
// Saved websites are guaranteed to have the https/http scheme
$displayWebsite = str_starts_with($this->value, 'https://')
? substr($this->value, 8)
: (str_starts_with($this->value, 'http://')
? substr($this->value, 7)
: null);
return $this->l10nFactory->get('lib')->t('Visit %s', [$displayWebsite]);
}

public function getPriority(): int {
Expand Down
2 changes: 1 addition & 1 deletion lib/private/Profile/ProfileManager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -396,7 +396,7 @@ public function getProfileConfigWithMetadata(IUser $targetUser, ?IUser $visiting
$propertiesMetadata = [
IAccountManager::PROPERTY_ADDRESS => [
'appId' => self::CORE_APP_ID,
'displayId' => $this->l10nFactory->get('lib')->t('Address'),
'displayId' => $this->l10nFactory->get('lib')->t('Location'),
],
IAccountManager::PROPERTY_AVATAR => [
'appId' => self::CORE_APP_ID,
Expand Down