ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akuznet...@apache.org
Subject ignite git commit: IGNITE-4943 Web Console: Improved tooltips on "Admin panel" screen.
Date Thu, 14 Dec 2017 03:39:08 GMT
Repository: ignite
Updated Branches:
  refs/heads/master a0516f9e8 -> c9d6dd5f4


IGNITE-4943 Web Console: Improved tooltips on "Admin panel" screen.


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

Branch: refs/heads/master
Commit: c9d6dd5f4dc516e327eac963d458adc5bf4c26ec
Parents: a0516f9
Author: vsisko <vsisko@gridgain.com>
Authored: Thu Dec 14 10:37:39 2017 +0700
Committer: Alexey Kuznetsov <akuznetsov@apache.org>
Committed: Thu Dec 14 10:37:39 2017 +0700

----------------------------------------------------------------------
 .../list-of-registered-users.column-defs.js     | 49 +++++++++++---------
 1 file changed, 26 insertions(+), 23 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/c9d6dd5f/modules/web-console/frontend/app/components/list-of-registered-users/list-of-registered-users.column-defs.js
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/components/list-of-registered-users/list-of-registered-users.column-defs.js
b/modules/web-console/frontend/app/components/list-of-registered-users/list-of-registered-users.column-defs.js
index 493c239..83382e0 100644
--- a/modules/web-console/frontend/app/components/list-of-registered-users/list-of-registered-users.column-defs.js
+++ b/modules/web-console/frontend/app/components/list-of-registered-users/list-of-registered-users.column-defs.js
@@ -17,7 +17,8 @@
 
 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"><i class="pull-left" ng-class="row.entity.admin
? \'icon-admin\' : \'icon-user\'"></i>&nbsp;{{ COL_FIELD }}</div>';
+const USER_TEMPLATE = '<div class="ui-grid-cell-contents">' +
+    '<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>`;
 const MODEL_HEADER_TEMPLATE = `<div class='ui-grid-cell-contents' bs-tooltip data-title='{{
col.headerTooltip(col) }}' data-placement='top'><i class='fa fa-object-group'></i>${ICON_SORT}</div>`;
@@ -46,35 +47,37 @@ const ACTIONS_TEMPLATE = `
         </li>
 </div>`;
 
-const EMAIL_TEMPLATE = '<div class="ui-grid-cell-contents"><a ng-href="mailto:{{
COL_FIELD }}">{{ COL_FIELD }}</a></div>';
+const EMAIL_TEMPLATE = '<div class="ui-grid-cell-contents"><a bs-tooltip data-title="{{
COL_FIELD }}" ng-href="mailto:{{ COL_FIELD }}">{{ COL_FIELD }}</a></div>';
+const DATE_WITH_TITLE = '<div class="ui-grid-cell-contents"><label bs-tooltip data-title="{{
COL_FIELD | date:\'M/d/yy HH:mm\' }}">{{ COL_FIELD | date:"M/d/yy HH:mm" }}</label></div>';
+const VALUE_WITH_TITLE = '<div class="ui-grid-cell-contents"><label bs-tooltip data-title="{{
COL_FIELD }}">{{ COL_FIELD }}</label></div>';
 
 export default [
     {name: 'actions', enableHiding: false, displayName: 'Actions', categoryDisplayName: 'Actions',
cellTemplate: ACTIONS_TEMPLATE, field: 'actions', minWidth: 70, width: 70, enableFiltering:
false, enableSorting: false, visible: false},
     {name: 'user', enableHiding: false, displayName: 'User', categoryDisplayName: 'User',
field: 'userName', cellTemplate: USER_TEMPLATE, minWidth: 160, enableFiltering: true, pinnedLeft:
true, filter: { placeholder: 'Filter by name...' }},
     {name: 'email', displayName: 'Email', categoryDisplayName: 'Email', field: 'email', cellTemplate:
EMAIL_TEMPLATE, minWidth: 160, enableFiltering: true, filter: { placeholder: 'Filter by email...'
}},
-    {name: 'company', displayName: 'Company', categoryDisplayName: 'Company', field: 'company',
minWidth: 180, enableFiltering: true, filter: { placeholder: 'Filter by company...' }},
-    {name: 'country', displayName: 'Country', categoryDisplayName: 'Country', field: 'countryCode',
minWidth: 160, enableFiltering: true, filter: { placeholder: 'Filter by country...' }},
-    {name: 'lastlogin', displayName: 'Last login', categoryDisplayName: 'Last login', field:
'lastLogin', cellFilter: 'date:"M/d/yy HH:mm"', minWidth: 135, width: 135, enableFiltering:
false, visible: false},
-    {name: 'lastactivity', displayName: 'Last activity', categoryDisplayName: 'Last activity',
field: 'lastActivity', cellFilter: 'date:"M/d/yy HH:mm"', minWidth: 135, width: 135, enableFiltering:
false, visible: true, sort: { direction: 'desc', priority: 0 }},
+    {name: 'company', displayName: 'Company', categoryDisplayName: 'Company', field: 'company',
cellTemplate: VALUE_WITH_TITLE, minWidth: 180, enableFiltering: true, filter: { placeholder:
'Filter by company...' }},
+    {name: 'country', displayName: 'Country', categoryDisplayName: 'Country', field: 'countryCode',
cellTemplate: VALUE_WITH_TITLE, minWidth: 160, enableFiltering: true, filter: { placeholder:
'Filter by country...' }},
+    {name: 'lastlogin', displayName: 'Last login', categoryDisplayName: 'Last login', field:
'lastLogin', cellTemplate: DATE_WITH_TITLE, minWidth: 135, width: 135, enableFiltering: false,
visible: false},
+    {name: 'lastactivity', displayName: 'Last activity', categoryDisplayName: 'Last activity',
field: 'lastActivity', cellTemplate: DATE_WITH_TITLE, minWidth: 135, width: 135, enableFiltering:
false, visible: true, sort: { direction: 'desc', priority: 0 }},
     // Configurations
-    {name: 'cfg_clusters', displayName: 'Clusters count', categoryDisplayName: 'Configurations',
headerCellTemplate: CLUSTER_HEADER_TEMPLATE, field: 'counters.clusters', type: 'number', cellClass:
'ui-grid-number-cell', headerTooltip: 'Clusters count', minWidth: 65, width: 65, enableFiltering:
false, visible: false},
-    {name: 'cfg_models', displayName: 'Models count', categoryDisplayName: 'Configurations',
headerCellTemplate: MODEL_HEADER_TEMPLATE, field: 'counters.models', type: 'number', cellClass:
'ui-grid-number-cell', headerTooltip: 'Models count', minWidth: 65, width: 65, enableFiltering:
false, visible: false},
-    {name: 'cfg_caches', displayName: 'Caches count', categoryDisplayName: 'Configurations',
headerCellTemplate: CACHE_HEADER_TEMPLATE, field: 'counters.caches', type: 'number', cellClass:
'ui-grid-number-cell', headerTooltip: 'Caches count', minWidth: 65, width: 65, enableFiltering:
false, visible: false},
-    {name: 'cfg_igfs', displayName: 'IGFS count', categoryDisplayName: 'Configurations',
headerCellTemplate: IGFS_HEADER_TEMPLATE, field: 'counters.igfs', type: 'number', cellClass:
'ui-grid-number-cell', headerTooltip: 'IGFS count', minWidth: 65, width: 65, enableFiltering:
false, visible: false},
+    {name: 'cfg_clusters', displayName: 'Clusters count', categoryDisplayName: 'Configurations',
headerCellTemplate: CLUSTER_HEADER_TEMPLATE, field: 'counters.clusters', cellTemplate: VALUE_WITH_TITLE,
type: 'number', cellClass: 'ui-grid-number-cell', headerTooltip: 'Clusters count', minWidth:
65, width: 65, enableFiltering: false, visible: false},
+    {name: 'cfg_models', displayName: 'Models count', categoryDisplayName: 'Configurations',
headerCellTemplate: MODEL_HEADER_TEMPLATE, field: 'counters.models', cellTemplate: VALUE_WITH_TITLE,
type: 'number', cellClass: 'ui-grid-number-cell', headerTooltip: 'Models count', minWidth:
65, width: 65, enableFiltering: false, visible: false},
+    {name: 'cfg_caches', displayName: 'Caches count', categoryDisplayName: 'Configurations',
headerCellTemplate: CACHE_HEADER_TEMPLATE, field: 'counters.caches', cellTemplate: VALUE_WITH_TITLE,
type: 'number', cellClass: 'ui-grid-number-cell', headerTooltip: 'Caches count', minWidth:
65, width: 65, enableFiltering: false, visible: false},
+    {name: 'cfg_igfs', displayName: 'IGFS count', categoryDisplayName: 'Configurations',
headerCellTemplate: IGFS_HEADER_TEMPLATE, field: 'counters.igfs', cellTemplate: VALUE_WITH_TITLE,
type: 'number', cellClass: 'ui-grid-number-cell', headerTooltip: 'IGFS count', minWidth: 65,
width: 65, enableFiltering: false, visible: false},
     // Activities Total
-    {name: 'cfg', displayName: 'Cfg', categoryDisplayName: 'Total activities', field: 'activitiesTotal["configuration"]
|| 0', type: 'number', cellClass: 'ui-grid-number-cell', headerTooltip: 'Total count of configuration
usages', minWidth: 70, width: 70, enableFiltering: false},
-    {name: 'qry', displayName: 'Qry', categoryDisplayName: 'Total activities', field: 'activitiesTotal["queries"]
|| 0', type: 'number', cellClass: 'ui-grid-number-cell', headerTooltip: 'Total count of queries
usages', minWidth: 70, width: 70, enableFiltering: false},
-    {name: 'demo', displayName: 'Demo', categoryDisplayName: 'Total activities', field: 'activitiesTotal["demo"]
|| 0', type: 'number', cellClass: 'ui-grid-number-cell', headerTooltip: 'Total count of demo
startup', minWidth: 85, width: 85, enableFiltering: false},
-    {name: 'dnld', displayName: 'Dnld', categoryDisplayName: 'Total activities', field: 'activitiesDetail["/agent/download"]
|| 0', type: 'number', cellClass: 'ui-grid-number-cell', headerTooltip: 'Total count of agent
downloads', minWidth: 80, width: 80, enableFiltering: false},
-    {name: 'starts', displayName: 'Starts', categoryDisplayName: 'Total activities', field:
'activitiesDetail["/agent/start"] || 0', type: 'number', cellClass: 'ui-grid-number-cell',
headerTooltip: 'Total count of agent startup', minWidth: 87, width: 87, enableFiltering: false},
+    {name: 'cfg', displayName: 'Cfg', categoryDisplayName: 'Total activities', field: 'activitiesTotal["configuration"]
|| 0', cellTemplate: VALUE_WITH_TITLE, type: 'number', cellClass: 'ui-grid-number-cell', headerTooltip:
'Total count of configuration usages', minWidth: 70, width: 70, enableFiltering: false},
+    {name: 'qry', displayName: 'Qry', categoryDisplayName: 'Total activities', field: 'activitiesTotal["queries"]
|| 0', cellTemplate: VALUE_WITH_TITLE, type: 'number', cellClass: 'ui-grid-number-cell', headerTooltip:
'Total count of queries usages', minWidth: 70, width: 70, enableFiltering: false},
+    {name: 'demo', displayName: 'Demo', categoryDisplayName: 'Total activities', field: 'activitiesTotal["demo"]
|| 0', cellTemplate: VALUE_WITH_TITLE, type: 'number', cellClass: 'ui-grid-number-cell', headerTooltip:
'Total count of demo startup', minWidth: 85, width: 85, enableFiltering: false},
+    {name: 'dnld', displayName: 'Dnld', categoryDisplayName: 'Total activities', field: 'activitiesDetail["/agent/download"]
|| 0', cellTemplate: VALUE_WITH_TITLE, type: 'number', cellClass: 'ui-grid-number-cell', headerTooltip:
'Total count of agent downloads', minWidth: 80, width: 80, enableFiltering: false},
+    {name: 'starts', displayName: 'Starts', categoryDisplayName: 'Total activities', field:
'activitiesDetail["/agent/start"] || 0', cellTemplate: VALUE_WITH_TITLE, type: 'number', cellClass:
'ui-grid-number-cell', headerTooltip: 'Total count of agent startup', minWidth: 87, width:
87, enableFiltering: false},
     // Activities Configuration
-    {name: 'clusters', displayName: 'Clusters', categoryDisplayName: 'Configuration\'s activities',
field: 'activitiesDetail["/configuration/clusters"] || 0', type: 'number', cellClass: 'ui-grid-number-cell',
headerTooltip: 'Configuration clusters', minWidth: 100, width: 100, enableFiltering: false,
visible: false},
-    {name: 'model', displayName: 'Model', categoryDisplayName: 'Configuration\'s activities',
field: 'activitiesDetail["/configuration/domains"] || 0', type: 'number', cellClass: 'ui-grid-number-cell',
headerTooltip: 'Configuration model', minWidth: 87, width: 87, enableFiltering: false, visible:
false},
-    {name: 'caches', displayName: 'Caches', categoryDisplayName: 'Configuration\'s activities',
field: 'activitiesDetail["/configuration/caches"] || 0', type: 'number', cellClass: 'ui-grid-number-cell',
headerTooltip: 'Configuration caches', minWidth: 96, width: 96, enableFiltering: false, visible:
false},
-    {name: 'igfs', displayName: 'IGFS', categoryDisplayName: 'Configuration\'s activities',
field: 'activitiesDetail["/configuration/igfs"] || 0', type: 'number', cellClass: 'ui-grid-number-cell',
headerTooltip: 'Configuration IGFS', minWidth: 85, width: 85, enableFiltering: false, visible:
false},
-    {name: 'summary', displayName: 'Summary', categoryDisplayName: 'Configuration\'s activities',
field: 'activitiesDetail["/configuration/summary"] || 0', type: 'number', cellClass: 'ui-grid-number-cell',
headerTooltip: 'Configuration summary', minWidth: 111, width: 111, enableFiltering: false,
visible: false},
+    {name: 'clusters', displayName: 'Clusters', categoryDisplayName: 'Configuration\'s activities',
field: 'activitiesDetail["/configuration/clusters"] || 0', cellTemplate: VALUE_WITH_TITLE,
type: 'number', cellClass: 'ui-grid-number-cell', headerTooltip: 'Configuration clusters',
minWidth: 100, width: 100, enableFiltering: false, visible: false},
+    {name: 'model', displayName: 'Model', categoryDisplayName: 'Configuration\'s activities',
field: 'activitiesDetail["/configuration/domains"] || 0', cellTemplate: VALUE_WITH_TITLE,
type: 'number', cellClass: 'ui-grid-number-cell', headerTooltip: 'Configuration model', minWidth:
87, width: 87, enableFiltering: false, visible: false},
+    {name: 'caches', displayName: 'Caches', categoryDisplayName: 'Configuration\'s activities',
field: 'activitiesDetail["/configuration/caches"] || 0', cellTemplate: VALUE_WITH_TITLE, type:
'number', cellClass: 'ui-grid-number-cell', headerTooltip: 'Configuration caches', minWidth:
96, width: 96, enableFiltering: false, visible: false},
+    {name: 'igfs', displayName: 'IGFS', categoryDisplayName: 'Configuration\'s activities',
field: 'activitiesDetail["/configuration/igfs"] || 0', cellTemplate: VALUE_WITH_TITLE, type:
'number', cellClass: 'ui-grid-number-cell', headerTooltip: 'Configuration IGFS', minWidth:
85, width: 85, enableFiltering: false, visible: false},
+    {name: 'summary', displayName: 'Summary', categoryDisplayName: 'Configuration\'s activities',
field: 'activitiesDetail["/configuration/summary"] || 0', cellTemplate: VALUE_WITH_TITLE,
type: 'number', cellClass: 'ui-grid-number-cell', headerTooltip: 'Configuration summary',
minWidth: 111, width: 111, enableFiltering: false, visible: false},
     // Activities Queries
-    {name: 'execute', displayName: 'Execute', categoryDisplayName: 'Queries\' activities',
field: 'activitiesDetail["/queries/execute"] || 0', type: 'number', cellClass: 'ui-grid-number-cell',
headerTooltip: 'Query executions', minWidth: 98, width: 98, enableFiltering: false, visible:
false},
-    {name: 'explain', displayName: 'Explain', categoryDisplayName: 'Queries\' activities',
field: 'activitiesDetail["/queries/explain"] || 0', type: 'number', cellClass: 'ui-grid-number-cell',
headerTooltip: 'Query explain executions', minWidth: 95, width: 95, enableFiltering: false,
visible: false},
-    {name: 'scan', displayName: 'Scan', categoryDisplayName: 'Queries\' activities', field:
'activitiesDetail["/queries/scan"] || 0', type: 'number', cellClass: 'ui-grid-number-cell',
headerTooltip: 'Scan query executions', minWidth: 80, width: 80, enableFiltering: false, visible:
false}
+    {name: 'execute', displayName: 'Execute', categoryDisplayName: 'Queries\' activities',
field: 'activitiesDetail["/queries/execute"] || 0', cellTemplate: VALUE_WITH_TITLE, type:
'number', cellClass: 'ui-grid-number-cell', headerTooltip: 'Query executions', minWidth: 98,
width: 98, enableFiltering: false, visible: false},
+    {name: 'explain', displayName: 'Explain', categoryDisplayName: 'Queries\' activities',
field: 'activitiesDetail["/queries/explain"] || 0', cellTemplate: VALUE_WITH_TITLE, type:
'number', cellClass: 'ui-grid-number-cell', headerTooltip: 'Query explain executions', minWidth:
95, width: 95, enableFiltering: false, visible: false},
+    {name: 'scan', displayName: 'Scan', categoryDisplayName: 'Queries\' activities', field:
'activitiesDetail["/queries/scan"] || 0', cellTemplate: VALUE_WITH_TITLE, type: 'number',
cellClass: 'ui-grid-number-cell', headerTooltip: 'Scan query executions', minWidth: 80, width:
80, enableFiltering: false, visible: false}
 ];


Mime
View raw message