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/16 17:54:23 UTC
ignite git commit: IGNITE-843 WIP Spinners and update dependencies.
Repository: ignite
Updated Branches:
refs/heads/ignite-843 e1d668ba2 -> aece5fb93
IGNITE-843 WIP Spinners and update dependencies.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/aece5fb9
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/aece5fb9
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/aece5fb9
Branch: refs/heads/ignite-843
Commit: aece5fb9345fc59967130bfbacc27d380c6d947a
Parents: e1d668b
Author: AKuznetsov <ak...@gridgain.com>
Authored: Wed Sep 16 22:54:09 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Wed Sep 16 22:54:09 2015 +0700
----------------------------------------------------------------------
.../main/js/controllers/caches-controller.js | 12 +++++--
.../main/js/controllers/clusters-controller.js | 10 ++++--
.../src/main/js/controllers/common-module.js | 1 +
.../main/js/controllers/metadata-controller.js | 1 +
.../control-center-web/src/main/js/package.json | 6 ++--
.../src/main/js/public/stylesheets/style.scss | 4 +++
.../src/main/js/views/configuration/caches.jade | 37 ++++++++++----------
.../main/js/views/configuration/clusters.jade | 37 ++++++++++----------
.../main/js/views/configuration/metadata.jade | 5 ++-
9 files changed, 66 insertions(+), 47 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/aece5fb9/modules/control-center-web/src/main/js/controllers/caches-controller.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/controllers/caches-controller.js b/modules/control-center-web/src/main/js/controllers/caches-controller.js
index 35adc23..da6ce4a 100644
--- a/modules/control-center-web/src/main/js/controllers/caches-controller.js
+++ b/modules/control-center-web/src/main/js/controllers/caches-controller.js
@@ -17,8 +17,8 @@
// Controller for Caches screen.
controlCenterModule.controller('cachesController', [
- '$scope', '$controller', '$http', '$timeout', '$common', '$focus', '$confirm', '$copy', '$table', '$preview',
- function ($scope, $controller, $http, $timeout, $common, $focus, $confirm, $copy, $table, $preview) {
+ '$scope', '$controller', '$http', '$timeout', '$common', '$focus', '$confirm', '$copy', '$table', '$preview', '$loading',
+ function ($scope, $controller, $http, $timeout, $common, $focus, $confirm, $copy, $table, $preview, $loading) {
// Initialize the super class and extend it.
angular.extend(this, $controller('save-remove', {$scope: $scope}));
@@ -226,6 +226,8 @@ controlCenterModule.controller('cachesController', [
}, []);
}
+ $loading.start('loadingCachesScreen');
+
// When landing on the page, get caches and show them.
$http.post('caches/list')
.success(function (data) {
@@ -333,9 +335,13 @@ controlCenterModule.controller('cachesController', [
.error(function (errMsg) {
$common.showError(errMsg);
});
- })
+ })
.error(function (errMsg) {
$common.showError(errMsg);
+ })
+ .finally(function () {
+ $scope.ui.ready = true;
+ $loading.finish('loadingCachesScreen');
});
$scope.selectItem = function (item, backup) {
http://git-wip-us.apache.org/repos/asf/ignite/blob/aece5fb9/modules/control-center-web/src/main/js/controllers/clusters-controller.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/controllers/clusters-controller.js b/modules/control-center-web/src/main/js/controllers/clusters-controller.js
index f051210..c63a691 100644
--- a/modules/control-center-web/src/main/js/controllers/clusters-controller.js
+++ b/modules/control-center-web/src/main/js/controllers/clusters-controller.js
@@ -16,8 +16,8 @@
*/
// Controller for Clusters screen.
-controlCenterModule.controller('clustersController', ['$scope', '$controller', '$http', '$timeout', '$common', '$focus', '$confirm', '$copy', '$table', '$preview',
- function ($scope, $controller, $http, $timeout, $common, $focus, $confirm, $copy, $table, $preview) {
+controlCenterModule.controller('clustersController', ['$scope', '$controller', '$http', '$timeout', '$common', '$focus', '$confirm', '$copy', '$table', '$preview', '$loading',
+ function ($scope, $controller, $http, $timeout, $common, $focus, $confirm, $copy, $table, $preview, $loading) {
// Initialize the super class and extend it.
angular.extend(this, $controller('save-remove', {$scope: $scope}));
@@ -152,6 +152,8 @@ controlCenterModule.controller('clustersController', ['$scope', '$controller', '
$scope.selectItem($scope.clusters[0]);
}
+ $loading.start('loadingClustersScreen');
+
// When landing on the page, get clusters and show them.
$http.post('clusters/list')
.success(function (data) {
@@ -259,6 +261,10 @@ controlCenterModule.controller('clustersController', ['$scope', '$controller', '
})
.error(function (errMsg) {
$common.showError(errMsg);
+ })
+ .finally(function () {
+ $scope.ui.ready = true;
+ $loading.finish('loadingClustersScreen');
});
$scope.selectItem = function (item, backup) {
http://git-wip-us.apache.org/repos/asf/ignite/blob/aece5fb9/modules/control-center-web/src/main/js/controllers/common-module.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/controllers/common-module.js b/modules/control-center-web/src/main/js/controllers/common-module.js
index 34da990..5990fdc 100644
--- a/modules/control-center-web/src/main/js/controllers/common-module.js
+++ b/modules/control-center-web/src/main/js/controllers/common-module.js
@@ -816,6 +816,7 @@ controlCenterModule.service('$common', [
},
formUI: function (initialDirtyCnt) {
return {
+ ready: false,
expanded: false,
dirty: initialDirtyCnt,
isDirty: function () {
http://git-wip-us.apache.org/repos/asf/ignite/blob/aece5fb9/modules/control-center-web/src/main/js/controllers/metadata-controller.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/controllers/metadata-controller.js b/modules/control-center-web/src/main/js/controllers/metadata-controller.js
index b62dde0..8db5bbf 100644
--- a/modules/control-center-web/src/main/js/controllers/metadata-controller.js
+++ b/modules/control-center-web/src/main/js/controllers/metadata-controller.js
@@ -632,6 +632,7 @@ controlCenterModule.controller('metadataController', [
$common.showError(errMsg);
})
.finally(function() {
+ $scope.ui.ready = true;
$loading.finish('loadingMetadataScreen');
});
http://git-wip-us.apache.org/repos/asf/ignite/blob/aece5fb9/modules/control-center-web/src/main/js/package.json
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/package.json b/modules/control-center-web/src/main/js/package.json
index f584a68..f2969b2 100644
--- a/modules/control-center-web/src/main/js/package.json
+++ b/modules/control-center-web/src/main/js/package.json
@@ -32,13 +32,13 @@
"express-session": "^1.11.1",
"jade": "~1.11.0",
"lodash": "3.10.1",
- "mongoose": "^4.1.6",
+ "mongoose": "^4.1.7",
"mongoose-deep-populate": "2.0.1",
"nconf": "^0.7.2",
- "node-sass-middleware": "^0.9.0",
+ "node-sass-middleware": "0.9.0",
"passport": "^0.3.0",
"passport-local": "^1.0.0",
- "passport-local-mongoose": "1.2.0",
+ "passport-local-mongoose": "2.0.0",
"nodemailer": "1.4.0",
"serve-favicon": "~2.3.0",
"ws": "~0.8.0"
http://git-wip-us.apache.org/repos/asf/ignite/blob/aece5fb9/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 a931767..4b67905 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
@@ -592,6 +592,10 @@ button.form-control {
width: 100%;
}
+ input[type="text"] {
+ font-weight: normal;
+ }
+
tbody {
border-left: 10px solid transparent;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/aece5fb9/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 61c3232..abad0c5 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
@@ -26,21 +26,22 @@ block content
h1 Create and Configure Ignite Caches
hr
.docs-body(ng-controller='cachesController')
- +block-callout('{{screenTip.workflowTitle}}', 'joinTip(screenTip.workflowContent)', '{{screenTip.whatsNextTitle}}', 'joinTip(screenTip.whatsNextContent)')
- +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')
- button.btn.btn-primary(id='new-item' ng-click='createItem()') New
- +save-remove-buttons('cache')
- //label {{ui.formTitle}}
- br
- hr
- form.form-horizontal(name='ui.inputForm' ng-if='backupItem' ng-submit='ui.noSubmit()' novalidate unsaved-warning-form)
- .panel-group(bs-collapse ng-model='panels.activePanels' data-allow-multiple='true')
- +groups('general', 'backupItem')
- div(ng-show='ui.expanded')
- +advanced-options-bottom
- +groups('advanced', 'backupItem')
- +advanced-options-top
- .section(ng-if='ui.expanded')
- +save-remove-buttons('cache')
+ div(dw-loading='loadingCachesScreen' dw-loading-options='{text: "Loading caches screen..."}')
+ div(ng-if='ui.ready')
+ +block-callout('{{screenTip.workflowTitle}}', 'joinTip(screenTip.workflowContent)', '{{screenTip.whatsNextTitle}}', 'joinTip(screenTip.whatsNextContent)')
+ +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')
+ button.btn.btn-primary(id='new-item' ng-click='createItem()') New
+ +save-remove-buttons('cache')
+ br
+ hr
+ form.form-horizontal(name='ui.inputForm' ng-if='backupItem' ng-submit='ui.noSubmit()' novalidate unsaved-warning-form)
+ .panel-group(bs-collapse ng-model='panels.activePanels' data-allow-multiple='true')
+ +groups('general', 'backupItem')
+ div(ng-show='ui.expanded')
+ +advanced-options-bottom
+ +groups('advanced', 'backupItem')
+ +advanced-options-top
+ .section(ng-if='ui.expanded')
+ +save-remove-buttons('cache')
http://git-wip-us.apache.org/repos/asf/ignite/blob/aece5fb9/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 23448f7..655593e 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
@@ -26,21 +26,22 @@ block content
h1 Create and Configure Ignite Clusters
hr
.docs-body(ng-controller='clustersController')
- +block-callout('{{screenTip.workflowTitle}}', 'joinTip(screenTip.workflowContent)', '{{screenTip.whatsNextTitle}}', 'joinTip(screenTip.whatsNextContent)')
- +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')
- button.btn.btn-primary(id='new-item' ng-click='createItem()') New
- +save-remove-buttons('cluster')
- //label {{ui.formTitle}}
- br
- hr
- form.form-horizontal(name='ui.inputForm' ng-if='backupItem' ng-submit='ui.noSubmit()' novalidate unsaved-warning-form)
- .panel-group(bs-collapse ng-model='panels.activePanels' data-allow-multiple='true' ng-click='triggerDigest = true')
- +groups('general', 'backupItem')
- div(ng-show='ui.expanded')
- +advanced-options-bottom
- +groups('advanced', 'backupItem')
- +advanced-options-top
- .section(ng-show='ui.expanded')
- +save-remove-buttons('cluster')
+ div(dw-loading='loadingClustersScreen' dw-loading-options='{text: "Loading clusters screen..."}')
+ div(ng-if='ui.ready')
+ +block-callout('{{screenTip.workflowTitle}}', 'joinTip(screenTip.workflowContent)', '{{screenTip.whatsNextTitle}}', 'joinTip(screenTip.whatsNextContent)')
+ +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')
+ button.btn.btn-primary(id='new-item' ng-click='createItem()') New
+ +save-remove-buttons('cluster')
+ br
+ hr
+ form.form-horizontal(name='ui.inputForm' ng-if='backupItem' ng-submit='ui.noSubmit()' novalidate unsaved-warning-form)
+ .panel-group(bs-collapse ng-model='panels.activePanels' data-allow-multiple='true' ng-click='triggerDigest = true')
+ +groups('general', 'backupItem')
+ div(ng-show='ui.expanded')
+ +advanced-options-bottom
+ +groups('advanced', 'backupItem')
+ +advanced-options-top
+ .section(ng-show='ui.expanded')
+ +save-remove-buttons('cluster')
http://git-wip-us.apache.org/repos/asf/ignite/blob/aece5fb9/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 ac253fd..b3e01de 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
@@ -26,8 +26,8 @@ block content
h1 Create and Configure Cache Type Metadata
hr
.docs-body(ng-controller='metadataController')
- div(dw-loading='loadingMetadataScreen' dw-loading-options='{className: "page-loading-overlay", text: "Loading metadata screen..."}')
- div(ng-show='metadatas')
+ div(dw-loading='loadingMetadataScreen' dw-loading-options='{text: "Loading metadata screen..."}')
+ div(ng-if='ui.ready')
+block-callout('{{screenTip.workflowTitle}}', 'joinTip(screenTip.workflowContent)', '{{screenTip.whatsNextTitle}}', 'joinTip(screenTip.whatsNextContent)')
+main-table('Types metadata:', 'metadatas', 'metadataName', 'selectItem(row)', '{{$index + 1}}) {{row.valueType}}')
.padding-top-dflt(bs-affix)
@@ -36,7 +36,6 @@ block content
.panel-tip-container(bs-tooltip data-title='Load new metadata from database' data-placement='bottom')
button.btn.btn-primary(ng-click='showLoadMetadataModal()') Load from database
+save-remove-buttons('metadata')
- //label {{ui.formTitle}}
br
hr
form.form-horizontal(name='ui.inputForm' ng-if='backupItem' ng-submit='ui.noSubmit()' novalidate unsaved-warning-form)