From 616ccd988cd3b16aafedaf2806a6e29ff22ee989 Mon Sep 17 00:00:00 2001 From: David Manthey Date: Mon, 7 Oct 2024 10:56:24 -0400 Subject: [PATCH] Make default item lists look less different than before #1651 --- CHANGELOG.md | 2 +- .../web_client/stylesheets/itemList.styl | 7 +++++++ .../girder_large_image/web_client/templates/itemList.pug | 3 ++- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9a4d26b98..5750c51af 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,7 @@ - Better handle images without enough tile layers ([#1648](../../pull/1648)) - Add users option to config files; have a default config file ([#1649](../../pull/1649)) -- Remove no longer used code; adjust item list slightly ([#1651](../../pull/1651)) +- Remove no longer used code; adjust item list slightly ([#1651](../../pull/1651), [#1668](../../pull/1668)) - Reduce updates when showing item lists; add a waiting spinner ([#1653](../../pull/1653)) - Update item lists check for large images when toggling recurse ([#1654](../../pull/1654)) - Support named item lists ([#1665](../../pull/1665)) diff --git a/girder/girder_large_image/web_client/stylesheets/itemList.styl b/girder/girder_large_image/web_client/stylesheets/itemList.styl index a6ecbf659..7280503f8 100644 --- a/girder/girder_large_image/web_client/stylesheets/itemList.styl +++ b/girder/girder_large_image/web_client/stylesheets/itemList.styl @@ -107,6 +107,13 @@ ul.g-item-list &>li>.li-item-list-cell display inline-block +ul.g-item-list[metadata-columns="0"] + .li-column-record-size + text-wrap no-wrap + + .li-column-record-name + width 100% + .li-item-list-filter padding-left 12px diff --git a/girder/girder_large_image/web_client/templates/itemList.pug b/girder/girder_large_image/web_client/templates/itemList.pug index 6545904fe..87ac8c36f 100644 --- a/girder/girder_large_image/web_client/templates/itemList.pug +++ b/girder/girder_large_image/web_client/templates/itemList.pug @@ -1,4 +1,5 @@ -ul.g-item-list.li-item-list(layout_mode=(itemList.layout || {}).mode || '') +- var metadataCount = itemList.columns.filter((col) => col.type === 'metadata').length +ul.g-item-list.li-item-list(layout_mode=(itemList.layout || {}).mode || '', metadata-columns=metadataCount) - var colNames = []; if items.length li.li-item-list-header