Repository: ignite Updated Branches: refs/heads/master 2f1770941 -> 3dc65eb65
IGNITE-4010 Web Console: Fixed issue with cache metadata layout. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/3dc65eb6 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/3dc65eb6 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/3dc65eb6 Branch: refs/heads/master Commit: 3dc65eb65edfcc94c600b578790397841b32a3c7 Parents: 2f17709 Author: Dmitriy Shabalin <[email protected]> Authored: Mon Jul 30 16:49:52 2018 +0700 Committer: Alexey Kuznetsov <[email protected]> Committed: Mon Jul 30 16:49:52 2018 +0700 ---------------------------------------------------------------------- .../queries-notebook/template.tpl.pug | 2 +- .../frontend/public/stylesheets/style.scss | 23 +++++++++++++++++++- .../frontend/views/sql/cache-metadata.tpl.pug | 3 ++- 3 files changed, 25 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/3dc65eb6/modules/web-console/frontend/app/components/page-queries/components/queries-notebook/template.tpl.pug ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/app/components/page-queries/components/queries-notebook/template.tpl.pug b/modules/web-console/frontend/app/components/page-queries/components/queries-notebook/template.tpl.pug index d1caafe..ab188fa 100644 --- a/modules/web-console/frontend/app/components/page-queries/components/queries-notebook/template.tpl.pug +++ b/modules/web-console/frontend/app/components/page-queries/components/queries-notebook/template.tpl.pug @@ -293,7 +293,7 @@ mixin paragraph-query .col-xs-4.col-sm-3 div(ng-show='caches.length > 0' style='padding: 5px 10px' st-table='displayedCaches' st-safe-src='caches') lable.labelField.labelFormField Caches: - i.fa.fa-database.tipField(title='Click to show cache types metadata dialog' bs-popover data-template-url='{{ $ctrl.cacheMetadataTemplateUrl }}' data-placement='bottom' data-trigger='click' data-container='#{{ paragraph.id }}') + i.fa.fa-database.tipField(title='Click to show cache types metadata dialog' bs-popover data-template-url='{{ $ctrl.cacheMetadataTemplateUrl }}' data-placement='bottom-right' data-trigger='click' data-container='#{{ paragraph.id }}') .input-tip input.form-control(type='text' st-search='label' placeholder='Filter caches...') table.links http://git-wip-us.apache.org/repos/asf/ignite/blob/3dc65eb6/modules/web-console/frontend/public/stylesheets/style.scss ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/public/stylesheets/style.scss b/modules/web-console/frontend/public/stylesheets/style.scss index 3d921df..be288dc 100644 --- a/modules/web-console/frontend/public/stylesheets/style.scss +++ b/modules/web-console/frontend/public/stylesheets/style.scss @@ -1067,7 +1067,28 @@ button.form-control { position: absolute; z-index: 1030; min-width: 305px; - max-width: 450px; + max-width: 335px; + + treecontrol li { + line-height: 16px; + } + + treeitem ul { + margin-top: -2px; + margin-bottom: 2px; + } + + .node-display { + position: relative; + top: 0; + + max-width: 280px; + + text-overflow: ellipsis; + line-height: 16px; + + overflow: hidden; + } .popover-title { color: black; http://git-wip-us.apache.org/repos/asf/ignite/blob/3dc65eb6/modules/web-console/frontend/views/sql/cache-metadata.tpl.pug ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/views/sql/cache-metadata.tpl.pug b/modules/web-console/frontend/views/sql/cache-metadata.tpl.pug index 385960a..ccffeae 100644 --- a/modules/web-console/frontend/views/sql/cache-metadata.tpl.pug +++ b/modules/web-console/frontend/views/sql/cache-metadata.tpl.pug @@ -24,7 +24,8 @@ span(ng-switch='node.type') span(ng-switch-when='type' ng-dblclick='dblclickMetadata(paragraph, node)') i.fa.fa-table - label.clickable(ng-bind='node.displayName') + label.clickable + div.node-display(ng-bind='node.displayName' ng-attr-title='{{node.displayName}}') span(ng-switch-when='plain') label {{node.name}} span(ng-switch-when='field' ng-dblclick='dblclickMetadata(paragraph, node)')
