Repository: incubator-ignite Updated Branches: refs/heads/ignite-843 e124dd332 -> af5337069
IGNITE-843 Fixed margins. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/af533706 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/af533706 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/af533706 Branch: refs/heads/ignite-843 Commit: af5337069393a8edaefbcc97576fdfa3fc6e9538 Parents: e124dd3 Author: AKuznetsov <akuznet...@gridgain.com> Authored: Mon Aug 10 18:06:14 2015 +0700 Committer: AKuznetsov <akuznet...@gridgain.com> Committed: Mon Aug 10 18:06:14 2015 +0700 ---------------------------------------------------------------------- .../src/main/js/controllers/models/metadata.json | 2 +- .../src/main/js/views/includes/controls.jade | 14 ++++++++------ 2 files changed, 9 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/af533706/modules/control-center-web/src/main/js/controllers/models/metadata.json ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/controllers/models/metadata.json b/modules/control-center-web/src/main/js/controllers/models/metadata.json index 91a875a..b0cf070 100644 --- a/modules/control-center-web/src/main/js/controllers/models/metadata.json +++ b/modules/control-center-web/src/main/js/controllers/models/metadata.json @@ -68,7 +68,7 @@ "fields": [ { "label": "Query fields", - "type": "queryFields", + "type": "queryFieldsFirst", "model": "queryFields", "keyName": "name", "valueName": "className", http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/af533706/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 3b0f10a..2ef3127 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 @@ -143,7 +143,7 @@ mixin details-row +tipField('detail.tip') .input-tip button.form-control(bs-select data-multiple='1' data-placeholder='{{::detail.placeholder}}' bs-options='item.value as item.label for item in {{detail.items}}')&attributes(detailCommon) - div(ng-switch-when='table-simple')&attributes(detailCommon) + .section(ng-switch-when='table-simple')&attributes(detailCommon) div(ng-if='detail.label') label {{::detail.label}}: +tipLabel('detail.tableTip') @@ -290,7 +290,7 @@ mixin form-row-custom(lblClasses, fieldClasses, dataSource) .col-sm-7.panel-details(ng-show='#{expanded} && #{fieldMdl}') .details-row(ng-repeat='detail in field.details[#{fieldMdl}].fields') +details-row - div(ng-switch-when='table-simple' ng-hide=fieldHide)&attributes(fieldCommon) + .section(ng-switch-when='table-simple' ng-hide=fieldHide)&attributes(fieldCommon) .col-sm-7.fieldset .legend label {{::field.label}}: @@ -317,11 +317,13 @@ mixin form-row-custom(lblClasses, fieldClasses, dataSource) +btn-save('tableSimpleSaveVisible(newValue)', 'tableSimpleSave(tableSimpleValid, backupItem, field, newValue, -1)') .input-tip input.form-control(id='new{{::field.focusId}}' type='text' ng-model='newValue' placeholder='{{::field.placeholder}}' on-enter='tableSimpleSaveVisible(newValue) && tableSimpleSave(tableSimpleValid, backupItem, field, newValue, -1)' on-escape='tableReset()') - div(ng-switch-when='indexedTypes') + .section(ng-switch-when='indexedTypes') +table-pair('Index key-value type pairs', fieldMdl, 'keyClass', 'valueClass', 'Key class full name', 'Value class full name', true, false) - div(ng-switch-when='queryFields' ng-hide=fieldHide) + div(ng-switch-when='queryFieldsFirst' ng-hide=fieldHide) +table-pair('{{::field.label}}', fieldMdl, 'name', 'className', 'Field name', 'Field class full name', false, true) - div(ng-switch-when='dbFields' ng-hide=fieldHide) + .section(ng-switch-when='queryFields' ng-hide=fieldHide) + +table-pair('{{::field.label}}', fieldMdl, 'name', 'className', 'Field name', 'Field class full name', false, true) + .section(ng-switch-when='dbFields' ng-hide=fieldHide) .col-sm-7.fieldset .legend label {{::field.label}}: @@ -341,7 +343,7 @@ mixin form-row-custom(lblClasses, fieldClasses, dataSource) tr td.col-sm-12(ng-init='newDatabaseType="INTEGER"; newJavaType="Integer"') +table-db-field-edit('newDatabaseName', 'newDatabaseType', 'newJavaName', 'newJavaType', '{{::field.focusId}}', '-1') - div(ng-switch-when='queryGroups' ng-hide=fieldHide) + .section(ng-switch-when='queryGroups' ng-hide=fieldHide) .col-sm-7.fieldset .legend label {{::field.label}}:
