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/07/23 10:40:57 UTC
[26/50] [abbrv] incubator-ignite git commit: # ignite-843 revert
# ignite-843 revert
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/fe13f028
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/fe13f028
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/fe13f028
Branch: refs/heads/ignite-1121
Commit: fe13f0282e33a8bb701f38f40022ec105d48c644
Parents: 66e7328
Author: Andrey <an...@gridgain.com>
Authored: Wed Jul 22 09:23:54 2015 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Wed Jul 22 09:23:54 2015 +0700
----------------------------------------------------------------------
.../nodejs/views/includes/controls.jade | 17 +++++++----------
1 file changed, 7 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fe13f028/modules/web-control-center/nodejs/views/includes/controls.jade
----------------------------------------------------------------------
diff --git a/modules/web-control-center/nodejs/views/includes/controls.jade b/modules/web-control-center/nodejs/views/includes/controls.jade
index 0725749..0ed22b6 100644
--- a/modules/web-control-center/nodejs/views/includes/controls.jade
+++ b/modules/web-control-center/nodejs/views/includes/controls.jade
@@ -54,14 +54,14 @@ mixin table-pair-edit(keyModel, valModel, keyPlaceholder, valPlaceholder)
input.form-control(type='text' ng-model=keyModel placeholder=keyPlaceholder)
mixin table-pair(header, tblMdl, keyFld, valFld, keyPlaceholder, valPlaceholder)
- .col-sm-12
+ .col-sm-6
label.table-header #{header}:
+tipLabel('field.tip')
button.btn.btn-primary.fieldButton(ng-click='tableNewItem(field)') Add
- table.panel-details.links-edit.col-sm-12(st-table=tblMdl)
+ table.links-edit.col-sm-12(st-table=tblMdl)
tbody
tr.col-sm-12(ng-repeat='item in #{tblMdl}')
- td.col-sm-12
+ td.col-sm-6
div(ng-show='!tableEditing(field, $index)')
a.labelFormField(ng-click='curPair = tableStartEdit(backupItem, field, $index); curKey = curPair.#{keyFld}; curValue = curPair.#{valFld}') {{$index + 1}}) {{item.#{keyFld}}} / {{item.#{valFld}}}
+btn-remove('tableRemove(backupItem, field, $index)')
@@ -70,7 +70,7 @@ mixin table-pair(header, tblMdl, keyFld, valFld, keyPlaceholder, valPlaceholder)
+btn-save('tablePairSaveVisible(curKey, curValue)', 'tablePairSave(tablePairValid, backupItem, field, curKey, curValue, $index)')
+table-pair-edit('curKey', 'curValue', keyPlaceholder, valPlaceholder)
tr.col-sm-12(ng-show='tableNewItemActive(field)')
- td.col-sm-12
+ td.col-sm-6
+btn-save('tablePairSaveVisible(newKey, newValue)', 'tablePairSave(tablePairValid, backupItem, field, newKey, newValue, -1)')
+table-pair-edit('newKey', 'newValue', keyPlaceholder, valPlaceholder)
@@ -251,9 +251,9 @@ mixin form-row-custom(lblClasses, fieldClasses)
+btn-save('tableSimpleSaveVisible(newValue)', 'tableSimpleSave(tableSimpleValid, backupItem, field, newValue, -1)')
.input-tip
input.form-control(type='text' ng-model='newValue' placeholder='{{field.placeholder}}')
- .col-sm-6(ng-switch-when='indexedTypes')
+ div(ng-switch-when='indexedTypes')
+table-pair('Index key-value type pairs', fieldMdl, 'keyClass', 'valueClass', 'Key class full name', 'Value class full name')
- .col-sm-6(ng-switch-when='queryFields' ng-hide=fieldHide)
+ div(ng-switch-when='queryFields' ng-hide=fieldHide)
+table-pair('{{field.label}}', fieldMdl, 'name', 'className', 'Field name', 'Field class full name')
div(ng-switch-when='dbFields' ng-hide=fieldHide)
.col-sm-6
@@ -313,7 +313,4 @@ mixin form-row-custom(lblClasses, fieldClasses)
td.col-sm-6
+btn-save('tableGroupSaveVisible(newGroupName)', 'tableGroupSave(newGroupName, -1)')
.input-tip
- input.form-control(type='text' ng-model='newGroupName' placeholder='Group name')
-
-
-
+ input.form-control(type='text' ng-model='newGroupName' placeholder='Group name')
\ No newline at end of file