Repository: incubator-ignite Updated Branches: refs/heads/ignite-843 cb09f2ca0 -> 4abc9f178
IGNITE-843 Minor tweak for borders. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/4abc9f17 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/4abc9f17 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/4abc9f17 Branch: refs/heads/ignite-843 Commit: 4abc9f178e07589c864f7a22919122c8458b6908 Parents: cb09f2c Author: AKuznetsov <akuznet...@gridgain.com> Authored: Mon Aug 10 22:40:00 2015 +0700 Committer: AKuznetsov <akuznet...@gridgain.com> Committed: Mon Aug 10 22:40:00 2015 +0700 ---------------------------------------------------------------------- .../main/js/controllers/models/clusters.json | 4 +-- .../control-center-web/src/main/js/package.json | 2 +- .../src/main/js/public/stylesheets/style.scss | 5 +++- .../src/main/js/views/includes/controls.jade | 28 +++++++++++++++++++- 4 files changed, 34 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4abc9f17/modules/control-center-web/src/main/js/controllers/models/clusters.json ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/controllers/models/clusters.json b/modules/control-center-web/src/main/js/controllers/models/clusters.json index 0da0f58..21012f7 100644 --- a/modules/control-center-web/src/main/js/controllers/models/clusters.json +++ b/modules/control-center-web/src/main/js/controllers/models/clusters.json @@ -214,7 +214,7 @@ }, { "label": "Regions", - "type": "table-simple", + "type": "table-simple-with-border", "path": "discovery.Cloud", "model": "regions", "placeholder": "Region name", @@ -232,7 +232,7 @@ }, { "label": "Zones", - "type": "table-simple", + "type": "table-simple-with-border", "path": "discovery.Cloud", "model": "zones", "placeholder": "Zone name", http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4abc9f17/modules/control-center-web/src/main/js/package.json ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/package.json b/modules/control-center-web/src/main/js/package.json index 8b705bd..31ee302 100644 --- a/modules/control-center-web/src/main/js/package.json +++ b/modules/control-center-web/src/main/js/package.json @@ -46,6 +46,6 @@ "morgan": "~1.6.1", "supertest": "^1.0.1", "mocha": "~2.2.5", - "should": "~7.0.2" + "should": "~7.0.3" } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4abc9f17/modules/control-center-web/src/main/js/public/stylesheets/style.scss ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/public/stylesheets/style.scss b/modules/control-center-web/src/main/js/public/stylesheets/style.scss index 283ff78..7ee7e1c 100644 --- a/modules/control-center-web/src/main/js/public/stylesheets/style.scss +++ b/modules/control-center-web/src/main/js/public/stylesheets/style.scss @@ -876,9 +876,12 @@ button .caret, .btn .caret { top: -10px; margin-left: 10px; margin-right: 10px; - background: white; overflow: visible; position: relative; + + label { + background: white; + } } .legend-btn { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4abc9f17/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 8a82b8a..a3bf869 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) - .section(ng-switch-when='table-simple')&attributes(detailCommon) + div(ng-switch-when='table-simple')&attributes(detailCommon) div(ng-if='detail.label') label {{::detail.label}}: +tipLabel('detail.tableTip') @@ -167,6 +167,32 @@ mixin details-row .input-tip.form-group.has-feedback input.form-control(id='new{{::detail.focusId}}' name='{{detail.model}}' type='text' ng-model='newValue' ng-focus='tableNewItem(detail)' placeholder='{{::detail.placeholder}}' on-enter='tableSimpleSave(tableSimpleValid, backupItem, detail, newValue, -1)' on-escape='tableReset()')&attributes(customValidators) +ico-exclamation('{{detail.model}}', 'ipaddress', 'Invalid address, see help for format description.') + div(ng-switch-when='table-simple-with-border')&attributes(detailCommon) + .fieldset + .legend + label {{::detail.label}}: + +tipLabel('detail.tableTip') + .fieldset-content + table.col-sm-12.links-edit-details(st-table='#{detailMdl}') + tbody + tr(ng-repeat='item in #{detailMdl} track by $index') + td + div(ng-show='!tableEditing(detail, $index)') + a.labelFormField(event-focus='cur{{::detail.focusId}}' ng-click='curValue = tableStartEdit(backupItem, detail, $index)') {{$index + 1}}) {{item}} + +btn-remove('tableRemove(backupItem, detail, $index)', 'detail.removeTip') + +btn-down('detail.reordering && tableSimpleDownVisible(backupItem, detail, $index)', 'tableSimpleDown(backupItem, detail, $index)') + +btn-up('detail.reordering && $index > 0', 'tableSimpleUp(backupItem, detail, $index)') + div(ng-if='tableEditing(detail, $index)') + label.labelField {{$index + 1}}) + +btn-save('tableSimpleSaveVisible(curValue)', 'tableSimpleSave(tableSimpleValid, backupItem, detail, curValue, $index)') + .input-tip.form-group.has-feedback + input.form-control(id='cur{{::detail.focusId}}' name='{{detail.model}}.edit' type='text' ng-model='curValue' placeholder='{{::detail.placeholder}}' on-enter='tableSimpleSave(tableSimpleValid, backupItem, detail, curValue, $index)' on-escape='tableReset()')&attributes(customValidators) + +ico-exclamation('{{detail.model}}.edit', 'ipaddress', 'Invalid address, see help for format description.') + button.btn.btn-primary.fieldButton(ng-disabled='!newValue' ng-click='tableSimpleSave(tableSimpleValid, backupItem, detail, newValue, -1)') Add + +tipField('detail.tip') + .input-tip.form-group.has-feedback + input.form-control(id='new{{::detail.focusId}}' name='{{detail.model}}' type='text' ng-model='newValue' ng-focus='tableNewItem(detail)' placeholder='{{::detail.placeholder}}' on-enter='tableSimpleSave(tableSimpleValid, backupItem, detail, newValue, -1)' on-escape='tableReset()')&attributes(customValidators) + +ico-exclamation('{{detail.model}}', 'ipaddress', 'Invalid address, see help for format description.') mixin table-db-field-edit(databaseName, databaseType, javaName, javaType, focusId, index) -var databaseNameId = databaseName + focusId
