You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ak...@apache.org on 2018/08/01 04:09:02 UTC
ignite git commit: IGNITE-9137 Web Console: Select node dialog
refactored to new UI.
Repository: ignite
Updated Branches:
refs/heads/master ccd65e613 -> 8ea35e74e
IGNITE-9137 Web Console: Select node dialog refactored to new UI.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/8ea35e74
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/8ea35e74
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/8ea35e74
Branch: refs/heads/master
Commit: 8ea35e74e1067babfbc68249f1565f18433b2fb9
Parents: ccd65e6
Author: Dmitriy Shabalin <dm...@gmail.com>
Authored: Wed Aug 1 11:08:54 2018 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Wed Aug 1 11:08:54 2018 +0700
----------------------------------------------------------------------
.../modules/nodes/nodes-dialog.controller.js | 6 ++---
.../app/modules/nodes/nodes-dialog.scss | 17 +++++-------
.../app/modules/nodes/nodes-dialog.tpl.pug | 28 ++++++++++++--------
3 files changed, 26 insertions(+), 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/8ea35e74/modules/web-console/frontend/app/modules/nodes/nodes-dialog.controller.js
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/modules/nodes/nodes-dialog.controller.js b/modules/web-console/frontend/app/modules/nodes/nodes-dialog.controller.js
index fbe6203..2296aed 100644
--- a/modules/web-console/frontend/app/modules/nodes/nodes-dialog.controller.js
+++ b/modules/web-console/frontend/app/modules/nodes/nodes-dialog.controller.js
@@ -18,9 +18,9 @@
const NID_TEMPLATE = '<div class="ui-grid-cell-contents" title="{{ COL_FIELD }}">{{ COL_FIELD | limitTo:8 }}</div>';
const COLUMNS_DEFS = [
- {displayName: 'Node ID8', field: 'nid', headerTooltip: 'Node ID8', cellTemplate: NID_TEMPLATE, minWidth: 85, width: 85, pinnedLeft: true},
- {displayName: 'Node IP', field: 'ip', headerTooltip: 'Primary IP address of node', minWidth: 75, width: 120},
- {displayName: 'Grid name', field: 'gridName', headerTooltip: 'Name of node grid cluster', minWidth: 75, width: 120},
+ {displayName: 'Node ID8', field: 'nid', headerTooltip: 'Node ID8', cellTemplate: NID_TEMPLATE, minWidth: 85, width: 145, pinnedLeft: true},
+ {displayName: 'Node IP', field: 'ip', headerTooltip: 'Primary IP address of node', minWidth: 100, width: 150},
+ {displayName: 'Grid name', field: 'gridName', headerTooltip: 'Name of node grid cluster', minWidth: 110, width: 150},
{displayName: 'Version', field: 'version', headerTooltip: 'Node version', minWidth: 75, width: 140},
{displayName: 'OS information', field: 'os', headerTooltip: 'OS information for node\'s host', minWidth: 125}
];
http://git-wip-us.apache.org/repos/asf/ignite/blob/8ea35e74/modules/web-console/frontend/app/modules/nodes/nodes-dialog.scss
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/modules/nodes/nodes-dialog.scss b/modules/web-console/frontend/app/modules/nodes/nodes-dialog.scss
index 8145dbc..cbb9000 100644
--- a/modules/web-console/frontend/app/modules/nodes/nodes-dialog.scss
+++ b/modules/web-console/frontend/app/modules/nodes/nodes-dialog.scss
@@ -16,22 +16,17 @@
*/
.ignite-nodes-dialog {
- label {
- font-size: 18px;
- margin-right: 20px;
- }
-
.ui-grid-pinned-container.ui-grid-pinned-container-left .ui-grid-cell:last-child,
.ui-grid-pinned-container.ui-grid-pinned-container-left .ui-grid-header-cell:last-child,
.ui-grid-header-cell:last-child .ui-grid-column-resizer.right {
- //border-right: none;
+ border-right: none;
}
- .nodes-grid {
- height: 320px;
+ .modal-dialog {
+ width: 900px;
}
- .panel-body_collapse {
- padding: 0;
- margin: 0;
+
+ button.pull-left.btn-ignite {
+ background: none;
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/8ea35e74/modules/web-console/frontend/app/modules/nodes/nodes-dialog.tpl.pug
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/modules/nodes/nodes-dialog.tpl.pug b/modules/web-console/frontend/app/modules/nodes/nodes-dialog.tpl.pug
index 21b138b..22f3b1d 100644
--- a/modules/web-console/frontend/app/modules/nodes/nodes-dialog.tpl.pug
+++ b/modules/web-console/frontend/app/modules/nodes/nodes-dialog.tpl.pug
@@ -14,22 +14,28 @@
See the License for the specific language governing permissions and
limitations under the License.
-.modal.ignite-nodes-dialog(tabindex='-1' role='dialog')
- .modal-dialog
- .modal-content
+.modal.modal--ignite.theme--ignite.ignite-nodes-dialog(tabindex='-1' role='dialog')
+ .modal-dialog.modal-dialog--adjust-height
+ form.modal-content
.modal-header
- button.close(ng-click='$cancel()' aria-hidden='true') ×
h4.modal-title Select Node
+ button.close(type='button' aria-label='Close' ng-click='$cancel()')
+ svg(ignite-icon="cross")
.modal-body.modal-body-with-scroll
p Choose node to execute query for cache: #[strong {{ $ctrl.options.target }}]
- .panel.panel-default.nodes-grid
- .panel-heading
- label Cache Nodes: {{ $ctrl.nodes.length }}
+ ul.tabs.tabs--blue
+ li.active(role='presentation')
+ a
+ span Cache Nodes
+ span.badge.badge--blue {{ $ctrl.data.length }}
- .panel-body.panel-body_collapse
- .grid(ui-grid='$ctrl.gridOptions' ui-grid-resize-columns ui-grid-selection ui-grid-pinning ui-grid-hovering)
+ .panel--ignite
+ .grid.ui-grid--ignite(ui-grid='$ctrl.gridOptions' ui-grid-resize-columns ui-grid-selection ui-grid-pinning ui-grid-hovering)
.modal-footer
- button.btn.btn-primary(id='confirm-btn-confirm' ng-click='$ok($ctrl.selected)' ng-disabled='$ctrl.selected.length === 0') Select node
- button.btn.btn-default(id='confirm-btn-close' ng-click='$cancel()') Cancel
+ button.pull-left.btn-ignite(disabled)
+ grid-item-selected(class='pull-left' grid-api='$ctrl.gridApi')
+
+ button.btn-ignite.btn-ignite--link-success(id='confirm-btn-close' ng-click='$cancel()') Cancel
+ button.btn-ignite.btn-ignite--success(id='confirm-btn-confirm' ng-click='$ok($ctrl.selected)' ng-disabled='$ctrl.selected.length === 0') Select node