From eb5aaaec96fc0fd804a13d0ccceba94673925b71 Mon Sep 17 00:00:00 2001 From: Jeffrey Baumes Date: Thu, 17 Oct 2024 12:21:16 -0400 Subject: [PATCH 1/3] add tailwind --- histomicsui/web_client/views/itemList.js | 4 +- histomicsui/webroot.mako | 225 +++++++++++++++++++++++ 2 files changed, 227 insertions(+), 2 deletions(-) diff --git a/histomicsui/web_client/views/itemList.js b/histomicsui/web_client/views/itemList.js index d3258601..ee9f32f8 100644 --- a/histomicsui/web_client/views/itemList.js +++ b/histomicsui/web_client/views/itemList.js @@ -67,8 +67,8 @@ wrap(ItemListWidget, 'render', function (render) { const webrootPath = (settings['histomicsui.webroot_path'] || ''); if (!this.$el.closest('.modal-dialog').length) { for (let ix = 0; ix < this.collection.length; ix++) { - if (!this.$el.find('.g-item-list li.g-item-list-entry:eq(' + ix + ') .g-hui-open-link').length && this.collection.models[ix].attributes.largeImage) { - this.$el.find('.g-item-list li.g-item-list-entry:eq(' + ix + ') a[class^=g-]:last').after( + if (!this.$el.find('.g-item-list .g-item-list-entry:eq(' + ix + ') .g-hui-open-link').length && this.collection.models[ix].attributes.largeImage) { + this.$el.find('.g-item-list .g-item-list-entry:eq(' + ix + ') a[class^=g-]:last').after( `` ); } diff --git a/histomicsui/webroot.mako b/histomicsui/webroot.mako index b2b6a434..e58b2b13 100644 --- a/histomicsui/webroot.mako +++ b/histomicsui/webroot.mako @@ -8,6 +8,231 @@ % for plugin in pluginCss: % endfor + + + + + + + + +
${apiRoot}
From 611380c57e0b5721bf3c6e3fd20430b1bea1f15b Mon Sep 17 00:00:00 2001 From: David Manthey Date: Fri, 11 Oct 2024 16:42:28 -0400 Subject: [PATCH 2/3] Add and support app buttons. This requires an appropriately new version in large_image. Future work is to support app icons. Those should probably be configurable before any are merged in. --- histomicsui/web_client/views/itemList.js | 35 +++++++++++++++++------- 1 file changed, 25 insertions(+), 10 deletions(-) diff --git a/histomicsui/web_client/views/itemList.js b/histomicsui/web_client/views/itemList.js index d3258601..577e9ba1 100644 --- a/histomicsui/web_client/views/itemList.js +++ b/histomicsui/web_client/views/itemList.js @@ -4,7 +4,7 @@ import {wrap} from '@girder/core/utilities/PluginUtils'; import {AccessType} from '@girder/core/constants'; import {restRequest} from '@girder/core/rest'; import events from '@girder/core/events'; -import ItemListWidget from '@girder/core/views/widgets/ItemListWidget'; +import ItemListWidget from '@girder/large_image/views/itemList'; import {HuiSettings} from './utils'; @@ -63,17 +63,32 @@ wrap(ItemListWidget, 'render', function (render) { } HuiSettings.getSettings().then((settings) => { - const brandName = (settings['histomicsui.brand_name'] || ''); - const webrootPath = (settings['histomicsui.webroot_path'] || ''); - if (!this.$el.closest('.modal-dialog').length) { - for (let ix = 0; ix < this.collection.length; ix++) { - if (!this.$el.find('.g-item-list li.g-item-list-entry:eq(' + ix + ') .g-hui-open-link').length && this.collection.models[ix].attributes.largeImage) { - this.$el.find('.g-item-list li.g-item-list-entry:eq(' + ix + ') a[class^=g-]:last').after( - `` - ); + const brandName = (settings['histomicsui.brand_name'] || 'HistomicsUI'); + const webrootPath = (settings['histomicsui.webroot_path'] || 'histomics'); + + ItemListWidget.registeredApplications.histomicsui = { + name: brandName, + // icon: + check: (modelType, model) => { + if (modelType !== 'item' || !model.get('largeImage')) { + return false; + } + const li = model.get('largeImage'); + if (!li.fileId || li.expected === true) { + return false; } + let priority = 0; + try { + if (model.get('meta') && model.get('meta').dicom && model.get('meta').dicom.Modality && model.get('meta').dicom.Modality !== 'SM') { + priority = 1; + } + } catch (e) {} + return { + url: `${webrootPath}#?image=${model.id}`, + priority: priority + }; } - } + }; if (this.accessLevel >= AccessType.WRITE) { adjustView.call(this, settings); } From f8312919bbc7c7885ec764c5ba6172a0edbe407f Mon Sep 17 00:00:00 2001 From: David Manthey Date: Mon, 12 Jan 2026 15:28:53 -0500 Subject: [PATCH 3/3] Fix a style in the wip-style branch --- histomicsui/webroot.mako | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/histomicsui/webroot.mako b/histomicsui/webroot.mako index e58b2b13..0ec6ce9f 100644 --- a/histomicsui/webroot.mako +++ b/histomicsui/webroot.mako @@ -230,6 +230,11 @@ display: none; } } + .h-annotation { + [class*=" icon-"]:before, [class^=icon-]:before { + margin-right: 0; + } + }