From 517110ba0911d31ff2ebeedc741a07c128f04ccc Mon Sep 17 00:00:00 2001 From: Simon Howe Date: Wed, 21 Sep 2016 15:24:59 +0200 Subject: [PATCH] Keep "count" as tooltip for new mini "#" column header --- .../components/node-details/node-details-table.js | 14 ++++++++++++-- render/detailed/connections.go | 2 +- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/client/app/scripts/components/node-details/node-details-table.js b/client/app/scripts/components/node-details/node-details-table.js index ba62decf6..754841e01 100644 --- a/client/app/scripts/components/node-details/node-details-table.js +++ b/client/app/scripts/components/node-details/node-details-table.js @@ -20,6 +20,11 @@ const CW = { }; +const XS_LABEL = { + count: '#' +}; + + const COLUMN_WIDTHS = { count: CW.XS, docker_container_created: CW.XL, @@ -227,14 +232,19 @@ export default class NodeDetailsTable extends React.Component { headerClasses.push('node-details-table-header-sorted'); } + const style = colStyles[i]; + const label = (style.width === CW.XS && XS_LABEL[header.id]) ? + XS_LABEL[header.id] : + header.label; + return ( - {isSortedAsc && } {isSortedDesc && } - {header.label} + {label} ); })} diff --git a/render/detailed/connections.go b/render/detailed/connections.go index 4141e344b..bd38be545 100644 --- a/render/detailed/connections.go +++ b/render/detailed/connections.go @@ -14,7 +14,7 @@ const ( portKey = "port" portLabel = "Port" countKey = "count" - countLabel = "#" + countLabel = "Count" remoteKey = "remote" remoteLabel = "Remote" number = "number"