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 2016/02/09 10:26:11 UTC
[12/51] [abbrv] ignite git commit: IGNITE-843 Refactored modules.
http://git-wip-us.apache.org/repos/asf/ignite/blob/0fc97266/modules/control-center-web/src/main/js/app/modules/logo/main.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/logo/main.js b/modules/control-center-web/src/main/js/app/modules/logo/main.js
deleted file mode 100644
index be7175d..0000000
--- a/modules/control-center-web/src/main/js/app/modules/logo/main.js
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import templateLogo from './logo.jade!';
-const templateTitle = `<label class= 'title'>{{::title.text}}</label>`;
-import templatePoweredByApache from './powered-by-apache.jade!';
-
-import angular from 'angular';
-
-angular
- .module('ignite-console.logo', [
-
- ])
- .provider('igniteLogo', function() {
- let poweredBy = false;
-
- let url = '/images/ignite-logo.png';
-
- let title = 'Management console for Apache Ignite';
-
- this.url = function(_url) {
- url = _url;
-
- poweredBy = true;
- };
-
- this.title = function(_title) {
- title = _title;
- };
-
- this.$get = [function() {
- return {
- url,
- poweredBy,
- title
- };
- }];
- })
- .directive('ignitePoweredByApache', ['igniteLogo', function(igniteLogo) {
- function controller() {
- const ctrl = this;
-
- ctrl.show = igniteLogo.poweredBy;
- }
-
- return {
- restrict: 'E',
- template: templatePoweredByApache,
- controller,
- controllerAs: 'poweredBy',
- replace: true
- };
- }])
- .directive('igniteLogo', ['igniteLogo', function(igniteLogo) {
- function controller() {
- const ctrl = this;
-
- ctrl.url = igniteLogo.url;
- }
-
- return {
- restrict: 'E',
- template: templateLogo,
- controller,
- controllerAs: 'logo',
- replace: true
- };
- }])
- .directive('igniteTitle', ['igniteLogo', function(igniteLogo) {
- function controller() {
- const ctrl = this;
-
- ctrl.text = igniteLogo.title;
- }
-
- return {
- restrict: 'E',
- template: templateTitle,
- controller,
- controllerAs: 'title',
- replace: true
- };
- }]);
-
http://git-wip-us.apache.org/repos/asf/ignite/blob/0fc97266/modules/control-center-web/src/main/js/app/modules/logo/powered-by-apache.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/logo/powered-by-apache.jade b/modules/control-center-web/src/main/js/app/modules/logo/powered-by-apache.jade
deleted file mode 100644
index af9aadf..0000000
--- a/modules/control-center-web/src/main/js/app/modules/logo/powered-by-apache.jade
+++ /dev/null
@@ -1,18 +0,0 @@
-//-
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
-a(ng-if='poweredBy.show' href='//ignite.apache.org' target='_blank')
- img(ng-src='/images/pb-ignite.png' height='65')
http://git-wip-us.apache.org/repos/asf/ignite/blob/0fc97266/modules/control-center-web/src/main/js/app/modules/navbar/Navbar.provider.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/navbar/Navbar.provider.js b/modules/control-center-web/src/main/js/app/modules/navbar/Navbar.provider.js
new file mode 100644
index 0000000..f1ae1b2
--- /dev/null
+++ b/modules/control-center-web/src/main/js/app/modules/navbar/Navbar.provider.js
@@ -0,0 +1,28 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+export default ['IgniteNavbar', [function() {
+ const items = [];
+
+ this.push = function(data) {
+ items.push(data);
+ };
+
+ this.$get = [function() {
+ return items;
+ }];
+}]];
http://git-wip-us.apache.org/repos/asf/ignite/blob/0fc97266/modules/control-center-web/src/main/js/app/modules/navbar/Userbar.directive.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/navbar/Userbar.directive.js b/modules/control-center-web/src/main/js/app/modules/navbar/Userbar.directive.js
new file mode 100644
index 0000000..0e94063
--- /dev/null
+++ b/modules/control-center-web/src/main/js/app/modules/navbar/Userbar.directive.js
@@ -0,0 +1,48 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+export default ['igniteUserbar', [function() {
+ return {
+ restrict: 'A',
+ controller: ['$rootScope', 'IgniteUserbar', function($root, IgniteUserbar) {
+ const ctrl = this;
+
+ ctrl.items = [
+ {text: 'Profile', sref: 'settings.profile'},
+ {text: 'Getting Started', click: 'gettingStarted.tryShow(true)'}
+ ];
+
+ const _rebuildSettings = (event, user) => {
+ ctrl.items.splice(2);
+
+ if (!user.becomeUsed && user.admin)
+ ctrl.items.push({text: 'Admin Panel', sref: 'settings.admin'});
+
+ ctrl.items.push(...IgniteUserbar);
+
+ if (!user.becomeUsed)
+ ctrl.items.push({text: 'Log Out', sref: 'logout'});
+ };
+
+ if ($root.user)
+ _rebuildSettings(null, $root.user);
+
+ $root.$on('user', _rebuildSettings);
+ }],
+ controllerAs: 'userbar'
+ };
+}]];
http://git-wip-us.apache.org/repos/asf/ignite/blob/0fc97266/modules/control-center-web/src/main/js/app/modules/navbar/Userbar.provider.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/navbar/Userbar.provider.js b/modules/control-center-web/src/main/js/app/modules/navbar/Userbar.provider.js
new file mode 100644
index 0000000..9513641
--- /dev/null
+++ b/modules/control-center-web/src/main/js/app/modules/navbar/Userbar.provider.js
@@ -0,0 +1,28 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+export default ['IgniteUserbar', [function() {
+ const items = [];
+
+ this.push = function(data) {
+ items.push(data);
+ };
+
+ this.$get = [function() {
+ return items;
+ }];
+}]];
http://git-wip-us.apache.org/repos/asf/ignite/blob/0fc97266/modules/control-center-web/src/main/js/app/modules/navbar/main.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/navbar/main.js b/modules/control-center-web/src/main/js/app/modules/navbar/main.js
deleted file mode 100644
index 258026d..0000000
--- a/modules/control-center-web/src/main/js/app/modules/navbar/main.js
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import angular from 'angular';
-
-angular
-.module('ignite-console.navbar', [
-
-])
-.provider('igniteNavbar', function() {
- const items = [];
-
- this.push = function(data) {
- items.push(data);
- };
-
- this.$get = [function() {
- return items;
- }];
-})
-.directive('igniteNavbar', ['igniteNavbar', function(igniteNavbar) {
- function controller() {
- const ctrl = this;
-
- ctrl.items = igniteNavbar;
- }
-
- return {
- restrict: 'A',
- controller,
- controllerAs: 'navbar'
- };
-}]);
http://git-wip-us.apache.org/repos/asf/ignite/blob/0fc97266/modules/control-center-web/src/main/js/app/modules/navbar/navbar.directive.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/navbar/navbar.directive.js b/modules/control-center-web/src/main/js/app/modules/navbar/navbar.directive.js
new file mode 100644
index 0000000..020cfe4
--- /dev/null
+++ b/modules/control-center-web/src/main/js/app/modules/navbar/navbar.directive.js
@@ -0,0 +1,30 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+export default ['igniteNavbar', ['IgniteNavbar', (IgniteNavbar) => {
+ function controller() {
+ const ctrl = this;
+
+ ctrl.items = IgniteNavbar;
+ }
+
+ return {
+ restrict: 'A',
+ controller,
+ controllerAs: 'navbar'
+ };
+}]];
http://git-wip-us.apache.org/repos/asf/ignite/blob/0fc97266/modules/control-center-web/src/main/js/app/modules/navbar/navbar.module.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/navbar/navbar.module.js b/modules/control-center-web/src/main/js/app/modules/navbar/navbar.module.js
new file mode 100644
index 0000000..b845cbc
--- /dev/null
+++ b/modules/control-center-web/src/main/js/app/modules/navbar/navbar.module.js
@@ -0,0 +1,33 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import angular from 'angular';
+
+import IgniteNavbar from './Navbar.provider';
+import IgniteUserbar from './Userbar.provider';
+
+import igniteNavbar from './navbar.directive';
+import igniteUserbar from './userbar.directive';
+
+angular
+.module('ignite-console.navbar', [
+
+])
+.provider(...IgniteNavbar)
+.provider(...IgniteUserbar)
+.directive(...igniteNavbar)
+.directive(...igniteUserbar);
http://git-wip-us.apache.org/repos/asf/ignite/blob/0fc97266/modules/control-center-web/src/main/js/app/modules/settings/main.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/settings/main.js b/modules/control-center-web/src/main/js/app/modules/settings/main.js
deleted file mode 100644
index fcc0609..0000000
--- a/modules/control-center-web/src/main/js/app/modules/settings/main.js
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import angular from 'angular';
-
-angular
-.module('ignite-console.userbar', [
-
-])
-.provider('igniteSettings', function() {
- const items = [];
-
- this.push = function(data) {
- items.push(data);
- };
-
- this.$get = [function() {
- return items;
- }];
-})
-.directive('igniteSettings', function() {
- return {
- restrict: 'A',
- controller: ['$rootScope', 'igniteSettings', function($root, igniteSettings) {
- const ctrl = this;
-
- ctrl.items = [
- {text: 'Profile', sref: 'settings.profile'},
- {text: 'Getting Started', click: 'gettingStarted.tryShow(true)'}
- ];
-
- const _rebuildSettings = (event, user) => {
- ctrl.items.splice(2);
-
- if (!user.becomeUsed && user.admin)
- ctrl.items.push({text: 'Admin Panel', sref: 'settings.admin'});
-
- ctrl.items.push(...igniteSettings);
-
- if (!user.becomeUsed)
- ctrl.items.push({text: 'Log Out', sref: 'logout'});
- };
-
- if ($root.user)
- _rebuildSettings(null, $root.user);
-
- $root.$on('user', _rebuildSettings);
- }],
- controllerAs: 'settings'
- };
-});
http://git-wip-us.apache.org/repos/asf/ignite/blob/0fc97266/modules/control-center-web/src/main/js/app/modules/states/login/index.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/states/login/index.js b/modules/control-center-web/src/main/js/app/modules/states/login/index.js
index 38cfb6b..e0632b4 100644
--- a/modules/control-center-web/src/main/js/app/modules/states/login/index.js
+++ b/modules/control-center-web/src/main/js/app/modules/states/login/index.js
@@ -21,7 +21,7 @@ angular
.module('ignite-console.states.login', [
'ui.router',
// services
- 'ignite-console.Auth'
+ 'ignite-console.user'
])
.config(['$stateProvider', function($stateProvider) {
// set up the states
@@ -36,9 +36,9 @@ angular
}
});
}])
-.run(['$rootScope', '$state', 'Auth', 'igniteTerms', function($root, $state, Auth, igniteTerms) {
+.run(['$rootScope', '$state', 'Auth', 'IgniteTerms', function($root, $state, Auth, IgniteTerms) {
$root.$on('$stateChangeStart', function(event, toState) {
- if (toState.name === igniteTerms.termsState)
+ if (toState.name === IgniteTerms.termsState)
return;
if (!Auth.authorized && (toState.name !== 'login' && !_.startsWith(toState.name, 'password.'))) {
http://git-wip-us.apache.org/repos/asf/ignite/blob/0fc97266/modules/control-center-web/src/main/js/app/modules/terms/main.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/terms/main.js b/modules/control-center-web/src/main/js/app/modules/terms/main.js
deleted file mode 100644
index 0fad45d..0000000
--- a/modules/control-center-web/src/main/js/app/modules/terms/main.js
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import angular from 'angular';
-
-angular
-.module('ignite-console.terms', [
-
-])
-.provider('igniteTerms', function() {
- let _rows = [
- 'Apache Ignite Web Console',
- '© 2016 The Apache Software Foundation.',
- 'Apache, Apache Ignite, the Apache feather and the Apache Ignite logo are trademarks of The Apache Software Foundation.'
- ];
-
- let _state;
-
- this.footerRows = function(rows) {
- _rows = rows;
- };
-
- this.termsState = function(state) {
- _state = state;
- };
-
- this.$get = [function() {
- return {
- footerRows: _rows,
- termsState: _state
- };
- }];
-})
-.directive('igniteTerms', ['igniteTerms', function(igniteTerms) {
- function controller() {
- const ctrl = this;
-
- ctrl.footerRows = igniteTerms.footerRows;
- ctrl.termsState = igniteTerms.termsState;
- }
-
- return {
- restrict: 'A',
- controller,
- controllerAs: 'terms'
- };
-}]);
http://git-wip-us.apache.org/repos/asf/ignite/blob/0fc97266/modules/control-center-web/src/main/js/app/services/Countries/Countries.service.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/services/Countries/Countries.service.js b/modules/control-center-web/src/main/js/app/services/Countries/Countries.service.js
new file mode 100644
index 0000000..82b8626
--- /dev/null
+++ b/modules/control-center-web/src/main/js/app/services/Countries/Countries.service.js
@@ -0,0 +1,23 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// Java built-in short class names.
+import COUNTRIES from 'app/data/countries.json!';
+
+export default ['IgniteCountries', function() {
+ return COUNTRIES;
+}];
http://git-wip-us.apache.org/repos/asf/ignite/blob/0fc97266/modules/control-center-web/src/main/js/app/services/Countries/index.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/services/Countries/index.js b/modules/control-center-web/src/main/js/app/services/Countries/index.js
deleted file mode 100644
index 82b8626..0000000
--- a/modules/control-center-web/src/main/js/app/services/Countries/index.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-// Java built-in short class names.
-import COUNTRIES from 'app/data/countries.json!';
-
-export default ['IgniteCountries', function() {
- return COUNTRIES;
-}];
http://git-wip-us.apache.org/repos/asf/ignite/blob/0fc97266/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 573cfa5..6c25e46 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
@@ -17,7 +17,7 @@
// Controller for Clusters screen.
consoleModule.controller('clustersController', function ($http, $timeout, $scope, $state, $controller,
- $common, $focus, $confirm, $clone, $loading, $unsavedChangesGuard, $cleanup, igniteIncludeEventGroups) {
+ $common, $focus, $confirm, $clone, $loading, $unsavedChangesGuard, $cleanup, igniteEventGroups) {
$unsavedChangesGuard.install($scope);
var __original_value;
@@ -70,7 +70,7 @@ consoleModule.controller('clustersController', function ($http, $timeout, $scope
{value: undefined, label: 'Not set'}
];
- $scope.eventGroups = igniteIncludeEventGroups;
+ $scope.eventGroups = igniteEventGroups;
$scope.toggleExpanded = function () {
$scope.ui.expanded = !$scope.ui.expanded;
http://git-wip-us.apache.org/repos/asf/ignite/blob/0fc97266/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 7c663ec..da6705a 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
@@ -27,11 +27,6 @@ var consoleModule = angular.module('ignite-web-console',
.run(function ($rootScope, $http, $state, $common, Auth, User, IgniteGettingStarted) {
$rootScope.gettingStarted = IgniteGettingStarted;
- if (Auth.authorized)
- User.read().then(function (user) {
- $rootScope.$broadcast('user', user);
- });
-
$rootScope.revertIdentity = function () {
$http
.get('/api/v1/admin/revert/identity')
http://git-wip-us.apache.org/repos/asf/ignite/blob/0fc97266/modules/control-center-web/src/main/js/helpers/generator/generator-java.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/helpers/generator/generator-java.js b/modules/control-center-web/src/main/js/helpers/generator/generator-java.js
index fdca965..da1074b 100644
--- a/modules/control-center-web/src/main/js/helpers/generator/generator-java.js
+++ b/modules/control-center-web/src/main/js/helpers/generator/generator-java.js
@@ -827,7 +827,7 @@ $generatorJava.clusterEvents = function (cluster, res) {
if (cluster.includeEventTypes && cluster.includeEventTypes.length > 0) {
res.emptyLineIfNeeded();
- var evtGrps = angular.element(document.getElementById('app')).injector().get('igniteIncludeEventGroups');
+ var evtGrps = angular.element(document.getElementById('app')).injector().get('igniteEventGroups');
var evtGrpDscr = _.find(evtGrps, {value: cluster.includeEventTypes[0]});
http://git-wip-us.apache.org/repos/asf/ignite/blob/0fc97266/modules/control-center-web/src/main/js/helpers/generator/generator-xml.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/helpers/generator/generator-xml.js b/modules/control-center-web/src/main/js/helpers/generator/generator-xml.js
index 5dd2711..830dca7 100644
--- a/modules/control-center-web/src/main/js/helpers/generator/generator-xml.js
+++ b/modules/control-center-web/src/main/js/helpers/generator/generator-xml.js
@@ -575,7 +575,7 @@ $generatorXml.clusterEvents = function (cluster, res) {
else {
res.startBlock('<list>');
- var evtGrps = angular.element(document.getElementById('app')).injector().get('igniteIncludeEventGroups');
+ var evtGrps = angular.element(document.getElementById('app')).injector().get('igniteEventGroups');
_.forEach(cluster.includeEventTypes, function(eventGroup, ix) {
if (ix > 0)
http://git-wip-us.apache.org/repos/asf/ignite/blob/0fc97266/modules/control-center-web/src/main/js/views/configuration/sidebar.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/views/configuration/sidebar.jade b/modules/control-center-web/src/main/js/views/configuration/sidebar.jade
index a59bb9c..bba6b25 100644
--- a/modules/control-center-web/src/main/js/views/configuration/sidebar.jade
+++ b/modules/control-center-web/src/main/js/views/configuration/sidebar.jade
@@ -17,7 +17,7 @@
.row
.col-xs-3.col-sm-3.col-md-2.border-right.section-left.greedy
.sidebar-nav(bs-affix)
- ul.menu(ignite-configuration-sidebar)
+ ul.menu(ignite-sidebar)
li(ng-repeat='item in sidebar.items')
a(ui-sref-active='active' ui-sref='{{::item.sref}}')
span.fa-stack
http://git-wip-us.apache.org/repos/asf/ignite/blob/0fc97266/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 5ff7766..3ed39b3 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
@@ -22,7 +22,7 @@ header#header.header
td.col-xs-3.col-sm-3.col-md-2
ignite-logo
td(ng-if='$root.user' style='padding-top: 20px')
- ul.nav.navbar-nav(ignite-configuration-sidebar ignite-navbar)
+ ul.nav.navbar-nav(ignite-sidebar ignite-navbar)
li(ng-class='{active: $state.includes("base.configuration")}')
a.dropdown-toggle(data-toggle='dropdown' bs-dropdown='sidebar.items' data-placement='bottom-right') Configuration
span.caret
@@ -34,7 +34,7 @@ header#header.header
li(ui-sref-active='active' ng-repeat='item in navbar.items')
a(ui-sref='{{::item.sref}}') {{::item.text}}
- ul.nav.navbar-nav.pull-right(ignite-settings)
+ ul.nav.navbar-nav.pull-right(ignite-userbar)
li(ng-class='{active: $state.includes("settings")}')
- a.dropdown-toggle(data-toggle='dropdown' bs-dropdown='settings.items' data-placement='bottom-right') {{user.username}}
+ a.dropdown-toggle(data-toggle='dropdown' bs-dropdown='userbar.items' data-placement='bottom-right') {{user.username}}
span.caret