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/09/08 04:42:56 UTC
ignite git commit: # GG-843 Fixed metadata tables.
Repository: ignite
Updated Branches:
refs/heads/ignite-843 934cc901f -> 6f86b9dc2
# GG-843 Fixed metadata tables.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/6f86b9dc
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/6f86b9dc
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/6f86b9dc
Branch: refs/heads/ignite-843
Commit: 6f86b9dc2a8790b29c134d1759e9d56a40072f43
Parents: 934cc90
Author: Andrey <an...@gridgain.com>
Authored: Tue Sep 8 09:43:52 2015 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Tue Sep 8 09:43:52 2015 +0700
----------------------------------------------------------------------
.../src/main/js/views/includes/controls.jade | 32 ++++++++++----------
1 file changed, 16 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/6f86b9dc/modules/control-center-web/src/main/js/views/includes/controls.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/views/includes/controls.jade b/modules/control-center-web/src/main/js/views/includes/controls.jade
index a48e750..bc2efc6 100644
--- a/modules/control-center-web/src/main/js/views/includes/controls.jade
+++ b/modules/control-center-web/src/main/js/views/includes/controls.jade
@@ -92,10 +92,10 @@ mixin table-pair(header, tblMdl, keyFld, valFld, keyPlaceholder, valPlaceholder,
+group-btn-add('tableNewItem(field)', 'field.addTip')
.group-content-empty(ng-if='!((#{tblMdl} && #{tblMdl}.length > 0) || tableNewItemActive(field))') Not defined
.group-content(ng-show='(#{tblMdl} && #{tblMdl}.length > 0) || tableNewItemActive(field)')
- table.col-sm-12.links-edit(id='{{::field.model}}' st-table=tblMdl)
+ table.links-edit(id='{{::field.model}}' st-table=tblMdl)
tbody
tr(ng-repeat='item in #{tblMdl}')
- td.col-sm-12
+ td
div(ng-show='!tableEditing(field, $index)')
a.labelFormField(ng-click='tableStartEdit(backupItem, field, $index)') {{compactJavaName(field.model, $index + 1, 55, [item.#{keyFld}, item.#{valFld}])}}
+btn-remove('tableRemove(backupItem, field, $index)', 'field.removeTip')
@@ -158,7 +158,7 @@ mixin details-row
+group-btn-add('tableNewItem(detail)', 'detail.addTip')
.group-content-empty(ng-show='!((#{detailMdl} && #{detailMdl}.length > 0) || tableNewItemActive(detail))') Not defined
.group-content(ng-show='(#{detailMdl} && #{detailMdl}.length > 0) || tableNewItemActive(detail)')
- table.col-sm-12.links-edit-details(st-table='#{detailMdl}')
+ table.links-edit-details(st-table='#{detailMdl}')
tbody
tr(ng-repeat='item in #{detailMdl} track by $index')
td
@@ -175,7 +175,7 @@ mixin details-row
+ico-exclamation('{{detail.model}}.edit', 'ipaddress', 'Invalid address, see help for format description.')
tfoot(ng-show='tableNewItemActive(detail)')
tr
- td.col-sm-12
+ td
+btn-save('tableSimpleSaveVisible(detail, -1)', 'tableSimpleSave(tableSimpleValid, backupItem, detail, -1)')
.input-tip.form-group.has-feedback
input.form-control(id='new{{::detail.focusId}}' name='{{detail.model}}' type='text' ng-model='detail.newValue' ng-focus='tableNewItem(detail)' placeholder='{{::detail.placeholder}}' on-enter='tableSimpleSaveVisible(detail, -1) && tableSimpleSave(tableSimpleValid, backupItem, detail, -1)' on-escape='tableReset()')&attributes(customValidators)
@@ -331,10 +331,10 @@ mixin form-row-custom(lblClasses, fieldClasses, dataSource)
+group-btn-add('tableNewItem(field)', 'field.addTip')
.group-content-empty(ng-show='!((#{fieldMdl} && #{fieldMdl}.length > 0) || tableNewItemActive(field))') Not defined
.group-content(ng-show='(#{fieldMdl} && #{fieldMdl}.length > 0) || tableNewItemActive(field)')
- table.col-sm-12.links-edit(id='{{::field.model}}' st-table='#{fieldMdl}')
+ table.links-edit(id='{{::field.model}}' st-table='#{fieldMdl}')
tbody
tr(ng-repeat='item in #{fieldMdl} track by $index')
- td.col-sm-12
+ td
div(ng-show='!tableEditing(field, $index)')
a.labelFormField(ng-click='tableStartEdit(backupItem, field, $index)') {{compactJavaName(field.model, $index + 1, 55, [item])}}
+btn-remove('tableRemove(backupItem, field, $index)', 'field.removeTip')
@@ -347,7 +347,7 @@ mixin form-row-custom(lblClasses, fieldClasses, dataSource)
input.form-control(id='cur{{::field.focusId}}' type='text' ng-model='field.curValue' placeholder='{{::field.placeholder}}' on-enter='tableSimpleSaveVisible(field) && tableSimpleSave(tableSimpleValid, backupItem, field, $index)' on-escape='tableReset()')
tfoot(ng-show='tableNewItemActive(field)')
tr
- td.col-sm-12
+ td
+btn-save('tableSimpleSaveVisible(field, -1)', 'tableSimpleSave(tableSimpleValid, backupItem, field, -1)')
.input-tip
input.form-control(id='new{{::field.focusId}}' type='text' ng-model='field.newValue' placeholder='{{::field.placeholder}}' on-enter='tableSimpleSaveVisible(field, -1) && tableSimpleSave(tableSimpleValid, backupItem, field, -1)' on-escape='tableReset()')
@@ -365,10 +365,10 @@ mixin form-row-custom(lblClasses, fieldClasses, dataSource)
+group-btn-add('tableNewItem(field)', 'field.addTip')
.group-content-empty(ng-show='!((#{fieldMdl} && #{fieldMdl}.length > 0) || tableNewItemActive(field))') Not defined
.group-content(ng-show='(#{fieldMdl} && #{fieldMdl}.length > 0) || tableNewItemActive(field)')
- table.col-sm-12.links-edit(st-table=fieldMdl)
+ table.links-edit(st-table=fieldMdl)
tbody
tr(ng-repeat='item in #{fieldMdl}')
- td.col-sm-12
+ td
div(ng-show='!tableEditing(field, $index)')
a.labelFormField(ng-click='tableStartEdit(backupItem, field, $index)') {{$index + 1}}) {{item.databaseName}} / {{item.databaseType}} / {{item.javaName}} / {{item.javaType}}
+btn-remove('tableRemove(backupItem, field, $index)', 'field.removeTip')
@@ -376,7 +376,7 @@ mixin form-row-custom(lblClasses, fieldClasses, dataSource)
+table-db-field-edit('cur', '{{::field.focusId}}', '$index')
tfoot(ng-show='tableNewItemActive(field)')
tr
- td.col-sm-12
+ td
+table-db-field-edit('new', '{{::field.focusId}}', '-1')
.group-section(ng-switch-when='table-query-groups' ng-hide=fieldHide)
.col-sm-12.group
@@ -386,11 +386,11 @@ mixin form-row-custom(lblClasses, fieldClasses, dataSource)
+group-btn-add('tableNewItem(field)', 'field.addTip')
.group-content-empty(id='{{::field.id + "-add"}}' ng-show='!((#{fieldMdl} && #{fieldMdl}.length > 0) || tableNewItemActive(field))') Not defined
.group-content(ng-show='(#{fieldMdl} && #{fieldMdl}.length > 0) || tableNewItemActive(field)')
- table.links-edit.col-sm-12(st-table=fieldMdl ng-init='newDirection = false')
+ table.links-edit(st-table=fieldMdl ng-init='newDirection = false')
tbody
tr(ng-repeat='group in #{fieldMdl}')
- td.col-sm-12
- .col-sm-12(ng-show='!tableEditing(field, $index)')
+ td
+ div(ng-show='!tableEditing(field, $index)')
a.labelFormField(id='{{field.id + $index}}' ng-click='tableStartEdit(backupItem, field, $index)') {{$index + 1}}) {{group.name}}
+btn-remove('tableRemove(backupItem, field, $index)', 'field.removeTip')
+btn-add('tableGroupNewItem(field, $index)', 'field.addItemTip')
@@ -400,7 +400,7 @@ mixin form-row-custom(lblClasses, fieldClasses, dataSource)
.input-tip
input#curGroupName.form-control(type='text' ng-model='field.curGroupName' placeholder='Index name' on-enter='tableGroupSaveVisible(field, $index) && tableGroupSave(field, $index)' on-escape='tableReset()')
.margin-left-dflt
- table.links-edit-sub.col-sm-12(st-table='group.fields' ng-init='groupIndex = $index')
+ table.links-edit-sub(st-table='group.fields' ng-init='groupIndex = $index')
tbody
tr(ng-repeat='groupItem in group.fields')
td
@@ -410,12 +410,12 @@ mixin form-row-custom(lblClasses, fieldClasses, dataSource)
div(ng-if='tableGroupItemEditing(groupIndex, $index)')
+table-group-item-edit('cur', '$index')
tfoot(ng-if='tableGroupNewItemActive(groupIndex)')
- tr.col-sm-12(style='padding-left: 18px')
+ tr(style='padding-left: 18px')
td
+table-group-item-edit('new', '-1')
tfoot(ng-show='tableNewItemActive(field)')
tr
- td.col-sm-12
+ td
+btn-save('tableGroupSaveVisible(field, -1)', 'tableGroupSave(field, -1)')
.input-tip
input#newGroupName.form-control(type='text' ng-model='field.newGroupName' placeholder='Group name' on-enter='tableGroupSaveVisible(field, -1) && tableGroupSave(field, -1)' on-escape='tableReset()')