You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ak...@apache.org on 2015/06/17 11:51:20 UTC
[1/2] incubator-ignite git commit: # IGNITE-843 Added [reordering]
option for panel with table.
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-843 d623c9da7 -> fa1906def
# IGNITE-843 Added [reordering] option for panel with table.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/122eb31f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/122eb31f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/122eb31f
Branch: refs/heads/ignite-843
Commit: 122eb31f613ab587554dba1f6cbefbb49928edb9
Parents: e139662
Author: AKuznetsov <ak...@gridgain.com>
Authored: Wed Jun 17 16:49:34 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Wed Jun 17 16:49:34 2015 +0700
----------------------------------------------------------------------
modules/webconfig/nodejs/public/form-models/clusters.json | 1 +
modules/webconfig/nodejs/views/includes/controls.jade | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/122eb31f/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 ab8c56f..4236192 100644
--- a/modules/webconfig/nodejs/public/form-models/clusters.json
+++ b/modules/webconfig/nodejs/public/form-models/clusters.json
@@ -28,6 +28,7 @@
"type": "table-simple",
"model": "addresses",
"editIdx": -1,
+ "reordering": true,
"placeholder": "IP address",
"tip": [
"Addresses may be represented as follows:",
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/122eb31f/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 de19f9f..994cdcd 100644
--- a/modules/webconfig/nodejs/views/includes/controls.jade
+++ b/modules/webconfig/nodejs/views/includes/controls.jade
@@ -64,7 +64,7 @@ mixin details-row
i.tipField.fa.fa-floppy-o(ng-click='detail.editIdx = -1; #{detailMdl}[$index]=curValue')
.input-tip
input.form-control(type='text' ng-model='curValue' placeholder='{{detail.placeholder}}')
- td.col-sm-1
+ td.col-sm-1(ng-if='detail.reordering')
i.fa.fa-arrow-up(ng-show='$index > 0' ng-click='detail.editIdx = -1')
i.fa.fa-arrow-down(ng-show='$index < #{detailMdl}.length - 1' ng-click='detail.editIdx = -1')
.details-label
@@ -147,7 +147,7 @@ mixin form-row
i.tipField.fa.fa-floppy-o(ng-click='field.editIdx = -1; #{tblMdl}[$index]=curValue')
.input-tip
input.form-control(type='text' ng-model='curValue' placeholder='{{field.placeholder}}')
- td.col-sm-1
+ td.col-sm-1(ng-if='field.reordering')
i.fa.fa-arrow-up(ng-show='$index > 0' ng-click='field.editIdx = -1')
i.fa.fa-arrow-down(ng-show='$index < #{tblMdl}.length - 1' ng-click='field.editIdx = -1')
.col-sm-5
[2/2] incubator-ignite git commit: Merge remote-tracking branch
'origin/ignite-843' into ignite-843
Posted by ak...@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/fa1906de
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/fa1906de
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/fa1906de
Branch: refs/heads/ignite-843
Commit: fa1906defc931e06f2ebbed31f92fd08ec67d08f
Parents: 122eb31 d623c9d
Author: AKuznetsov <ak...@gridgain.com>
Authored: Wed Jun 17 16:51:14 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Wed Jun 17 16:51:14 2015 +0700
----------------------------------------------------------------------
.../public/javascripts/controllers/caches.js | 4 +--
.../public/javascripts/controllers/clusters.js | 4 +--
.../public/javascripts/controllers/common.js | 9 ++++--
.../nodejs/public/stylesheets/style.css | 2 +-
.../nodejs/public/stylesheets/style.less | 9 ++++--
.../webconfig/nodejs/views/indexedTypes.jade | 33 --------------------
modules/webconfig/nodejs/views/login.jade | 4 +--
modules/webconfig/nodejs/views/register.jade | 24 --------------
modules/webconfig/nodejs/views/simplePopup.jade | 33 --------------------
9 files changed, 20 insertions(+), 102 deletions(-)
----------------------------------------------------------------------