ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akuznet...@apache.org
Subject [3/8] ignite git commit: IGNITE-843 Fixed signin page.
Date Wed, 17 Feb 2016 09:30:56 GMT
IGNITE-843 Fixed signin page.


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

Branch: refs/heads/ignite-843-rc3
Commit: 652d85f410a021744a2bb00b91a24221bad3cb23
Parents: aa5bf5c
Author: Andrey <anovikov@gridgain.com>
Authored: Wed Feb 17 14:36:52 2016 +0700
Committer: Andrey <anovikov@gridgain.com>
Committed: Wed Feb 17 14:36:52 2016 +0700

----------------------------------------------------------------------
 .../src/main/js/public/stylesheets/style.scss   |   4 +
 .../src/main/js/views/signin.jade               | 235 ++++++++++---------
 2 files changed, 122 insertions(+), 117 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/652d85f4/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 226b2b7..024fba9 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
@@ -382,6 +382,10 @@ h1, h2, h3, h4, h5, h6 {
     height: #{"calc(100vh - 270px)"};
 }
 
+.signin-greedy {
+    height: #{"calc(100vh - 300px)"};
+}
+
 @media (min-width: 768px) {
     .navbar-nav > li > a {
         padding: 0 15px;

http://git-wip-us.apache.org/repos/asf/ignite/blob/652d85f4/modules/control-center-web/src/main/js/views/signin.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/views/signin.jade b/modules/control-center-web/src/main/js/views/signin.jade
index b0f7ebe..cb78abc 100644
--- a/modules/control-center-web/src/main/js/views/signin.jade
+++ b/modules/control-center-web/src/main/js/views/signin.jade
@@ -30,124 +30,125 @@ header#header.header
 
 .container.body-container
     .main-content(ng-controller='auth')
-        .row.greedy.home
-            .col-xs-12.col-md-6
-                form(name='form' novalidate)
-                    .modal-body.row(style='padding-bottom: 10px; margin: 0')
-                        .settings-row(ng-if='action == "signup"')
-                            h3.login-header Sign Up
-                        .settings-row(ng-if='action == "signin"')
-                            h3.login-header Sign In
-                        .settings-row(ng-if='action == "password/forgot"')
-                            h3.login-header Forgot password?
-                        .settings-row
-                            p.col-xs-12.col-md-11(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.
-                        .settings-row(ng-show='action == "signup"')
-                            +lblRequired('Full Name:')
-                            .col-xs-9.col-md-8
-                                input#user_name.form-control(enter-focus-next='user_email'
type='text' ng-model='user_info.username' placeholder='John Smith' ng-required='action=="signup"')
-                        .settings-row
-                            +lblRequired('Email:')
-                            .col-xs-9.col-md-8
-                                input#user_email.form-control(enter-focus-next='company'
type='email' ng-model='user_info.email' placeholder='you@domain.com' required)
-                        .settings-row(ng-show='action == "signup"')
-                            +lbl('Company:')
-                            .col-xs-9.col-md-8
-                                input#company.form-control(enter-focus-next='country' type='text'
ng-model='user_info.company' placeholder='Your company name')
-                        .settings-row(ng-show='action == "signup"')
-                            +lbl('Country:')
-                            .col-xs-9.col-md-8
-                                button#country.select-toggle.form-control(bs-select bs-options='item
for item in countries' enter-focus-next='user_password' type='text' ng-model='user_info.country'
placeholder='Choose your country')
-                        .settings-row(ng-show='action != "password/forgot"')
-                            +lblRequired('Password:')
-                            .col-xs-9.col-md-8
-                                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" && form.$valid && auth(action,
user_info)')
-                        .settings-row(ng-if='action == "signup"')
-                            +lblRequired('Confirm:')
-                            .col-xs-9.col-md-8
-                                input#user_confirm.form-control(type='password' ng-model='user_info.confirm'
match='user_info.password' placeholder='Confirm password' ng-required='action == "signup"'
on-enter='form.$valid && auth(action, user_info)')
-                        .settings-row(ignite-terms)
-                            .col-md-offset-3(ng-if='action == "signup" && terms.termsState')
-                                label
-                                    input(type='checkbox' ng-model='user_info.agree', ng-required='true')
-                                    | I agree to the #[a(ui-sref='{{::terms.termsState}}'
target='_blank') terms and conditions]
-                    .col-xs-12.col-md-11
-                        .login-footer(ng-show='action == "signup"')
-                            a.labelField(ng-click='action = "password/forgot"' on-click-focus='user_email')
Forgot password?
-                            a.labelLogin(ng-click='action = "signin"' on-click-focus='user_email')
Sign In
-                            button#signup.btn.btn-primary(ng-click='auth(action, user_info)'
ng-disabled='form.$invalid') Sign Up
-                    .col-xs-12.col-md-11
-                        .login-footer(ng-show='action == "password/forgot"')
-                            a.labelField(ng-click='action = "signin"' on-click-focus='user_email')
Sign In
-                            button#forgot.btn.btn-primary(ng-click='auth(action, user_info)'
ng-disabled='form.$invalid') Send it to me
-                    .col-xs-12.col-md-11
-                        .login-footer(ng-show='action == "signin"')
-                            a.labelField(ng-click='action = "password/forgot"' on-click-focus='user_email')
Forgot password?
-                            a.labelLogin(ng-click='action = "signup"' on-click-focus='user_name')
Sign Up
-                            button#login.btn.btn-primary(ng-click='auth(action, user_info)'
ng-disabled='form.$invalid') Sign In
+        .row.home
+            .signin-greedy
+                .col-xs-12.col-md-6
+                    form(name='form' novalidate)
+                        .modal-body.row(style='padding-bottom: 10px; margin: 0')
+                            .settings-row(ng-if='action == "signup"')
+                                h3.login-header Sign Up
+                            .settings-row(ng-if='action == "signin"')
+                                h3.login-header Sign In
+                            .settings-row(ng-if='action == "password/forgot"')
+                                h3.login-header Forgot password?
+                            .settings-row
+                                p.col-xs-12.col-md-11(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.
+                            .settings-row(ng-show='action == "signup"')
+                                +lblRequired('Full Name:')
+                                .col-xs-9.col-md-8
+                                    input#user_name.form-control(enter-focus-next='user_email'
type='text' ng-model='user_info.username' placeholder='John Smith' ng-required='action=="signup"')
+                            .settings-row
+                                +lblRequired('Email:')
+                                .col-xs-9.col-md-8
+                                    input#user_email.form-control(enter-focus-next='company'
type='email' ng-model='user_info.email' placeholder='you@domain.com' required)
+                            .settings-row(ng-show='action == "signup"')
+                                +lbl('Company:')
+                                .col-xs-9.col-md-8
+                                    input#company.form-control(enter-focus-next='country'
type='text' ng-model='user_info.company' placeholder='Your company name')
+                            .settings-row(ng-show='action == "signup"')
+                                +lbl('Country:')
+                                .col-xs-9.col-md-8
+                                    button#country.select-toggle.form-control(bs-select bs-options='item
for item in countries' enter-focus-next='user_password' type='text' ng-model='user_info.country'
placeholder='Choose your country')
+                            .settings-row(ng-show='action != "password/forgot"')
+                                +lblRequired('Password:')
+                                .col-xs-9.col-md-8
+                                    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" && form.$valid && auth(action,
user_info)')
+                            .settings-row(ng-if='action == "signup"')
+                                +lblRequired('Confirm:')
+                                .col-xs-9.col-md-8
+                                    input#user_confirm.form-control(type='password' ng-model='user_info.confirm'
match='user_info.password' placeholder='Confirm password' ng-required='action == "signup"'
on-enter='form.$valid && auth(action, user_info)')
+                            .settings-row(ignite-terms)
+                                .col-md-offset-3(ng-if='action == "signup" && terms.termsState')
+                                    label
+                                        input(type='checkbox' ng-model='user_info.agree',
ng-required='true')
+                                        | I agree to the #[a(ui-sref='{{::terms.termsState}}'
target='_blank') terms and conditions]
+                        .col-xs-12.col-md-11
+                            .login-footer(ng-show='action == "signup"')
+                                a.labelField(ng-click='action = "password/forgot"' on-click-focus='user_email')
Forgot password?
+                                a.labelLogin(ng-click='action = "signin"' on-click-focus='user_email')
Sign In
+                                button#signup.btn.btn-primary(ng-click='auth(action, user_info)'
ng-disabled='form.$invalid') Sign Up
+                        .col-xs-12.col-md-11
+                            .login-footer(ng-show='action == "password/forgot"')
+                                a.labelField(ng-click='action = "signin"' on-click-focus='user_email')
Sign In
+                                button#forgot.btn.btn-primary(ng-click='auth(action, user_info)'
ng-disabled='form.$invalid') Send it to me
+                        .col-xs-12.col-md-11
+                            .login-footer(ng-show='action == "signin"')
+                                a.labelField(ng-click='action = "password/forgot"' on-click-focus='user_email')
Forgot password?
+                                a.labelLogin(ng-click='action = "signup"' on-click-focus='user_name')
Sign Up
+                                button#login.btn.btn-primary(ng-click='auth(action, user_info)'
ng-disabled='form.$invalid') Sign In
 
-                .col-xs-12.col-md-11.home-panel
-                    p Web Console is an interactive management tool which allows to:
-                    ul
-                        li Create and download cluster configurations
-                        li Automatically import domain model from any RDBMS
-                        li Connect to cluster and run SQL analytics on it
-            .col-xs-12.col-md-6
-                #carousel.carousel.slide
-                    // Indicators
-                    ol.carousel-indicators
-                        li.active(data-target='#carousel', data-slide-to='0')
-                        li(data-target='#carousel', data-slide-to='1')
-                        li(data-target='#carousel', data-slide-to='2')
-                        li(data-target='#carousel', data-slide-to='3')
-                        li(data-target='#carousel', data-slide-to='4')
-                        li(data-target='#carousel', data-slide-to='5')
-                        li(data-target='#carousel', data-slide-to='6')
-                    // Wrapper for slides
-                    .carousel-inner(role='listbox')
-                        .item.active
-                            img(src='/images/cluster.png', alt='Clusters screen')
-                            .carousel-caption
-                                h3 Clusters screen
-                                p Configure clusters, link clusters to caches
-                        .item
-                            img(src='/images/cache.png', alt='Caches screen')
-                            .carousel-caption
-                                h3 Caches screen
-                                p Configure caches, link domain models to caches, link caches
to clusters
-                        .item
-                            img(src='/images/domains.png', alt='Domain model screen')
-                            .carousel-caption
-                                h3 Domain model screen
-                                p Manually enter domain model or import from database
-                        .item
-                            img(src='/images/summary.png', alt='Summary screen')
-                            .carousel-caption
-                                h3 Summary screen
-                                p Preview XML config, JAVA code,Docker file and download
project
-                        .item
-                            img(src='/images/query-table.png', alt='Query')
-                            .carousel-caption
-                                h3 Query
-                                p Explain SQL, execute, scan queries
-                        .item
-                            img(src='/images/query-metadata.png', alt='Cache metadata')
-                            .carousel-caption
-                                h3 Cache metadata
-                                p View cache type metadata
-                        .item
-                            img(src='/images/query-chart.png', alt='Query chart')
-                            .carousel-caption
-                                h3 Query chart
-                                p View data in tabular form and as charts
-                    // Controls
-                    a.left.carousel-control(href='#carousel', role='button', data-slide='prev')
-                        span.fa.fa-chevron-left(aria-hidden='true')
-                        span.sr-only Previous
-                    a.right.carousel-control(href='#carousel', role='button', data-slide='next')
-                        span.fa.fa-chevron-right(aria-hidden='true')
-                        span.sr-only Next
+                    .col-xs-12.col-md-11.home-panel
+                        p Web Console is an interactive management tool which allows to:
+                        ul
+                            li Create and download cluster configurations
+                            li Automatically import domain model from any RDBMS
+                            li Connect to cluster and run SQL analytics on it
+                .col-xs-12.col-md-6
+                    #carousel.carousel.slide
+                        // Indicators
+                        ol.carousel-indicators
+                            li.active(data-target='#carousel', data-slide-to='0')
+                            li(data-target='#carousel', data-slide-to='1')
+                            li(data-target='#carousel', data-slide-to='2')
+                            li(data-target='#carousel', data-slide-to='3')
+                            li(data-target='#carousel', data-slide-to='4')
+                            li(data-target='#carousel', data-slide-to='5')
+                            li(data-target='#carousel', data-slide-to='6')
+                        // Wrapper for slides
+                        .carousel-inner(role='listbox')
+                            .item.active
+                                img(src='/images/cluster.png', alt='Clusters screen')
+                                .carousel-caption
+                                    h3 Clusters screen
+                                    p Configure clusters, link clusters to caches
+                            .item
+                                img(src='/images/cache.png', alt='Caches screen')
+                                .carousel-caption
+                                    h3 Caches screen
+                                    p Configure caches, link domain models to caches, link
caches to clusters
+                            .item
+                                img(src='/images/domains.png', alt='Domain model screen')
+                                .carousel-caption
+                                    h3 Domain model screen
+                                    p Manually enter domain model or import from database
+                            .item
+                                img(src='/images/summary.png', alt='Summary screen')
+                                .carousel-caption
+                                    h3 Summary screen
+                                    p Preview XML config, JAVA code,Docker file and download
project
+                            .item
+                                img(src='/images/query-table.png', alt='Query')
+                                .carousel-caption
+                                    h3 Query
+                                    p Explain SQL, execute, scan queries
+                            .item
+                                img(src='/images/query-metadata.png', alt='Cache metadata')
+                                .carousel-caption
+                                    h3 Cache metadata
+                                    p View cache type metadata
+                            .item
+                                img(src='/images/query-chart.png', alt='Query chart')
+                                .carousel-caption
+                                    h3 Query chart
+                                    p View data in tabular form and as charts
+                        // Controls
+                        a.left.carousel-control(href='#carousel', role='button', data-slide='prev')
+                            span.fa.fa-chevron-left(aria-hidden='true')
+                            span.sr-only Previous
+                        a.right.carousel-control(href='#carousel', role='button', data-slide='next')
+                            span.fa.fa-chevron-right(aria-hidden='true')
+                            span.sr-only Next
 
 include includes/footer
 


Mime
View raw message