IT4Change/Ocelot-Social
3
0
Fork 0
mirror of https://github.com/IT4Change/Ocelot-Social.git synced 2025-12-13 07:45:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move location hint under location select on group and settings form

Browse Source
This commit is contained in:
Wolfgang Huß 2023-02-01 11:11:30 +01:00
parent dbefa5d8a6
commit 6590a8dd9f
4 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
webapp/components/Group/GroupForm.vue
View File

@ -125,11 +125,7 @@
<!-- location -->
<ds-select
id="city"
:label="
$t('settings.data.labelCity') +
locationNameLabelAddOnOldName +
$t('settings.data.labelCityHint')
"
:label="$t('settings.data.labelCity') + locationNameLabelAddOnOldName"
v-model="formData.locationName"
:options="cities"
icon="map-marker"
@ -146,6 +142,9 @@
style="position: relative; display: inline-block; right: -96%; top: -33px; width: 26px"
@click="formData.locationName = ''"
></base-button>
<ds-text class="location-hint" color="softer">
{{ $t('settings.data.labelCityHint') }}
</ds-text>
<ds-space margin-top="small" />
@ -440,5 +439,9 @@ export default {
align-self: flex-end;
margin-top: $space-base;
}
> .location-hint {
margin-top: -$space-base + $space-xxx-small;
}
}
</style>

2
webapp/locales/de.json
View File

@ -816,7 +816,7 @@
"data": {
"labelBio": "Über Dich",
"labelCity": "Deine Stadt oder Region",
"labelCityHint": " (zeigt ungenaue Position auf der Landkarte)",
"labelCityHint": "(zeigt ungefähre Position auf der Landkarte)",
"labelName": "Dein Name",
"labelSlug": "Dein eindeutiger Benutzername",
"name": "Deine Daten",

2
webapp/locales/en.json
View File

@ -816,7 +816,7 @@
"data": {
"labelBio": "About You",
"labelCity": "Your City or Region",
"labelCityHint": " (shows inaccurate position on map)",
"labelCityHint": "(shows approximate position on map)",
"labelName": "Your Name",
"labelSlug": "Your unique user name",
"name": "Your data",

16
webapp/pages/settings/index.vue
View File

@ -1,5 +1,5 @@
<template>
<ds-form v-model="form" :schema="formSchema" @submit="submit">
<ds-form class="settings-form" v-model="form" :schema="formSchema" @submit="submit">
<template #default="{ errors }">
<base-card>
<h2 class="title">{{ $t('settings.data.name') }}</h2>
@ -17,11 +17,14 @@
model="locationName"
icon="map-marker"
:options="cities"
:label="$t('settings.data.labelCity') + $t('settings.data.labelCityHint')"
:label="$t('settings.data.labelCity')"
:placeholder="$t('settings.data.labelCity')"
:loading="loadingGeo"
@input.native="handleCityInput"
/>
<ds-text class="location-hint" color="softer">
{{ $t('settings.data.labelCityHint') }}
</ds-text>
<!-- eslint-enable vue/use-v-on-exact -->
<ds-input
id="about"
@ -158,3 +161,12 @@ export default {
},
}
</script>
<style lang="scss">
// .settings-form {
// >
.location-hint {
margin-top: -$space-x-small - $space-xxx-small - $space-xxx-small;
}
// }
</style>