ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From anovi...@apache.org
Subject ignite git commit: IGNITE-8758 Web Console: Fixed broken UI in case of long user name.
Date Sat, 09 Jun 2018 04:24:06 GMT
Repository: ignite
Updated Branches:
  refs/heads/master 3710050a8 -> 5520dae16


IGNITE-8758 Web Console: Fixed broken UI in case of long user name.


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/5520dae1
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/5520dae1
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/5520dae1

Branch: refs/heads/master
Commit: 5520dae16a41f39bd17a24d8bcd20f86dbe32179
Parents: 3710050
Author: Andrey Novikov <anovikov@gridgain.com>
Authored: Sat Jun 9 11:23:56 2018 +0700
Committer: Andrey Novikov <anovikov@gridgain.com>
Committed: Sat Jun 9 11:23:56 2018 +0700

----------------------------------------------------------------------
 .../components/list-of-registered-users/column-defs.js |  2 +-
 .../app/components/list-of-registered-users/style.scss | 11 +++++++++++
 .../app/components/web-console-header/style.scss       | 13 ++++++++++++-
 .../frontend/views/includes/header-right.pug           |  6 +++---
 4 files changed, 27 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/5520dae1/modules/web-console/frontend/app/components/list-of-registered-users/column-defs.js
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/components/list-of-registered-users/column-defs.js
b/modules/web-console/frontend/app/components/list-of-registered-users/column-defs.js
index f53de69..419a063 100644
--- a/modules/web-console/frontend/app/components/list-of-registered-users/column-defs.js
+++ b/modules/web-console/frontend/app/components/list-of-registered-users/column-defs.js
@@ -17,7 +17,7 @@
 
 const ICON_SORT = '<span ui-grid-one-bind-id-grid="col.uid + \'-sortdir-text\'" ui-grid-visible="col.sort.direction"
aria-label="Sort Descending"><i ng-class="{ \'ui-grid-icon-up-dir\': col.sort.direction
== asc, \'ui-grid-icon-down-dir\': col.sort.direction == desc, \'ui-grid-icon-blank\': !col.sort.direction
}" title="" aria-hidden="true"></i></span>';
 
-const USER_TEMPLATE = '<div class="ui-grid-cell-contents">' +
+const USER_TEMPLATE = '<div class="ui-grid-cell-contents user-cell">' +
     '<i class="pull-left" ng-class="row.entity.admin ? \'icon-admin\' : \'icon-user\'"></i>&nbsp;<label
bs-tooltip data-title="{{ COL_FIELD }}">{{ COL_FIELD }}</label></div>';
 
 const CLUSTER_HEADER_TEMPLATE = `<div class='ui-grid-cell-contents' bs-tooltip data-title='{{
col.headerTooltip(col) }}' data-placement='top'><i class='icon-cluster'></i>${ICON_SORT}</div>`;

http://git-wip-us.apache.org/repos/asf/ignite/blob/5520dae1/modules/web-console/frontend/app/components/list-of-registered-users/style.scss
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/components/list-of-registered-users/style.scss
b/modules/web-console/frontend/app/components/list-of-registered-users/style.scss
index b0a4c4d..5a0c713 100644
--- a/modules/web-console/frontend/app/components/list-of-registered-users/style.scss
+++ b/modules/web-console/frontend/app/components/list-of-registered-users/style.scss
@@ -18,6 +18,17 @@
 ignite-list-of-registered-users {
     display: block;
 
+    .user-cell {
+        display: flex;
+        overflow-wrap: normal;
+        white-space: normal;
+
+        label {
+            overflow: hidden;
+            text-overflow: ellipsis;
+        }
+    }
+
     .ui-grid-settings--heading {
         display: flex;
     }

http://git-wip-us.apache.org/repos/asf/ignite/blob/5520dae1/modules/web-console/frontend/app/components/web-console-header/style.scss
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/components/web-console-header/style.scss b/modules/web-console/frontend/app/components/web-console-header/style.scss
index 4c02af5..abff216 100644
--- a/modules/web-console/frontend/app/components/web-console-header/style.scss
+++ b/modules/web-console/frontend/app/components/web-console-header/style.scss
@@ -101,7 +101,7 @@ web-console-header {
         &:hover {
             color: $color-hover;
         }
-        
+
         &:focus, :focus,
         &.active, .active {
             color: $color-active;
@@ -119,6 +119,17 @@ web-console-header {
         &:not(:last-child) {
             margin-right: $nav-item-margin;
         }
+
+        .user-name-wrapper {
+            display: flex;
+            align-items: center;
+
+           & > span {
+               max-width: 180px;
+               overflow: hidden;
+               text-overflow: ellipsis;
+           }
+        }
     }
 
     .wch-demo-toggle {

http://git-wip-us.apache.org/repos/asf/ignite/blob/5520dae1/modules/web-console/frontend/views/includes/header-right.pug
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/views/includes/header-right.pug b/modules/web-console/frontend/views/includes/header-right.pug
index b223f2e..2255275 100644
--- a/modules/web-console/frontend/views/includes/header-right.pug
+++ b/modules/web-console/frontend/views/includes/header-right.pug
@@ -23,13 +23,13 @@
 web-console-header-extension
 
 .wch-nav-item(ignite-userbar)
-    div(
+    .user-name-wrapper(
         ng-class='{active: $state.includes("base.settings")}'
         ng-click='$event.stopPropagation()'
         bs-dropdown='userbar.items'
-        data-placement='bottom-right'
+        data-placement='bottom-left'
         data-trigger='hover focus'
         data-container='self'
     )
         span {{$root.user.firstName}} {{$root.user.lastName}}
-            span.caret
+        span.caret


Mime
View raw message