Troplo/pleroma-fe
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'issue-396-registration-bio-field' into 'develop'

Browse source 
#396: update registration form

Closes #396

See merge request pleroma/pleroma-fe!612
This commit is contained in:
HJ 2019-02-25 19:58:17 +00:00
commit fef0981bc4
2 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/components/registration/registration.vue
View file

@ -9,7 +9,7 @@
<div class='text-fields'> <div class='text-fields'>
<div class='form-group' :class="{ 'form-group--error': $v.user.username.$error }"> <div class='form-group' :class="{ 'form-group--error': $v.user.username.$error }">
<label class='form--label' for='sign-up-username'>{{$t('login.username')}}</label> <label class='form--label' for='sign-up-username'>{{$t('login.username')}}</label>
<input :disabled="isPending" v-model.trim='$v.user.username.$model' class='form-control' id='sign-up-username' placeholder='e.g. lain'> <input :disabled="isPending" v-model.trim='$v.user.username.$model' class='form-control' id='sign-up-username' :placeholder="$t('registration.username_placeholder')">
</div> </div>
<div class="form-error" v-if="$v.user.username.$dirty"> <div class="form-error" v-if="$v.user.username.$dirty">
<ul> <ul>
@ -21,7 +21,7 @@
<div class='form-group' :class="{ 'form-group--error': $v.user.fullname.$error }"> <div class='form-group' :class="{ 'form-group--error': $v.user.fullname.$error }">
<label class='form--label' for='sign-up-fullname'>{{$t('registration.fullname')}}</label> <label class='form--label' for='sign-up-fullname'>{{$t('registration.fullname')}}</label>
<input :disabled="isPending" v-model.trim='$v.user.fullname.$model' class='form-control' id='sign-up-fullname' placeholder='e.g. Lain Iwakura'> <input :disabled="isPending" v-model.trim='$v.user.fullname.$model' class='form-control' id='sign-up-fullname' :placeholder="$t('registration.fullname_placeholder')">
</div> </div>
<div class="form-error" v-if="$v.user.fullname.$dirty"> <div class="form-error" v-if="$v.user.fullname.$dirty">
<ul> <ul>
@ -44,8 +44,8 @@
</div> </div>
<div class='form-group'> <div class='form-group'>
<label class='form--label' for='bio'>{{$t('registration.bio')}}</label> <label class='form--label' for='bio'>{{$t('registration.bio')}} ({{$t('general.optional')}})</label>
<input :disabled="isPending" v-model='user.bio' class='form-control' id='bio'> <textarea :disabled="isPending" v-model='user.bio' class='form-control' id='bio' :placeholder="$t('registration.bio_placeholder')"></textarea>
</div> </div>
<div class='form-group' :class="{ 'form-group--error': $v.user.password.$error }"> <div class='form-group' :class="{ 'form-group--error': $v.user.password.$error }">
@ -139,6 +139,10 @@ $validations-cRed: #f04124;
flex-direction: column; flex-direction: column;
} }
textarea {
min-height: 100px;
}
.form-group { .form-group {
display: flex; display: flex;
flex-direction: column; flex-direction: column;

6
src/i18n/en.json
View file

@ -19,7 +19,8 @@
"apply": "Apply", "apply": "Apply",
"submit": "Submit", "submit": "Submit",
"more": "More", "more": "More",
"generic_error": "An error occured" "generic_error": "An error occured",
"optional": "optional"
}, },
"image_cropper": { "image_cropper": {
"crop_picture": "Crop picture", "crop_picture": "Crop picture",
@ -92,6 +93,9 @@
"token": "Invite token", "token": "Invite token",
"captcha": "CAPTCHA", "captcha": "CAPTCHA",
"new_captcha": "Click the image to get a new captcha", "new_captcha": "Click the image to get a new captcha",
"username_placeholder": "e.g. lain",
"fullname_placeholder": "e.g. Lain Iwakura",
"bio_placeholder": "e.g.\nHi, I'm Lain\nI’m an anime girl living in suburban Japan. You may know me from the Wired.",
"validations": { "validations": {
"username_required": "cannot be left blank", "username_required": "cannot be left blank",
"fullname_required": "cannot be left blank", "fullname_required": "cannot be left blank",