Merge pull request #18 from usegalaxy-au/dev

Open internal usegalaxy links with target="_top"
usegalaxy-au · Dec 12, 2024 · 079b465 · 079b465
2 parents 3dc638c + f37098a
commit 079b465
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 33 deletions.
diff --git a/app/labs/templates/labs/components/accordion.html b/app/labs/templates/labs/components/accordion.html
@@ -39,7 +39,6 @@ <h2 class="accordion-header" id="{{ section.id }}-{{ tab_id }}-{{ forloop.counte
                 title="{{ item.button_tip|default:'Run tool' }}"
                 data-bs-toggle="tooltip"
                 data-bs-placement="left"
-                target="_blank"
               >
                 {% if item.button_icon %}
                 <span class="material-icons">{{ item.button_icon|iconkey }}</span>
@@ -55,7 +54,6 @@ <h2 class="accordion-header" id="{{ section.id }}-{{ tab_id }}-{{ forloop.counte
               <a
                 href="{{ item.view_link }}"
                 class="btn btn-galaxy"
-                target="_blank"
                 {% if item.view_tip %}
                 title="{{ item.view_tip }}"
                 data-bs-toggle="tooltip"

diff --git a/app/labs/templates/labs/components/info-modal.html b/app/labs/templates/labs/components/info-modal.html
diff --git a/app/labs/templates/labs/exported.html b/app/labs/templates/labs/exported.html
@@ -77,9 +77,12 @@
     if (
       item.href
       && item.href.slice(0, 1) !== "/"
-      && !item.href.includes("{{ galaxy_base_url }}")
     ) {
-      item.target = '_blank';
+      if (item.href.includes("{{ galaxy_base_url }}")) {
+        item.target = '_top';
+      } else {
+        item.target = '_blank';
+      }
     }
   });
 {% endblock %}