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 2015/09/28 04:19:46 UTC
ignite git commit: ignite-843 Fixed index page.
Repository: ignite
Updated Branches:
refs/heads/ignite-843 512a833e0 -> 749bec1b6
ignite-843 Fixed index page.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/749bec1b
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/749bec1b
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/749bec1b
Branch: refs/heads/ignite-843
Commit: 749bec1b670142d93c370dce2e593d9fba904475
Parents: 512a833
Author: Andrey <an...@gridgain.com>
Authored: Mon Sep 28 09:20:10 2015 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Mon Sep 28 09:20:10 2015 +0700
----------------------------------------------------------------------
.../src/main/js/public/stylesheets/style.scss | 11 ++
.../src/main/js/views/includes/footer.jade | 2 +-
.../src/main/js/views/includes/header.jade | 2 +-
.../src/main/js/views/index.jade | 170 +++++++++++++------
.../src/main/js/views/templates/layout.jade | 13 +-
5 files changed, 135 insertions(+), 63 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/749bec1b/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 62f8600..3914225 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
@@ -1725,4 +1725,15 @@ treecontrol.tree-classic {
.ag-selection-checkbox {
margin-left: 4px;
}
+
+ .ag-loading-panel {
+ background-color: rgba(255, 255, 255, 0.9);
+ }
+
+ .ag-loading-center {
+ background-color: white;
+ border: 1px solid $ignite-darck-border-color;
+ border-radius: 10px;
+ padding: 10px;
+ }
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/749bec1b/modules/control-center-web/src/main/js/views/includes/footer.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/views/includes/footer.jade b/modules/control-center-web/src/main/js/views/includes/footer.jade
index 6d70557..8ebac3d 100644
--- a/modules/control-center-web/src/main/js/views/includes/footer.jade
+++ b/modules/control-center-web/src/main/js/views/includes/footer.jade
@@ -17,6 +17,6 @@
.container.container-footer
footer
center
- p Apache Ignite Web Console, version 1.0.0
+ p Apache Ignite Web Console, version 1.0.0 beta
p © 2015 The Apache Software Foundation.
p Apache, Apache Ignite, the Apache feather and the Apache Ignite logo are trademarks of The Apache Software Foundation.
http://git-wip-us.apache.org/repos/asf/ignite/blob/749bec1b/modules/control-center-web/src/main/js/views/includes/header.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/views/includes/header.jade b/modules/control-center-web/src/main/js/views/includes/header.jade
index 3364e88..0d1d04a 100644
--- a/modules/control-center-web/src/main/js/views/includes/header.jade
+++ b/modules/control-center-web/src/main/js/views/includes/header.jade
@@ -24,7 +24,7 @@ header#header.header
a(href='/admin/become') revert to your identity.
.container(ng-controller='auth')
h1.navbar-brand
- a(href='/') Apache Ignite Web Configurator
+ a(href='/') Apache Ignite Web Console
.navbar-collapse.collapse(ng-controller='activeLink')
ul.nav.navbar-nav(ng-show='user')
+header-item('/configuration', '/configuration/clusters', 'Configuration')
http://git-wip-us.apache.org/repos/asf/ignite/blob/749bec1b/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 21b0435..8311007 100644
--- a/modules/control-center-web/src/main/js/views/index.jade
+++ b/modules/control-center-web/src/main/js/views/index.jade
@@ -16,63 +16,123 @@
extends templates/layout
+append scripts
+ script(src='//raw.githubusercontent.com/twbs/bootstrap/master/js/carousel.js')
+
mixin lbl(txt)
label.col-xs-4.col-sm-3.col-sm-offset-1.required #{txt}
-block container
- .row(ng-controller='auth')
- .docs-header
- h1 Apache Ignite Web Console
- hr
- .docs-content
- p Apache Ignite Web Console is an interactive console for the Apache Ignite<sup>tm</sup> Grid.
- .block-callout-parent
- table
- tbody
- tr
- td.block-callout-left
- i.fa.fa-check-square.block-callout-header-left
- label.block-callout-header-left With Apache Ignite Web Console you can:
- ul
- li Create cluster configurations
- li Load metadata from database
- li Execute SQL queries
- hr
- form(name='loginForm')
- .modal-body.row
+block body
+ header#header.header
+ .container
+ h1.navbar-brand
+ a(href='/') Apache Ignite Web Configurator
+ p.navbar-text(style='font-size: 18px;') Apache Ignite Web Console is an interactive console for the Apache Ignite<sup>tm</sup> Grid.
+
+ .container.body-container
+ .main-content(ng-controller='auth')
+ .row
+ 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(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
- .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(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
+ .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
+ hr
+ .row
+ .col-sm-6
+ #carousel-left.carousel.slide(data-ride='carousel')
+ // Indicators
+ ol.carousel-indicators
+ li.active(data-target='#carousel-left', data-slide-to='0')
+ li(data-target='#carousel-left', data-slide-to='1')
+ li(data-target='#carousel-left', data-slide-to='2')
+ li(data-target='#carousel-left', data-slide-to='3')
+ // Wrapper for slides
+ .carousel-inner(role='listbox')
+ .item.active
+ img(src='https://placeholdit.imgix.net/~text?txtsize=33&txt=First left slide&w=540&h=540', alt='First left slide [540x540]')
+ .carousel-caption
+ h3 First left slide
+ .item
+ img(src='https://placeholdit.imgix.net/~text?txtsize=33&txt=Second left slide&w=540&h=540', alt='Second left slide [540x540]')
+ .carousel-caption
+ h3 Second left slide
+ .item
+ img(src='https://placeholdit.imgix.net/~text?txtsize=33&txt=Third left slide&w=540&h=540', alt='Third left slide [540x540]')
+ .carousel-caption
+ h3 Third left slide
+ .item
+ img(src='https://placeholdit.imgix.net/~text?txtsize=33&txt=Fourth left slide&w=540&h=540', alt='Fourth left slide [540x540]')
+ .carousel-caption
+ h3 Fourth left slide
+ // Controls
+ a.left.carousel-control(href='#carousel-left', role='button', data-slide='prev')
+ span.fa.fa-chevron-circle-left.icon-prev(aria-hidden='true')
+ span.sr-only Previous
+ a.right.carousel-control(href='#carousel-left', role='button', data-slide='next')
+ span.fa.fa-chevron-circle-right.icon-next(aria-hidden='true')
+ span.sr-only Next
+ .col-sm-6
+ #carousel-right.carousel.slide(data-ride='carousel')
+ // Indicators
+ ol.carousel-indicators
+ li.active(data-target='#carousel-right', data-slide-to='0')
+ li(data-target='#carousel-right', data-slide-to='1')
+ li(data-target='#carousel-right', data-slide-to='2')
+ // Wrapper for slides
+ .carousel-inner(role='listbox')
+ .item.active
+ img(src='https://placeholdit.imgix.net/~text?txtsize=33&txt=First right slide&w=540&h=540', alt='First right slide [540x540]')
+ .carousel-caption
+ h3 First right slide
+ .item
+ img(src='https://placeholdit.imgix.net/~text?txtsize=33&txt=Second right slide&w=540&h=540', alt='Second right slide [540x540]')
+ .carousel-caption
+ h3 Second right slide
+ .item
+ img(src='https://placeholdit.imgix.net/~text?txtsize=33&txt=Third right slide&w=540&h=540', alt='Third right slide [540x540]')
+ .carousel-caption
+ h3 Third right slide
+ // Controls
+ a.left.carousel-control(href='#carousel-right', role='button', data-slide='prev')
+ span.fa.fa-chevron-circle-left.icon-prev(aria-hidden='true')
+ span.sr-only Previous
+ a.right.carousel-control(href='#carousel-right', role='button', data-slide='next')
+ span.fa.fa-chevron-circle-right.icon-next(aria-hidden='true')
+ span.sr-only Next
+
+ include includes/footer
+
http://git-wip-us.apache.org/repos/asf/ignite/blob/749bec1b/modules/control-center-web/src/main/js/views/templates/layout.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/views/templates/layout.jade b/modules/control-center-web/src/main/js/views/templates/layout.jade
index 74e2a6e..c6c0e18 100644
--- a/modules/control-center-web/src/main/js/views/templates/layout.jade
+++ b/modules/control-center-web/src/main/js/views/templates/layout.jade
@@ -71,11 +71,12 @@ html(ng-app='ignite-web-console' ng-init='user = #{JSON.stringify(user)}; become
body.theme-line.body-overlap.greedy
.wrapper
- include ../includes/header
+ block body
+ include ../includes/header
- block main-container
- .container.body-container
- .main-content
- block container
+ block main-container
+ .container.body-container
+ .main-content
+ block container
- include ../includes/footer
+ include ../includes/footer