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/08 13:35:50 UTC
[1/2] incubator-ignite git commit: # ignite-850 WIP Discovery details.
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-843 3493e95d1 -> 9805e8c0f
# ignite-850 WIP Discovery 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/2ee1c4cf
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/2ee1c4cf
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/2ee1c4cf
Branch: refs/heads/ignite-843
Commit: 2ee1c4cfe4aa1ce0999fb1b77629cb0bbf8cbe13
Parents: b54b256
Author: Andrey <an...@gridgain.com>
Authored: Mon Jun 8 18:36:08 2015 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Mon Jun 8 18:36:08 2015 +0700
----------------------------------------------------------------------
.../nodejs/public/form-models/clusters.json | 2 +-
.../webconfig/nodejs/views/includes/controls.jade | 17 ++++++++++++++++-
2 files changed, 17 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2ee1c4cf/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 b178f0a..36ce6fa 100644
--- a/modules/webconfig/nodejs/public/form-models/clusters.json
+++ b/modules/webconfig/nodejs/public/form-models/clusters.json
@@ -19,7 +19,7 @@
"Vm": [
{
"label": "Addresses",
- "type": "table",
+ "type": "addresses",
"model": "addresses"
}
],
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2ee1c4cf/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..35ffdbb 100644
--- a/modules/webconfig/nodejs/views/includes/controls.jade
+++ b/modules/webconfig/nodejs/views/includes/controls.jade
@@ -31,7 +31,7 @@ mixin details-row
div(ng-switch-when='text')
label.col-sm-2.details-label {{detail.label}}:
.col-sm-3
- input.form-control(type='text' ng-model=detailMdl placeholder='{{field.model}}{{detail.model}}')
+ input.form-control(type='text' ng-model=detailMdl placeholder='{{detail.placeholder}}')
+tip-detail
div(ng-switch-when='dropdown')
label.col-sm-2.details-label {{detail.label}}:
@@ -43,6 +43,21 @@ mixin details-row
.col-sm-3
button.form-control(bs-select ng-model=detailMdl data-multiple='1' data-template='/select' data-placeholder='{{detail.placeholder}}' bs-options='item.value as item.label for item in {{detail.items}}')
+tip-detail
+ div(ng-switch-when='addresses')
+ .details-label
+ button.btn.btn-primary(ng-click='addAddress()') Add address
+ //+tip
+ .col-sm-10.links.details-row(style='margin-bottom: 0px;')
+ table
+ tbody
+ tr
+ td
+ a 1. 127.0.0.1:47500..47510
+ label.fa.fa-remove
+ tr
+ td
+ a 2. 9.9.9.9:47501
+ label.fa.fa-remove
mixin form-row
- var masterMdl = 'backupItem[field.group][field.model]'
[2/2] incubator-ignite git commit: Merge remote-tracking branch
'origin/ignite-843' into ignite-843
Posted by an...@apache.org.
Merge remote-tracking branch 'origin/ignite-843' into ignite-843
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/9805e8c0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9805e8c0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9805e8c0
Branch: refs/heads/ignite-843
Commit: 9805e8c0f7bb4c14c08e8a2a6fc753bb314aed34
Parents: 2ee1c4c 3493e95
Author: Andrey <an...@gridgain.com>
Authored: Mon Jun 8 18:36:27 2015 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Mon Jun 8 18:36:27 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/9805e8c0/modules/webconfig/nodejs/views/includes/controls.jade
----------------------------------------------------------------------