ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akuznet...@apache.org
Subject [1/3] ignite git commit: IGNITE-843 Login / sign up in one column.
Date Wed, 23 Sep 2015 11:11:25 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-843 09c14d5d0 -> 91c38aa42


IGNITE-843 Login / sign up in one column.


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/763cfc25
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/763cfc25
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/763cfc25

Branch: refs/heads/ignite-843
Commit: 763cfc259737976caf3a06b08f1b62eced17c384
Parents: 09c14d5
Author: vsisko <vsisko@gridgain.com>
Authored: Wed Sep 23 18:10:15 2015 +0700
Committer: Alexey Kuznetsov <akuznetsov@apache.org>
Committed: Wed Sep 23 18:10:15 2015 +0700

----------------------------------------------------------------------
 .../src/main/js/public/stylesheets/style.scss   | 10 ++-
 .../src/main/js/views/index.jade                | 83 +++++++++-----------
 2 files changed, 45 insertions(+), 48 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/763cfc25/modules/control-center-web/src/main/js/public/stylesheets/style.scss
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/public/stylesheets/style.scss b/modules/control-center-web/src/main/js/public/stylesheets/style.scss
index c5bd9f6..b317408 100644
--- a/modules/control-center-web/src/main/js/public/stylesheets/style.scss
+++ b/modules/control-center-web/src/main/js/public/stylesheets/style.scss
@@ -326,8 +326,8 @@ h1, h2, h3, h4, h5, h6 {
 .login-footer {
     @extend .modal-footer;
 
-    margin-left: 20px;
-    margin-right: 20px;
+    padding-left: 8px;
+    padding-right: 4px;
 }
 
 .modal-body {
@@ -1296,6 +1296,8 @@ a {
 }
 
 .block-callout-parent {
+    margin-top: 10px;
+
     table {
         width: 100%
     }
@@ -1491,6 +1493,10 @@ a {
     background-color: rgba(255, 255, 255, 1) !important;
 }
 
+.dw-loading {
+    min-height: 200px;
+}
+
 .dw-loading > .dw-loading-body > .dw-loading-text {
     left: -50%;
 }

http://git-wip-us.apache.org/repos/asf/ignite/blob/763cfc25/modules/control-center-web/src/main/js/views/index.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/views/index.jade b/modules/control-center-web/src/main/js/views/index.jade
index 346834d..21b0435 100644
--- a/modules/control-center-web/src/main/js/views/index.jade
+++ b/modules/control-center-web/src/main/js/views/index.jade
@@ -17,7 +17,7 @@
 extends templates/layout
 
 mixin lbl(txt)
-    label.col-xs-5.col-sm-4.required #{txt}
+    label.col-xs-4.col-sm-3.col-sm-offset-1.required #{txt}
 
 block container
     .row(ng-controller='auth')
@@ -38,50 +38,41 @@ block container
                                     li Load metadata from database
                                     li Execute SQL queries
         hr
-        .col-xs-6.col-sm-6.col-md-6(ng-init='loginAction == "login"')
-            form(name='loginForm')
-                .modal-body.row
-                    .col-sm-10.col-sm-offset-1
-                        p(ng-show='loginAction == "password/forgot"')
+        form(name='loginForm')
+            .modal-body.row
+                .col-sm-6.col-sm-offset-3
+                    .details-row
+                        p.col-xs-10.col-sm-10.col-sm-offset-1(ng-show='action == "password/forgot"')
                             | That's ok! Simply enter your email below and a reset password
link will be sent to you via email. You can then follow that link and select a new password.
-                        .details-row
-                            +lbl('Email:')
-                            .col-xs-7.col-sm-8
-                                input#login_user_email.form-control(enter-focus-next='login_user_password'
type='email' ng-model='user_info.email' placeholder='you@domain.com' required on-enter='loginAction
== "password/forgot" && loginForm.$valid && auth(loginAction, user_info)')
-                        .details-row(ng-show='loginAction != "password/forgot"')
-                            +lbl('Password:')
-                            .col-xs-7.col-sm-8
-                                input#login_user_password.form-control(type='password' ng-model='user_info.password'
placeholder='Password' ng-required='loginAction != "password/forgot"' on-enter='loginAction
== "login" && loginForm.$valid && auth(loginAction, user_info)')
-        .col-xs-6.col-sm-6.col-md-6
-            form(name='signupForm')
-                .modal-body.row
-                    .col-sm-10.col-sm-offset-1
-                        .details-row
-                            +lbl('Full Name:')
-                            .col-xs-7.col-sm-8
-                                input#signup_user_name.form-control(enter-focus-next='signup_user_email'
type='text' ng-model='user_info.username' placeholder='John Smith' required)
-                        .details-row
-                            +lbl('Email:')
-                            .col-xs-7.col-sm-8
-                                input#signup_user_email.form-control(enter-focus-next='signup_user_password'
type='email' ng-model='user_info.email' placeholder='you@domain.com' required on-enter='signupForm.$valid
&& auth("register", user_info)')
-                        .details-row
-                            +lbl('Password:')
-                            .col-xs-7.col-sm-8
-                                input#signup_user_password.form-control(enter-focus-next='signup_user_confirm'
type='password' ng-model='user_info.password' placeholder='Password' required on-enter='signupForm.$valid
&& auth("register", user_info)')
-                        .details-row
-                            +lbl('Confirm:')
-                            .col-xs-7.col-sm-8
-                                input#signup_user_confirm.form-control(type='password' ng-model='user_info.confirm'
match='user_info.password' placeholder='Confirm password' required on-enter='signupForm.$valid
&& auth("register", user_info)')
-        .col-xs-6.col-sm-6.col-md-6
-            .col-sm-10.col-sm-offset-1
-                .login-footer(ng-show='loginAction == "login"')
-                    a.labelField(ng-click='loginAction = "password/forgot"' on-click-focus='user_email')
Forgot password?
-                    button.btn.btn-primary(ng-click='auth(loginAction, user_info)' ng-disabled='loginForm.$invalid')
Log In
-                .login-footer(ng-show='loginAction == "password/forgot"')
-                    a.labelField(ng-click='loginAction = "login"' on-click-focus='user_email')
Log In
-                    button.btn.btn-primary(ng-click='auth(loginAction, user_info)' ng-disabled='loginForm.$invalid')
Send it to me
-        .col-xs-6.col-sm-6.col-md-6
-            .col-sm-10.col-sm-offset-1
-                .login-footer
-                    button#signup.btn.btn-primary(ng-click='auth("register", user_info)'
ng-disabled='signupForm.$invalid') Sign Up
+                    .details-row(ng-show='action == "register"')
+                        +lbl('Full Name:')
+                        .col-xs-6.col-sm-7
+                            input#user_name.form-control(enter-focus-next='user_email' type='text'
ng-model='user_info.username' placeholder='John Smith' ng-required='action=="register"')
+                    .details-row
+                        +lbl('Email:')
+                        .col-xs-6.col-sm-7
+                            input#user_email.form-control(enter-focus-next='user_password'
type='email' ng-model='user_info.email' placeholder='you@domain.com' required on-enter='action
== "password/forgot" && loginForm.$valid && auth(action, user_info)')
+                    .details-row(ng-show='action != "password/forgot"')
+                        +lbl('Password:')
+                        .col-xs-6.col-sm-7
+                            input#user_password.form-control(enter-focus-next='user_confirm'
type='password' ng-model='user_info.password' placeholder='Password' ng-required='action !=
"password/forgot"' on-enter='action == "login" && loginForm.$valid && auth(action,
user_info)')
+                    .details-row(ng-if='action == "register"')
+                        +lbl('Confirm:')
+                        .col-xs-6.col-sm-7
+                            input#user_confirm.form-control(type='password' ng-model='user_info.confirm'
match='user_info.password' placeholder='Confirm password' ng-required='action == "register"'
on-enter='loginForm.$valid && auth(action, user_info)')
+        .col-sm-6.col-sm-offset-3
+            .col-xs-10.col-sm-10.col-sm-offset-1
+                .login-footer(ng-show='action == "register"')
+                    a.labelField(ng-click='action = "password/forgot"' on-click-focus='user_email')
Forgot password?
+                    a.labelLogin(ng-click='action = "login"' on-click-focus='user_email')
Log In
+                    button#signup.btn.btn-primary(ng-click='auth(action, user_info)' ng-disabled='loginForm.$invalid')
Sign Up
+            .col-xs-10.col-sm-10.col-sm-offset-1
+                .login-footer(ng-show='action == "password/forgot"')
+                    a.labelField(ng-click='action = "login"' on-click-focus='user_email')
Log In
+                    button#forgot.btn.btn-primary(ng-click='auth(action, user_info)' ng-disabled='loginForm.$invalid')
Send it to me
+            .col-xs-10.col-sm-10.col-sm-offset-1
+                .login-footer(ng-show='action == "login"')
+                    a.labelField(ng-click='action = "password/forgot"' on-click-focus='user_email')
Forgot password?
+                    a.labelLogin(ng-click='action = "register"' on-click-focus='user_name')
Sign Up
+                    button#login.btn.btn-primary(ng-click='auth(action, user_info)' ng-disabled='loginForm.$invalid')
Log In
 


Mime
View raw message