Repository: incubator-ignite Updated Branches: refs/heads/ignite-843 b54b25673 -> 3493e95d1
# IGNITE-843 WIP on panels. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/3493e95d Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/3493e95d Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/3493e95d Branch: refs/heads/ignite-843 Commit: 3493e95d1cf3085173b5dd21b8964d7b105d8ba2 Parents: b54b256 Author: AKuznetsov <akuznet...@gridgain.com> Authored: Mon Jun 8 18:22:32 2015 +0700 Committer: AKuznetsov <akuznet...@gridgain.com> Committed: Mon Jun 8 18:22:32 2015 +0700 ---------------------------------------------------------------------- .../public/javascripts/controllers/caches.js | 10 +++--- modules/webconfig/nodejs/routes/pages.js | 5 +++ .../nodejs/views/includes/controls.jade | 2 +- .../webconfig/nodejs/views/indexedTypes.jade | 33 ++++++++++++++++++++ 4 files changed, 44 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3493e95d/modules/webconfig/nodejs/public/javascripts/controllers/caches.js ---------------------------------------------------------------------- diff --git a/modules/webconfig/nodejs/public/javascripts/controllers/caches.js b/modules/webconfig/nodejs/public/javascripts/controllers/caches.js index f4d0806..ae67a7f 100644 --- a/modules/webconfig/nodejs/public/javascripts/controllers/caches.js +++ b/modules/webconfig/nodejs/public/javascripts/controllers/caches.js @@ -15,7 +15,7 @@ * limitations under the License. */ -configuratorModule.controller('cachesController', ['$scope', '$http', function($scope, $http) { +configuratorModule.controller('cachesController', ['$scope', '$modal', '$http', function($scope, $modal, $http) { $scope.templates = [ {value: {mode: 'PARTITIONED', atomicity: 'TRANSACTIONAL'}, label: 'Partitioned'}, {value: {mode: 'REPLICATED', atomicity: 'ATOMIC'}, label: 'Replicated'}, @@ -60,11 +60,11 @@ configuratorModule.controller('cachesController', ['$scope', '$http', function($ }); - // Create popup for discovery advanced settings. - var discoveryModal = $modal({scope: $scope, template: '/discovery', show: false}); + // Create popup for indexedTypes. + var indexedTypesModal = $modal({scope: $scope, template: '/indexedTypes', show: false}); - $scope.editDiscovery = function(cluster) { - discoveryModal.$promise.then(discoveryModal.show); + $scope.editIndexedTypes = function(cache) { + indexedTypesModal.$promise.then(indexedTypesModal.show); }; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3493e95d/modules/webconfig/nodejs/routes/pages.js ---------------------------------------------------------------------- diff --git a/modules/webconfig/nodejs/routes/pages.js b/modules/webconfig/nodejs/routes/pages.js index d111042..da26276 100644 --- a/modules/webconfig/nodejs/routes/pages.js +++ b/modules/webconfig/nodejs/routes/pages.js @@ -32,6 +32,11 @@ router.get('/discovery', function(req, res) { res.render('discovery'); }); +/* GET page for indexedTypes popup. */ +router.get('/indexedTypes', function(req, res) { + res.render('indexedTypes'); +}); + /* GET register page. */ router.get('/register', function(req, res) { res.render('register'); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3493e95d/modules/webconfig/nodejs/views/includes/controls.jade ---------------------------------------------------------------------- diff --git a/modules/webconfig/nodejs/views/includes/controls.jade b/modules/webconfig/nodejs/views/includes/controls.jade index 268149a..cf751ca 100644 --- a/modules/webconfig/nodejs/views/includes/controls.jade +++ b/modules/webconfig/nodejs/views/includes/controls.jade @@ -76,7 +76,7 @@ mixin form-row +details-row div(ng-switch-when='indexedTypes') div - button.btn.btn-primary(ng-click='addIndexedTypes()') Add indexed type + button.btn.btn-primary(ng-click='editIndexedTypes()') Add indexed type +tip .col-sm-10.links(style='margin-left: 18px') table http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3493e95d/modules/webconfig/nodejs/views/indexedTypes.jade ---------------------------------------------------------------------- diff --git a/modules/webconfig/nodejs/views/indexedTypes.jade b/modules/webconfig/nodejs/views/indexedTypes.jade new file mode 100644 index 0000000..a2c958c --- /dev/null +++ b/modules/webconfig/nodejs/views/indexedTypes.jade @@ -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. +div(class=['modal', 'center'] tabindex='-1' role='dialog') + .modal-dialog + .modal-content + .modal-header + button.close(type='button', ng-click='$hide()', aria-hidden='true') × + h4.modal-title Configure Indexed Types + form.form-horizontal(name='indexedTypeForm') + .modal-body.row + .col-sm-10.login.col-sm-offset-1 + .form-group + label.col-sm-3.control-label Key Class: + .controls.col-sm-9 + input.form-control(type='text') + .form-group + label.col-sm-3.control-label Value Class: + .controls.col-sm-9 + input.form-control(type='text') + .modal-footer + button.btn.btn-primary(ng-click='saveIndexedType(key, val)' ng-disabled='discoveryForm.$invalid') Save + button.btn.btn-primary(ng-click='$hide()') Cancel
