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 04:56:58 UTC
incubator-ignite git commit: # ignite-843 Fixed ui
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-843 e7088d5dc -> 14fa6f65f
# ignite-843 Fixed ui
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/14fa6f65
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/14fa6f65
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/14fa6f65
Branch: refs/heads/ignite-843
Commit: 14fa6f65fd12c47b23e2b9755f62c607d85b5c77
Parents: e7088d5
Author: Andrey <an...@gridgain.com>
Authored: Thu Jul 23 09:57:58 2015 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Thu Jul 23 09:57:58 2015 +0700
----------------------------------------------------------------------
.../src/main/js/views/includes/controls.jade | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/14fa6f65/modules/web-control-center/src/main/js/views/includes/controls.jade
----------------------------------------------------------------------
diff --git a/modules/web-control-center/src/main/js/views/includes/controls.jade b/modules/web-control-center/src/main/js/views/includes/controls.jade
index 00ab6fa..d8bf89e 100644
--- a/modules/web-control-center/src/main/js/views/includes/controls.jade
+++ b/modules/web-control-center/src/main/js/views/includes/controls.jade
@@ -76,7 +76,8 @@ mixin table-pair(header, tblMdl, keyFld, valFld, keyPlaceholder, valPlaceholder)
label.labelField {{$index + 1}})
+btn-save('tablePairSaveVisible(curKey, curValue)', 'tablePairSave(tablePairValid, backupItem, field, curKey, curValue, $index)')
+table-pair-edit('curKey', 'curValue', keyPlaceholder, valPlaceholder)
- tr(ng-show='tableNewItemActive(field)')
+ tfoot(ng-show='tableNewItemActive(field)')
+ tr
td.col-sm-12
+btn-save('tablePairSaveVisible(newKey, newValue)', 'tablePairSave(tablePairValid, backupItem, field, newKey, newValue, -1)')
+table-pair-edit('newKey', 'newValue', keyPlaceholder, valPlaceholder)
@@ -256,7 +257,8 @@ mixin form-row-custom(lblClasses, fieldClasses)
+btn-save('tableSimpleSaveVisible(curValue)', 'tableSimpleSave(tableSimpleValid, backupItem, field, curValue, $index)')
.input-tip
input.form-control(type='text' ng-model='curValue' placeholder='{{field.placeholder}}')
- tr(ng-show='tableNewItemActive(field)')
+ tfoot(ng-show='tableNewItemActive(field)')
+ tr
td.col-sm-12
+btn-save('tableSimpleSaveVisible(newValue)', 'tableSimpleSave(tableSimpleValid, backupItem, field, newValue, -1)')
.input-tip
@@ -284,7 +286,8 @@ mixin form-row-custom(lblClasses, fieldClasses)
label.labelField {{$index + 1}})
+btn-save('tableDbFieldSaveVisible(curDbName, curDbType, curJavaName, curJavaType)', 'tableDbFieldSave(field, curDbName, curDbType, curJavaName, curJavaType, $index)')
+table-db-field-edit('curDbName', 'curDbType', 'curJavaName', 'curJavaType')
- tr(ng-show='tableNewItemActive(field)')
+ tfoot(ng-show='tableNewItemActive(field)')
+ tr
td.col-sm-12
+btn-save('tableDbFieldSaveVisible(newDbName, newDbType, newJavaName, newJavaType)', 'tableDbFieldSave(field, newDbName, newDbType, newJavaName, newJavaType, -1)')
+table-db-field-edit('newDbName', 'newDbType', 'newJavaName', 'newJavaType')
@@ -296,7 +299,7 @@ mixin form-row-custom(lblClasses, fieldClasses)
.col-sm-12(ng-show='(#{fieldMdl} && #{fieldMdl}.length > 0) || tableNewItemActive(field)')
.col-sm-6
.table-details
- table.links-edit(st-table=fieldMdl)
+ table.links-edit.col-sm-12(st-table=fieldMdl)
tbody
tr(ng-repeat='group in #{fieldMdl}')
td.col-sm-12
@@ -325,7 +328,8 @@ mixin form-row-custom(lblClasses, fieldClasses)
td
+btn-save('tableGroupItemSaveVisible(newFieldName, newClassName)', 'tableGroupItemSave(newFieldName, newClassName, newDirection, groupIndex, -1)')
+table-group-item-edit('newFieldName', 'newClassName', 'newDirection')
- tr(ng-show='tableNewItemActive(field)')
+ tfoot(ng-show='tableNewItemActive(field)')
+ tr
td.col-sm-12
+btn-save('tableGroupSaveVisible(newGroupName)', 'tableGroupSave(newGroupName, -1)')
.input-tip