Repository: ignite Updated Branches: refs/heads/ignite-843 a218a5594 -> 7e135ce90
ignite-843 Fixed index page. Add carousel. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/7e135ce9 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/7e135ce9 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/7e135ce9 Branch: refs/heads/ignite-843 Commit: 7e135ce90e831c4f073df7dd7db646aed108baa6 Parents: a218a55 Author: Andrey <[email protected]> Authored: Mon Sep 28 14:40:16 2015 +0700 Committer: Andrey <[email protected]> Committed: Mon Sep 28 14:40:16 2015 +0700 ---------------------------------------------------------------------- .../src/main/js/public/images/caches.png | Bin 0 -> 336927 bytes .../src/main/js/public/images/clusters.png | Bin 0 -> 626003 bytes .../src/main/js/public/images/metadata.png | Bin 0 -> 488258 bytes .../src/main/js/public/images/query-chart.png | Bin 0 -> 545872 bytes .../main/js/public/images/query-metadata.png | Bin 0 -> 1117710 bytes .../src/main/js/public/images/query.png | Bin 0 -> 792386 bytes .../src/main/js/public/images/summary.png | Bin 0 -> 642286 bytes .../stylesheets/_bootstrap-variables.scss | 8 ++-- .../src/main/js/public/stylesheets/style.scss | 23 +++++++++- .../src/main/js/views/index.jade | 43 +++++++++++-------- .../src/main/js/views/sql/sql.jade | 2 +- 11 files changed, 52 insertions(+), 24 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/7e135ce9/modules/control-center-web/src/main/js/public/images/caches.png ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/public/images/caches.png b/modules/control-center-web/src/main/js/public/images/caches.png new file mode 100644 index 0000000..047269b Binary files /dev/null and b/modules/control-center-web/src/main/js/public/images/caches.png differ http://git-wip-us.apache.org/repos/asf/ignite/blob/7e135ce9/modules/control-center-web/src/main/js/public/images/clusters.png ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/public/images/clusters.png b/modules/control-center-web/src/main/js/public/images/clusters.png new file mode 100644 index 0000000..978ac68 Binary files /dev/null and b/modules/control-center-web/src/main/js/public/images/clusters.png differ http://git-wip-us.apache.org/repos/asf/ignite/blob/7e135ce9/modules/control-center-web/src/main/js/public/images/metadata.png ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/public/images/metadata.png b/modules/control-center-web/src/main/js/public/images/metadata.png new file mode 100644 index 0000000..ba3fd39 Binary files /dev/null and b/modules/control-center-web/src/main/js/public/images/metadata.png differ http://git-wip-us.apache.org/repos/asf/ignite/blob/7e135ce9/modules/control-center-web/src/main/js/public/images/query-chart.png ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/public/images/query-chart.png b/modules/control-center-web/src/main/js/public/images/query-chart.png new file mode 100644 index 0000000..01d4d1b Binary files /dev/null and b/modules/control-center-web/src/main/js/public/images/query-chart.png differ http://git-wip-us.apache.org/repos/asf/ignite/blob/7e135ce9/modules/control-center-web/src/main/js/public/images/query-metadata.png ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/public/images/query-metadata.png b/modules/control-center-web/src/main/js/public/images/query-metadata.png new file mode 100644 index 0000000..0893554 Binary files /dev/null and b/modules/control-center-web/src/main/js/public/images/query-metadata.png differ http://git-wip-us.apache.org/repos/asf/ignite/blob/7e135ce9/modules/control-center-web/src/main/js/public/images/query.png ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/public/images/query.png b/modules/control-center-web/src/main/js/public/images/query.png new file mode 100644 index 0000000..caa1be6 Binary files /dev/null and b/modules/control-center-web/src/main/js/public/images/query.png differ http://git-wip-us.apache.org/repos/asf/ignite/blob/7e135ce9/modules/control-center-web/src/main/js/public/images/summary.png ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/public/images/summary.png b/modules/control-center-web/src/main/js/public/images/summary.png new file mode 100644 index 0000000..5a8d7d4 Binary files /dev/null and b/modules/control-center-web/src/main/js/public/images/summary.png differ http://git-wip-us.apache.org/repos/asf/ignite/blob/7e135ce9/modules/control-center-web/src/main/js/public/stylesheets/_bootstrap-variables.scss ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/public/stylesheets/_bootstrap-variables.scss b/modules/control-center-web/src/main/js/public/stylesheets/_bootstrap-variables.scss index d109b10..be56058 100644 --- a/modules/control-center-web/src/main/js/public/stylesheets/_bootstrap-variables.scss +++ b/modules/control-center-web/src/main/js/public/stylesheets/_bootstrap-variables.scss @@ -826,13 +826,13 @@ $breadcrumb-separator: "/" !default; $carousel-text-shadow: 0 1px 2px rgba(0,0,0,.6) !default; -$carousel-control-color: #fff !default; +$carousel-control-color: #555 !default; $carousel-control-width: 15% !default; -$carousel-control-opacity: .5 !default; +$carousel-control-opacity: 0 !default; $carousel-control-font-size: 20px !default; -$carousel-indicator-active-bg: #fff !default; -$carousel-indicator-border-color: #fff !default; +$carousel-indicator-active-bg: #ddd !default; +$carousel-indicator-border-color: #888 !default; $carousel-caption-color: #fff !default; http://git-wip-us.apache.org/repos/asf/ignite/blob/7e135ce9/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 3914225..1a023af 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 @@ -399,7 +399,7 @@ button, a.btn { margin-left: 0; } - > button.btn-primary:not(.dropdown-toggle) { + > button.btn-primary:not(:last-child) { border-right-color: black; } } @@ -1080,6 +1080,15 @@ label { margin-right: 5px; } +.fa-chevron-circle-left { + color: $brand-primary; + margin-right: 5px; + + font-size: 15px; + + line-height: $line-height-base; +} + .fa-chevron-circle-right { color: $brand-primary; margin-right: 5px; @@ -1737,3 +1746,15 @@ treecontrol.tree-classic { padding: 10px; } } + +.carousel-caption { + color: $ignite-header-color; + + h3 { + margin-bottom: 10px; + } +} + +.carousel-indicators { + +} http://git-wip-us.apache.org/repos/asf/ignite/blob/7e135ce9/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 8311007..cd7eb2c 100644 --- a/modules/control-center-web/src/main/js/views/index.jade +++ b/modules/control-center-web/src/main/js/views/index.jade @@ -82,27 +82,31 @@ block body // 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]') + img(src='/images/clusters.png', alt='Cluster screen') .carousel-caption - h3 First left slide + h3 Clusters screen + p Configure clusters, link clusters to caches .item - img(src='https://placeholdit.imgix.net/~text?txtsize=33&txt=Second left slide&w=540&h=540', alt='Second left slide [540x540]') + img(src='/images/caches.png', alt='Caches screen') .carousel-caption - h3 Second left slide + h3 Caches screen + p Configure caches, link metadata to caches, link caches to clusters .item - img(src='https://placeholdit.imgix.net/~text?txtsize=33&txt=Third left slide&w=540&h=540', alt='Third left slide [540x540]') + img(src='/images/metadata.png', alt='Metadatas screen') .carousel-caption - h3 Third left slide + h3 Metadata screen + p Manually enter metadata or load from database .item - img(src='https://placeholdit.imgix.net/~text?txtsize=33&txt=Fourth left slide&w=540&h=540', alt='Fourth left slide [540x540]') + img(src='/images/summary.png', alt='Summary screen') .carousel-caption - h3 Fourth left slide + h3 Summary screen + p Download XML config, JAVA code, Docker file // 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.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.icon-next(aria-hidden='true') span.sr-only Next .col-sm-6 #carousel-right.carousel.slide(data-ride='carousel') @@ -114,23 +118,26 @@ block body // 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]') + img(src='/images/query.png', alt='Query') .carousel-caption - h3 First right slide + h3 Query + p Explain SQL, execute, scan queries .item - img(src='https://placeholdit.imgix.net/~text?txtsize=33&txt=Second right slide&w=540&h=540', alt='Second right slide [540x540]') + img(src='/images/query-metadata.png', alt='Cache metadata') .carousel-caption - h3 Second right slide + h3 Cache metadata + p View cache type metadata .item - img(src='https://placeholdit.imgix.net/~text?txtsize=33&txt=Third right slide&w=540&h=540', alt='Third right slide [540x540]') + img(src='/images/query-chart.png', alt='Query chart') .carousel-caption - h3 Third right slide + h3 Query chart + h3 View data in tabular form and as charts // 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.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.icon-next(aria-hidden='true') span.sr-only Next include includes/footer http://git-wip-us.apache.org/repos/asf/ignite/blob/7e135ce9/modules/control-center-web/src/main/js/views/sql/sql.jade ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/views/sql/sql.jade b/modules/control-center-web/src/main/js/views/sql/sql.jade index 1ce2056..8e41679 100644 --- a/modules/control-center-web/src/main/js/views/sql/sql.jade +++ b/modules/control-center-web/src/main/js/views/sql/sql.jade @@ -108,7 +108,7 @@ block container tr(ng-repeat='cache in displayedCaches track by cache.name') td(style='width: 100%') input.labelField(type='radio' value='{{cache.name}}') - a(bs-popover data-template-url='cache-metadata', data-placement='auto', data-trigger='click') {{cache.name}} + a(bs-popover data-template-url='cache-metadata', data-placement='bottom', data-trigger='click') {{cache.name}} .empty-caches(ng-show='displayedCaches.length == 0 && caches.length != 0') label Wrong caches filter .empty-caches(ng-show='caches.length == 0')
