From f3f35d7365e27459017b857d6947693db670fa6c Mon Sep 17 00:00:00 2001
From: Cort Buffington <n0mjs@me.com>
Date: Fri, 30 Nov 2018 13:38:44 -0600
Subject: [PATCH] =?UTF-8?q?updating=20table=20format=20=E2=80=93=20prepare?=
 =?UTF-8?q?=20for=20additional=20information?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 templates/hblink_table.html | 32 +++++++-------------------------
 web_tables.py               |  2 +-
 2 files changed, 8 insertions(+), 26 deletions(-)

diff --git a/templates/hblink_table.html b/templates/hblink_table.html
index efa67a5..0d6cc23 100755
--- a/templates/hblink_table.html
+++ b/templates/hblink_table.html
@@ -3,45 +3,27 @@
 <table style="width:100%; font: 10pt arial, sans-serif">
     <colgroup>
         <col style="width: 15%" />
-        <col style="width: 10%" />
-        <col style="width: 10%" />
-        <col style="width: 10%" />
-        <col style="width: 5%" />
-        <col style="width: 5%" />
         <col style="width: 15%" />
         <col style="width: 10%" />
-        <col style="width: 10%" />
-        <col style="width: 10%" />
+        <col style="width: 5%" />
     </colgroup>
     <tr style="width:100%; font: 10pt arial, sans-serif; background-color:#666666; color:white">
         <th>HBP System</th>
-        <th>Client Radio ID</th>
-        <th>Callsign</th>
+        <th>ID/Callsign/Location<br>IP:Port/KeepAlives</th>
         <th>Frequency</th>
-        <th>ColorCode</th>
-        <th>LinkTS</th>
-        <th>Location</th>
-        <th>Pings Received</th>
-        <th>IP</th>
-        <th>Port</th>
+        <th>ColorCode<br>LinkedTS</th>
     </tr>
 
     {% for _master in _table['MASTERS'] %}    
 
     <tr>
-        <td style="font-weight:bold" rowspan="{{ _table['MASTERS'][_master]['PEERS']|length + 1 }}"> {{ _master}} </td>
+        <td style="font-weight:bold" rowspan="{{ _table['MASTERS'][_master]['PEERS']|(length + 1)*2 }}"> {{ _master}} </td>
     </tr>
     {% for _client, _cdata in _table['MASTERS'][_master]['PEERS'].iteritems() %}
     <tr>
-        <td>{{ _client }}</td>
-        <td>{{ _cdata['CALLSIGN'] }}</td>
-        <td>{{ _cdata['TX_FREQ'] }}</td>
-        <td>{{ _cdata['COLORCODE'] }}</td>
-        <td>{{ _cdata['SLOTS'] }}</td>
-        <td>{{ _cdata['LOCATION'] }}</td>
-        <td>{{ _cdata['PINGS_RECEIVED'] }}</td>
-        <td>{{ _cdata['IP'] }}</td>
-        <td>{{ _cdata['PORT'] }}</td>
+        <td rowspan="2">{{ _client }}, {{ _cdata['CALLSIGN'] }}, {{ _cdata['LOCATION'] }}<br><div style="font: 8pt arial, sans-serif">{{ _cdata['IP'] }}:{{ _cdata['PORT'] }} / {{ _cdata['PINGS_RECEIVED'] }}</div></td>
+        <td rowspan="2">TX: {{ _cdata['RX_FREQ'] }}<br>RX: {{ _cdata['TX_FREQ] }}</td>
+        <td rowspan="2">{{ _cdata['COLORCODE'] }}<br>{{ _cdata['SLOTS'] }}</td>
     </tr>    
     {% endfor %}
 {% endfor %}
diff --git a/web_tables.py b/web_tables.py
index f309d05..bcbcb13 100755
--- a/web_tables.py
+++ b/web_tables.py
@@ -67,7 +67,7 @@ OPCODE = {
 
 # Global Variables:
 CONFIG      = {}
-CTABLE      = {'MASTERS': {}, 'PEERS': {}}
+CTABLE      = {'MASTERS': {}, 'PEERS': {}, 'OPENBRIDGES': {}}
 BRIDGES     = {}
 BTABLE      = {}
 BTABLE['BRIDGES'] = {}