Repository: ignite Updated Branches: refs/heads/ignite-843-rc2 b0f0d4d1b -> 9cf1c03d6
IGNITE-843 Minor. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/9cf1c03d Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/9cf1c03d Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/9cf1c03d Branch: refs/heads/ignite-843-rc2 Commit: 9cf1c03d64bc74df21bbb59310322eb0faf301f9 Parents: b0f0d4d Author: Alexey Kuznetsov <[email protected]> Authored: Tue Feb 2 13:26:14 2016 +0700 Committer: Alexey Kuznetsov <[email protected]> Committed: Tue Feb 2 13:26:14 2016 +0700 ---------------------------------------------------------------------- .../src/main/js/app/modules/Form/field/dropdown.jade | 2 +- .../modules/states/configuration/clusters/transactions.jade | 2 +- .../src/main/js/views/configuration/domains-import.jade | 4 ++-- .../src/main/js/views/configuration/summary.jade | 4 ++-- .../src/main/js/views/includes/controls.jade | 8 ++++---- .../src/main/js/views/sql/cache-metadata.jade | 2 +- .../src/main/js/views/templates/dropdown.jade | 2 +- .../src/main/js/views/templates/getting-started.jade | 2 +- 8 files changed, 13 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/9cf1c03d/modules/control-center-web/src/main/js/app/modules/Form/field/dropdown.jade ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/app/modules/Form/field/dropdown.jade b/modules/control-center-web/src/main/js/app/modules/Form/field/dropdown.jade index ba461d0..6d4dd82 100644 --- a/modules/control-center-web/src/main/js/app/modules/Form/field/dropdown.jade +++ b/modules/control-center-web/src/main/js/app/modules/Form/field/dropdown.jade @@ -23,7 +23,7 @@ bs-select bs-options='item.value as item.label for item in dropdown.options' - data-multiple="1" + data-multiple='1' ng-model='dropdown.value' ng-class='{ placeholder: value === undefined || value === null || !value.length }' http://git-wip-us.apache.org/repos/asf/ignite/blob/9cf1c03d/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/transactions.jade ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/transactions.jade b/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/transactions.jade index 2b55360..bfe7a29 100644 --- a/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/transactions.jade +++ b/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/transactions.jade @@ -42,7 +42,7 @@ form.panel.panel-default(name='transactionConfiguration' novalidate) {value: "OPTIMISTIC", label: "OPTIMISTIC"},\ {value: "PESSIMISTIC", label: "PESSIMISTIC"}\ ]' - data-ng-model="#{model}.defaultTxConcurrency" + data-ng-model='#{model}.defaultTxConcurrency' data-placeholder='PESSIMISTIC' ) .settings-row http://git-wip-us.apache.org/repos/asf/ignite/blob/9cf1c03d/modules/control-center-web/src/main/js/views/configuration/domains-import.jade ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/views/configuration/domains-import.jade b/modules/control-center-web/src/main/js/views/configuration/domains-import.jade index 73df0c0..55f563e 100644 --- a/modules/control-center-web/src/main/js/views/configuration/domains-import.jade +++ b/modules/control-center-web/src/main/js/views/configuration/domains-import.jade @@ -30,7 +30,7 @@ mixin td-ellipses-lbl(w, lbl) button.close(ng-click='$hide()' aria-hidden='true') × h4.modal-title(ng-if='!importDomain.demo') Import domain models from database h4.modal-title(ng-if='importDomain.demo') Import domain models from demo database - .import-domain-model-wizard-page(ng-show='importDomain.action == "drivers"' style="margin-bottom: 256px;") + .import-domain-model-wizard-page(ng-show='importDomain.action == "drivers"' style='margin-bottom: 256px') div(ng-if='!importDomain.jdbcDriversFound') label Domain model could not be imported ul @@ -167,7 +167,7 @@ mixin td-ellipses-lbl(w, lbl) .col-xs-9.col-sm-10.col-md-10 i.tipField.fa.fa-question-circle(bs-tooltip='' data-title='Package that will be used for POJOs generation') .input-tip - input.form-control(id='domainPackageName' type="text" ng-model='ui.packageName' placeholder='Package for POJOs generation') + input.form-control(id='domainPackageName' type='text' ng-model='ui.packageName' placeholder='Package for POJOs generation') .settings-row .checkbox label http://git-wip-us.apache.org/repos/asf/ignite/blob/9cf1c03d/modules/control-center-web/src/main/js/views/configuration/summary.jade ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/views/configuration/summary.jade b/modules/control-center-web/src/main/js/views/configuration/summary.jade index e4b461d..019bef6 100644 --- a/modules/control-center-web/src/main/js/views/configuration/summary.jade +++ b/modules/control-center-web/src/main/js/views/configuration/summary.jade @@ -51,7 +51,7 @@ mixin ignite-form-field-tooltip(message) label Server .panel-collapse(id='server' role='tabpanel' bs-collapse-target) - .summary-tabs(bs-tabs data-bs-active-pane="tabsServer.activeTab" template='configuration/summary-tabs.html') + .summary-tabs(bs-tabs data-bs-active-pane='tabsServer.activeTab' template='configuration/summary-tabs.html') div(bs-pane title='XML') ignite-ui-ace-xml(data-cluster='cluster') div(bs-pane title='Java') @@ -130,7 +130,7 @@ mixin ignite-form-field-tooltip(message) data-placeholder='100000' ) - .summary-tabs(bs-tabs data-bs-active-pane="tabsClient.activeTab" template='configuration/summary-tabs.html') + .summary-tabs(bs-tabs data-bs-active-pane='tabsClient.activeTab' template='configuration/summary-tabs.html') div(bs-pane title='XML') ignite-ui-ace-xml(data-cluster='cluster' data-cluster-cfg='#{nearCfg}') div(bs-pane title='Java') http://git-wip-us.apache.org/repos/asf/ignite/blob/9cf1c03d/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 0c5cd51..7ce0b5d 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 @@ -119,7 +119,7 @@ mixin table-igfs-path-mode-edit(prefix, keyPlaceholder, valPlaceholder, focusId, label.placeholder #{valPlaceholder} +btn-save(btnVisible, btnSave) .input-tip - button.select-toggle.form-control(id=valFocusId bs-select ng-model=valModel data-placeholder=valPlaceholder bs-options="item.value as item.label for item in igfsModes" tabindex='0' on-enter=btnVisibleAndSave on-escape='tableReset()') + button.select-toggle.form-control(id=valFocusId bs-select ng-model=valModel data-placeholder=valPlaceholder bs-options='item.value as item.label for item in igfsModes' tabindex='0' on-enter=btnVisibleAndSave on-escape='tableReset()') mixin table-igfs-path-mode(header, tblMdl, keyFld, valFld, keyPlaceholder, valPlaceholder) .col-sm-12.group @@ -491,7 +491,7 @@ mixin form-row-custom(lblClasses, fieldClasses, dataSource) label.placeholder Index type +btn-save('tableIndexSaveVisible(field, $index)', 'tableIndexSave(field, $index)') .input-tip - button.select-toggle.form-control(id='{{"curIndexType" + $index}}' bs-select ng-model='field.curIndexType' data-placeholder='Select index type' bs-options="item.value as item.label for item in indexType" tabindex='0' on-enter=btnVisibleAndSave on-escape='tableReset()') + button.select-toggle.form-control(id='{{"curIndexType" + $index}}' bs-select ng-model='field.curIndexType' data-placeholder='Select index type' bs-options='item.value as item.label for item in indexType' tabindex='0' on-enter=btnVisibleAndSave on-escape='tableReset()') .margin-left-dflt table.links-edit-sub(st-table='item.fields' ng-init='itemIndex = $index') tbody @@ -514,12 +514,12 @@ mixin form-row-custom(lblClasses, fieldClasses, dataSource) label.placeholder Index name label.fieldSep / .input-tip - input#newIndexName.form-control(type='text' enter-focus-next="newIndexType" ng-model='field.newIndexName' placeholder='Index name' on-enter='tableIndexSaveVisible(field, -1) && tableIndexSave(field, -1)' on-escape='tableReset()') + input#newIndexName.form-control(type='text' enter-focus-next='newIndexType' ng-model='field.newIndexName' placeholder='Index name' on-enter='tableIndexSaveVisible(field, -1) && tableIndexSave(field, -1)' on-escape='tableReset()') .col-sm-5 label.placeholder Index type +btn-save('tableIndexSaveVisible(field, -1)', 'tableIndexSave(field, -1)') .input-tip - button#newIndexType.select-toggle.form-control(bs-select ng-model='field.newIndexType' data-placeholder='Select index type' bs-options="item.value as item.label for item in indexType" tabindex='0' on-enter=btnVisibleAndSave on-escape='tableReset()') + button#newIndexType.select-toggle.form-control(bs-select ng-model='field.newIndexType' data-placeholder='Select index type' bs-options='item.value as item.label for item in indexType' tabindex='0' on-enter=btnVisibleAndSave on-escape='tableReset()') mixin main-table(title, rows, focusId, click, rowTemplate, searchField) .padding-bottom-dflt(ng-show='#{rows} && #{rows}.length > 0') http://git-wip-us.apache.org/repos/asf/ignite/blob/9cf1c03d/modules/control-center-web/src/main/js/views/sql/cache-metadata.jade ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/views/sql/cache-metadata.jade b/modules/control-center-web/src/main/js/views/sql/cache-metadata.jade index ef191ab..5b092a0 100644 --- a/modules/control-center-web/src/main/js/views/sql/cache-metadata.jade +++ b/modules/control-center-web/src/main/js/views/sql/cache-metadata.jade @@ -18,7 +18,7 @@ .input-tip input.form-control(type='text' ng-model='metaFilter' placeholder='Filter matadata...') .popover-content(ng-if='metadata && metadata.length > 0') - treecontrol.tree-classic(tree-model='metadata' options='metaOptions' filter-expression="metaFilter") + treecontrol.tree-classic(tree-model='metadata' options='metaOptions' filter-expression='metaFilter') span(ng-switch='' on='node.type') span(ng-switch-when='type' ng-dblclick='dblclickMetadata(paragraph, node)') i.fa.fa-table http://git-wip-us.apache.org/repos/asf/ignite/blob/9cf1c03d/modules/control-center-web/src/main/js/views/templates/dropdown.jade ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/views/templates/dropdown.jade b/modules/control-center-web/src/main/js/views/templates/dropdown.jade index 862dbcd..6ebfe63 100644 --- a/modules/control-center-web/src/main/js/views/templates/dropdown.jade +++ b/modules/control-center-web/src/main/js/views/templates/dropdown.jade @@ -1,5 +1,5 @@ ul.dropdown-menu(tabindex='-1' role='menu' ng-show='content && content.length') li(role='presentation' ui-sref-active='active' ng-class='{divider: item.divider, active: item.active, custom: item.custom}' ng-repeat='item in content') a(role='menuitem' tabindex='-1' ui-sref='{{item.sref}}' ng-if='!item.divider && item.sref' ng-bind='item.text') - a(role='menuitem' tabindex='-1' ng-href='{{item.href}}' ng-if='!item.divider && item.href' target="{{item.target || ''}}" ng-bind='item.text') + a(role='menuitem' tabindex='-1' ng-href='{{item.href}}' ng-if='!item.divider && item.href' target='{{item.target || ""}}' ng-bind='item.text') a(role='menuitem' tabindex='-1' href='javascript:void(0)' ng-if='!item.divider && item.click' ng-click='$eval(item.click);$hide()' ng-bind='item.text') http://git-wip-us.apache.org/repos/asf/ignite/blob/9cf1c03d/modules/control-center-web/src/main/js/views/templates/getting-started.jade ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/views/templates/getting-started.jade b/modules/control-center-web/src/main/js/views/templates/getting-started.jade index ec18bab..816d8ca 100644 --- a/modules/control-center-web/src/main/js/views/templates/getting-started.jade +++ b/modules/control-center-web/src/main/js/views/templates/getting-started.jade @@ -18,7 +18,7 @@ #errors-container.modal-header.header button.close(ng-click='close()' aria-hidden='true') × h4.modal-title {{title}} - .import-domain-model-wizard-page(style="margin-bottom: 256px;") + .import-domain-model-wizard-page(style='margin-bottom: 256px') .col-xs-12(ng-bind-html='message') .modal-footer .checkbox
