ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From anovi...@apache.org
Subject [1/2] incubator-ignite git commit: # ignite-850 WIP Discovery details.
Date Mon, 08 Jun 2015 11:35:50 GMT
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 <anovikov@gridgain.com>
Authored: Mon Jun 8 18:36:08 2015 +0700
Committer: Andrey <anovikov@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&nbsp;
+                                label.fa.fa-remove
+                        tr
+                            td
+                                a 2. 9.9.9.9:47501&nbsp;
+                                label.fa.fa-remove
 
 mixin form-row
     - var masterMdl = 'backupItem[field.group][field.model]'


Mime
View raw message