ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From anovi...@apache.org
Subject ignite git commit: IGNITE-843 Minor fix
Date Wed, 30 Dec 2015 10:58:57 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-843-rc2 0e5fe0343 -> 72dfcb74b


IGNITE-843 Minor fix


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

Branch: refs/heads/ignite-843-rc2
Commit: 72dfcb74bded3f8bc3bc7beca87b70fa47d022f2
Parents: 0e5fe03
Author: Andrey <anovikov@gridgain.com>
Authored: Wed Dec 30 17:58:42 2015 +0700
Committer: Andrey <anovikov@gridgain.com>
Committed: Wed Dec 30 17:58:42 2015 +0700

----------------------------------------------------------------------
 modules/control-center-web/src/main/js/views/login.jade | 5 ++---
 modules/control-center-web/src/main/js/views/reset.jade | 3 ++-
 2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/72dfcb74/modules/control-center-web/src/main/js/views/login.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/views/login.jade b/modules/control-center-web/src/main/js/views/login.jade
index 5814051..3d5cf19 100644
--- a/modules/control-center-web/src/main/js/views/login.jade
+++ b/modules/control-center-web/src/main/js/views/login.jade
@@ -28,7 +28,7 @@ header#header.header
         .row.greedy.home
             .col-xs-12.col-md-6
                 form(name='loginForm')
-                    .modal-body.row(style='padding: 0; margin: 0')
+                    .modal-body.row(style='padding-bottom: 10px; margin: 0')
                         .settings-row(ng-if='action == "register"')
                             h3.login-header Sign Up
                         .settings-row(ng-if='action == "login"')
@@ -57,8 +57,7 @@ header#header.header
                         .settings-row(ignite-terms)
                             .col-md-offset-3(ng-if='action == "register" && terms.termsState')
                                 input(type='checkbox' ng-model='user_info.agree', ng-required='true')
-                                | I agree to the&nbsp;
-                                a(ui-sref='{{::terms.termsState}}') terms and conditions
+                                | 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 == "register"')
                             a.labelField(ng-click='action = "password/forgot"' on-click-focus='user_email')
Forgot password?

http://git-wip-us.apache.org/repos/asf/ignite/blob/72dfcb74/modules/control-center-web/src/main/js/views/reset.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/views/reset.jade b/modules/control-center-web/src/main/js/views/reset.jade
index 7f5a98d..72d835f 100644
--- a/modules/control-center-web/src/main/js/views/reset.jade
+++ b/modules/control-center-web/src/main/js/views/reset.jade
@@ -40,6 +40,7 @@ header#header.header
                         label.col-sm-1.required Confirm:
                         .col-sm-3
                             input#user_confirm.form-control(type='password' ng-model='reset_info.confirm'
match='reset_info.password' placeholder='Confirm new password' required on-enter='resetForm.$valid
&& resetPassword(user_info)')
-                button.btn.btn-primary(ng-disabled='resetForm.$invalid' ng-click='resetPassword(reset_info)')
Reset Password
+                    .settings-row
+                        button.btn.btn-primary(ng-disabled='resetForm.$invalid' ng-click='resetPassword(reset_info)')
Reset Password
 
 include includes/footer


Mime
View raw message