better layout & wording
This commit is contained in:
parent
184f1cdc24
commit
3311c676ad
5 changed files with 62 additions and 43 deletions
|
|
@ -1,4 +1,18 @@
|
|||
.profile-tab {
|
||||
// overriding global for better look
|
||||
div.profile-edit {
|
||||
margin: 0;
|
||||
|
||||
h2 {
|
||||
margin-left: 1rem;
|
||||
}
|
||||
|
||||
.user-card {
|
||||
padding: 1.2em;
|
||||
overflow: hidden;
|
||||
}
|
||||
}
|
||||
|
||||
.bio {
|
||||
margin: 0;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,12 +1,15 @@
|
|||
<template>
|
||||
<div class="profile-tab">
|
||||
<UserCard
|
||||
:user-id="user.id"
|
||||
:editable="true"
|
||||
:switcher="false"
|
||||
rounded="top"
|
||||
>
|
||||
</UserCard>
|
||||
<div class="setting-item profile-edit">
|
||||
<h2>{{ $t('settings.account_profile_edit') }}</h2>
|
||||
<UserCard
|
||||
:user-id="user.id"
|
||||
:editable="true"
|
||||
:switcher="false"
|
||||
rounded="top"
|
||||
>
|
||||
</UserCard>
|
||||
</div>
|
||||
<div class="setting-item">
|
||||
<h2>{{ $t('settings.account_privacy') }}</h2>
|
||||
<ul class="setting-list">
|
||||
|
|
|
|||
|
|
@ -426,6 +426,7 @@
|
|||
|
||||
.user-profile-fields {
|
||||
margin: 0 0.5em;
|
||||
padding: 0 0.5em;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
|
||||
|
|
|
|||
|
|
@ -330,41 +330,6 @@
|
|||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<template v-if="editable">
|
||||
<h3>{{ $t('settings.user_preferences') }}</h3>
|
||||
<p
|
||||
v-if="role === 'admin' || role === 'moderator'"
|
||||
class="user-card-setting"
|
||||
>
|
||||
<Checkbox v-model="newShowRole">
|
||||
<template v-if="role === 'admin'">
|
||||
{{ $t('settings.show_admin_badge') }}
|
||||
</template>
|
||||
<template v-if="role === 'moderator'">
|
||||
{{ $t('settings.show_moderator_badge') }}
|
||||
</template>
|
||||
</Checkbox>
|
||||
</p>
|
||||
<p class="user-card-setting">
|
||||
<label>
|
||||
{{ $t('settings.actor_type') }}
|
||||
<Select v-model="newActorType">
|
||||
<option
|
||||
v-for="option in availableActorTypes"
|
||||
:key="option"
|
||||
:value="option"
|
||||
>
|
||||
{{ $t('settings.actor_type_' + (option === 'Person' ? 'person_proper' : option)) }}
|
||||
</option>
|
||||
</Select>
|
||||
<div v-if="groupActorAvailable">
|
||||
<small>
|
||||
{{ $t('settings.actor_type_description') }}
|
||||
</small>
|
||||
</div>
|
||||
</label>
|
||||
</p>
|
||||
</template>
|
||||
<div
|
||||
v-if="!editable && loggedIn && isOtherUser && (hasNote || !hideBio) && !mergedConfig.userCardHidePersonalMarks"
|
||||
class="personal-marks"
|
||||
|
|
@ -646,6 +611,41 @@
|
|||
</div>
|
||||
</template>
|
||||
</div>
|
||||
<template v-if="editable">
|
||||
<h3>{{ $t('settings.profile_other') }}</h3>
|
||||
<p
|
||||
v-if="role === 'admin' || role === 'moderator'"
|
||||
class="user-card-setting"
|
||||
>
|
||||
<Checkbox v-model="newShowRole">
|
||||
<template v-if="role === 'admin'">
|
||||
{{ $t('settings.show_admin_badge') }}
|
||||
</template>
|
||||
<template v-if="role === 'moderator'">
|
||||
{{ $t('settings.show_moderator_badge') }}
|
||||
</template>
|
||||
</Checkbox>
|
||||
</p>
|
||||
<p class="user-card-setting">
|
||||
<label>
|
||||
{{ $t('settings.actor_type') }}
|
||||
<Select v-model="newActorType">
|
||||
<option
|
||||
v-for="option in availableActorTypes"
|
||||
:key="option"
|
||||
:value="option"
|
||||
>
|
||||
{{ $t('settings.actor_type_' + (option === 'Person' ? 'person_proper' : option)) }}
|
||||
</option>
|
||||
</Select>
|
||||
<div v-if="groupActorAvailable">
|
||||
<small>
|
||||
{{ $t('settings.actor_type_description') }}
|
||||
</small>
|
||||
</div>
|
||||
</label>
|
||||
</p>
|
||||
</template>
|
||||
<teleport to="#modal">
|
||||
<UserTimedFilterModal
|
||||
ref="timedMuteDialog"
|
||||
|
|
|
|||
|
|
@ -493,7 +493,7 @@
|
|||
"avatarRadius": "Avatars",
|
||||
"background": "Background",
|
||||
"bio": "Bio",
|
||||
"user_preferences": "Profile settings",
|
||||
"profile_other": "Other",
|
||||
"email_language": "Language for receiving emails from the server",
|
||||
"block_export": "Block export",
|
||||
"block_export_button": "Export your blocks to a csv file",
|
||||
|
|
@ -664,6 +664,7 @@
|
|||
"label": "Birthday",
|
||||
"show_birthday": "Show my birthday"
|
||||
},
|
||||
"account_profile_edit": "Edit Profile",
|
||||
"account_privacy": "Privacy",
|
||||
"use_contain_fit": "Don't crop the attachment in thumbnails",
|
||||
"name": "Name",
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue