You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by an...@apache.org on 2018/04/17 07:13:13 UTC
ignite git commit: IGNITE-8287 Change position on signup inputs on
page-sign-in.
Repository: ignite
Updated Branches:
refs/heads/master 1cfc9897f -> e5c3f893a
IGNITE-8287 Change position on signup inputs on page-sign-in.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e5c3f893
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e5c3f893
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e5c3f893
Branch: refs/heads/master
Commit: e5c3f893aee0200d8956ae9263ec6ce1326e3c29
Parents: 1cfc989
Author: Ilya Borisov <ib...@gridgain.com>
Authored: Tue Apr 17 14:12:39 2018 +0700
Committer: Andrey Novikov <an...@gridgain.com>
Committed: Tue Apr 17 14:12:39 2018 +0700
----------------------------------------------------------------------
.../app/components/page-signin/style.scss | 10 +++++
.../app/components/page-signin/template.pug | 39 ++++++++++----------
2 files changed, 29 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/e5c3f893/modules/web-console/frontend/app/components/page-signin/style.scss
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/components/page-signin/style.scss b/modules/web-console/frontend/app/components/page-signin/style.scss
index 7e13ffe..8ea143a 100644
--- a/modules/web-console/frontend/app/components/page-signin/style.scss
+++ b/modules/web-console/frontend/app/components/page-signin/style.scss
@@ -35,4 +35,14 @@ page-sign-in {
background-color: #ffffff;
color: #444444;
}
+
+ .ps-grid {
+ display: grid;
+ grid-gap: 10px;
+ grid-template-columns: 1fr 1fr;
+
+ .ps-grid-full-width {
+ grid-column: 1 / 3;
+ }
+ }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/e5c3f893/modules/web-console/frontend/app/components/page-signin/template.pug
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/components/page-signin/template.pug b/modules/web-console/frontend/app/components/page-signin/template.pug
index 9a8b3ba..58d8571 100644
--- a/modules/web-console/frontend/app/components/page-signin/template.pug
+++ b/modules/web-console/frontend/app/components/page-signin/template.pug
@@ -27,10 +27,9 @@ section
.row
.col-xs-12.col-md-11
-var form = '$ctrl.form_signup'
- form(name=form novalidate)
- .settings-row
- h3 Don't Have An Account?
- .settings-row
+ h3 Don't Have An Account?
+ form.ps-grid(name=form novalidate)
+ .ps-grid-full-width
+form-field__email({
label: 'Email:',
model: '$ctrl.data.signup.email',
@@ -42,7 +41,7 @@ section
ng-model-options='{allowInvalid: true}'
)
+form-field__error({error: 'server', message: `{{$ctrl.serverErrors.signup}}`})
- .settings-row
+ div
+form-field__password({
label: 'Password:',
model: '$ctrl.data.signup.password',
@@ -52,7 +51,7 @@ section
})(
ignite-on-enter-focus-move='confirmInput'
)
- .settings-row
+ div
+form-field__password({
label: 'Confirm:',
model: 'confirm',
@@ -63,7 +62,7 @@ section
ignite-on-enter-focus-move='firstNameInput'
ignite-match='$ctrl.data.signup.password'
)
- .settings-row
+ div
+form-field__text({
label: 'First name:',
model: '$ctrl.data.signup.firstName',
@@ -73,7 +72,7 @@ section
})(
ignite-on-enter-focus-move='lastNameInput'
)
- .settings-row
+ div
+form-field__text({
label: 'Last name:',
model: '$ctrl.data.signup.lastName',
@@ -83,17 +82,7 @@ section
})(
ignite-on-enter-focus-move='companyInput'
)
- .settings-row
- +form-field__text({
- label: 'Company:',
- model: '$ctrl.data.signup.company',
- name: '"company"',
- placeholder: 'Input company name',
- required: true
- })(
- ignite-on-enter-focus-move='countryInput'
- )
- .settings-row
+ .ps-grid-full-width
+form-field__dropdown({
label: 'Country:',
model: '$ctrl.data.signup.country',
@@ -104,7 +93,17 @@ section
})(
ignite-on-enter-focus-move='signup_submit'
)
- .login-footer
+ .ps-grid-full-width
+ +form-field__text({
+ label: 'Company:',
+ model: '$ctrl.data.signup.company',
+ name: '"company"',
+ placeholder: 'Input company name',
+ required: true
+ })(
+ ignite-on-enter-focus-move='countryInput'
+ )
+ .login-footer.ps-grid-full-width
button#signup_submit.btn-ignite.btn-ignite--primary(
ng-click='$ctrl.signup()'
ng-disabled=`!$ctrl.canSubmitForm(${form})`