You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ak...@apache.org on 2015/09/23 13:11:27 UTC
[3/3] ignite git commit: IGNITE-843 Tweak screens callouts.
IGNITE-843 Tweak screens callouts.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/91c38aa4
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/91c38aa4
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/91c38aa4
Branch: refs/heads/ignite-843
Commit: 91c38aa42335180e0c9a302433d26bd98058bca0
Parents: 772d968
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Wed Sep 23 18:11:25 2015 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Wed Sep 23 18:11:25 2015 +0700
----------------------------------------------------------------------
.../main/js/controllers/summary-controller.js | 60 +++++++++++---------
.../src/main/js/views/configuration/caches.jade | 2 +-
.../main/js/views/configuration/clusters.jade | 2 +-
.../main/js/views/configuration/metadata.jade | 2 +-
.../main/js/views/configuration/summary.jade | 4 +-
.../src/main/js/views/includes/controls.jade | 2 +-
.../src/main/js/views/sql/sql.jade | 40 ++++++-------
7 files changed, 59 insertions(+), 53 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/91c38aa4/modules/control-center-web/src/main/js/controllers/summary-controller.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/controllers/summary-controller.js b/modules/control-center-web/src/main/js/controllers/summary-controller.js
index 08c8f0e..b91ed09 100644
--- a/modules/control-center-web/src/main/js/controllers/summary-controller.js
+++ b/modules/control-center-web/src/main/js/controllers/summary-controller.js
@@ -16,7 +16,7 @@
*/
// Controller for Summary screen.
-controlCenterModule.controller('summaryController', ['$scope', '$http', '$common', function ($scope, $http, $common) {
+controlCenterModule.controller('summaryController', ['$scope', '$http', '$common', '$loading', function ($scope, $http, $common, $loading) {
$scope.joinTip = $common.joinTip;
$scope.getModel = $common.getModel;
@@ -161,38 +161,44 @@ controlCenterModule.controller('summaryController', ['$scope', '$http', '$common
return $common.isDefined($generatorJava.metadatas) && $generatorJava.metadatas.length > 0;
};
- $http.post('clusters/list').success(function (data) {
- $scope.clusters = data.clusters;
+ $loading.start('loadingSummaryScreen');
- if ($scope.clusters.length > 0) {
- // Populate clusters with caches.
- _.forEach($scope.clusters, function (cluster) {
- cluster.caches = _.filter(data.caches, function (cache) {
- return _.contains(cluster.caches, cache._id);
+ $http.post('clusters/list')
+ .success(function (data) {
+ $scope.clusters = data.clusters;
+
+ if ($scope.clusters.length > 0) {
+ // Populate clusters with caches.
+ _.forEach($scope.clusters, function (cluster) {
+ cluster.caches = _.filter(data.caches, function (cache) {
+ return _.contains(cluster.caches, cache._id);
+ });
});
- });
- var restoredId = sessionStorage.summarySelectedId;
+ var restoredId = sessionStorage.summarySelectedId;
- var selectIdx = 0;
+ var selectIdx = 0;
- if (restoredId) {
- var idx = _.findIndex($scope.clusters, function (cluster) {
- return cluster._id == restoredId;
- });
+ if (restoredId) {
+ var idx = _.findIndex($scope.clusters, function (cluster) {
+ return cluster._id == restoredId;
+ });
- if (idx >= 0)
- selectIdx = idx;
- else
- delete sessionStorage.summarySelectedId;
- }
+ if (idx >= 0)
+ selectIdx = idx;
+ else
+ delete sessionStorage.summarySelectedId;
+ }
- $scope.selectItem($scope.clusters[selectIdx]);
+ $scope.selectItem($scope.clusters[selectIdx]);
- $scope.$watch('selectedItem', function (val) {
- if (val)
- sessionStorage.summarySelectedId = val._id;
- }, true);
- }
- });
+ $scope.$watch('selectedItem', function (val) {
+ if (val)
+ sessionStorage.summarySelectedId = val._id;
+ }, true);
+ }
+ })
+ .finally(function () {
+ $loading.finish('loadingSummaryScreen');
+ });
}]);
http://git-wip-us.apache.org/repos/asf/ignite/blob/91c38aa4/modules/control-center-web/src/main/js/views/configuration/caches.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/views/configuration/caches.jade b/modules/control-center-web/src/main/js/views/configuration/caches.jade
index 7631d5a..a7721a5 100644
--- a/modules/control-center-web/src/main/js/views/configuration/caches.jade
+++ b/modules/control-center-web/src/main/js/views/configuration/caches.jade
@@ -24,11 +24,11 @@ include ../includes/controls
block content
.docs-header
h1 Create and Configure Ignite Caches
- hr
.docs-body(ng-controller='cachesController')
div(dw-loading='loadingCachesScreen' dw-loading-options='{text: "Loading caches screen..."}')
div(ng-if='ui.ready')
+block-callout('{{screenTip.workflowTitle}}', 'screenTip.workflowContent', '{{screenTip.whatsNextTitle}}', 'screenTip.whatsNextContent')
+ hr
+main-table('Caches:', 'caches', 'cacheName', 'selectItem(row)', '{{$index + 1}}) {{row.name}}, {{row.cacheMode | displayValue:cacheModes:"Cache mode not set"}}, {{row.atomicityMode | displayValue:atomicities:"Cache atomicity not set"}}')
.padding-top-dflt(bs-affix)
.panel-tip-container(data-placement='bottom' bs-tooltip data-title='Create new caches')
http://git-wip-us.apache.org/repos/asf/ignite/blob/91c38aa4/modules/control-center-web/src/main/js/views/configuration/clusters.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/views/configuration/clusters.jade b/modules/control-center-web/src/main/js/views/configuration/clusters.jade
index 8cbb5a5..c503b6d 100644
--- a/modules/control-center-web/src/main/js/views/configuration/clusters.jade
+++ b/modules/control-center-web/src/main/js/views/configuration/clusters.jade
@@ -24,11 +24,11 @@ include ../includes/controls
block content
.docs-header
h1 Create and Configure Ignite Clusters
- hr
.docs-body(ng-controller='clustersController')
div(dw-loading='loadingClustersScreen' dw-loading-options='{text: "Loading clusters screen..."}')
div(ng-if='ui.ready')
+block-callout('{{screenTip.workflowTitle}}', 'screenTip.workflowContent', '{{screenTip.whatsNextTitle}}', 'screenTip.whatsNextContent')
+ hr
+main-table('Clusters:', 'clusters', 'clusterName', 'selectItem(row)', '{{$index + 1}}) {{row.name}}, {{row.discovery.kind | displayValue:discoveries:"Discovery not set"}}')
.padding-top-dflt(bs-affix)
.panel-tip-container(data-placement='bottom' bs-tooltip data-title='Create new cluster')
http://git-wip-us.apache.org/repos/asf/ignite/blob/91c38aa4/modules/control-center-web/src/main/js/views/configuration/metadata.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/views/configuration/metadata.jade b/modules/control-center-web/src/main/js/views/configuration/metadata.jade
index 3403e33..cff8aef 100644
--- a/modules/control-center-web/src/main/js/views/configuration/metadata.jade
+++ b/modules/control-center-web/src/main/js/views/configuration/metadata.jade
@@ -24,11 +24,11 @@ include ../includes/controls
block content
.docs-header
h1 Create and Configure Cache Type Metadata
- hr
.docs-body(ng-controller='metadataController')
div(dw-loading='loadingMetadataScreen' dw-loading-options='{text: "Loading metadata screen..."}')
div(ng-if='ui.ready')
+block-callout('{{screenTip.workflowTitle}}', 'screenTip.workflowContent', '{{screenTip.whatsNextTitle}}', 'screenTip.whatsNextContent')
+ hr
+main-table('Types metadata:', 'metadatas', 'metadataName', 'selectItem(row)', '{{$index + 1}}) {{row.valueType}}')
.padding-top-dflt(bs-affix)
.panel-tip-container(data-placement='bottom' bs-tooltip data-title='Create new metadata')
http://git-wip-us.apache.org/repos/asf/ignite/blob/91c38aa4/modules/control-center-web/src/main/js/views/configuration/summary.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/views/configuration/summary.jade b/modules/control-center-web/src/main/js/views/configuration/summary.jade
index 7bb7198..1336efc 100644
--- a/modules/control-center-web/src/main/js/views/configuration/summary.jade
+++ b/modules/control-center-web/src/main/js/views/configuration/summary.jade
@@ -39,9 +39,9 @@ mixin btn-download(side)
block content
.docs-header
h1 Configurations Summary
- hr
- .docs-body(ng-controller='summaryController')
+ .docs-body(dw-loading='loadingSummaryScreen' dw-loading-options='{text: "Loading summary screen..."}' ng-controller='summaryController')
+block-callout('{{screenTip.workflowTitle}}', 'screenTip.workflowContent', '{{screenTip.whatsNextTitle}}', 'screenTip.whatsNextContent')
+ hr
.padding-dflt(ng-if='clusters.length == 0')
| You have no clusters configured. Please configure them
a(href='clusters') here.
http://git-wip-us.apache.org/repos/asf/ignite/blob/91c38aa4/modules/control-center-web/src/main/js/views/includes/controls.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/views/includes/controls.jade b/modules/control-center-web/src/main/js/views/includes/controls.jade
index e273454..3c2edd1 100644
--- a/modules/control-center-web/src/main/js/views/includes/controls.jade
+++ b/modules/control-center-web/src/main/js/views/includes/controls.jade
@@ -443,7 +443,7 @@ mixin form-row-custom(lblClasses, fieldClasses, dataSource)
input#newGroupName.form-control(type='text' ng-model='field.newGroupName' placeholder='Group name' on-enter='tableGroupSaveVisible(field, -1) && tableGroupSave(field, -1)' on-escape='tableReset()')
mixin main-table(title, rows, focusId, click, rowTemplate)
- .padding-dflt(ng-show='#{rows} && #{rows}.length > 0')
+ .padding-bottom-dflt(ng-show='#{rows} && #{rows}.length > 0')
table.links(st-set-filter='#{rows}Search' st-table='displayedRows' st-safe-src='#{rows}')
thead
tr
http://git-wip-us.apache.org/repos/asf/ignite/blob/91c38aa4/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 25ad779..14f3a02 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
@@ -31,26 +31,6 @@ mixin btn-toolbar-data(btn, kind, tip)
i.btn.btn-default.fa(class=btn ng-click='setResult(paragraph, "#{kind}")' ng-class='{active: resultEq(paragraph, "#{kind}")}' bs-tooltip='' data-title=tip data-trigger='hover' data-placement='bottom')
block container
- .block-callout-parent
- table
- tbody
- tr
- td.block-callout-left(width='50%')
- i.fa.fa-check-square.block-callout-header-left
- label.block-callout-header-left With SQL Notebook you can:
- ul
- li Create any number of paragraphs
- li Execute and explain SQL queries
- li Execute scan queries
- li View data in tabular form and as charts
- td.block-callout-right(width='50%')
- i.fa.fa-check-square.block-callout-header-right
- label.block-callout-header-right To execute SQL you need:
- ul
- li Start Apache Ignite Cluster with caches
- li Populate caches with data
- li Start Apache Ignite Web Agent
- li Create paragraph, enter some SQL and execute it
.row
.col-sm-12(ng-init='noteId = "#{noteId}"')
.docs-content(ng-controller='sqlController' )
@@ -66,6 +46,26 @@ block container
i.tipLabel.fa.fa-floppy-o(ng-show='notebook.editName' ng-click='renameNotebook(notebook.editName)' bs-tooltip data-title='Save notebook name' data-trigger='hover')
.pull-right
+btn-toolbar('fa-plus', 'addParagraph()', 'Add new query')
+ .block-callout-parent
+ table
+ tbody
+ tr
+ td.block-callout-left(width='50%')
+ i.fa.fa-check-square.block-callout-header-left
+ label.block-callout-header-left With SQL Notebook you can:
+ ul
+ li Create any number of queries
+ li Execute and explain SQL queries
+ li Execute scan queries
+ li View data in tabular form and as charts
+ td.block-callout-right(width='50%')
+ i.fa.fa-check-square.block-callout-header-right
+ label.block-callout-header-right To execute SQL you need:
+ ul
+ li Start Apache Ignite Cluster with caches
+ li Populate caches with data
+ li Start Apache Ignite Web Agent
+ li Create paragraph, enter some SQL and execute it
hr
.docs-body.paragraphs
.panel-group(bs-collapse ng-model='notebook.expandedParagraphs' data-allow-multiple='true' data-start-collapsed='false')