From f37098a0a625061fc4d69817040448ea276b0688 Mon Sep 17 00:00:00 2001
From: Cameron Hyde <chyde@neoformit.com>
Date: Thu, 12 Dec 2024 15:24:50 +1000
Subject: [PATCH] Open internal usegalaxy links with target="_top"

---
 .../templates/labs/components/accordion.html  |  2 --
 .../templates/labs/components/info-modal.html | 29 -------------------
 app/labs/templates/labs/exported.html         |  7 +++--
 3 files changed, 5 insertions(+), 33 deletions(-)
 delete mode 100644 app/labs/templates/labs/components/info-modal.html

diff --git a/app/labs/templates/labs/components/accordion.html b/app/labs/templates/labs/components/accordion.html
index 24e3a6a..add698f 100644
--- 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
deleted file mode 100644
index f99a17c..0000000
--- a/app/labs/templates/labs/components/info-modal.html
+++ /dev/null
@@ -1,29 +0,0 @@
-{% load static %}
-
-<div class="modal fade" id="infoModal" tabindex="-1">
-  <div class="modal-dialog modal-lg">
-    <div class="modal-content">
-      <div class="modal-header">
-        <h5 class="modal-title">Galaxy Australia {{ site_name }}</h5>
-        <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
-      </div>
-      <div class="modal-body">
-        <p>
-          This site <em>{{ subdomain }}.usegalaxy.org.au</em> is connected to the same server as <em>usegalaxy.org.au</em>, but with an interface dedicated to helping our {{ researchers }} researchers. Your history, jobs and data quota are shared with the Base server.
-        </p>
-
-        <div class="my-3">
-          Switch between sites quickly using the dropdown in Galaxy Australia's main navigation bar:
-          <img class="w-100 my-3 mx-auto" src="{% static 'labs/img/site-switcher.png' %}" alt="Switch site button">
-        </div>
-
-        <p><a class="ga-btn" href="https://usegalaxy.org.au" target="_blank">Take me back to Galaxy Australia</a></p>
-        <p><a class="ga-btn" href="/about">What is Galaxy Australia?</a></p>
-        <p><a class="ga-btn" href="/request/support">Galaxy Australia support</a></p>
-      </div>
-      <div class="modal-footer">
-        <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>
-      </div>
-    </div>
-  </div>
-</div>
diff --git a/app/labs/templates/labs/exported.html b/app/labs/templates/labs/exported.html
index 8693b09..3aed368 100644
--- 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 %}