From f2288ceb4938c5638abcdc3cbdfb014b349496da Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Fri, 8 May 2020 23:53:50 +0200
Subject: [PATCH] let's work with frame targets

---
 htdocs/include/header.include.html | 2 +-
 htdocs/openwebrx.js                | 6 +++---
 owrx/controllers/template.py       | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/htdocs/include/header.include.html b/htdocs/include/header.include.html
index c86977c..aa2275a 100644
--- a/htdocs/include/header.include.html
+++ b/htdocs/include/header.include.html
@@ -16,7 +16,7 @@
                 <div class="button" data-toggle-panel="openwebrx-panel-status"><img src="static/gfx/openwebrx-panel-status.png" /><br/>Status</div>
                 <div class="button" data-toggle-panel="openwebrx-panel-log"><img  src="static/gfx/openwebrx-panel-log.png" /><br/>Log</div>
                 <div class="button" data-toggle-panel="openwebrx-panel-receiver"><img src="static/gfx/openwebrx-panel-receiver.png" /><br/>Receiver</div>
-                <a class="button" href="map" target="_blank"><img src="static/gfx/openwebrx-panel-map.png" /><br/>Map</a>
+                <a class="button" href="map" target="openwebrx-map"><img src="static/gfx/openwebrx-panel-map.png" /><br/>Map</a>
                 ${settingslink}
             </section>
         </div>
diff --git a/htdocs/openwebrx.js b/htdocs/openwebrx.js
index 8f2ca79..0fa62cd 100644
--- a/htdocs/openwebrx.js
+++ b/htdocs/openwebrx.js
@@ -975,14 +975,14 @@ function update_wsjt_panel(msg) {
     if (['FT8', 'JT65', 'JT9', 'FT4'].indexOf(msg['mode']) >= 0) {
         matches = linkedmsg.match(/(.*\s[A-Z0-9]+\s)([A-R]{2}[0-9]{2})$/);
         if (matches && matches[2] !== 'RR73') {
-            linkedmsg = html_escape(matches[1]) + '<a href="map?locator=' + matches[2] + '" target="_blank">' + matches[2] + '</a>';
+            linkedmsg = html_escape(matches[1]) + '<a href="map?locator=' + matches[2] + '" target="openwebrx-map">' + matches[2] + '</a>';
         } else {
             linkedmsg = html_escape(linkedmsg);
         }
     } else if (msg['mode'] === 'WSPR') {
         matches = linkedmsg.match(/([A-Z0-9]*\s)([A-R]{2}[0-9]{2})(\s[0-9]+)/);
         if (matches) {
-            linkedmsg = html_escape(matches[1]) + '<a href="map?locator=' + matches[2] + '" target="_blank">' + matches[2] + '</a>' + html_escape(matches[3]);
+            linkedmsg = html_escape(matches[1]) + '<a href="map?locator=' + matches[2] + '" target="openwebrx-map">' + matches[2] + '</a>' + html_escape(matches[3]);
         } else {
             linkedmsg = html_escape(linkedmsg);
         }
@@ -1068,7 +1068,7 @@ function update_packet_panel(msg) {
         'style="' + stylesToString(styles) + '"'
     ].join(' ');
     if (msg.lat && msg.lon) {
-        link = '<a ' + attrs + ' href="map?callsign=' + source + '" target="_blank">' + overlay + '</a>';
+        link = '<a ' + attrs + ' href="map?callsign=' + source + '" target="openwebrx-map">' + overlay + '</a>';
     } else {
         link = '<div ' + attrs + '>' + overlay + '</div>'
     }
diff --git a/owrx/controllers/template.py b/owrx/controllers/template.py
index 6030fd1..23c1d17 100644
--- a/owrx/controllers/template.py
+++ b/owrx/controllers/template.py
@@ -23,7 +23,7 @@ class WebpageController(TemplateController):
         settingslink = ""
         pm = Config.get()
         if "webadmin_enabled" in pm and pm["webadmin_enabled"]:
-            settingslink = """<a class="button" href="settings" target="_blank"><img src="static/gfx/openwebrx-panel-settings.png" /><br/>Settings</a>"""
+            settingslink = """<a class="button" href="settings" target="openwebrx-settings"><img src="static/gfx/openwebrx-panel-settings.png" /><br/>Settings</a>"""
         header = self.render_template("include/header.include.html", settingslink=settingslink)
         return {"header": header}