Repository: incubator-ignite Updated Branches: refs/heads/ignite-843 f074e6114 -> 74c1f9b5c
IGNITE-843 Added "Show settings" configuration for dropdown-details. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/74c1f9b5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/74c1f9b5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/74c1f9b5 Branch: refs/heads/ignite-843 Commit: 74c1f9b5c493045d419f2e5936381fe6fb7d5a97 Parents: f074e61 Author: AKuznetsov <akuznet...@gridgain.com> Authored: Thu Aug 13 16:27:44 2015 +0700 Committer: AKuznetsov <akuznet...@gridgain.com> Committed: Thu Aug 13 16:27:44 2015 +0700 ---------------------------------------------------------------------- .../src/main/js/controllers/models/caches.json | 3 +++ .../src/main/js/controllers/models/clusters.json | 12 +++--------- .../src/main/js/controllers/models/summary.json | 1 + .../src/main/js/views/includes/controls.jade | 4 ++-- 4 files changed, 9 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/74c1f9b5/modules/control-center-web/src/main/js/controllers/models/caches.json ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/controllers/models/caches.json b/modules/control-center-web/src/main/js/controllers/models/caches.json index ec426dc..2ca832a 100644 --- a/modules/control-center-web/src/main/js/controllers/models/caches.json +++ b/modules/control-center-web/src/main/js/controllers/models/caches.json @@ -145,6 +145,7 @@ { "label": "Eviction policy", "type": "dropdown-details", + "settings": true, "path": "evictionPolicy", "model": "kind", "placeholder": "Choose eviction policy", @@ -381,6 +382,7 @@ { "label": "Store factory", "type": "dropdown-details", + "settings": true, "path": "cacheStoreFactory", "model": "kind", "placeholder": "Choose store factory", @@ -738,6 +740,7 @@ { "label": "Eviction policy", "type": "dropdown-details", + "settings": true, "path": "nearConfiguration.nearEvictionPolicy", "model": "kind", "placeholder": "Choose eviction policy", http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/74c1f9b5/modules/control-center-web/src/main/js/controllers/models/clusters.json ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/controllers/models/clusters.json b/modules/control-center-web/src/main/js/controllers/models/clusters.json index 399d3e9..73e56e3 100644 --- a/modules/control-center-web/src/main/js/controllers/models/clusters.json +++ b/modules/control-center-web/src/main/js/controllers/models/clusters.json @@ -49,17 +49,15 @@ { "label": "Discovery", "type": "dropdown-details", + "settings": false, "path": "discovery", "model": "kind", - "required": true, - "placeholder": "Choose discovery", "items": "discoveries", "tip": [ "Discovery allows to discover remote nodes in grid." ], "details": { "Vm": { - "expanded": true, "fields": [ { "label": "Addresses", @@ -93,7 +91,6 @@ ] }, "Multicast": { - "expanded": false, "fields": [ { "label": "IP address", @@ -151,7 +148,6 @@ ] }, "S3": { - "expanded": true, "fields": [ { "label": "Bucket name", @@ -170,7 +166,6 @@ ] }, "Cloud": { - "expanded": true, "fields": [ { "label": "Credential", @@ -253,7 +248,6 @@ ] }, "GoogleStorage": { - "expanded": true, "fields": [ { "label": "Project name", @@ -301,7 +295,6 @@ ] }, "Jdbc": { - "expanded": true, "fields": [ { "label": "DB schema should be initialized by Ignite", @@ -315,7 +308,6 @@ ] }, "SharedFs": { - "expanded": false, "fields": [ { "label": "File path", @@ -490,6 +482,7 @@ { "label": "Marshaller", "type": "dropdown-details", + "settings": true, "path": "marshaller", "model": "kind", "placeholder": "Choose marshaller", @@ -663,6 +656,7 @@ { "label": "Swap space SPI", "type": "dropdown-details", + "settings": true, "path": "swapSpaceSpi", "model": "kind", "items": "swapSpaceSpis", http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/74c1f9b5/modules/control-center-web/src/main/js/controllers/models/summary.json ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/controllers/models/summary.json b/modules/control-center-web/src/main/js/controllers/models/summary.json index 2b5d470..a87ec6c 100644 --- a/modules/control-center-web/src/main/js/controllers/models/summary.json +++ b/modules/control-center-web/src/main/js/controllers/models/summary.json @@ -29,6 +29,7 @@ { "label": "Near cache eviction policy", "type": "dropdown-details", + "settings": true, "path": "nearConfiguration.nearEvictionPolicy", "model": "kind", "placeholder": "Choose eviction policy", http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/74c1f9b5/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 ac73462..0994aa2 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 @@ -315,8 +315,8 @@ mixin form-row-custom(lblClasses, fieldClasses, dataSource) +tipField('field.tip') .input-tip button.form-control(bs-select data-placeholder='{{::field.placeholder}}' bs-options='item.value as item.label for item in {{field.items}}')&attributes(fieldCommon) - a.customize(ng-show='#{fieldMdl} && field.details[#{fieldMdl}].fields' ng-click='#{expanded} = !#{expanded}') {{#{expanded} ? "Hide settings" : "Show settings"}} - .col-sm-7.panel-details(ng-show='#{expanded} && #{fieldMdl}') + a.customize(ng-show='#{fieldMdl} && field.settings' ng-click='#{expanded} = !#{expanded}') {{#{expanded} ? "Hide settings" : "Show settings"}} + .col-sm-7.panel-details(ng-show='(#{expanded} || !field.settings) && #{fieldMdl}') .details-row(ng-repeat='detail in field.details[#{fieldMdl}].fields') +details-row .section(ng-switch-when='table-simple' ng-hide=fieldHide)&attributes(fieldCommon)
