Repository: incubator-ignite Updated Branches: refs/heads/ignite-843 f405183ec -> b54b25673
# 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/b54b2567 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b54b2567 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b54b2567 Branch: refs/heads/ignite-843 Commit: b54b2567360f2143ea17b8e8baa4ab1085cb33fb Parents: f405183 Author: AKuznetsov <akuznet...@gridgain.com> Authored: Mon Jun 8 17:34:29 2015 +0700 Committer: AKuznetsov <akuznet...@gridgain.com> Committed: Mon Jun 8 17:34:29 2015 +0700 ---------------------------------------------------------------------- .../public/javascripts/controllers/caches.js | 8 +++++ .../nodejs/public/stylesheets/style.less | 1 - .../nodejs/views/includes/controls.jade | 34 +++++++++----------- 3 files changed, 23 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b54b2567/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 57824d8..f4d0806 100644 --- a/modules/webconfig/nodejs/public/javascripts/controllers/caches.js +++ b/modules/webconfig/nodejs/public/javascripts/controllers/caches.js @@ -60,6 +60,14 @@ configuratorModule.controller('cachesController', ['$scope', '$http', function($ }); + // Create popup for discovery advanced settings. + var discoveryModal = $modal({scope: $scope, template: '/discovery', show: false}); + + $scope.editDiscovery = function(cluster) { + discoveryModal.$promise.then(discoveryModal.show); + }; + + //DefaultLockTimeout dfltLockTimeout //invalidate //TransactionManagerLookupClassName tmLookupClsName http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b54b2567/modules/webconfig/nodejs/public/stylesheets/style.less ---------------------------------------------------------------------- diff --git a/modules/webconfig/nodejs/public/stylesheets/style.less b/modules/webconfig/nodejs/public/stylesheets/style.less index e10073f..4135b92 100644 --- a/modules/webconfig/nodejs/public/stylesheets/style.less +++ b/modules/webconfig/nodejs/public/stylesheets/style.less @@ -1018,5 +1018,4 @@ label { white-space: nowrap; overflow: hidden; text-overflow: ellipsis; - } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b54b2567/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 0d40bdb..268149a 100644 --- a/modules/webconfig/nodejs/views/includes/controls.jade +++ b/modules/webconfig/nodejs/views/includes/controls.jade @@ -25,9 +25,8 @@ mixin details-row div(ng-switch='detail.type') div(ng-switch-when='check') - .col-sm-5 - input(type='checkbox' ng-model=detailMdl) - label(ng-click='#{detailMdl} = !#{detailMdl}') {{detail.label}} + input(type='checkbox' ng-model=detailMdl) + label(ng-click='#{detailMdl} = !#{detailMdl}') {{detail.label}} +tip-detail div(ng-switch-when='text') label.col-sm-2.details-label {{detail.label}}: @@ -50,9 +49,8 @@ mixin form-row div(ng-switch='field.type') div(ng-switch-when='check') - .col-sm-5 - input(type='checkbox' ng-model='backupItem[field.model]') - label(ng-click='backupItem[field.model] = !backupItem[field.model]') {{field.label}} + input(type='checkbox' ng-model='backupItem[field.model]') + label(ng-click='backupItem[field.model] = !backupItem[field.model]') {{field.label}} +tip div(ng-switch-when='text') label.col-sm-2 {{field.label}}: @@ -77,20 +75,18 @@ mixin form-row .details-row(ng-repeat='detail in field.details[#{masterMdl}]') +details-row div(ng-switch-when='indexedTypes') - label.col-sm-2 Indexed types: - button.btn.btn-primary(ng-click='addIndexedTypes()') Add - +tip - .col-sm-5 - table.table.table-striped.table-nowrap - thead - tr - th Key class - th Value class + div + button.btn.btn-primary(ng-click='addIndexedTypes()') Add indexed type + +tip + .col-sm-10.links(style='margin-left: 18px') + table tbody tr - td org.apache.some.other.package.KeyClazz1 - td org.apache.some.other.package.ValueClazz1 + td + a 1. o.a.s.other.package.KeyClazz1, o.a.s.other.package.ValueClazz1 + label.fa.fa-remove tr - td org.apache.some.KeyClazz2 - td org.apache.some.ValueClazz3 + td + a 2. org.apache.some.KeyClazz2, og.a.s.v.v.long.package.ValueClazz3 + label.fa.fa-remove
