fHDHR/device/channels/channel.py

@@ -153,7 +153,7 @@ class Channel():
                  'GuideNumber': self.number,
                  'GuideName': self.dict['name'],
                  'Tags': ",".join(self.dict['tags']),
-                 'URL': self.hdhr_stream_url,
+                 'URL': self.stream_url,
                  'HD': self.dict["HD"],
                  "Favorite": self.dict["favorite"],
                 }
@@ -163,27 +163,11 @@ class Channel():
         return "/api/images?method=generate&type=channel&message=%s" % self.number
 
     @property
-    def hdhr_stream_url(self):
-        return '/auto/%s' % self.hdhr_stream_ident
+    def stream_url(self):
+        return '/auto/v%s' % self.number
 
     @property
-    def hdhr_stream_ident(self):
-        return 'v%s' % self.number
-
-    @property
-    def rmg_stream_url(self):
-        return "/devices/%s/media/%s" % (self.fhdhr.config.dict["main"]["uuid"], self.rmg_stream_ident)
-
-    @property
-    def rmg_stream_ident(self):
-        return "id://%s" % self.number
-
-    @property
-    def api_stream_url(self):
-        return '/api/tuners?method=%s&channel=%s' % (self.fhdhr.config.dict["fhdhr"]["stream_type"], self.number)
-
-    @property
-    def m3u_url(self):
+    def play_url(self):
         return '/api/m3u?method=get&channel=%s' % self.number
 
     def set_favorite(self, enablement):

fHDHR_web/api/channels.py

@@ -9,9 +9,6 @@ class Channels():
     endpoints = ["/api/channels"]
     endpoint_name = "api_channels"
     endpoint_methods = ["GET", "POST"]
-    endpoint_default_parameters = {
-                                    "method": "get"
-                                    }
 
     def __init__(self, fhdhr):
         self.fhdhr = fhdhr
@@ -29,8 +26,8 @@ class Channels():
             for fhdhr_id in [x["id"] for x in self.fhdhr.device.channels.get_channels()]:
                 channel_obj = self.fhdhr.device.channels.list[fhdhr_id]
                 channel_dict = channel_obj.dict.copy()
-                channel_dict["m3u_url"] = channel_obj.m3u_url
-                channel_dict["stream_url"] = channel_obj.api_stream_url
+                channel_dict["play_url"] = channel_obj.play_url
+                channel_dict["stream_url"] = channel_obj.stream_url
                 channels_info[channel_obj.number] = channel_dict
 
             # Sort the channels

fHDHR_web/api/cluster.py

@@ -7,9 +7,6 @@ class Cluster():
     endpoints = ["/api/cluster"]
     endpoint_name = "api_cluster"
     endpoint_methods = ["GET", "POST"]
-    endpoint_default_parameters = {
-                                    "method": "get"
-                                    }
 
     def __init__(self, fhdhr):
         self.fhdhr = fhdhr

fHDHR_web/api/images.py

@@ -5,11 +5,6 @@ class Images():
     endpoints = ["/api/images"]
     endpoint_name = "api_images"
     endpoint_methods = ["GET", "POST"]
-    endpoint_default_parameters = {
-                                    "method": "generate",
-                                    "type": "content",
-                                    "message": "Internal Image Handling"
-                                    }
 
     def __init__(self, fhdhr):
         self.fhdhr = fhdhr

fHDHR_web/api/m3u.py

@@ -75,7 +75,7 @@ class M3U():
                                                     "tvg-logo": logourl,
                                                     "group-title": self.fhdhr.config.dict["fhdhr"]["friendlyname"],
                                                     "group-titleb": str(channel_obj.dict['name']),
-                                                    "stream_url": "%s%s" % (base_url, channel_obj.api_stream_url)
+                                                    "stream_url": "%s%s" % (base_url, channel_obj.stream_url)
                                                     }
 
             # Sort the channels

fHDHR_web/api/settings.py

@@ -1,8 +1,5 @@
-from flask import request, redirect, Response, session
+from flask import request, redirect, session
 import urllib.parse
-import threading
-import time
-import json
 
 
 class Settings():
@@ -13,9 +10,6 @@ class Settings():
     def __init__(self, fhdhr):
         self.fhdhr = fhdhr
 
-        self.restart_url = "/api/settings?method=restart_actual"
-        self.restart_sleep = 5
-
     def __call__(self, *args):
         return self.get(*args)
 
@@ -24,28 +18,7 @@ class Settings():
         method = request.args.get('method', default="get", type=str)
         redirect_url = request.args.get('redirect', default=None, type=str)
 
-        if method == "get":
-            web_settings_dict = {}
-            for config_section in list(self.fhdhr.config.conf_default.keys()):
-                web_settings_dict[config_section] = {}
-
-                for config_item in list(self.fhdhr.config.conf_default[config_section].keys()):
-                    real_config_section = config_section
-                    if config_section == self.fhdhr.config.dict["main"]["dictpopname"]:
-                        real_config_section = "origin"
-                    web_settings_dict[config_section][config_item] = {
-                        "value": self.fhdhr.config.dict[real_config_section][config_item],
-                        }
-                    if self.fhdhr.config.conf_default[config_section][config_item]["config_web_hidden"]:
-                        web_settings_dict[config_section][config_item]["value"] = "***********"
-
-            return_json = json.dumps(web_settings_dict, indent=4)
-
-            return Response(status=200,
-                            response=return_json,
-                            mimetype='application/json')
-
-        elif method == "update":
+        if method == "update":
             config_section = request.form.get('config_section', None)
             config_name = request.form.get('config_name', None)
             config_value = request.form.get('config_value', None)
@@ -62,18 +35,11 @@ class Settings():
             self.fhdhr.config.write(config_section, config_name, config_value)
 
         elif method == "restart":
-            restart_thread = threading.Thread(target=self.restart_thread)
-            restart_thread.start()
-            return redirect(redirect_url + "?retmessage=" + urllib.parse.quote("Restarting in %s seconds" % self.restart_sleep))
-
-        elif method == "restart_actual":
+            instance_id = request.args.get('instance_id', default=None, type=str)
+            if instance_id == session["instance_id"]:
                 session["restart"] = True
 
         if redirect_url:
             return redirect(redirect_url + "?retmessage=" + urllib.parse.quote("%s Success" % method))
         else:
             return "%s Success" % method
-
-    def restart_thread(self):
-        time.sleep(self.restart_sleep)
-        self.fhdhr.api.get(self.restart_url)

fHDHR_web/api/tools.py

@@ -7,9 +7,6 @@ class API_Tools():
     endpoints = ["/api/tools"]
     endpoint_name = "api_tools"
     endpoint_methods = ["GET", "POST"]
-    endpoint_default_parameters = {
-                                    "method": "get"
-                                    }
 
     def __init__(self, fhdhr):
         self.fhdhr = fhdhr
@@ -23,15 +20,7 @@ class API_Tools():
 
         redirect_url = request.args.get('redirect', default=None, type=str)
 
-        if method == "get":
-
-            return_json = json.dumps({"tools": "api for tools page"}, indent=4)
-
-            return Response(status=200,
-                            response=return_json,
-                            mimetype='application/json')
-
-        elif method == "prettyjson":
+        if method == "prettyjson":
 
             dirty_json_url = request.form.get('url', None)
 

fHDHR_web/api/tuners.py

@@ -10,9 +10,6 @@ class Tuners():
     endpoints = ["/api/tuners"]
     endpoint_name = "api_tuners"
     endpoint_methods = ["GET", "POST"]
-    endpoint_default_parameters = {
-                                    "method": "status"
-                                    }
 
     def __init__(self, fhdhr):
         self.fhdhr = fhdhr
@@ -32,7 +29,7 @@ class Tuners():
 
         method = request.args.get('method', default=self.fhdhr.config.dict["fhdhr"]["stream_type"], type=str)
 
-        tuner_number = request.args.get('tuner', default=None, type=str)
+        tuner_number = request.args.get('tuner', None, type=str)
 
         redirect_url = request.args.get('redirect', default=None, type=str)
 

fHDHR_web/pages/__init__.py

@@ -9,8 +9,8 @@ from .xmltv_html import xmlTV_HTML
 from .version_html import Version_HTML
 from .diagnostics_html import Diagnostics_HTML
 from .settings_html import Settings_HTML
-from .channels_editor_html import Channels_Editor_HTML
-from .tools_html import Tools_HTML
+from .channels_editor import Channels_Editor_HTML
+from .tools import Tools_HTML
 
 
 class fHDHR_Pages():
@@ -20,7 +20,7 @@ class fHDHR_Pages():
 
         self.index_html = Index_HTML(fhdhr)
         self.channels_html = Channels_HTML(fhdhr)
-        self.channels_editor_html = Channels_Editor_HTML(fhdhr)
+        self.channels_editor = Channels_Editor_HTML(fhdhr)
         self.guide_html = Guide_HTML(fhdhr)
         self.cluster_html = Cluster_HTML(fhdhr)
         self.tuners_html = Tuners_HTML(fhdhr)
@@ -28,4 +28,4 @@ class fHDHR_Pages():
         self.version_html = Version_HTML(fhdhr)
         self.diagnostics_html = Diagnostics_HTML(fhdhr)
         self.settings_html = Settings_HTML(fhdhr)
-        self.tools_html = Tools_HTML(fhdhr)
+        self.tools = Tools_HTML(fhdhr)

fHDHR_web/pages/channels_editor.py

@@ -24,7 +24,7 @@ class Channels_Editor_HTML():
 
             channel_dict["number"] = channel_obj.number
             channel_dict["chan_thumbnail"] = channel_obj.thumbnail
-            channel_dict["m3u_url"] = channel_obj.m3u_url
+            channel_dict["play_url"] = channel_obj.play_url
 
             channelslist[channel_dict["number"]] = channel_dict
 

fHDHR_web/pages/channels_html.py

@@ -29,7 +29,7 @@ class Channels_HTML():
 
             channel_dict["number"] = channel_obj.number
             channel_dict["chan_thumbnail"] = channel_obj.thumbnail
-            channel_dict["m3u_url"] = channel_obj.m3u_url
+            channel_dict["play_url"] = channel_obj.play_url
 
             channelslist[channel_dict["number"]] = channel_dict
             if channel_dict["enabled"]:

fHDHR_web/pages/diagnostics_html.py

@@ -35,15 +35,9 @@ class Diagnostics_HTML():
                             button_link += "%s=%s" % (parameter, parameter_val)
                         button_link = button_link.replace("<devicekey>", self.fhdhr.config.dict["main"]["uuid"])
                         button_link = button_link.replace("<base_url>", base_url)
-                        curr_button_dict = {
+                        button_dict[route_group].append({
                                             "label": session["route_list"][route_group][route_item]["pretty_name"],
                                             "link": button_link,
-                                            "methods": ",".join(session["route_list"][route_group][route_item]["endpoint_methods"]),
-                                            "button": True
-                                            }
-                        if ("GET" not in session["route_list"][route_group][route_item]["endpoint_methods"]
-                           or "<tuner_number>" in button_link or "<channel>" in button_link):
-                            curr_button_dict["button"] = False
-                        button_dict[route_group].append(curr_button_dict)
+                                            })
 
         return render_template('diagnostics.html', session=session, request=request, fhdhr=self.fhdhr, button_dict=button_dict, list=list)

fHDHR_web/pages/guide_html.py

@@ -67,7 +67,7 @@ class Guide_HTML():
                 chan_dict["number"] = chan_obj.number
                 chan_dict["chan_thumbnail"] = chan_obj.thumbnail
                 chan_dict["enabled"] = chan_obj.dict["enabled"]
-                chan_dict["m3u_url"] = chan_obj.m3u_url
+                chan_dict["play_url"] = chan_obj.play_url
 
                 chan_dict["listing_thumbnail"] = chan_dict["listing_thumbnail"] or chan_obj.thumbnail
             else:

fHDHR_web/rmg/devices_devicekey_channels.py

@@ -27,7 +27,7 @@ class RMG_Devices_DeviceKey_Channels():
                 if channel_obj.enabled:
                     sub_el(out, 'Channel',
                            drm="0",
-                           channelIdentifier=channel_obj.rmg_stream_ident,
+                           channelIdentifier="id://%s" % channel_obj.number,
                            name=channel_obj.dict["name"],
                            origin=channel_obj.dict["callsign"],
                            number=str(channel_obj.number),

fHDHR_web/templates/base.html

@@ -1,12 +1,12 @@
 <html>
-
   <head>
     <title>{{ fhdhr.config.dict["fhdhr"]["friendlyname"] }}</title>
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <style>
+      table, th, td {border: 1px solid black;}
+    </style>
     <link href="style.css" rel="stylesheet">
-
   </head>
-
     <body>
       <h1 style="text-align: center;">
         <span style="text-decoration: underline;"><strong><em>{{ fhdhr.config.dict["fhdhr"]["friendlyname"] }}</em></strong>
@@ -15,14 +15,14 @@
       </h1>
       <br><br>
       <p></p>
-
       <div>
-      <button onclick="location.href='/index'" type="button">fHDHR</button>
-      <button onclick="location.href='/origin'" type="button">{{ fhdhr.config.dict["main"]["servicename"] }}</button>
+
+      <button class="pull-left" onclick="OpenLink('/index')">fHDHR</button>
+      <button class="pull-left" onclick="OpenLink('/origin')">{{ fhdhr.config.dict["main"]["servicename"] }}</button>
 
       {% for page_dict in session["route_list"]["pages"] %}
         {% if session["route_list"]["pages"][page_dict]["name"] != "page_index_html" and fhdhr.config.dict["web_ui"]["access_level"] >= session["route_list"]["pages"][page_dict]["endpoint_access_level"] %}
-          <button onclick="location.href='{{ session["route_list"]["pages"][page_dict]["endpoints"][0] }}'" type="button">{{ session["route_list"]["pages"][page_dict]["pretty_name"] }}</button>
+          <button class="pull-left" onclick="OpenLink('{{ session["route_list"]["pages"][page_dict]["endpoints"][0] }}')">{{ session["route_list"]["pages"][page_dict]["pretty_name"] }}</button>
         {% endif %}
       {% endfor %}
 
@@ -58,7 +58,7 @@
         {% if locations %}
           <div>
           {% for location in locations %}
-            <button onclick="location.href='{{ location["base_url"] }}'" type="button">{{ location["name"] }}</button>
+              <button class="pull-left" onclick="OpenLink('{{ location["base_url"] }}')">{{ location["name"] }}</a></button>
           {% endfor %}
           </div>
           <hr align="center" width="100%">
@@ -73,3 +73,6 @@
       {% block content %}{% endblock %}
     </body>
 </html>
+<script>
+  function OpenLink(NewURL) {window.open(NewURL, "_self");}
+</script>

fHDHR_web/templates/channels.html

@@ -5,8 +5,7 @@
     <h4 style="text-align: center;">{{ fhdhr.config.dict["fhdhr"]["friendlyname"] }} Channels</h4>
 
     <div style="text-align: center;">
-    <button onclick="location.href='/api/tuners?method=scan&redirect=/channels'" type="button">Force Channel Update</button>
-    <p> Note: This may take some time.</p>
+      <button onclick="OpenLink('/api/tuners?method=scan&redirect=%2Fchannels')">Force Channel Update</a></button><p> Note: This may take some time.</p>
     </div>
     <br>
 
@@ -25,7 +24,7 @@
 
     <br>
     <div style="text-align: center;">
-    <button onclick="location.href='/channels_editor'" type="button">Edit Channels</button>
+      <button onclick="OpenLink('/channels_editor')">Edit Channels</a></button>
     </div>
     <br>
 
@@ -46,11 +45,12 @@
     <tbody class="body-half-screen">
     {% for chan_dict in channelslist %}
     <tr>
+
          <td>
           {% if chan_dict["enabled"] %}
-                <a href="{{ chan_dict["m3u_url"] }}">Play</a>
+            <a href="{{ chan_dict["play_url"] }}">Play</a>
 	  {% else %}
-	               <a href="{{ chan_dict["m3u_url"] }}" style="visibility:hidden">Play</a>
+	    <a href="{{ chan_dict["play_url"] }}" style="visibility:hidden">Play</a>
           {% endif %}
          </td>
 

fHDHR_web/templates/channels_editor.html

@@ -25,6 +25,7 @@
            document["enable_button"].value = "0"
            document["enable_button"].text = "Disable All"
 
+
        @bind("#chanSubmit", "submit")
        def submit_fixup(evt):
           for element in document.get(selector='input[type="checkbox"]'):
@@ -52,7 +53,7 @@
           postForm = document.createElement('form')
           postData = document.createElement('input')
           postForm.method = "POST"
-        postForm.action = "/api/channels?method=modify&redirect=/channels_editor"
+          postForm.action = "/api/channels?method=modify&redirect=%2Fchannels_editor"
           postForm.setRequestHeader = "('Content-Type', 'application/json')"
           postData.name = "channels"
           postData.value = chanlist
@@ -94,8 +95,7 @@
     {% for chan_dict in channelslist %}
         <tr>
           <td><input type="hidden" name="id" class="channels" value={{ chan_dict["id"] }}>
-              <input type="text" class="channels" name="name" value="{{ chan_dict["name"] }}">
-            </td>
+          <input type="text" class="channels" name="name" value="{{ chan_dict["name"] }}"></td>
           <td><input type="text"  class="channels" name="callsign" value="{{ chan_dict["callsign"] }}"></td>
           <td><input type="text"  class="channels" name="number" value="{{ chan_dict["number"] }}"></td>
           <td><input type="text"  class="channels" name="thumbnail" value="{{ chan_dict["thumbnail"] }}"></td>
@@ -110,7 +110,7 @@
 	  <td><input type="checkbox"  class="channels" name="favorite" value=1 ></td>
           {% endif %}
 	  <td>
-              <form method="post" action="/api/channels?method=update&redirect=/channels_editor">
+             <form method="post" action="/api/channels?method=update&redirect=%2Fchannels_editor">
              <input type="hidden" class="reset" name="id" value="{{ chan_dict["id"] }}">
              <input type="hidden" class="reset" name="name" value="{{ chan_dict["origin_name"] }}">
              <input type="hidden" class="reset" name="callsign" value="{{ chan_dict["origin_callsign"] }}">
@@ -121,6 +121,7 @@
              </form>
 	  </td>
          </tr>
+
     {% endfor %}
     </tbody>
     </table>

fHDHR_web/templates/cluster.html

@@ -8,15 +8,16 @@
     {% else %}
 
       <div style="text-align: center;">
-      <button onclick="location.href='/api/cluster?method=scan&redirect=/cluster'" type="button">Force Scan</button>
-      <button onclick="location.href='/api/cluster?method=alive&redirect=/cluster'" type="button">Send Alive</button>
-      <button onclick="location.href='/api/cluster?method=disconnect&redirect=/cluster'" type="button">Disconnect</button>
+        <button onclick="OpenLink('/api/cluster?method=scan&redirect=%2Fcluster')">Force Scan</a></button>
+        <button onclick="OpenLink('/api/cluster?method=alive&redirect=%2Fcluster')">Send Alive</a></button>
+        <button onclick="OpenLink('/api/cluster?method=disconnect&redirect=%2Fcluster')">Disconnect</a></button>
       </div>
       <br>
 
     <div class="container">
     <table class="table-medium center action-col">
     <tbody>
+
         <tr>
           <th>Name</th>
           <th>Location</th>
@@ -31,13 +32,15 @@
         <td>{{ location["joined"] }}</td>
             <td>
               {% if location["joined"] in ["True", "False"] %}
-                  <button onclick="location.href='{{ location["location"] }}'" type="button">Visit</button>
+                <button onclick="OpenLink('{{ location["location"] }}')">Visit</a></button>
               {% endif %}
+
               {% if location["joined"] == "True" %}
-                  <button onclick="location.href='/api/cluster?method=del&location={{ location["url_query"] }}&redirect=/cluster'" type="button">Remove</button>
+                <button onclick="OpenLink('/api/cluster?method=del&location={{ location["url_query"] }}&redirect=%2Fcluster')">Remove</a></button>
               {% elif location["joined"] == "False" %}
-                  <button onclick="location.href='/api/cluster?method=add&location={{ location["url_query"] }}&redirect=/cluster'" type="button">Add</button>
+                <button onclick="OpenLink('/api/cluster?method=add&location={{ location["url_query"] }}&redirect=%2Fcluster')">Add</a></button>
               {% endif %}
+
             </td>
           </tr>
       {% endfor %}

fHDHR_web/templates/diagnostics.html

@@ -13,21 +13,16 @@
         <thead>
           <tr>
             <th>Link</th>
-            <th>Methods</th>
           </tr>
         </thead>
         <tbody>
+
           {% for button_item in button_dict[route_group] %}
+
             <tr>
-              <td>
-                {% if button_item["button"] %}
-                  <button onclick="location.href='{{ button_item["link"] }}'" type="button">{{ button_item["label"] }}</button>
-                {% else %}
-                  <a>{{ button_item["link"] }}</a>
-                {% endif %}
-              </td>
-              <td><a>{{ button_item["methods"] }}</a></td>
+              <td><button onclick="OpenLink('{{ button_item["link"] }}')">{{ button_item["label"] }}</a></button></td>
             </tr>
+
           {% endfor %}
         </tbody>
       </table>

fHDHR_web/templates/guide.html

@@ -6,7 +6,7 @@
 
     <p>
       {% for epg_method in epg_methods %}
-      <button onclick="location.href='/guide?source={{ epg_method }}'" type="button">{{ epg_method }}</button>
+        <button onclick="OpenLink('/guide?source={{ epg_method }}')">{{ epg_method }}</a></button>
       {% endfor %}
     </p>
 
@@ -35,9 +35,9 @@
           {% if source in ["blocks", "origin", fhdhr.config.dict["main"]["dictpopname"]] %}
           <td>
               {% if chan_dict["enabled"] %}
-                  <a href="{{ chan_dict["m3u_url"] }}">Play</a>
+                <a href="{{ chan_dict["play_url"] }}">Play</a>
               {% else %}
-                  <a href="{{ chan_dict["m3u_url"] }}" style="visibility:hidden">Play</a>
+                <a href="{{ chan_dict["play_url"] }}" style="visibility:hidden">Play</a>
               {% endif %}
             </td>
           {% endif %}

fHDHR_web/templates/index.html

@@ -5,7 +5,7 @@
     <h4 style="text-align: center;">fHDHR Status</h4>
 
 
-  <div class="container">
+    <td class="container">
     <table class="table-medium center">
     <tbody>
 

fHDHR_web/templates/settings.html

@@ -7,8 +7,7 @@
   <h4 style="text-align: center;">Some Settings will require a manual restart.</h4>
 
   <div style="text-align: center;">
-    <button onclick="location.href='/api/settings?method=restart&redirect=/settings'" type="button">Restart fHDHR</button>
-    <p> Note: This may take some time, and you will have to refresh your page.</p>
+    <button onclick="OpenLink('/api/settings?method=restart&instance_id={{ session["instance_id"] }}&redirect=%2Fsettings')">Restart fHDHR</a></button><p> Note: This may take some time, and you will have to refresh your page.</p>
   </div>
   <br>
 
@@ -33,11 +32,14 @@
       <tbody>
 
       {% for config_item in list(web_settings_dict[config_section].keys()) %}
+
         <tr>
           <td>{{ config_item }}</td>
+
           <td>{{ web_settings_dict[config_section][config_item]["value_default"] }}</td>
+
     	    <td>
-                <form method="post" action="/api/settings?method=update&redirect=/settings">
+            <form method="post" action="/api/settings?method=update&redirect=%2Fsettings">
               <input type="hidden" name="config_section" value="{{ config_section }}">
               <input type="hidden" name="config_name" value="{{ config_item }}">
               <input type="hidden" name="config_default" value="{{ web_settings_dict[config_section][config_item]["value_default"] }}">
@@ -60,7 +62,9 @@
     	        <input type="submit" value="Reset">
             </form>
           </td>
+
         </tr>
+
       {% endfor %}
     </tbody>
     </table>

fHDHR_web/templates/tools.html

@@ -4,7 +4,7 @@
 
     <h4 style="text-align: center;">{{ fhdhr.config.dict["fhdhr"]["friendlyname"] }} Tools</h4>
 
-  <form method="post" action="/api/tools?method=prettyjson&redirect=/tools">
+    <form method="post" action="/api/tools?method=prettyjson&redirect=%2Ftools">
       <a data-th="URL"><input type="text" name="url" value=""></a>
         <a data-th="Convert Json url to tabbbed"><input type="submit" value="Convert Json url to tabbbed"></a>
     </form>

fHDHR_web/templates/tuners.html

@@ -37,10 +37,10 @@
           {% endif %}
           <td>
               {% if tuner_dict["status"] != "Inactive" %}
-                <button onclick="location.href='/api/tuners?method=close&tuner={{ tuner_dict["number"] }}&redirect=/tuners'" type="button">Close</button>
+                <button onclick="OpenLink('/api/tuners?method=close&tuner={{ tuner_dict["number"] }}&redirect=%2Ftuners')">Close</a></button>
               {% endif %}
               {% if not tuner_scanning and tuner_dict["status"] == "Inactive" %}
-                <button onclick="location.href='/api/tuners?method=scan&tuner={{ tuner_dict["number"] }}&redirect=/tuners'" type="button">Channel Scan</button>
+                <button onclick="OpenLink('/api/tuners?method=scan&tuner={{ tuner_dict["number"] }}&redirect=%2Ftuners')">Channel Scan</a></button>
               {% endif %}
           </td>
         </tr>

fHDHR_web/templates/version.html

@@ -8,6 +8,7 @@
     <div class="container">
     <table class="table-medium center">
     <tbody>
+
       {% for key in list(version_dict.keys()) %}
         <tr>
           <td>{{ key }}</td>

fHDHR_web/templates/xmltv.html

@@ -20,18 +20,23 @@
         {% if epg_method == "origin" %}
           {% set epg_method_name = fhdhr.config.dict["main"]["dictpopname"] %}
         {% endif %}
+
         <tr>
            <td> {{ epg_method_name }}</td>
            <td><a href="/api/xmltv?method=get&source={{ epg_method }}">{{ epg_method_name }}</a></td>
            <td><a href="/api/epg?method=get&source={{ epg_method }}">{{ epg_method_name }}</a></td>
+
            <td>
-                <button onclick="location.href='/api/xmltv?method=update&source={{ epg_method }}&redirect=/xmltv'" type="button">Update</button>
-                <button onclick="location.href='/api/xmltv?method=clearcache&source={{ epg_method }}&redirect=/xmltv'" type="button">Clear Cache</button>
+              <button onclick="OpenLink('/api/xmltv?method=update&source={{ epg_method }}&redirect=%2Fxmltv')">Update</a></button>
+              <button onclick="OpenLink('/api/xmltv?method=clearcache&source={{ epg_method }}&redirect=%2Fxmltv')">Clear Cache</a></button>
            </td>
         </tr>
+
+
       {% endif %}
+
     {% endfor %}
-      </tbody>
+    </body>
     </table>
     </div>
 {% endblock %}

fHDHR_web/www_dir/style.css

@@ -1,7 +1,3 @@
-table {border: 1px solid black;}
-th {border: 1px solid black;}
-td {border: 1px solid black;}
-
 .pull-right { float: right; }
 
 .pull-left { float: left; }

origin/origin_web/origin.html

@@ -4,18 +4,17 @@
 
     <h4 style="text-align: center;">{{ fhdhr.config.dict["main"]["servicename"] }} Status</h4>
 
+      <table class="center" style="width:50%">
+        <tr>
+          <th></th>
+          <th></th>
+        </tr>
 
-  <div class="container">
-    <table class="table-medium center">
-      <tbody>
       {% for key in list(origin_status_dict.keys()) %}
         <tr>
           <td>{{ key }}</td>
           <td>{{ origin_status_dict[key] }}</td>
         </tr>
       {% endfor %}
-      </tbody>
-    </table>
-  </div>
 
 {% endblock %}