+
Skip to content

externalInfo display #613

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

externalInfo display #613

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
cac3aa7
Show externalInfo in right panel if available
will-moore Mar 13, 2025
aeb7536
Move External info under Filset info panel
will-moore Mar 14, 2025
a8c190b
Pass obj to toolbar.html for all objects. Tweak extInfo css
will-moore Mar 14, 2025
cca34cb
Only show ExternalInfo on .show()
will-moore Jun 2, 2025
f3c42d3
Show externalInfo with 'Zarr' button. Link to open in BioNGFF viewer
will-moore Sep 11, 2025
189a107
Remove console.log
will-moore Sep 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion omeroweb/webclient/static/webclient/css/dusty.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ button::-moz-focus-inner {
.btn_hierarchy {background: url('../../webgateway/img/iconmonstr-sitemap-6-icon-16.png') center center no-repeat;}
.btn_link {background: url('../../webgateway/img/icon_link.png')center center no-repeat;}

.btn_fspath, .btn_link, .btn_add, .btn_hierarchy {
.btn_fspath, .btn_link, .btn_add, .btn_hierarchy, .btn_extinfo {
float:right;
position: relative;
margin-left: 5px;
Expand Down
43 changes: 41 additions & 2 deletions omeroweb/webclient/templates/webclient/annotations/includes/toolbar.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,11 @@
});

{% endif %}

$("#show_ext_info").on("click", function() {
var $panel = $("#externalInfo");
$panel.toggle();
});

});
</script>
Expand Down Expand Up @@ -348,10 +353,12 @@
</li>
{% endwith %}
{% endif %}
{% endif %}
{% endif %} <!-- endif image -->
</ul>
</div>

{% endif %} <!-- endif image or filesetInfo -->

{% if not share %}
{% if image.showOriginalFilePaths %}
<!-- show original file paths -->
Expand All @@ -366,7 +373,6 @@
</button>
{% endif %}
{% endif %}
{% endif %}


<!-- Publishing Options (Figure Scripts) -->
Expand All @@ -375,6 +381,17 @@
{% include "webclient/annotations/includes/figure_scripts_menu.html" %}
{% endif %}
{% endif %}

<!-- External Info (Zarr url)-->
{% with extinfo=obj.getExternalInfo %}
{% if extinfo %}
<button id="show_ext_info" class="btn silver btn_extinfo" title="Zarr url" >
<span style="width: 25px; margin: 3px 2px 1px 2px; background: transparent; box-shadow: none; font-size: 11px; padding: 0px;">
Zarr
</span>
</button>
{% endif %}
{% endwith %}



Expand Down Expand Up @@ -424,3 +441,25 @@
<input type="text" size="30">
<img title="Close" src="{% static 'webgateway/img/close.gif' %}" />
</div>

<!-- This is HIDDEN here, but cloned into the Fileset Info panel when shown -->
<div id="externalInfo" class="debug" style="display: none; margin-top: 20px; font-size: 13px;">
<!-- This will return None if obj.getExternalInfo method doesn't exist (omero-py 5.19.6 and earlier) -->
{% with extinfo=obj.getExternalInfo %}
{% if extinfo %}
<h3>External Info (ID: {{ extinfo.id.val }})</h3>

<!-- slice 2: to remove "s3" and replace with https -->
<a href="https://biongff.github.io/biongff-viewer/?source=https{{ extinfo.lsid.val|slice:"2:" }}" target="_blank"
style="font-size: 13px; text-decoration: underline; display: inline-block;">
Open with BioNGFF viewer
</a>

<ul style="background: white; margin: 5px 0; padding: 7px; border: 1px solid rgb(221, 221, 221); overflow: auto;">
<li>lsid: <strong>{{ extinfo.lsid.val }}</strong></li>
<li>entityType: <strong>{{ extinfo.entityType.val }}</strong></li>
<li>entityId: <strong>{{ extinfo.entityId.val }}</strong></li>
</ul>
{% endif %}
{% endwith %}
</div>
31 changes: 22 additions & 9 deletions omeroweb/webclient/templates/webclient/annotations/metadata_general.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,9 +141,10 @@
return;
}
$("#toolbar_info_panel").show();
$panel_title.html("Loading...");
$panel_title.html("&nbsp");
$panel_div.empty();
if (original_file_paths_url) {
$panel_title.html("Loading...");
$.getJSON(original_file_paths_url,
function(data) {
var repo = data.repo,
Expand Down Expand Up @@ -498,7 +499,7 @@

{% if manager.image %}

{% with image=manager.image canDownload=manager.image.canDownload %}
{% with obj=manager.image image=manager.image canDownload=manager.image.canDownload %}
{% include "webclient/annotations/includes/toolbar.html" %}
{% endwith %}

Expand Down Expand Up @@ -536,7 +537,9 @@ <h1 class="can-collapse defclose" data-name="details">
{% else %}
{% if manager.dataset %}

{% include "webclient/annotations/includes/toolbar.html" %}
{% with obj=manager.dataset %}
{% include "webclient/annotations/includes/toolbar.html" %}
{% endwith %}

<!-- Dataset Name, ID, Owner -->
{% with obj=manager.dataset nameText=manager.dataset.name %}
Expand All @@ -563,7 +566,9 @@ <h1 class="can-collapse defclose" data-name="details">
{% else %}
{% if manager.project %}

{% include "webclient/annotations/includes/toolbar.html" %}
{% with obj=manager.project %}
{% include "webclient/annotations/includes/toolbar.html" %}
{% endwith %}

<!-- Project Name, ID, Owner -->
{% with obj=manager.project nameText=manager.project.name %}
Expand Down Expand Up @@ -592,7 +597,7 @@ <h1 class="can-collapse defclose" data-name="details">
{% endif %}

{% if manager.well %}
{% with image=manager.getWellSampleImage %}
{% with obj=manager.well image=manager.getWellSampleImage %}
{% include "webclient/annotations/includes/toolbar.html" %}
{% endwith %}

Expand All @@ -604,7 +609,9 @@ <h1 class="can-collapse defclose" data-name="details">
{% else %}
{% if manager.acquisition %}

{% include "webclient/annotations/includes/toolbar.html" %}
{% with obj=manager.acquisition %}
{% include "webclient/annotations/includes/toolbar.html" %}
{% endwith %}

<!-- Acquisition Name -->
{% with obj=manager.acquisition nameText=manager.acquisition.name %}
Expand Down Expand Up @@ -640,7 +647,9 @@ <h1 class="can-collapse defclose" data-name="details">
{% else %}
{% if manager.plate %}

{% include "webclient/annotations/includes/toolbar.html" %}
{% with obj=manager.plate %}
{% include "webclient/annotations/includes/toolbar.html" %}
{% endwith %}

<!-- Plate Name, ID, Owner -->
{% with obj=manager.plate nameText=manager.plate.name %}
Expand Down Expand Up @@ -674,7 +683,9 @@ <h1 class="can-collapse defclose" data-name="details">
{% else %}
{% if manager.screen %}

{% include "webclient/annotations/includes/toolbar.html" %}
{% with obj=manager.screen %}
{% include "webclient/annotations/includes/toolbar.html" %}
{% endwith %}

<!-- Screen Name, ID, Owner -->
{% with obj=manager.screen nameText=manager.screen.name %}
Expand Down Expand Up @@ -733,7 +744,9 @@ <h1 class="can-collapse defclose" data-name="details">
<div id="general_tab" class="right_tab_inner" >

<!-- Toolbar at the top -->
{% include "webclient/annotations/includes/toolbar.html" %}
{% with obj=manager.tag %}
{% include "webclient/annotations/includes/toolbar.html" %}
{% endwith %}


<!-- Tag TextValue, ID, Owner -->
Expand Down
2 changes: 2 additions & 0 deletions omeroweb/webclient/templates/webclient/base/base_container.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,8 @@
<script type="text/javascript" src="{% static "webgateway/js/ome.spwgridview.js"|add:url_suffix %}"></script>

<script>
// Tip for developers... E.g. shows ExternalInfo after loading right panel
console.log("For dev info, use: $('.debug').show();");

// OMERO constants
if (OMERO === undefined) {var OMERO = {};}
Expand Down
点击 这是indexloc提供的php浏览器服务，不要输入任何密码和下载