pleroma-fe

commit: fef0981bc400199c4466581f9bd16724d993782f
parent: dbf46942d0f9af347ac98494a52148733365cc3d
Author: HJ <spam@hjkos.com>
Date:   Mon, 25 Feb 2019 19:58:17 +0000

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

#396: update registration form

Closes #396

See merge request pleroma/pleroma-fe!612
Diffstat:
M
src/components/registration/registration.vue
12
++++++++----
M
src/i18n/en.json
6
+++++-

2 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/src/components/registration/registration.vue b/src/components/registration/registration.vue
@@ -9,7 +9,7 @@
           <div class='text-fields'>
             <div class='form-group' :class="{ 'form-group--error': $v.user.username.$error }">
               <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 class="form-error" v-if="$v.user.username.$dirty">
               <ul>
@@ -21,7 +21,7 @@
 
             <div class='form-group' :class="{ 'form-group--error': $v.user.fullname.$error }">
               <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 class="form-error" v-if="$v.user.fullname.$dirty">
               <ul>
@@ -44,8 +44,8 @@
             </div>
 
             <div class='form-group'>
-              <label class='form--label' for='bio'>{{$t('registration.bio')}}</label>
-              <input :disabled="isPending" v-model='user.bio' class='form-control' id='bio'>
+              <label class='form--label' for='bio'>{{$t('registration.bio')}} ({{$t('general.optional')}})</label>
+              <textarea :disabled="isPending" v-model='user.bio' class='form-control' id='bio' :placeholder="$t('registration.bio_placeholder')"></textarea>
             </div>
 
             <div class='form-group' :class="{ 'form-group--error': $v.user.password.$error }">
@@ -139,6 +139,10 @@ $validations-cRed: #f04124;
     flex-direction: column;
   }
 
+  textarea {
+    min-height: 100px;
+  }
+
   .form-group {
     display: flex;
     flex-direction: column;
diff --git a/src/i18n/en.json b/src/i18n/en.json
@@ -19,7 +19,8 @@
     "apply": "Apply",
     "submit": "Submit",
     "more": "More",
-    "generic_error": "An error occured"
+    "generic_error": "An error occured",
+    "optional": "optional"
   },
   "image_cropper": {
     "crop_picture": "Crop picture",
@@ -92,6 +93,9 @@
     "token": "Invite token",
     "captcha": "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": {
       "username_required": "cannot be left blank",
       "fullname_required": "cannot be left blank",