From 5ada234f64196cd3b6751291067836d701adb133 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Thu, 11 Jul 2019 19:37:00 +0200
Subject: [PATCH] remove javascript from the header

---
 htdocs/include/header.include.html | 16 ++++++++--------
 htdocs/openwebrx.js                |  9 +++++++++
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/htdocs/include/header.include.html b/htdocs/include/header.include.html
index b2f3bc9..c7efe13 100644
--- a/htdocs/include/header.include.html
+++ b/htdocs/include/header.include.html
@@ -5,21 +5,21 @@
             <a href="https://sdr.hu/openwebrx" target="_blank"><img src="static/gfx/openwebrx-top-logo.png" id="webrx-top-logo" /></a>
             <a href="http://ha5kfu.sch.bme.hu/" target="_blank"><img src="static/gfx/openwebrx-ha5kfu-top-logo.png" id="webrx-ha5kfu-top-logo" /></a>
             <div id="webrx-rx-avatar-background">
-                <img id="webrx-rx-avatar" src="static/gfx/openwebrx-avatar.png" onclick="toggle_rx_photo();"/>
+                <img id="webrx-rx-avatar" class="openwebrx-photo-trigger" src="static/gfx/openwebrx-avatar.png"/>
             </div>
             <div id="webrx-rx-texts">
-                <div id="webrx-rx-title" onclick="toggle_rx_photo();"></div>
-                <div id="webrx-rx-desc" onclick="toggle_rx_photo();"></div>
+                <div id="webrx-rx-title" class="openwebrx-photo-trigger"></div>
+                <div id="webrx-rx-desc" class="openwebrx-photo-trigger"></div>
             </div>
             <div id="openwebrx-rx-details-arrow">
-                <a id="openwebrx-rx-details-arrow-up" onclick="toggle_rx_photo();"><img src="static/gfx/openwebrx-rx-details-arrow-up.png" /></a>
-                <a id="openwebrx-rx-details-arrow-down" onclick="toggle_rx_photo();"><img src="static/gfx/openwebrx-rx-details-arrow.png" /></a>
+                <a id="openwebrx-rx-details-arrow-up" class="openwebrx-photo-trigger"><img src="static/gfx/openwebrx-rx-details-arrow-up.png" /></a>
+                <a id="openwebrx-rx-details-arrow-down" class="openwebrx-photo-trigger"><img src="static/gfx/openwebrx-rx-details-arrow.png" /></a>
             </div>
             <section id="openwebrx-main-buttons">
                 <ul>
-                    <li onmouseup="toggle_panel('openwebrx-panel-status');"><img src="static/gfx/openwebrx-panel-status.png" /><br/>Status</li>
-                    <li onmouseup="toggle_panel('openwebrx-panel-log');"><img  src="static/gfx/openwebrx-panel-log.png" /><br/>Log</li>
-                    <li onmouseup="toggle_panel('openwebrx-panel-receiver');"><img src="static/gfx/openwebrx-panel-receiver.png" /><br/>Receiver</li>
+                    <li data-toggle-panel="openwebrx-panel-status"><img src="static/gfx/openwebrx-panel-status.png" /><br/>Status</li>
+                    <li data-toggle-panel="openwebrx-panel-log"><img  src="static/gfx/openwebrx-panel-log.png" /><br/>Log</li>
+                    <li data-toggle-panel="openwebrx-panel-receiver"><img src="static/gfx/openwebrx-panel-receiver.png" /><br/>Receiver</li>
                     <li><a href="/map" target="_blank"><img src="static/gfx/openwebrx-panel-map.png" /><br/>Map</a></li>
                 </ul>
             </section>
diff --git a/htdocs/openwebrx.js b/htdocs/openwebrx.js
index 1b4fe11..e004ae4 100644
--- a/htdocs/openwebrx.js
+++ b/htdocs/openwebrx.js
@@ -86,6 +86,7 @@ function init_rx_photo()
 	window.setTimeout(function() { animate(e("webrx-rx-photo-title"),"opacity","",1,0,1,500,30); },1000);
 	window.setTimeout(function() { animate(e("webrx-rx-photo-desc"),"opacity","",1,0,1,500,30); },1500);
 	window.setTimeout(function() { close_rx_photo() },2500);
+	$('#webrx-top-container .openwebrx-photo-trigger').click(toggle_rx_photo);
 }
 
 dont_toggle_rx_photo_flag=0;
@@ -2365,6 +2366,13 @@ function openwebrx_resize()
 	check_top_bar_congestion();
 }
 
+function init_header()
+{
+    $('#openwebrx-main-buttons li[data-toggle-panel]').click(function() {
+        toggle_panel($(this).data('toggle-panel'));
+    });
+}
+
 function openwebrx_init()
 {
 	if(ios||is_chrome) e("openwebrx-big-grey").style.display="table-cell";
@@ -2377,6 +2385,7 @@ function openwebrx_init()
 	window.setTimeout(function(){window.setInterval(debug_audio,1000);},1000);
 	window.addEventListener("resize",openwebrx_resize);
 	check_top_bar_congestion();
+	init_header();
 
 	//Synchronise volume with slider
 	updateVolume();