From fa3f9f91f3731adccec508bb6b2638ce2656a89c Mon Sep 17 00:00:00 2001
From: Peng Zhong <peng@nylira.com>
Date: Mon, 11 Sep 2017 15:08:10 +0800
Subject: [PATCH] better form design for larger screens

---
 .../components/common/NiFormGroup.vue         | 23 +++++++---
 .../renderer/components/common/NiFormMsg.vue  | 10 ++---
 .../govern/PageProposalsNewAdjust.vue         |  8 ++--
 .../govern/PageProposalsNewAmend.vue          |  8 ++--
 .../govern/PageProposalsNewCreate.vue         |  8 ++--
 .../govern/PageProposalsNewText.vue           |  8 ++--
 .../govern/PageProposalsNewUpgrade.vue        |  8 ++--
 .../components/staking/PageNominate.vue       | 45 +++++++------------
 8 files changed, 59 insertions(+), 59 deletions(-)

diff --git a/app/src/renderer/components/common/NiFormGroup.vue b/app/src/renderer/components/common/NiFormGroup.vue
index 5aaaf42043..5056cb7d65 100644
--- a/app/src/renderer/components/common/NiFormGroup.vue
+++ b/app/src/renderer/components/common/NiFormGroup.vue
@@ -1,7 +1,7 @@
-<template>
-  <div :class="cssClass">
-    <slot></slot>
-  </div>
+<template lang='pug'>
+div(:class='cssClass')
+  label(:for='fieldId') {{ fieldLabel }}
+  .ni-form-group-field: slot
 </template>
 
 <script>
@@ -14,7 +14,7 @@ export default {
       return value
     }
   },
-  props: ['error']
+  props: ['error', 'field-id', 'field-label']
 }
 </script>
 
@@ -42,4 +42,17 @@ export default {
       border-color #f00
     .ni-form-msg-error
       display flex
+
+@media (min-width: 768px)
+  .ni-form-group
+    display flex
+    label
+      flex 0 0 16rem
+    .ni-form-group-field
+      flex 1
+
+  .ni-form-group-field
+    > .ni-field
+    > .ni-field-group
+      width 100%
 </style>
diff --git a/app/src/renderer/components/common/NiFormMsg.vue b/app/src/renderer/components/common/NiFormMsg.vue
index bba43cfb11..093dabe155 100644
--- a/app/src/renderer/components/common/NiFormMsg.vue
+++ b/app/src/renderer/components/common/NiFormMsg.vue
@@ -1,8 +1,7 @@
-<template>
-  <div :class="cssClass">
-    <template v-if="name">{{ name }} {{ error }}</template>
-    <slot v-else></slot>
-  </div>
+<template lang='pug'>
+div(:class='cssClass')
+  template(v-if='name') {{ name }} {{ error }}
+  slot(v-else='')
 </template>
 
 <script>
@@ -63,6 +62,7 @@ export default {
   line-height 2rem
   font-size 0.75rem
   display flex
+  margin 0 !important
  
 .ni-form-msg:before
   content ''
diff --git a/app/src/renderer/components/govern/PageProposalsNewAdjust.vue b/app/src/renderer/components/govern/PageProposalsNewAdjust.vue
index a716766700..48c7287f33 100644
--- a/app/src/renderer/components/govern/PageProposalsNewAdjust.vue
+++ b/app/src/renderer/components/govern/PageProposalsNewAdjust.vue
@@ -3,8 +3,8 @@ page(title="Proposal: Adjust Parameters")
   tool-bar
     router-link(to="/proposals/new" exact): i.material-icons arrow_back
   form-struct(:submit="onSubmit")
-    form-group(:error="$v.fields.title.$error")
-      label(for="proposal-title") Proposal Title
+    form-group(:error="$v.fields.title.$error"
+      field-id='proposal-title' field-label='Proposal Title')
       field#proposal-title(
         type="text"
         placeholder="Proposal Title"
@@ -14,8 +14,8 @@ page(title="Proposal: Adjust Parameters")
       form-msg(name='Proposal Title' type='length'
         :min='titleMinLength' :max='titleMaxLength'
         v-if='!$v.fields.title.minLength || !$v.fields.title.maxLength')
-    form-group(:error="$v.fields.body.$error")
-      label(for="proposal-body") Proposal Body
+    form-group(:error="$v.fields.body.$error"
+      field-id='proposal-body' field-label='Proposal Body')
       field#proposal-body(
         type="textarea"
         placeholder="Write your proposal here..."
diff --git a/app/src/renderer/components/govern/PageProposalsNewAmend.vue b/app/src/renderer/components/govern/PageProposalsNewAmend.vue
index 7d2784f010..283ed92457 100644
--- a/app/src/renderer/components/govern/PageProposalsNewAmend.vue
+++ b/app/src/renderer/components/govern/PageProposalsNewAmend.vue
@@ -3,8 +3,8 @@ page(title="Proposal: Amend Constitution")
   tool-bar
     router-link(to="/proposals/new" exact): i.material-icons arrow_back
   form-struct(:submit="onSubmit")
-    form-group(:error="$v.fields.title.$error")
-      label(for="proposal-title") Proposal Title
+    form-group(:error="$v.fields.title.$error"
+      field-id='proposal-title' field-label='Proposal Title')
       field#proposal-title(
         type="text"
         placeholder="Proposal Title"
@@ -14,8 +14,8 @@ page(title="Proposal: Amend Constitution")
       form-msg(name='Proposal Title' type='length'
         :min='titleMinLength' :max='titleMaxLength'
         v-if='!$v.fields.title.minLength || !$v.fields.title.maxLength')
-    form-group(:error="$v.fields.body.$error")
-      label(for="proposal-body") Proposal Body
+    form-group(:error="$v.fields.body.$error"
+      field-id='proposal-body' field-label='Proposal Body')
       field#proposal-body(
         type="textarea"
         placeholder="Write your proposal here..."
diff --git a/app/src/renderer/components/govern/PageProposalsNewCreate.vue b/app/src/renderer/components/govern/PageProposalsNewCreate.vue
index 1b224ae984..778ea7bc42 100644
--- a/app/src/renderer/components/govern/PageProposalsNewCreate.vue
+++ b/app/src/renderer/components/govern/PageProposalsNewCreate.vue
@@ -3,8 +3,8 @@ page(title="Proposal: Create Atoms")
   tool-bar
     router-link(to="/proposals/new" exact): i.material-icons arrow_back
   form-struct(:submit="onSubmit")
-    form-group(:error="$v.fields.title.$error")
-      label(for="proposal-title") Proposal Title
+    form-group(:error="$v.fields.title.$error"
+      field-id='proposal-title' field-label='Proposal Title')
       field#proposal-title(
         type="text"
         placeholder="Proposal Title"
@@ -14,8 +14,8 @@ page(title="Proposal: Create Atoms")
       form-msg(name='Proposal Title' type='length'
         :min='titleMinLength' :max='titleMaxLength'
         v-if='!$v.fields.title.minLength || !$v.fields.title.maxLength')
-    form-group(:error="$v.fields.body.$error")
-      label(for="proposal-body") Proposal Body
+    form-group(:error="$v.fields.body.$error"
+      field-id='proposal-body' field-label='Proposal Body')
       field#proposal-body(
         type="textarea"
         placeholder="Write your proposal here..."
diff --git a/app/src/renderer/components/govern/PageProposalsNewText.vue b/app/src/renderer/components/govern/PageProposalsNewText.vue
index 035a98e426..3f5d5cec9e 100644
--- a/app/src/renderer/components/govern/PageProposalsNewText.vue
+++ b/app/src/renderer/components/govern/PageProposalsNewText.vue
@@ -3,8 +3,8 @@ page(title="Proposal: Freeform Text")
   tool-bar
     router-link(to="/proposals/new" exact): i.material-icons arrow_back
   form-struct(:submit="onSubmit")
-    form-group(:error="$v.fields.title.$error")
-      label(for="proposal-title") Proposal Title
+    form-group(:error="$v.fields.title.$error"
+      field-id='proposal-title' field-label='Proposal Title')
       field#proposal-title(
         type="text"
         placeholder="Proposal Title"
@@ -14,8 +14,8 @@ page(title="Proposal: Freeform Text")
       form-msg(name='Proposal Title' type='length'
         :min='titleMinLength' :max='titleMaxLength'
         v-if='!$v.fields.title.minLength || !$v.fields.title.maxLength')
-    form-group(:error="$v.fields.body.$error")
-      label(for="proposal-body") Proposal Body
+    form-group(:error="$v.fields.body.$error"
+      field-id='proposal-body' field-label='Proposal Body')
       field#proposal-body(
         type="textarea"
         placeholder="Write your proposal here..."
diff --git a/app/src/renderer/components/govern/PageProposalsNewUpgrade.vue b/app/src/renderer/components/govern/PageProposalsNewUpgrade.vue
index 0bd33990c1..4cb5f49d45 100644
--- a/app/src/renderer/components/govern/PageProposalsNewUpgrade.vue
+++ b/app/src/renderer/components/govern/PageProposalsNewUpgrade.vue
@@ -3,8 +3,8 @@ page(title="Proposal: Upgrade Code")
   tool-bar
     router-link(to="/proposals/new" exact): i.material-icons arrow_back
   form-struct(:submit="onSubmit")
-    form-group(:error="$v.fields.title.$error")
-      label(for="proposal-title") Proposal Title
+    form-group(:error="$v.fields.title.$error"
+      field-id='proposal-title' field-label='Proposal Title')
       field#proposal-title(
         type="text"
         placeholder="Proposal Title"
@@ -14,8 +14,8 @@ page(title="Proposal: Upgrade Code")
       form-msg(name='Proposal Title' type='length'
         :min='titleMinLength' :max='titleMaxLength'
         v-if='!$v.fields.title.minLength || !$v.fields.title.maxLength')
-    form-group(:error="$v.fields.body.$error")
-      label(for="proposal-body") Proposal Body
+    form-group(:error="$v.fields.body.$error"
+      field-id='proposal-body' field-label='Proposal Body')
       field#proposal-body(
         type="textarea"
         placeholder="Write your proposal here..."
diff --git a/app/src/renderer/components/staking/PageNominate.vue b/app/src/renderer/components/staking/PageNominate.vue
index fcf6675df6..6ea2064c28 100644
--- a/app/src/renderer/components/staking/PageNominate.vue
+++ b/app/src/renderer/components/staking/PageNominate.vue
@@ -9,8 +9,8 @@ page(:title='pageTitle')
     a(v-else @click='onSubmit')
       | #[i.material-icons check] Nominate
   form-struct(:submit='onSubmit')
-    form-group(:error='$v.fields.id.$error')
-      label(for='form-nominate-id') Keybase ID
+    form-group( error='$v.fields.id.$error'
+      field-id='form-nominate-id' field-label='Keybase ID')
       field(
         v-if="user.nominationActive"
         id='form-nominate-id'
@@ -33,8 +33,8 @@ page(:title='pageTitle')
         :min='config.CANDIDATE.KEYBASE_MIN' :max='config.CANDIDATE.KEYBASE_MAX'
         v-if='!$v.fields.id.minLength || !$v.fields.id.maxLength')
 
-    form-group(:error='$v.fields.description.$error')
-      label(for='form-nominate-description') Description
+    form-group(:error='$v.fields.description.$error'
+      field-id='form-nominate-descripton' field-label='Description')
       field(
         id='form-nominate-description'
         theme='cosmos'
@@ -47,8 +47,8 @@ page(:title='pageTitle')
         :min='config.CANDIDATE.DESCRIPTION_MIN' :max='config.CANDIDATE.DESCRIPTION_MAX'
         v-if='!$v.fields.description.minLength || !$v.fields.description.maxLength')
 
-    form-group(:error='$v.fields.serverDetails.$error')
-      label(for='form-nominate-server-power') Server Power
+    form-group(:error='$v.fields.serverDetails.$error'
+      field-id='form-nominate-server-power' field-label='Server Power')
       field(
         id='form-nominate-server-power'
         theme='cosmos'
@@ -61,21 +61,8 @@ page(:title='pageTitle')
         :min='config.CANDIDATE.DESCRIPTION_MIN' :max='config.CANDIDATE.DESCRIPTION_MAX'
         v-if='!$v.fields.serverDetails.minLength || !$v.fields.serverDetails.maxLength')
 
-    // form-group(:error='$v.fields.startDate.$error')
-      label(for='form-nominate-start-date') Start Date
-      field(
-        id='form-nominate-start-date'
-        theme='cosmos'
-        type='datetime'
-        placeholder='Select start date...'
-        v-model='fields.startDate')
-      form-msg(name='Start Date' type='required'
-        v-if='!$v.fields.startDate.required')
-      form-msg(name='Start Date' type='datetime'
-        v-if='!$v.fields.startDate.datetime')
-
-    form-group(:error='$v.fields.country.$error')
-      label(for='form-nominate-country') Country
+    form-group(:error='$v.fields.country.$error'
+      field-id='form-nominate-country' field-label='Country')
       field(
         id='form-nominate-country'
         theme='cosmos'
@@ -85,8 +72,8 @@ page(:title='pageTitle')
       form-msg(name='Country' type='required'
         v-if='!$v.fields.country.required')
 
-    form-group(:error='$v.fields.commissionPercent.$error')
-      label(for='form-nominate-commission-percent') Commission Percent
+    form-group(:error='$v.fields.commissionPercent.$error'
+      field-id='form-nominate-commission-percent' field-label='Commission Percent')
       field-group
         field(
           id='form-nominate-commission-percent'
@@ -102,8 +89,8 @@ page(:title='pageTitle')
         :min='config.CANDIDATE.COMMISSION_MIN' :max='config.CANDIDATE.COMMISSION_MAX'
         v-if='!$v.fields.commissionPercent.between')
 
-    form-group(:error='$v.fields.ownCoinsBonded.$error')
-      label(for='form-atoms-to-bond') Atoms To Bond
+    form-group(:error='$v.fields.ownCoinsBonded.$error'
+      field-id='form-nominate-atoms-to-bond' field-label='Atoms to Bond')
       field-group
         field(
           id='form-atoms-to-bond'
@@ -119,8 +106,8 @@ page(:title='pageTitle')
         :min='config.CANDIDATE.SELF_BOND_MIN' :max='config.CANDIDATE.SELF_BOND_MAX'
         v-if='!$v.fields.ownCoinsBonded.between')
 
-    form-group(:error='$v.fields.website.$error')
-      label(for='form-nominate-website') Website
+    form-group(:error='$v.fields.website.$error'
+      field-id='form-nominate-website' field-label='Website')
       field(
         id='form-nominate-website'
         theme='cosmos'
@@ -132,8 +119,8 @@ page(:title='pageTitle')
       form-msg(name='Website' type='url'
         v-if='!$v.fields.website.url')
 
-    form-group(:error='$v.fields.ipAddress.$error')
-      label(for='form-nominate-ip-address') Public IP Address (Optional)
+    form-group(:error='$v.fields.ipAddress.$error'
+      field-id='form-nominate-ip-address' field-label='Website (Optional')
       field-group
         field(
           id='form-nominate-address'