diff --git a/client/res/templates/record/list.tpl b/client/res/templates/record/list.tpl index fc3cf6be88..b17f1b0f12 100644 --- a/client/res/templates/record/list.tpl +++ b/client/res/templates/record/list.tpl @@ -108,14 +108,16 @@ {{/if}} {{#if displayTotalCount}} -
- {{totalCountFormatted}} -
+
+ {{totalCountFormatted}} +
{{/if}} +{{else}} +
{{/if}}
diff --git a/client/src/views/record/list.js b/client/src/views/record/list.js index 949f8129b2..6ecfce6091 100644 --- a/client/src/views/record/list.js +++ b/client/src/views/record/list.js @@ -936,12 +936,15 @@ function (Dep, MassActionHelper, ExportHelper, RecordModal) { } } + let displayTotalCount = this.displayTotalCount && this.collection.total > 0; + let topBar = paginationTop || this.checkboxes || (this.buttonList.length && !this.buttonsDisabled) || (this.dropdownItemList.length && !this.buttonsDisabled) || - this.forceDisplayTopBar; + this.forceDisplayTopBar || + displayTotalCount; return { scope: this.scope, @@ -963,7 +966,7 @@ function (Dep, MassActionHelper, ExportHelper, RecordModal) { checkAllResultDisabled: checkAllResultDisabled, buttonList: this.buttonList, dropdownItemList: this.dropdownItemList, - displayTotalCount: this.displayTotalCount && this.collection.total > 0, + displayTotalCount: displayTotalCount, displayActionsButtonGroup: this.checkboxes || this.massActionList || this.buttonList.length || this.dropdownItemList.length, totalCountFormatted: this.getNumberUtil().formatInt(this.collection.total), diff --git a/frontend/less/espo/custom.less b/frontend/less/espo/custom.less index 17e4267b9d..8160f170f7 100644 --- a/frontend/less/espo/custom.less +++ b/frontend/less/espo/custom.less @@ -867,6 +867,7 @@ input.global-search-input { .list-container .list-buttons-container { margin-bottom: @padding-base-horizontal; + min-height: 35px; } .list-buttons-container .sticked-bar {