You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by an...@apache.org on 2015/06/05 09:45:09 UTC
[5/5] incubator-ignite git commit: # ignite-843 WIP.
# ignite-843 WIP.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/04508dc0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/04508dc0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/04508dc0
Branch: refs/heads/ignite-843
Commit: 04508dc038143ff5928fafff980e07044ac3cc89
Parents: a6fc038
Author: Andrey <an...@gridgain.com>
Authored: Fri Jun 5 14:45:23 2015 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Fri Jun 5 14:45:23 2015 +0700
----------------------------------------------------------------------
.../nodejs/public/form-models/clusters.json | 2 +-
modules/webconfig/nodejs/views/caches.jade | 26 +++++------
modules/webconfig/nodejs/views/clusters.jade | 6 +--
.../nodejs/views/includes/controls.jade | 49 ++++++++++++--------
4 files changed, 45 insertions(+), 38 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/04508dc0/modules/webconfig/nodejs/public/form-models/clusters.json
----------------------------------------------------------------------
diff --git a/modules/webconfig/nodejs/public/form-models/clusters.json b/modules/webconfig/nodejs/public/form-models/clusters.json
index 19b9097..bdd12df 100644
--- a/modules/webconfig/nodejs/public/form-models/clusters.json
+++ b/modules/webconfig/nodejs/public/form-models/clusters.json
@@ -7,7 +7,7 @@
},
{
"label": "Discovery",
- "type": "dropdown",
+ "type": "dropdown-details",
"model": "discovery.kind",
"placeholder": "Choose discovery",
"items": "discoveries",
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/04508dc0/modules/webconfig/nodejs/views/caches.jade
----------------------------------------------------------------------
diff --git a/modules/webconfig/nodejs/views/caches.jade b/modules/webconfig/nodejs/views/caches.jade
index 9b69f00..e02d347 100644
--- a/modules/webconfig/nodejs/views/caches.jade
+++ b/modules/webconfig/nodejs/views/caches.jade
@@ -42,25 +42,23 @@ block content
form.form-horizontal(name='editForm' ng-if='backupItem')
h3 General
.settings-row(ng-repeat='field in general')
- div(ng-switch on='field.type')
- +form-row
+ +form-row
.panel(bs-collapse data-start-collapsed='true')
.panel-collapse(bs-collapse-target)
div(ng-repeat='group in advanced')
h3 {{group.label}}
.settings-row(ng-repeat='field in group.fields')
- div(ng-switch on='field.type')
- +form-row
- div(ng-switch-when='idxTypes')
- div
- label.col-sm-2 Key class:
- .col-sm-3
- +edt('create.keyCls', 'Fully qualified key class name')
- +tip
- div
- label.col-sm-2 Value class:
- .col-sm-3
- +edt('create.valCls', 'Fully qualified value class name')
+ +form-row
+ div(ng-switch-when='idxTypes')
+ div
+ label.col-sm-2 Key class:
+ .col-sm-3
+ +edt('create.keyCls', 'Fully qualified key class name')
+ +tip
+ div
+ label.col-sm-2 Value class:
+ .col-sm-3
+ +edt('create.valCls', 'Fully qualified value class name')
.panel-heading
.panel-title
span(bs-collapse-toggle)
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/04508dc0/modules/webconfig/nodejs/views/clusters.jade
----------------------------------------------------------------------
diff --git a/modules/webconfig/nodejs/views/clusters.jade b/modules/webconfig/nodejs/views/clusters.jade
index 6021005..4b95b5e 100644
--- a/modules/webconfig/nodejs/views/clusters.jade
+++ b/modules/webconfig/nodejs/views/clusters.jade
@@ -42,15 +42,13 @@ block content
form.form-horizontal(name='editForm' ng-if='backupItem')
h3 General
.settings-row(ng-repeat='field in general')
- div(ng-switch on='field.type')
- +form-row
+ +form-row
.panel(bs-collapse data-start-collapsed='true')
.panel-collapse(bs-collapse-target)
div(ng-repeat='group in advanced')
h3 {{group.label}}
.settings-row(ng-repeat='field in group.fields')
- div(ng-switch on='field.type')
- +form-row
+ +form-row
.panel-heading
.panel-title
span(bs-collapse-toggle)
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/04508dc0/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 8c28ff0..f831c89 100644
--- a/modules/webconfig/nodejs/views/includes/controls.jade
+++ b/modules/webconfig/nodejs/views/includes/controls.jade
@@ -21,22 +21,33 @@ mixin edt(mdl, ph)
input.form-control(type='text' ng-model=mdl placeholder=ph)
mixin form-row
- div(ng-switch-when='check')
- 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}}:
- .col-sm-3
- +edt('backupItem[field.model]', '{{field.placeholder}}')
- +tip
- div(ng-switch-when='dropdown')
- label.col-sm-2 {{field.label}}:
- .col-sm-3
- button.form-control(bs-select ng-model='backupItem[field.model]' data-template='/select' data-placeholder='{{field.placeholder}}' bs-options='item.value as item.label for item in {{field.items}}')
- +tip
- div(ng-switch-when='dropdown-multiple')
- label.col-sm-2 {{field.label}}:
- .col-sm-3
- button.form-control(bs-select ng-model='backupItem[field.model]' data-multiple='1' data-template='/select' data-placeholder='{{field.placeholder}}' bs-options='item.value as item.label for item in {{field.items}}')
- +tip
+ div(ng-switch='field.type')
+ div(ng-switch-when='check')
+ 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}}:
+ .col-sm-3
+ +edt('backupItem[field.model]', '{{field.placeholder}}')
+ +tip
+ div(ng-switch-when='dropdown')
+ label.col-sm-2 {{field.label}}:
+ .col-sm-3
+ button.form-control(bs-select ng-model='backupItem[field.model]' data-template='/select' data-placeholder='{{field.placeholder}}' bs-options='item.value as item.label for item in {{field.items}}')
+ +tip
+ div(ng-switch-when='dropdown-multiple')
+ label.col-sm-2 {{field.label}}:
+ .col-sm-3
+ button.form-control(bs-select ng-model='backupItem[field.model]' data-multiple='1' data-template='/select' data-placeholder='{{field.placeholder}}' bs-options='item.value as item.label for item in {{field.items}}')
+ +tip
+ div(ng-switch-when='dropdown-details')
+ label.col-sm-2 {{field.label}}:
+ .col-sm-3
+ button.form-control(bs-select ng-model='backupItem[field.model]' data-template='/select' data-placeholder='{{field.placeholder}}' bs-options='item.value as item.label for item in {{field.items}}')
+ +tip
+ div(ng-switch='backupItem[field.model]')
+ div(ng-switch-when='Vm')
+ label.col-sm-2 {{backupItem[field.model]}}:
+ div(ng-switch-when='Multicast')
+ label.col-sm-2 {{backupItem[field.model]}}:
\ No newline at end of file