IGNITE-2612 WIP Rework to Angular directives.

Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/81991245
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/81991245
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/81991245

Branch: refs/heads/ignite-2612
Commit: 819912456e242842ad4b25022e6274572f23d86d
Parents: 9124a08
Author: AKuznetsov <[email protected]>
Authored: Tue Mar 1 20:16:37 2016 +0700
Committer: AKuznetsov <[email protected]>
Committed: Tue Mar 1 21:08:47 2016 +0700

----------------------------------------------------------------------
 .../states/configuration/caches/general.jade    |   2 +-
 .../states/configuration/caches/memory.jade     |  31 +++++
 .../states/configuration/caches/query.jade      |  26 ++--
 .../configuration/caches/server-near-cache.jade | 117 +++++++++-------
 .../states/configuration/caches/store.jade      | 132 ++++++++++++++++++-
 .../states/configuration/clusters/general.jade  |   2 +-
 .../clusters/general/discovery/zookeeper.jade   |   2 +-
 .../configuration/clusters/marshaller.jade      |   2 +-
 .../states/configuration/clusters/swap.jade     |   2 +-
 .../main/js/views/configuration/summary.jade    |  18 +--
 10 files changed, 255 insertions(+), 79 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/81991245/modules/control-center-web/src/main/js/app/modules/states/configuration/caches/general.jade
----------------------------------------------------------------------
diff --git 
a/modules/control-center-web/src/main/js/app/modules/states/configuration/caches/general.jade
 
b/modules/control-center-web/src/main/js/app/modules/states/configuration/caches/general.jade
index 975585b..b6f7a96 100644
--- 
a/modules/control-center-web/src/main/js/app/modules/states/configuration/caches/general.jade
+++ 
b/modules/control-center-web/src/main/js/app/modules/states/configuration/caches/general.jade
@@ -70,7 +70,7 @@ form.panel.panel-default(name='general' novalidate)
                 .settings-row
                     ignite-form-field
                         ignite-form-field-label
-                            | Cache mode:
+                            | Mode:
                         ignite-form-field-tooltip
                             | Cache modes:
                             ul: li Partitioned - in this mode the overall key 
set will be divided into partitions and all partitions will be split equally 
between participating nodes

http://git-wip-us.apache.org/repos/asf/ignite/blob/81991245/modules/control-center-web/src/main/js/app/modules/states/configuration/caches/memory.jade
----------------------------------------------------------------------
diff --git 
a/modules/control-center-web/src/main/js/app/modules/states/configuration/caches/memory.jade
 
b/modules/control-center-web/src/main/js/app/modules/states/configuration/caches/memory.jade
index 533a6ad..7e026f4 100644
--- 
a/modules/control-center-web/src/main/js/app/modules/states/configuration/caches/memory.jade
+++ 
b/modules/control-center-web/src/main/js/app/modules/states/configuration/caches/memory.jade
@@ -90,6 +90,37 @@ form.panel.panel-default(name='memory' novalidate)
                     span(ng-if='#{model}.evictionPolicy.kind')
                         a.customize(ng-show='__.expanded' 
ng-click='__.expanded = false') Hide settings
                         a.customize(ng-hide='__.expanded' 
ng-click='__.expanded = true') Show settings
+                        .panel-details.col-sm-12(ng-if='__.expanded')
+                            .details-row
+                                ignite-form-field(data-label='Batch size')
+                                    ignite-form-field-tooltip
+                                        | Number of entries to remove on 
shrink"
+                                    ignite-form-field-input-number(
+                                        data-id='batchSize'
+                                        data-name='batchSize'
+                                        
data-ng-model='#{model}.evictionPolicy[#{model}.evictionPolicy.kind].batchSize'
+                                        data-placeholder='1'
+                                    )
+                            .details-row
+                                ignite-form-field(data-label='Max memory size')
+                                    ignite-form-field-tooltip
+                                        | Maximum allowed cache size in bytes
+                                    ignite-form-field-input-number(
+                                        data-id='maxMemorySize'
+                                        data-name='maxMemorySize'
+                                        
data-ng-model='#{model}.evictionPolicy[#{model}.evictionPolicy.kind].maxMemorySize'
+                                        data-placeholder='0'
+                                    )
+                            .details-row
+                                ignite-form-field(data-label='Max size')
+                                    ignite-form-field-tooltip
+                                        | Maximum allowed size of cache before 
entry will start getting evicted
+                                    ignite-form-field-input-number(
+                                        data-id='maxSize'
+                                        data-name='maxSize'
+                                        
data-ng-model='#{model}.evictionPolicy[#{model}.evictionPolicy.kind].maxSize'
+                                        data-placeholder='100000'
+                                    )
                 .settings-row
                     ignite-form-field
                         ignite-form-field-label

http://git-wip-us.apache.org/repos/asf/ignite/blob/81991245/modules/control-center-web/src/main/js/app/modules/states/configuration/caches/query.jade
----------------------------------------------------------------------
diff --git 
a/modules/control-center-web/src/main/js/app/modules/states/configuration/caches/query.jade
 
b/modules/control-center-web/src/main/js/app/modules/states/configuration/caches/query.jade
index 13bb53c..9ba7376 100644
--- 
a/modules/control-center-web/src/main/js/app/modules/states/configuration/caches/query.jade
+++ 
b/modules/control-center-web/src/main/js/app/modules/states/configuration/caches/query.jade
@@ -89,6 +89,19 @@ form.panel.panel-default(name='query' novalidate)
                             data-min='1'
                         )
                 .settings-row
+                    ignite-form-field
+                        ignite-form-field-label
+                            | Long query timeout:
+                        ignite-form-field-tooltip
+                            | Timeout in milliseconds after which long query 
warning will be printed
+                        ignite-form-field-input-number(
+                            data-id='longQueryWarningTimeout'
+                            data-name='longQueryWarningTimeout'
+                            data-ng-model='#{model}.longQueryWarningTimeout'
+                            data-placeholder='3000'
+                            data-min='0'
+                        )
+                .settings-row
                     ignite-form-group(ng-model='#{sqlFunctionClasses}' 
ng-form='#{form}')
                         ignite-form-field-label
                             | SQL functions
@@ -130,19 +143,6 @@ form.panel.panel-default(name='query' novalidate)
                         
.group-content-empty(ng-if='!(#{sqlFunctionClasses}.length) && 
!group.add.length')
                             | Not defined
                 .settings-row
-                    ignite-form-field
-                        ignite-form-field-label
-                            | Long query timeout:
-                        ignite-form-field-tooltip
-                            | Timeout in milliseconds after which long query 
warning will be printed
-                        ignite-form-field-input-number(
-                            data-id='longQueryWarningTimeout'
-                            data-name='longQueryWarningTimeout'
-                            data-ng-model='#{model}.longQueryWarningTimeout'
-                            data-placeholder='3000'
-                            data-min='0'
-                        )
-                .settings-row
                     ignite-form-field.checkbox
                         ignite-form-field-input-checkbox(
                             data-id='snapshotableIndex'

http://git-wip-us.apache.org/repos/asf/ignite/blob/81991245/modules/control-center-web/src/main/js/app/modules/states/configuration/caches/server-near-cache.jade
----------------------------------------------------------------------
diff --git 
a/modules/control-center-web/src/main/js/app/modules/states/configuration/caches/server-near-cache.jade
 
b/modules/control-center-web/src/main/js/app/modules/states/configuration/caches/server-near-cache.jade
index c08e4b5..7a6a846 100644
--- 
a/modules/control-center-web/src/main/js/app/modules/states/configuration/caches/server-near-cache.jade
+++ 
b/modules/control-center-web/src/main/js/app/modules/states/configuration/caches/server-near-cache.jade
@@ -29,68 +29,85 @@ form.panel.panel-default(name='server-near-cache' 
novalidate)
         .panel-body
             .col-sm-6
                 .settings-row
-                    ignite-form-field
-                        ignite-form-field-label
-                            | Name:
-                        ignite-form-field-tooltip
-                            | Cache name
-                        ignite-form-field-input-text(
-                            data-id='cacheName'
-                            data-name='cacheName'
-                            data-ng-model='#{model}.name'
-                            data-ng-required='true'
-                            data-placeholder='Input name'
+                    ignite-form-field.checkbox
+                        ignite-form-field-input-checkbox(
+                            data-id='swapEnabled'
+                            data-name='swapEnabled'
+                            data-ng-model='#{model}.swapEnabled'
                         )
-                .settings-row
-                    ignite-form-field
-                        ignite-form-field-label
-                            | Clusters: 
#[a(ui-sref='base.configuration.clusters({id: #{model}._id})') (add)]
+                        | Swap enabled
                         ignite-form-field-tooltip
-                            | Associate clusters with the current cache
-                        ignite-form-field-dropdown(
-                            data-id='clusters'
-                            data-name='clusters'
-                            data-options='clusters'
-                            data-multiple='true'
-                            data-ng-model='#{model}.clusters'
-                            data-ng-disabled='!clusters.length'
-                            data-placeholder='{{ clusters.length ? "Choose 
clusters": "No clusters configured" }}'
-                        )
-                .settings-row
+                            | Flag indicating whether swap storage is enabled 
or not for this cache
+                .settings-row(data-ng-show='#{model}.memoryMode !== 
"OFFHEAP_VALUES"')
                     ignite-form-field
                         ignite-form-field-label
-                            | Domain models: 
#[a(ui-sref='base.configuration.domains({id: #{model}._id})') (add)]
+                            | Start size:
                         ignite-form-field-tooltip
-                            | Associate clusters with the current cache
-                        ignite-form-field-dropdown(
-                            data-id='domains'
-                            data-name='domains'
-                            data-options='domains'
-                            data-multiple='true'
-                            data-ng-model='#{model}.domains'
-                            data-ng-disabled='!domains.length'
-                            data-placeholder='{{ domains.length ? "Choose 
domain models": "No domain models configured" }}'
+                            | Initial cache size for near cache which will be 
used to pre-create internal hash table after start
+                        ignite-form-field-input-number(
+                            data-id='nearStartSize'
+                            data-name='nearStartSize'
+                            
data-ng-model='#{model}.nearConfiguration.nearStartSize'
+                            data-ng-disabled='!#{model}.nearCacheEnabled'
+                            data-placeholder='375000'
+                            data-min='-1'
                         )
                 .settings-row
+                    -var evictionPolicy = model + 
'.nearConfiguration.nearEvictionPolicy'
+                    -var evictionPolicyKind = evictionPolicy + '.kind'
+
                     ignite-form-field
                         ignite-form-field-label
-                            | Cache mode:
+                            | Eviction policy:
                         ignite-form-field-tooltip
-                            | Cache modes:
-                            ul: li Partitioned - in this mode the overall key 
set will be divided into partitions and all partitions will be split equally 
between participating nodes
-                                li Replicated - in this mode all the keys are 
distributed to all participating nodes
-                                li Local - in this mode caches residing on 
different grid nodes will not know about each other
+                            | Optional cache eviction policy#[br]
+                            | Must be set for entries to be evicted from 
on-heap to off-heap or swap
                         ignite-form-field-dropdown(
-                        data-id='cacheMode'
-                        data-name='cacheMode'
-                        data-options='[\
-                            {value: "LOCAL", label: "LOCAL"},\
-                            {value: "REPLICATED", label: "REPLICATED"},\
-                            {value: "PARTITIONED", label: "PARTITIONED"}\
-                        ]'
-                        data-ng-model='#{model}.cacheMode'
-                        data-placeholder='PARTITIONED'
+                            data-id='nearCacheEvictionPolicyKind'
+                            data-name='nearCacheEvictionPolicyKind'
+                            data-options='[\
+                                {value: "LRU", label: "LRU"},\
+                                {value: "FIFO", label: "FIFO"},\
+                                {value: "SORTED", label: "Sorted"},\
+                                {value: undefined, label: "Not set"}\
+                            ]'
+                            data-ng-model='#{evictionPolicyKind}'
+                            data-ng-disabled='!#{model}.nearCacheEnabled'
                         )
+                    span(ng-if='#{evictionPolicyKind}')
+                        a.customize(ng-show='__.expanded' 
ng-click='__.expanded = false') Hide settings
+                        a.customize(ng-hide='__.expanded' 
ng-click='__.expanded = true') Show settings
+                        .panel-details.col-sm-12(ng-if='__.expanded')
+                            .details-row
+                                ignite-form-field(data-label='Batch size')
+                                    ignite-form-field-tooltip
+                                        | Number of entries to remove on 
shrink"
+                                    ignite-form-field-input-number(
+                                        data-id='nearEvictionPolicyBatchSize'
+                                        data-name='nearEvictionPolicyBatchSize'
+                                        
data-ng-model='#{evictionPolicy}[#{evictionPolicyKind}].batchSize'
+                                        data-placeholder='1'
+                                    )
+                            .details-row
+                                ignite-form-field(data-label='Max memory size')
+                                    ignite-form-field-tooltip
+                                        | Maximum allowed cache size in bytes
+                                    ignite-form-field-input-number(
+                                        
data-id='nearEvictionPolicyMaxMemorySize'
+                                        
data-name='nearEvictionPolicyMaxMemorySize'
+                                        
data-ng-model='#{evictionPolicy}[#{evictionPolicyKind}].maxMemorySize'
+                                        data-placeholder='0'
+                                    )
+                            .details-row
+                                ignite-form-field(data-label='Max size')
+                                    ignite-form-field-tooltip
+                                        | Maximum allowed size of cache before 
entry will start getting evicted
+                                    ignite-form-field-input-number(
+                                        data-id='nearEvictionPolicyMaxSize'
+                                        data-name='nearEvictionPolicyMaxSize'
+                                        
data-ng-model='#{evictionPolicy}[#{evictionPolicyKind}].maxSize'
+                                        data-placeholder='100000'
+                                    )
             ignite-ui-ace.col-sm-6
                 .preview-panel(ng-init='mode = false')
                     .preview-legend

http://git-wip-us.apache.org/repos/asf/ignite/blob/81991245/modules/control-center-web/src/main/js/app/modules/states/configuration/caches/store.jade
----------------------------------------------------------------------
diff --git 
a/modules/control-center-web/src/main/js/app/modules/states/configuration/caches/store.jade
 
b/modules/control-center-web/src/main/js/app/modules/states/configuration/caches/store.jade
index 380c108..15afc9a 100644
--- 
a/modules/control-center-web/src/main/js/app/modules/states/configuration/caches/store.jade
+++ 
b/modules/control-center-web/src/main/js/app/modules/states/configuration/caches/store.jade
@@ -15,6 +15,7 @@
     limitations under the License.
 
 - var model = 'backupItem'
+- var form = 'writeBehind'
 
 form.panel.panel-default(name='store' novalidate)
     .panel-heading(bs-collapse-toggle)
@@ -27,6 +28,23 @@ form.panel.panel-default(name='store' novalidate)
         .panel-body
             .col-sm-6
                 .settings-row
+                    ignite-form-field
+                        ignite-form-field-label
+                            | Store factory:
+                        ignite-form-field-tooltip
+                            | Factory for persistent storage for cache data
+                        ignite-form-field-dropdown(
+                            data-id='cacheStoreFactory'
+                            data-name='cacheStoreFactory'
+                            data-options='[\
+                                {value: "CacheJdbcPojoStoreFactory", label: 
"JDBC POJO store factory"},\
+                                {value: "CacheJdbcBlobStoreFactory", label: 
"JDBC BLOB store factory"},\
+                                {value: "CacheHibernateBlobStoreFactory", 
label: "Hibernate BLOB store factory"},\
+                                {value: undefined, label: "Not set"}\
+                            ]'
+                            data-ng-model='#{model}.cacheStoreFactory.kind'
+                        )
+                .settings-row
                     ignite-form-field.checkbox
                         ignite-form-field-input-checkbox(
                             data-id='storeKeepBinary'
@@ -37,11 +55,119 @@ form.panel.panel-default(name='store' novalidate)
                         ignite-form-field-tooltip
                             | Flag indicating that CacheStore implementation 
is working with binary objects instead of Java objects
                 .settings-row
-
+                    ignite-form-field.checkbox
+                        ignite-form-field-input-checkbox(
+                            data-id='loadPreviousValue'
+                            data-name='loadPreviousValue'
+                            data-ng-model='#{model}.loadPreviousValue'
+                        )
+                        | Load previous value
+                        ignite-form-field-tooltip
+                            | Flag indicating whether value should be loaded 
from store if it is not in the cache for following cache operations:",
+                            ul: li IgniteCache.putIfAbsent()
+                                li IgniteCache.replace()
+                                li IgniteCache.replace()
+                                li IgniteCache.remove()
+                                li IgniteCache.getAndPut()
+                                li IgniteCache.getAndRemove()
+                                li IgniteCache.getAndReplace()
+                                li IgniteCache.getAndPutIfAbsent()
                 .settings-row
-
+                    ignite-form-field.checkbox
+                        ignite-form-field-input-checkbox(
+                            data-id='readThrough'
+                            data-name='readThrough'
+                            data-ng-model='#{model}.readThrough'
+                        )
+                        | Read-through
+                        ignite-form-field-tooltip
+                            | Flag indicating whether read-through caching 
should be used
                 .settings-row
-
+                    ignite-form-field.checkbox
+                        ignite-form-field-input-checkbox(
+                            data-id='writeThrough'
+                            data-name='writeThrough'
+                            data-ng-model='#{model}.writeThrough'
+                        )
+                        | Write-through
+                        ignite-form-field-tooltip
+                            | Flag indicating whether write-through caching 
should be used
+                .settings-row
+                    ignite-form-group(ng-model='#{model}' ng-form='#{form}')
+                        ignite-form-field-label
+                            | Write behind
+                        ignite-form-group-tooltip
+                            | Cache write behind settings#[br]
+                            | Write-behind is a special mode when updates to 
cache accumulated and then asynchronously flushed to persistent store as a bulk 
operation
+                        .group-content
+                            .details-row
+                                ignite-form-field.checkbox
+                                    ignite-form-field-input-checkbox(
+                                        data-id='writeBehindEnabled'
+                                        data-name='writeBehindEnabled'
+                                        
data-ng-model='#{model}.writeBehindEnabled'
+                                    )
+                                    | Enabled
+                                    ignite-form-field-tooltip
+                                        | Flag indicating whether Ignite 
should use write-behind behaviour for the cache store
+                            .details-row
+                                ignite-form-field
+                                    ignite-form-field-label
+                                        | Batch size:
+                                    ignite-form-field-tooltip
+                                        | Maximum batch size for write-behind 
cache store operations#[br]
+                                        | Store operations (get or remove) are 
combined in a batch of this size to be passed to cache store
+                                    ignite-form-field-input-number(
+                                        data-id='writeBehindBatchSize'
+                                        data-name='writeBehindBatchSize'
+                                        
data-ng-model='#{model}.writeBehindBatchSize'
+                                        
data-ng-disabled='!#{model}.writeBehindEnabled'
+                                        data-placeholder='512'
+                                        data-min='1'
+                                    )
+                            .details-row
+                                ignite-form-field
+                                    ignite-form-field-label
+                                        | Flush size:
+                                    ignite-form-field-tooltip
+                                        | Maximum size of the write-behind 
cache#[br]
+                                        | If cache size exceeds this value, 
all cached items are flushed to the cache store and write cache is cleared
+                                    ignite-form-field-input-number(
+                                        data-id='writeBehindFlushSize'
+                                        data-name='writeBehindFlushSize'
+                                        
data-ng-model='#{model}.writeBehindFlushSize'
+                                        
data-ng-disabled='!#{model}.writeBehindEnabled'
+                                        data-placeholder='10240'
+                                        data-min='1'
+                                    )
+                            .details-row
+                                ignite-form-field
+                                    ignite-form-field-label
+                                        | Flush frequency:
+                                    ignite-form-field-tooltip
+                                        | Frequency with which write-behind 
cache is flushed to the cache store in milliseconds
+                                    ignite-form-field-input-number(
+                                        data-id='writeBehindFlushFrequency'
+                                        data-name='writeBehindFlushFrequency'
+                                        
data-ng-model='#{model}.writeBehindFlushFrequency'
+                                        
data-ng-disabled='!#{model}.writeBehindEnabled'
+                                        data-placeholder='5000'
+                                        data-min='1'
+                                    )
+                            .details-row
+                                ignite-form-field
+                                    ignite-form-field-label
+                                        | Flush threads count:
+                                    ignite-form-field-tooltip
+                                        | Number of threads that will perform 
cache flushing
+                                    ignite-form-field-input-number(
+                                        data-id='writeBehindFlushThreadCount'
+                                        data-name='writeBehindFlushThreadCount'
+                                        
data-ng-model='#{model}.writeBehindFlushThreadCount'
+                                        
data-ng-disabled='!#{model}.writeBehindEnabled'
+                                        data-placeholder='1'
+                                        data-min='1'
+                                    )
             ignite-ui-ace.col-sm-6
                 .preview-panel(ng-init='mode = false')
                     .preview-legend

http://git-wip-us.apache.org/repos/asf/ignite/blob/81991245/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/general.jade
----------------------------------------------------------------------
diff --git 
a/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/general.jade
 
b/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/general.jade
index 8317b47..af50dc5 100644
--- 
a/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/general.jade
+++ 
b/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/general.jade
@@ -86,7 +86,7 @@ form.panel.panel-default(name='general' novalidate)
                             data-placeholder='Choose marshaller'
                         )
                 .settings-row
-                    .col-sm-12.panel-details
+                    .panel-details.col-sm-12
                         ignite-configuration-clusters-general-discovery-cloud(
                             ng-if='#{model}.discovery.kind === "Cloud"')
                         ignite-configuration-clusters-general-discovery-google(

http://git-wip-us.apache.org/repos/asf/ignite/blob/81991245/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/general/discovery/zookeeper.jade
----------------------------------------------------------------------
diff --git 
a/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/general/discovery/zookeeper.jade
 
b/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/general/discovery/zookeeper.jade
index c1d3b0b..251d0fb 100644
--- 
a/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/general/discovery/zookeeper.jade
+++ 
b/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/general/discovery/zookeeper.jade
@@ -74,7 +74,7 @@ div
                 data-multiple='false'
             )
     .details-row(ng-if='#{model}.retryPolicy.kind')
-        .col-sm-12.panel-details()
+        .panel-details.col-sm-12
             div(ng-switch='#{model}.retryPolicy.kind')
                 
ignite-configuration-clusters-general-discovery-zookeeper-exponential(ng-switch-when='ExponentialBackoff')
                 
ignite-configuration-clusters-general-discovery-zookeeper-bounded-exponential(ng-switch-when='BoundedExponentialBackoff')

http://git-wip-us.apache.org/repos/asf/ignite/blob/81991245/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/marshaller.jade
----------------------------------------------------------------------
diff --git 
a/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/marshaller.jade
 
b/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/marshaller.jade
index f8219e6..d760a25 100644
--- 
a/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/marshaller.jade
+++ 
b/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/marshaller.jade
@@ -52,7 +52,7 @@ form.panel.panel-default(name='marshaller' novalidate)
                     ) {{ #{model}.expanded ? "Hide settings" : "Show 
settings"}}
 
                 .settings-row
-                    .col-sm-12.panel-details(ng-if='#{model}.expanded && 
#{model}.kind === "OptimizedMarshaller"')
+                    .panel-details.col-sm-12(ng-if='#{model}.expanded && 
#{model}.kind === "OptimizedMarshaller"')
                         .details-row
                             ignite-form-field
                                 ignite-form-field-label

http://git-wip-us.apache.org/repos/asf/ignite/blob/81991245/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/swap.jade
----------------------------------------------------------------------
diff --git 
a/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/swap.jade
 
b/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/swap.jade
index 9676c94..3c23d2f 100644
--- 
a/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/swap.jade
+++ 
b/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/swap.jade
@@ -50,7 +50,7 @@ form.panel.panel-default(name='swapSpaceSpi' novalidate)
                     ) {{ #{model}.expanded ? "Hide settings" : "Show 
settings"}}
 
                 .settings-row
-                    .col-sm-12.panel-details(ng-if='#{model}.expanded && 
#{model}.kind')
+                    .panel-details.col-sm-12(ng-if='#{model}.expanded && 
#{model}.kind')
                         .details-row
                             ignite-form-field
                                 ignite-form-field-label

http://git-wip-us.apache.org/repos/asf/ignite/blob/81991245/modules/control-center-web/src/main/js/views/configuration/summary.jade
----------------------------------------------------------------------
diff --git 
a/modules/control-center-web/src/main/js/views/configuration/summary.jade 
b/modules/control-center-web/src/main/js/views/configuration/summary.jade
index 538f7d9..834ebf8 100644
--- a/modules/control-center-web/src/main/js/views/configuration/summary.jade
+++ b/modules/control-center-web/src/main/js/views/configuration/summary.jade
@@ -20,9 +20,6 @@ include ../includes/infos
 mixin hard-link(ref, txt)
     a(style='color:#ec1c24' href=ref target='_blank') #{txt}
 
-mixin ignite-form-field-tooltip(message)
-    i.tipField.fa.fa-question-circle(bs-tooltip='"#{message}"')
-
 .docs-header
     h1 Configurations Summary
 .docs-body
@@ -74,7 +71,8 @@ mixin ignite-form-field-tooltip(message)
 
                                 .details-row
                                     
ignite-form-field.col-xs-8.col-sm-8.col-md-7(data-label='Near cache start size')
-                                        +ignite-form-field-tooltip("Initial 
cache size for near cache which will be used to pre-create internal hash table 
after start")
+                                        ignite-form-field-tooltip
+                                            | Initial cache size for near 
cache which will be used to pre-create internal hash table after start
                                         ignite-form-field-input-number(
                                             data-name='nearStartSize'
                                             
data-ng-model='#{nearCfg}.nearStartSize'
@@ -83,7 +81,8 @@ mixin ignite-form-field-tooltip(message)
 
                                 .details-row
                                     
ignite-form-field.col-xs-8.col-sm-8.col-md-7(data-label='Near cache eviction 
policy')
-                                        +ignite-form-field-tooltip("Cache 
expiration policy")
+                                        ignite-form-field-tooltip
+                                            | Cache expiration policy
                                         ignite-form-field-dropdown(
                                             data-name='evictionPolicies'
                                             data-options='[\
@@ -108,7 +107,8 @@ mixin ignite-form-field-tooltip(message)
                                     
.panel-details.col-xs-12.col-sm-12.col-md-7(ng-if='ctrl.__form.expanded && 
#{nearCfg}.nearEvictionPolicy.kind')
                                         .details-row
                                             
ignite-form-field(data-label='Batch size')
-                                                
+ignite-form-field-tooltip("Number of entries to remove on shrink")
+                                                ignite-form-field-tooltip
+                                                    | Number of entries to 
remove on shrink
                                                 ignite-form-field-input-number(
                                                     data-name='batchSize'
                                                     
data-ng-model='#{nearCfgEvictionPolicy}.batchSize'
@@ -116,7 +116,8 @@ mixin ignite-form-field-tooltip(message)
                                                 )           
                                         .details-row
                                             ignite-form-field(data-label='Max 
memory size')
-                                                
+ignite-form-field-tooltip("Maximum allowed cache size in bytes")
+                                                ignite-form-field-tooltip
+                                                    | Maximum allowed cache 
size in bytes
                                                 ignite-form-field-input-number(
                                                     data-name='maxMemorySize'
                                                     
data-ng-model='#{nearCfgEvictionPolicy}.maxMemorySize'
@@ -124,7 +125,8 @@ mixin ignite-form-field-tooltip(message)
                                                 )
                                         .details-row
                                             ignite-form-field(data-label='Max 
size')
-                                                
+ignite-form-field-tooltip("Maximum allowed size of cache before entry will 
start getting evicted")
+                                                ignite-form-field-tooltip
+                                                    | Maximum allowed size of 
cache before entry will start getting evicted
                                                 ignite-form-field-input-number(
                                                     data-name='maxSize'
                                                     
data-ng-model='#{nearCfgEvictionPolicy}.maxSize'

Reply via email to