IGNITE-4659 Cleanup after merge.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/9d8de41b Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/9d8de41b Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/9d8de41b Branch: refs/heads/ignite-4932 Commit: 9d8de41b6e8ed6ec8a29179b68a05c93d9077045 Parents: 27fbb7a Author: Alexey Kuznetsov <[email protected]> Authored: Mon Apr 3 14:19:56 2017 +0700 Committer: Alexey Kuznetsov <[email protected]> Committed: Mon Apr 3 14:19:56 2017 +0700 ---------------------------------------------------------------------- .../activities-user-dialog.jade | 36 --------- .../form-field-datepicker.jade | 55 ------------- .../list-of-registered-users.jade | 58 -------------- .../ui-grid-header/ui-grid-header.jade | 27 ------- .../states/configuration/caches/affinity.jade | 82 -------------------- 5 files changed, 258 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/9d8de41b/modules/web-console/frontend/app/components/activities-user-dialog/activities-user-dialog.jade ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/app/components/activities-user-dialog/activities-user-dialog.jade b/modules/web-console/frontend/app/components/activities-user-dialog/activities-user-dialog.jade deleted file mode 100644 index 074851c..0000000 --- a/modules/web-console/frontend/app/components/activities-user-dialog/activities-user-dialog.jade +++ /dev/null @@ -1,36 +0,0 @@ -//- - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with - this work for additional information regarding copyright ownership. - The ASF licenses this file to You under the Apache License, Version 2.0 - (the "License"); you may not use this file except in compliance with - the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - -.modal(tabindex='-1' role='dialog') - .modal-dialog - .modal-content - .modal-header - h4.modal-title - i.fa.fa-info-circle - | Activities: {{ ctrl.user.userName }} - .modal-body.modal-body-with-scroll(id='activities-user-dialog') - table.table.table-striped.table-bordered.table-hover(scrollable-container='#activities-user-dialog' st-table='displayedRows' st-safe-src='ctrl.data') - thead - th.text-center(st-sort='action | translate') Description - th.text-center(st-sort='action') Action - th.text-center(st-sort='amount') Visited - tbody - tr(ng-repeat='row in displayedRows') - td.text-left {{ row.action | translate }} - td.text-left {{ row.action }} - td.text-left {{ row.amount }} - .modal-footer - button.btn.btn-primary(id='confirm-btn-confirm' ng-click='$hide()') Close http://git-wip-us.apache.org/repos/asf/ignite/blob/9d8de41b/modules/web-console/frontend/app/components/form-field-datepicker/form-field-datepicker.jade ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/app/components/form-field-datepicker/form-field-datepicker.jade b/modules/web-console/frontend/app/components/form-field-datepicker/form-field-datepicker.jade deleted file mode 100644 index 2578cf4..0000000 --- a/modules/web-console/frontend/app/components/form-field-datepicker/form-field-datepicker.jade +++ /dev/null @@ -1,55 +0,0 @@ -//- - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with - this work for additional information regarding copyright ownership. - The ASF licenses this file to You under the Apache License, Version 2.0 - (the "License"); you may not use this file except in compliance with - the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - -mixin ignite-form-field-datepicker(label, model, name, disabled, required, placeholder, tip) - mixin form-field-input() - input.form-control( - id='{{ #{name} }}Input' - name='{{ #{name} }}' - - placeholder=placeholder - - data-ng-model=model - - data-ng-required=required && '#{required}' - data-ng-disabled=disabled && '#{disabled}' - - bs-datepicker - data-date-format='MMM yyyy' - data-start-view='1' - data-min-view='1' - data-max-date='today' - - data-container='body > .wrapper' - - tabindex='0' - - onkeydown="return false" - - data-ignite-form-panel-field='' - )&attributes(attributes.attributes) - - .ignite-form-field - +ignite-form-field__label(label, name, required) - .ignite-form-field__control - if tip - i.tipField.icon-help(bs-tooltip='' data-title=tip) - - if block - block - - .input-tip - +form-field-input(attributes=attributes) http://git-wip-us.apache.org/repos/asf/ignite/blob/9d8de41b/modules/web-console/frontend/app/components/list-of-registered-users/list-of-registered-users.jade ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/app/components/list-of-registered-users/list-of-registered-users.jade b/modules/web-console/frontend/app/components/list-of-registered-users/list-of-registered-users.jade deleted file mode 100644 index 1195910..0000000 --- a/modules/web-console/frontend/app/components/list-of-registered-users/list-of-registered-users.jade +++ /dev/null @@ -1,58 +0,0 @@ -//- - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with - this work for additional information regarding copyright ownership. - The ASF licenses this file to You under the Apache License, Version 2.0 - (the "License"); you may not use this file except in compliance with - the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - -include /app/helpers/jade/mixins.jade -include /app/components/form-field-datepicker/form-field-datepicker.jade - -mixin grid-settings() - i.fa.fa-bars(data-animation='am-flip-x' bs-dropdown='' aria-haspopup='true' aria-expanded='expanded' data-auto-close='1' data-trigger='click') - ul.select.dropdown-menu(role='menu') - li(ng-repeat='item in $ctrl.gridOptions.categories|filter:{selectable:true}') - a(ng-click='$ctrl.toggleColumns(item, !item.visible)') - i.fa.fa-check-square-o.pull-left(ng-if='item.visible') - i.fa.fa-square-o.pull-left(ng-if='!item.visible') - span {{::item.name}} - li.divider - li - a(ng-click='$ctrl.selectAllColumns()') Select all - li - a(ng-click='$ctrl.clearAllColumns()') Clear all - li.divider - li - a(ng-click='$hide()') Close - -.panel.panel-default - .panel-heading.ui-grid-settings - +grid-settings - label Total users: - strong {{ $ctrl.gridOptions.data.length }} - label Showing users: - strong {{ $ctrl.gridApi.grid.getVisibleRows().length }} - sub(ng-show='users.length === $ctrl.gridApi.grid.getVisibleRows().length') all - - form.pull-right(ng-form=form novalidate) - -var form = 'admin' - - button.btn.btn-primary(ng-click='$ctrl.exportCsv()' bs-tooltip data-title='Export table to csv') Export - - .ui-grid-settings-dateperiod - +ignite-form-field-datepicker('Period:', '$ctrl.params.startDate', '"period"') - - .ui-grid-settings-filter - +ignite-form-field-text('Exclude:', '$ctrl.params.companiesExclude', '"exclude"', false, false, 'Exclude by company name...') - - .panel-collapse - .grid.ui-grid--ignite(ui-grid='$ctrl.gridOptions' ui-grid-resize-columns ui-grid-selection ui-grid-exporter ui-grid-pinning) http://git-wip-us.apache.org/repos/asf/ignite/blob/9d8de41b/modules/web-console/frontend/app/components/ui-grid-header/ui-grid-header.jade ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/app/components/ui-grid-header/ui-grid-header.jade b/modules/web-console/frontend/app/components/ui-grid-header/ui-grid-header.jade deleted file mode 100644 index 7e44d94..0000000 --- a/modules/web-console/frontend/app/components/ui-grid-header/ui-grid-header.jade +++ /dev/null @@ -1,27 +0,0 @@ -//- - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with - this work for additional information regarding copyright ownership. - The ASF licenses this file to You under the Apache License, Version 2.0 - (the "License"); you may not use this file except in compliance with - the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - -.ui-grid-header.ui-grid-header--subcategories(role='rowgroup') - .ui-grid-top-panel - .ui-grid-header-viewport - .ui-grid-header-canvas - .ui-grid-header-cell-wrapper(ng-style='colContainer.headerCellWrapperStyle()') - .ui-grid-header-cell-row(role='row') - .ui-grid-header-span.ui-grid-header-cell.ui-grid-clearfix(ng-repeat='cat in grid.options.categories') - div(ng-show='(colContainer.renderedColumns|uiGridSubcategories:cat.name).length > 1') - .ui-grid-cell-contents {{ cat.name }} - .ui-grid-header-cell-row - .ui-grid-header-cell.ui-grid-clearfix(ng-repeat='col in (colContainer.renderedColumns|uiGridSubcategories:cat.name) track by col.uid' ui-grid-header-cell='' col='col' render-index='$index') http://git-wip-us.apache.org/repos/asf/ignite/blob/9d8de41b/modules/web-console/frontend/app/modules/states/configuration/caches/affinity.jade ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/app/modules/states/configuration/caches/affinity.jade b/modules/web-console/frontend/app/modules/states/configuration/caches/affinity.jade deleted file mode 100644 index 3c4746b..0000000 --- a/modules/web-console/frontend/app/modules/states/configuration/caches/affinity.jade +++ /dev/null @@ -1,82 +0,0 @@ -//- - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with - this work for additional information regarding copyright ownership. - The ASF licenses this file to You under the Apache License, Version 2.0 - (the "License"); you may not use this file except in compliance with - the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - -include /app/helpers/jade/mixins.jade - --var form = 'affinity' --var model = 'backupItem' --var affModel = model + '.affinity' --var affMapModel = model + '.affinityMapper' --var rendezvousAff = affModel + '.kind === "Rendezvous"' --var fairAff = affModel + '.kind === "Fair"' --var customAff = affModel + '.kind === "Custom"' --var customAffMapper = affMapModel + '.kind === "Custom"' --var rendPartitionsRequired = rendezvousAff + ' && ' + affModel + '.Rendezvous.affinityBackupFilter' --var fairPartitionsRequired = fairAff + ' && ' + affModel + '.Fair.affinityBackupFilter' - -.panel.panel-default(ng-form=form novalidate) - .panel-heading(bs-collapse-toggle='' ng-click='ui.loadPanel("#{form}")') - ignite-form-panel-chevron - label Affinity Collocation - ignite-form-field-tooltip.tipLabel - | Collocate data with data to improve performance and scalability of your application#[br] - | #[a(href="http://apacheignite.gridgain.org/docs/affinity-collocation"; target="_blank") More info] - ignite-form-revert - .panel-collapse(role='tabpanel' bs-collapse-target id=form) - .panel-body(ng-if='ui.isPanelLoaded("#{form}")') - .col-sm-6 - .settings-row - +dropdown('Function:', affModel + '.kind', '"AffinityKind"', 'true', 'Default', - '[\ - {value: "Rendezvous", label: "Rendezvous"},\ - {value: "Fair", label: "Fair"},\ - {value: "Custom", label: "Custom"},\ - {value: undefined, label: "Default"}\ - ]', - 'Key topology resolver to provide mapping from keys to nodes\ - <ul>\ - <li>Rendezvous - Based on Highest Random Weight algorithm<br/></li>\ - <li>Fair - Tries to ensure that all nodes get equal number of partitions with minimum amount of reassignments between existing nodes<br/></li>\ - <li>Custom - Custom implementation of key affinity fynction<br/></li>\ - <li>Default - By default rendezvous affinity function with 1024 partitions is used<br/></li>\ - </ul>') - .panel-details(ng-if=rendezvousAff) - .details-row - +number-required('Partitions', affModel + '.Rendezvous.partitions', '"RendPartitions"', 'true', rendPartitionsRequired, '1024', '1', 'Number of partitions') - .details-row - +java-class('Backup filter', affModel + '.Rendezvous.affinityBackupFilter', '"RendAffinityBackupFilter"', 'true', 'false', - 'Backups will be selected from all nodes that pass this filter') - .details-row - +checkbox('Exclude neighbors', affModel + '.Rendezvous.excludeNeighbors', '"RendExcludeNeighbors"', - 'Exclude same - host - neighbors from being backups of each other and specified number of backups') - .panel-details(ng-if=fairAff) - .details-row - +number-required('Partitions', affModel + '.Fair.partitions', '"FairPartitions"', 'true', fairPartitionsRequired, '256', '1', 'Number of partitions') - .details-row - +java-class('Backup filter', affModel + '.Fair.affinityBackupFilter', '"FairAffinityBackupFilter"', 'true', 'false', - 'Backups will be selected from all nodes that pass this filter') - .details-row - +checkbox('Exclude neighbors', affModel + '.Fair.excludeNeighbors', '"FairExcludeNeighbors"', - 'Exclude same - host - neighbors from being backups of each other and specified number of backups') - .panel-details(ng-if=customAff) - .details-row - +java-class('Class name:', affModel + '.Custom.className', '"AffCustomClassName"', 'true', customAff, - 'Custom key affinity function implementation class name') - .settings-row - +java-class('Mapper:', model + '.affinityMapper', '"AffMapCustomClassName"', 'true', 'false', - 'Provide custom affinity key for any given key') - .col-sm-6 - +preview-xml-java(model, 'cacheAffinity')
