IGNITE-843 Groups minor.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/27b6f953 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/27b6f953 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/27b6f953 Branch: refs/heads/ignite-1121 Commit: 27b6f9532fdcef81fec11cd94cac1ea92a57d72f Parents: 9499ee2 Author: AKuznetsov <akuznet...@gridgain.com> Authored: Tue Jul 21 13:01:13 2015 +0700 Committer: AKuznetsov <akuznet...@gridgain.com> Committed: Tue Jul 21 13:01:13 2015 +0700 ---------------------------------------------------------------------- .../nodejs/public/stylesheets/style.less | 3 +- .../nodejs/views/includes/controls.jade | 47 ++++++++++---------- 2 files changed, 26 insertions(+), 24 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/27b6f953/modules/web-control-center/nodejs/public/stylesheets/style.less ---------------------------------------------------------------------- diff --git a/modules/web-control-center/nodejs/public/stylesheets/style.less b/modules/web-control-center/nodejs/public/stylesheets/style.less index a16318d..da6ffae 100644 --- a/modules/web-control-center/nodejs/public/stylesheets/style.less +++ b/modules/web-control-center/nodejs/public/stylesheets/style.less @@ -740,7 +740,8 @@ button .caret, .btn .caret { } .theme-line table.links-edit:extend(.theme-line .links table all) { - margin-bottom: 10px; + margin-top: 5px; + margin-bottom: 5px; label { line-height: @input-height; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/27b6f953/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 f45b60e..141a198 100644 --- a/modules/web-control-center/nodejs/views/includes/controls.jade +++ b/modules/web-control-center/nodejs/views/includes/controls.jade @@ -52,7 +52,7 @@ mixin table-pair(header, tblMdl, keyFld, valFld, keyPlaceholder, valPlaceholder) label.table-header #{header}: +tipLabel('field.tip') button.btn.btn-primary.fieldButton(ng-click='tableNewItem(field)') Add - table.links-edit.col-sm-12(st-table=tblMdl ng-show='#{tblMdl}.length > 0') + table.links-edit.col-sm-12(st-table=tblMdl) tbody tr.col-sm-12(ng-repeat='item in #{tblMdl}') td.col-sm-6 @@ -63,10 +63,10 @@ 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) - .settings-row(ng-show='tableNewItemActive(field)') - .col-sm-6 - +btn-save('tablePairSaveVisible(newKey, newValue)', 'tablePairSave(tablePairValid, backupItem, field, newKey, newValue, -1)') - +table-pair-edit('newKey', 'newValue', keyPlaceholder, valPlaceholder) + tr.col-sm-12(ng-show='tableNewItemActive(field)') + td.col-sm-6 + +btn-save('tablePairSaveVisible(newKey, newValue)', 'tablePairSave(tablePairValid, backupItem, field, newKey, newValue, -1)') + +table-pair-edit('newKey', 'newValue', keyPlaceholder, valPlaceholder) mixin details-row - var lblDetailClasses = ['col-sm-4', 'details-label'] @@ -226,7 +226,7 @@ mixin form-row-custom(lblClasses, fieldClasses) label.table-header {{field.label}}: +tipLabel('field.tableTip') button.btn.btn-primary.fieldButton(ng-click='tableNewItem(field)') Add - table.links-edit.col-sm-12(st-table='#{fieldMdl}' ng-show='#{fieldMdl}.length > 0') + table.links-edit.col-sm-12(st-table='#{fieldMdl}') tbody tr.col-sm-12(ng-repeat='item in #{fieldMdl} track by $index') td.col-sm-6 @@ -240,11 +240,11 @@ 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}}') - .settings-row(ng-show='tableNewItemActive(field)') - .col-sm-6 - +btn-save('tableSimpleSaveVisible(newValue)', 'tableSimpleSave(tableSimpleValid, backupItem, field, newValue, -1)') - .input-tip - input.form-control(type='text' ng-model='newValue' placeholder='{{field.placeholder}}') + tr.col-sm-12(ng-show='tableNewItemActive(field)') + td.col-sm-6 + +btn-save('tableSimpleSaveVisible(newValue)', 'tableSimpleSave(tableSimpleValid, backupItem, field, newValue, -1)') + .input-tip + input.form-control(type='text' ng-model='newValue' placeholder='{{field.placeholder}}') div(ng-switch-when='indexedTypes') +table-pair('Index key-value type pairs', fieldMdl, 'keyClass', 'valueClass', 'Key class full name', 'Value class full name') div(ng-switch-when='queryFields' ng-hide=fieldHide) @@ -265,10 +265,10 @@ 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') - .settings-row(ng-show='tableNewItemActive(field)') - .col-sm-6 - +btn-save('tableDbFieldSaveVisible(newDbName, newDbType, newJavaName, newJavaType)', 'tableDbFieldSave(field, newDbName, newDbType, newJavaName, newJavaType, -1)') - +table-db-field-edit('newDbName', 'newDbType', 'newJavaName', 'newJavaType') + tr(ng-show='tableNewItemActive(field)') + td.col-sm-6 + +btn-save('tableDbFieldSaveVisible(newDbName, newDbType, newJavaName, newJavaType)', 'tableDbFieldSave(field, newDbName, newDbType, newJavaName, newJavaType, -1)') + +table-db-field-edit('newDbName', 'newDbType', 'newJavaName', 'newJavaType') div(ng-switch-when='queryGroups' ng-hide=fieldHide) .col-sm-6 label.table-header {{field.label}}: @@ -299,14 +299,15 @@ mixin form-row-custom(lblClasses, fieldClasses) label.labelField {{$index + 1}}) +btn-save('tableGroupItemSaveVisible(curFieldName, curClassName)', 'tableGroupItemSave(curFieldName, curClassName, curDirection, groupIndex, $index)') +table-group-item-edit('curFieldName', 'curClassName', 'curDirection') - .settings-row(style='padding-left: 18px' ng-show='tableGroupNewItemActive(groupIndex)') - +btn-save('tableGroupItemSaveVisible(newFieldName, newClassName)', 'tableGroupItemSave(newFieldName, newClassName, newDirection, groupIndex, -1)') - +table-group-item-edit('newFieldName', 'newClassName', 'newDirection') - .settings-row(ng-show='tableNewItemActive(field)') - .col-sm-6 - +btn-save('tableGroupSaveVisible(newGroupName)', 'tableGroupSave(newGroupName, -1)') - .input-tip - input.form-control(type='text' ng-model='newGroupName' placeholder='Group name') + tr.col-sm-12(style='padding-left: 18px' ng-show='tableGroupNewItemActive(groupIndex)') + td + +btn-save('tableGroupItemSaveVisible(newFieldName, newClassName)', 'tableGroupItemSave(newFieldName, newClassName, newDirection, groupIndex, -1)') + +table-group-item-edit('newFieldName', 'newClassName', 'newDirection') + tr.col-sm-12(ng-show='tableNewItemActive(field)') + td.col-sm-6 + +btn-save('tableGroupSaveVisible(newGroupName)', 'tableGroupSave(newGroupName, -1)') + .input-tip + input.form-control(type='text' ng-model='newGroupName' placeholder='Group name')
