supplemental-web: fe_status: add a loading screen

move to main menu and a few other tweaks

1 files changed, 9 insertions, 3 deletions

diff --git a/abs/core/supplemental-web/contents/fe_status.py b/abs/core/supplemental-web/contents/fe_status.py
index 49bbf95..993ef72 100644
--- a/abs/core/supplemental-web/contents/fe_status.py
+++ b/abs/core/supplemental-web/contents/fe_status.py
@@ -16,6 +16,7 @@ def msg(msg):
 def parse_xml(frontend):
     temp_dict = {'state':" --- ",
                  'title':" --- ",
+                 'subtitle':" --- ",
                  'location':" --- "}
     url = "http://%s:6547/Frontend/GetStatus" %frontend
     try:
@@ -40,6 +41,9 @@ def parse_xml(frontend):
             elif keyitem == "title":
                 temp_dict['title'] = valueitem
 
+            elif keyitem == "subtitle":
+                temp_dict['subtitle'] = valueitem
+
             elif keyitem == "currentlocation":
                 temp_dict['location'] = valueitem
 
@@ -82,15 +86,17 @@ def print_html(status_dict):
     <td> %s  </td>
     <td> %s  </td>
     <td> %s  </td>
-    <td> %s </td>
+    <td> %s  </td>
+    <td> %s  </td>
 </tr>
 '''
-    print row %("  Frontend  ","  State  ","  Title  ","  MythTV Location")
+    print row %("  MythFrontend Host  ","  State  ","  Title  ","  Subtitle  ","  MythFrontend Location  ")
     for fe in status_dict.keys():
         temp_dict = status_dict[fe]
         print row %(fe,
                     temp_dict['state'],
                     temp_dict['title'],
+                    temp_dict['subtitle'],
                     temp_dict['location'])
 
     print "</table>"
@@ -99,7 +105,7 @@ def print_html(status_dict):
     print '''
     <div id="footer">
        </br>
-       <p>Offline systems will not be listed</p>
+       <p>Offline systems are not listed</p>
     </div>
 '''