diff --git a/html/bridges.php b/html/bridges.php index 7104a1e..6ec5586 100644 --- a/html/bridges.php +++ b/html/bridges.php @@ -5,29 +5,29 @@ include_once 'include/version.php';?> - - -HBlink3 DMR Server - Bridges - - - + + + HBlink3 DMR Server - Bridges + + + -
-
-

Dashboard Version:

-HBlink Logo -
-
-

-
-
- -
-
- - - -
+
+
+

Dashboard Version:

+ HBlink Logo +
+
+

+
+
+ +
+
+ + + +
diff --git a/html/buttons.html b/html/buttons.html index c750eff..5e71295 100644 --- a/html/buttons.html +++ b/html/buttons.html @@ -1,60 +1,60 @@ -
- - - + + -  - -  - -  - -  - -  - -  - -  - -  - - + --> +   + +   + +   + +   + +   + +   + +   + +   + + - - + + -->

diff --git a/html/index.php b/html/index.php index bda1156..9e72dec 100644 --- a/html/index.php +++ b/html/index.php @@ -5,37 +5,37 @@ include_once 'include/version.php';?> - - -HBlink3 DMR Server - Dashboard - - - + + + HBlink3 DMR Server - Dashboard + + + -
-
-

Dashboard Version:

-HBlink Logo -
-
-

-
- -
- -
-
- -
-
-  .: Call Log :.  +
+
+

Dashboard Version:

+ HBlink Logo +
+
+

+
+ +
+ +
+
+ +
+
+  .: Call Log :.  

-

-

-
-
-
-

+      

+    

+    
+    
+    
+  

 
 
\ No newline at end of file
diff --git a/html/info.php b/html/info.php
index c6434e2..ac382e4 100644
--- a/html/info.php
+++ b/html/info.php
@@ -5,55 +5,55 @@ include_once 'include/version.php';?>
 
 
 
-
-
-HBlink3 DMR Server - Talkgroup Info
-
-
-
+  
+  
+  HBlink3 DMR Server - Talkgroup Info
+  
+  
+  
 
 
-

-

-
Dashboard Version: 

-HBlink Logo
-

-

-

-

-
-
-

-

- .: Talk Groups :. 
-
-    
-        
-        
-        
-        
-    
-   
-        
-        
-    
-    
-    
-     
-        
-    
-    
-        
-    
-
TG#TS 1TS 2Description
 TG 5    D | S Talk group XLX750-X D-Star/DMR/C4FM.
 TG 9999    D | S Echo (Parrot).

-

-Hotspot: D - duplex | S - simplex
-

-

-

-
-
-
-

+  

+    

+      
Dashboard Version: 

+      HBlink Logo
+    

+    

+      

+    

+    
+    
+    

+      

+         .: Talk Groups :. 
+        
+          
+            
+            
+            
+            
+          
+          
+            
+            
+            
+            
+          
+          
+            
+            
+            
+            
+          
+        
TG#TS 1TS 2Description
 TG 5    D | S Talk group XLX750-X D-Star/DMR/C4FM.
 TG 9999    D | S Echo (Parrot).

+        

+        Hotspot: D - duplex | S - simplex
+      

+    

+    

+    
+    
+    
+  

 
 
diff --git a/html/log.php b/html/log.php
index ef18ad7..16012a6 100644
--- a/html/log.php
+++ b/html/log.php
@@ -5,31 +5,31 @@ include_once 'include/version.php';?>
 
 
 
-
-
-
-HBlink3 DMR Server - Lastheard
-
-
-
+  
+  
+  
+  HBlink3 DMR Server - Lastheard
+  
+  
+  
 
 
-

-

-
Dashboard Version: 

-HBlink Logo
-

-

-

-

-
-

-

-

-
-    
-
-
+  

+    

+      
Dashboard Version: 

+      HBlink Logo
+    

+    

+      

+    

+    
+    

+      

+        

+          
LastHeard
  Date Time Callsign (DMR-Id)  Name TG#  TG NameTX (s) Source

+            
+            
+            ";
 // close logfile after parsing
 fclose ($handle);
 ?>
-
-
-
-
+    
+    
+    
+  
diff --git a/html/masters.php b/html/masters.php
index 2735085..28dda6d 100644
--- a/html/masters.php
+++ b/html/masters.php
@@ -5,30 +5,30 @@ include_once 'include/version.php';?>
 
-
-
-HBlink3 DMR Server - Masters
-
-
-
+  
+  
+  HBlink3 DMR Server - Masters
+  
+  
+  
-

-

-
Dashboard Version: 

-HBlink Logo
-

-

-

-
-

-

-
-    

-

-
-
-
-

+  

+    

+      
Dashboard Version: 

+      HBlink Logo
+    

+    

+      

+      
+    

+    

+      
+      

+    

+    
+    
+    
+  

diff --git a/html/moni.php b/html/moni.php
index 538142b..2a44ebe 100644
--- a/html/moni.php
+++ b/html/moni.php
@@ -5,37 +5,37 @@ include_once 'include/version.php';?>
 
-
-
-HBlink3 DMR Server - Log Monitor
-
-
-
+  
+  
+  HBlink3 DMR Server - Log Monitor
+  
+  
+  
-

-

-
Dashboard Version: 

-HBlink Logo
-

-

-

-

-
-

-
-

-

-
-

-

-	 .: Call Log :. 
-    

-

-
    
-
-
-
-

+  

+    

+      
Dashboard Version: 

+      HBlink Logo
+    

+    

+      

+    

+    
+    

+      
+      

+    

+    
+    

+      

+         .: Call Log :. 
+        

+      

+    

+    
+    
+    
+  

diff --git a/html/opb.php b/html/opb.php
index 4e59389..a2dd056 100644
--- a/html/opb.php
+++ b/html/opb.php
@@ -5,30 +5,30 @@ include_once 'include/version.php';?>
 
-
-
-HBlink3 DMR Server - OpenBridge Systems
-
-
-
+  
+  
+  HBlink3 DMR Server - OpenBridge Systems
+  
+  
+  
-

-

-
Dashboard Version: 

-HBlink Logo
-

-

-

-

-
-

-
-    

-

-
-
-
-

+  

+    

+      
Dashboard Version: 

+      HBlink Logo
+    

+    

+      

+    

+    
+    

+      
+      

+    

+    
+    
+    
+  

diff --git a/html/peers.php b/html/peers.php
index b6431ff..7bcac59 100644
--- a/html/peers.php
+++ b/html/peers.php
@@ -5,30 +5,30 @@ include_once 'include/version.php';?>
 
-
-
-HBlink3 DMR Server - Peer Systems
-
-
-
+  
+  
+  HBlink3 DMR Server - Peer Systems
+  
+  
+  
-

-

-
Dashboard Version: 

-HBlink Logo
-

-

-

-

-
-

-
-    

-

-
-
-
-

+  

+    

+      
Dashboard Version: 

+      HBlink Logo
+    

+    

+      

+    

+    
+    

+      
+      

+    

+    
+    
+    
+  

diff --git a/html/sysinfo.php b/html/sysinfo.php
index 8b4295a..a66bae4 100644
--- a/html/sysinfo.php
+++ b/html/sysinfo.php
@@ -5,49 +5,49 @@ include_once 'include/version.php';?>
 
-
-
-
-HBlink3 DMR Server - System Info
-
-
-
+  
+  
+  
+  HBlink3 DMR Server - System Info
+  
+  
+  
-

-

-
Dashboard Version: 

-HBlink Logo
-

-

-

-

-
-
-

- .: System Info :. 
-

-
-
CPU Temperature

-
-
Disk Usage

-
-
Memory Usage

-
-
CPU Load

-
-
Network Traffic

-

-
BLUE Outgoing Traffic in Bits per Second | GREEN Incoming Traffic in Bits per Second

-

-

-
-
-
-

+  

+    

+      
Dashboard Version: 

+      HBlink Logo
+    

+    

+      

+    

+    
+    
+    

+       .: System Info :. 
+      

+        
+        
CPU Temperature

+        
+        
Disk Usage

+        
+        
Memory Usage

+        
+        
CPU Load

+        
+        
Network Traffic

+      

+      
BLUE Outgoing Traffic in Bits per Second | GREEN Incoming Traffic in Bits per Second

+    

+    

+    
+    
+    
+  

diff --git a/templates/bridge_table.html b/templates/bridge_table.html
index 3ddbfb0..aac4a17 100644
--- a/templates/bridge_table.html
+++ b/templates/bridge_table.html
@@ -1,55 +1,54 @@
 

- .: Bridge status :. 
- {% if _table['BRIDGES']|length == 0 and _table['SETUP']['BRIDGES'] != False %}
-         
LastHeard
  Date Time Callsign (DMR-Id)  Name TG#  TG NameTX (s) Source

 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 

-             
-             
-             
-            
Waiting for data from the Server ...

-{% elif _table['SETUP']['BRIDGES'] == False %}
-         
-             
-             
-             
-            
BRIDGES display is disabled by setup

-{% else %}
-{% for _bridge, _bridge_data in _table['BRIDGES'].items() %}
-
+   .: Bridge status :. 
+  {% if _table['BRIDGES']|length == 0 and _table['SETUP']['BRIDGES'] != False %}
+  

+    
+      
+    
+  
Waiting for data from the Server ...

+  {% elif _table['SETUP']['BRIDGES'] == False %}
+  
+    
+      
+    
+  
BRIDGES display is disabled by setup

+  {% else %}
+  {% for _bridge, _bridge_data in _table['BRIDGES'].items() %}
+  -        -        -        -        -        -        -        -        +      +      +      +      +      +      +      +      
{{ _bridge }}

-        
-        
-        
-        
-        
-        
-        
-        
+      
+      
+      
+      
+      
+      
+      
+      
     {% for system, _system_data in _table['BRIDGES'][_bridge].items() %}
     
-        
-        
-        
-        
-        
-        
-        
-        
+      
+      
+      
+      
+      
+      
+      
+      
     {% endfor %}
-

     
















     
     
     
SystemSlotTG#StatusTimeoutTimeout ActionConnect TG#Disconnect TG#SystemSlotTG#StatusTimeoutTimeout ActionConnect TG#Disconnect TG#
     
{{ system }}{{ _table['BRIDGES'][_bridge][system]['TS'] }}{{ _table['BRIDGES'][_bridge][system]['TGID'] }}{{ _table['BRIDGES'][_bridge][system]['ACTIVE'] }}{{ _table['BRIDGES'][_bridge][system]['EXP_TIME'] }}{{ _table['BRIDGES'][_bridge][system]['TO_ACTION'] }}{{ _table['BRIDGES'][_bridge][system]['TRIG_ON'] }}{{ _table['BRIDGES'][_bridge][system]['TRIG_OFF'] }}{{ system }}{{ _table['BRIDGES'][_bridge][system]['TS'] }}{{ _table['BRIDGES'][_bridge][system]['TGID'] }}{{ _table['BRIDGES'][_bridge][system]['ACTIVE'] }}{{ _table['BRIDGES'][_bridge][system]['EXP_TIME'] }}{{ _table['BRIDGES'][_bridge][system]['TO_ACTION'] }}{{ _table['BRIDGES'][_bridge][system]['TRIG_ON'] }}{{ _table['BRIDGES'][_bridge][system]['TRIG_OFF'] }}
     

-{% endfor %}
- {% endif %}
-

-
+  
+  {% endfor %}
+  {% endif %}
+
\ No newline at end of file
diff --git a/templates/lastheard.html b/templates/lastheard.html
index dc5f783..c475295 100644
--- a/templates/lastheard.html
+++ b/templates/lastheard.html
@@ -1,5 +1,6 @@
 

- .: Lastheard :. 
-
-
-
DateTimeCallsign (DMR-Id)NameTG#TG NameTX (s)System


+   .: Lastheard :. 
+  
+    
+  
DateTimeCallsign (DMR-Id)NameTG#TG NameTX (s)System

+

diff --git a/templates/main_table.html b/templates/main_table.html
index edb39ee..08b2d54 100644
--- a/templates/main_table.html
+++ b/templates/main_table.html
@@ -1,119 +1,126 @@
 
 

- .: Server Activity :. 
-{% if _table['MASTERS']|length >0 %}
- 
+   .: Server Activity :. 
+  {% if _table['MASTERS']|length >0 %}
+  

-    
-      
-{% endif %}
-

     

       
Active QSO's

     

     

-    

-    {% for _master in _table['MASTERS'] %}
-    {% for _client, _cdata in _table['MASTERS'][_master]['PEERS'].items() %}
-    {% if _cdata[1]['TS'] == True or _cdata[2]['TS'] == True %}
-        {% if _cdata[1]['TRX'] == "RX" %}
-         [M: {{ _cdata[1]['CALL']|safe }}
-         >> {{ _cdata[1]['TG']|safe }}] 
-        {% endif %}
-        {% if _cdata[2]['TRX'] == "RX" %}
-         [M: {{ _cdata[2]['CALL']|safe}}
-         >> {{_cdata[2]['TG']|safe}}] 
+      

+        

+        {% for _master in _table['MASTERS'] %}
+        {% for _client, _cdata in _table['MASTERS'][_master]['PEERS'].items() %}
+        {% if _cdata[1]['TS'] == True or _cdata[2]['TS'] == True %}
+          {% if _cdata[1]['TRX'] == "RX" %}
+           [M: {{ _cdata[1]['CALL']|safe }}
+           >> {{ _cdata[1]['TG']|safe }}] 
+          {% endif %}
+          {% if _cdata[2]['TRX'] == "RX" %}
+           [M: {{ _cdata[2]['CALL']|safe}}
+           >> {{_cdata[2]['TG']|safe}}] 
+          {% endif %}
         {% endif %}
+        {% endfor %}
+        {% endfor %}
+  {% else %}
+  
+    
+      
+    
+  
Waiting for data from the Server ...

+  {% endif %}
+  {% for _peer, _pdata  in _table['PEERS'].items() %}
+  {% if _pdata[1]['TS'] == True or _pdata[2]['TS'] == True %}
+    {% if _pdata[1]['TRX'] == "RX" %}
+     [M: {{ _pdata[1]['CALL']|safe }}
+     >> {{ _pdata[1]['TG']|safe }}] 
     {% endif %}
-    {% endfor %}
-    {% endfor %}
-{% else %}
-         
-             
-             
-             
-            
Waiting for data from the Server ...

- {% endif %}
-    {% for _peer, _pdata  in _table['PEERS'].items() %}
-    {% if _pdata[1]['TS'] == True or _pdata[2]['TS'] == True %}
-        {% if _pdata[1]['TRX'] == "RX" %}
-         [M: {{ _pdata[1]['CALL']|safe }}
-         >> {{ _pdata[1]['TG']|safe }}] 
-        {% endif %}
-        {% if _pdata[2]['TRX'] == "RX" %}
-         [M: {{ _pdata[2]['CALL']|safe }}
-         >> {{ _pdata[2]['TG']|safe }}] 
-        {% endif %}
+    {% if _pdata[2]['TRX'] == "RX" %}
+     [M: {{ _pdata[2]['CALL']|safe }}
+     >> {{ _pdata[2]['TG']|safe }}] 
     {% endif %}
+  {% endif %}
+  {% endfor %}
+  {% if _table['OPENBRIDGES']|length >0 %}
+  {% for _openbridge in _table['OPENBRIDGES'] %}
+  {% set rx = namespace(value=0) %}
+  {% if _table['OPENBRIDGES'][_openbridge]['STREAMS']|length >0 %}
+    {% for entry in _table['OPENBRIDGES'][_openbridge]['STREAMS'] if _table['OPENBRIDGES'][_openbridge]['STREAMS'][entry][0]=='RX' %}
+      {% set rx.value=1 %}
     {% endfor %}
-{% if _table['OPENBRIDGES']|length >0 %}
-    {% for _openbridge in _table['OPENBRIDGES'] %}
-    {% set rx = namespace(value=0) %}
-    {% if _table['OPENBRIDGES'][_openbridge]['STREAMS']|length >0 %}
-       {% for entry in _table['OPENBRIDGES'][_openbridge]['STREAMS'] if _table['OPENBRIDGES'][_openbridge]['STREAMS'][entry][0]=='RX' %}
-         {% set rx.value=1 %}
-       {% endfor %}
-       {% if rx.value == 1 %}
-         {% for entry in _table['OPENBRIDGES'][_openbridge]['STREAMS']  if _table['OPENBRIDGES'][_openbridge]['STREAMS'][entry][0] == 'RX' %} [O: {{ _table['OPENBRIDGES'][_openbridge]['STREAMS'][entry][1]}} >> TG {{ _table['OPENBRIDGES'][_openbridge]['STREAMS'][entry][2]|safe}}] {% endfor %}
-      {% endif %}
-   {% endif %}
-   {% endfor %}
-     

+    {% if rx.value == 1 %}
+      {% for entry in _table['OPENBRIDGES'][_openbridge]['STREAMS']  if _table['OPENBRIDGES'][_openbridge]['STREAMS'][entry][0] == 'RX' %} [O: {{ _table['OPENBRIDGES'][_openbridge]['STREAMS'][entry][1]}} >> TG {{ _table['OPENBRIDGES'][_openbridge]['STREAMS'][entry][2]|safe}}] {% endfor %}
+    {% endif %}
+  {% endif %}
+  {% endfor %}
+        

+      
+    
+  {% endif %}
+  
 
 {% if _table['SETUP']['LASTHEARD'] == True %}
   {% include 'lastheard.html' ignore missing %}
 {% endif %}
 

- .: Connected to Server :. 
-
-{% if _table['MASTERS']|length >0 %}
-
+    
+  

-

-

-
  USERS:

-

-    {% for _master in _table['MASTERS'] %}    
-    {% if _table['MASTERS'][_master]['PEERS']|length >0 %}
-    {% for _client, _cdata in _table['MASTERS'][_master]['PEERS'].items() %}
-    
-    {{_cdata['CALLSIGN']}}
-    
-        
-           DMR ID: {{ _client }}

-        {% if _cdata['RX_FREQ'] == 'N/A' and _cdata['TX_FREQ'] == 'N/A' %}
-                Type: IP Network

-        {% else %} 
-               Type: Radio ({{ _cdata['SLOTS'] }})

-        {% endif %}
-           Hardware: {{_cdata['PACKAGE_ID'] }}
-        
   Soft_Ver: {{_cdata['SOFTWARE_ID'] }}
-        
   Info: {{_cdata['LOCATION']}}
-        
   Master: {{_master}}
-        
   Time connected: {{ _cdata['CONNECTED'] }}
-         
-    {% endfor %}
+   .: Connected to Server :. 
+  
+    {% if _table['MASTERS']|length >0 %}
+    
+      

+        

+          

+          
  USERS:

+          

+            {% for _master in _table['MASTERS'] %}
+            {% if _table['MASTERS'][_master]['PEERS']|length >0 %}
+            {% for _client, _cdata in _table['MASTERS'][_master]['PEERS'].items() %}
+            
+              {{_cdata['CALLSIGN']}}
+              
+                
+                     DMR ID: {{ _client }}

+                  {% if _cdata['RX_FREQ'] == 'N/A' and _cdata['TX_FREQ'] == 'N/A' %}
+                       Type: IP Network

+                  {% else %}
+                       Type: Radio ({{ _cdata['SLOTS'] }})

+                  {% endif %}
+                     Hardware: {{_cdata['PACKAGE_ID'] }}
+                  
   Soft_Ver: {{_cdata['SOFTWARE_ID'] }}
+                  
   Info: {{_cdata['LOCATION']}}
+                  
   Master: {{_master}}
+                  
   Time connected: {{ _cdata['CONNECTED'] }}
+                
+              
+             
+            {% endfor %}
+            {% endif %}
+            {% endfor %}
+          

     {% endif %}
-    {% endfor %}
-

-{% endif %}
-{% if _table['PEERS']|length >0 %}
-

-
  PEERS:

-

-    {% for _peer, _pdata  in _table['PEERS'].items() %}
-      {{_peer}}  
-    {% if _table['PEERS'][_peer]['STATS']['CONNECTION'] == 'YES' %}
-    
-    
Connected

-    
-   {% else %}
-    
-    
Disconnected

-    
+    {% if _table['PEERS']|length >0 %}
+          

+          
  PEERS:

+          

+            {% for _peer, _pdata  in _table['PEERS'].items() %}
+              {{_peer}}  
+              {% if _table['PEERS'][_peer]['STATS']['CONNECTION'] == 'YES' %}
+              
+                
Connected

+              
+              {% else %}
+              
+                
Disconnected

+              
+              {% endif %}
+             
+            {% endfor %}
+          

     {% endif %}
-     
- {% endfor %}
-

-{% endif %}
-

- 

+          

+        

+      

 

diff --git a/templates/masters_table.html b/templates/masters_table.html
index 978af6f..68419f5 100644
--- a/templates/masters_table.html
+++ b/templates/masters_table.html
@@ -1,55 +1,55 @@
 

- .: Masters status :. 
-{% if _table['MASTERS']|length >0 %}
-
+   .: Masters status :. 
+  {% if _table['MASTERS']|length >0 %}
+  

-        
-        
-        
-        
-        
-        
+      
+      
+      
+      
+      
+      
 
-    {% for _master in _table['MASTERS'] %}    
+    {% for _master in _table['MASTERS'] %}
     {% if ((_table['MASTERS'][_master]['PEERS']|length==0 or _table['MASTERS'][_master]['PEERS']|length>0) and emaster==True) or (_table['MASTERS'][_master]['PEERS']|length>0 and emaster==False) %}
 
     
-        
+      
     {% for _client, _cdata in _table['MASTERS'][_master]['PEERS'].items() %}
     
-        
-        
-        
-        
-        
-        
+      
+      
+      
+      
+      
-        
+      
 
-        
-     {% endfor %}
-   {% endif %}
-{% endfor %}
-

     
HB Protocol
Master Systems		Callsign (DMR Id)
Info		Time ConnectedSlotSourceDestinationHB Protocol
Master Systems		Callsign (DMR Id)
Info		Time ConnectedSlotSourceDestination
     
 {{_master}}
{{_table['MASTERS'][_master]['REPEAT']}}
 {{_master}}
{{_table['MASTERS'][_master]['REPEAT']}}

     
{{ _cdata['CALLSIGN']}} 
+      
{{ _cdata['CALLSIGN']}}
         (Id: {{ _client }})
         
         {% if _cdata['RX_FREQ'] == 'N/A' and _cdata['TX_FREQ'] == 'N/A' %}
-                Type: IP Network

-        {% else %} 
-               Type: Radio ({{ _cdata['SLOTS'] }})

+             Type: IP Network

+        {% else %}
+             Type: Radio ({{ _cdata['SLOTS'] }})

         {% endif %}
-               Soft_Ver: {{_cdata['SOFTWARE_ID'] }}
+             Soft_Ver: {{_cdata['SOFTWARE_ID'] }}
         
   Hardware: {{_cdata['PACKAGE_ID'] }}

         
{{_cdata['LOCATION']}}
{{ _cdata['CONNECTED'] }}TS1{{ _cdata[1]['SUB']|safe }}{{ _cdata[1]['DEST']|safe }}
{{ _cdata['CONNECTED'] }}TS1{{ _cdata[1]['SUB']|safe }}{{ _cdata[1]['DEST']|safe }}

         TS2
         {{ _cdata[2]['SUB']|safe }}
         {{ _cdata[2]['DEST']|safe }}

-{% else %}
-         
-             
-             
-             
-            
Waiting for data from the Server ...

-{% endif %}
+    
+    {% endfor %}
+    {% endif %}
+    {% endfor %}
+  
+  {% else %}
+  
+    
+      
+    
+  
Waiting for data from the Server ...

+  {% endif %}
 

diff --git a/templates/opb_table.html b/templates/opb_table.html
index 2c4926a..6aa6871 100644
--- a/templates/opb_table.html
+++ b/templates/opb_table.html
@@ -1,25 +1,25 @@
 

- .: OpenBridge status :. 
-    {% if _table['OPENBRIDGES']|length >0 %}
-
+   .: OpenBridge status :. 
+  {% if _table['OPENBRIDGES']|length >0 %}
+  

-        
-        
-        
+      
+      
+      
     {% for _openbridge in _table['OPENBRIDGES'] %}
     
-        
-        
-        
-   
+      
+      
+      
+    
     {% endfor %}
-

     
OpenBridge
Systems		Network IDActive QSOsOpenBridge
Systems		Network IDActive QSOs
     
 {{ _openbridge}} 
Net ID: {{ _table['OPENBRIDGES'][_openbridge]['NETWORK_ID'] }}
{% for entry in _table['OPENBRIDGES'][_openbridge]['STREAMS']  %}[{{ _table['OPENBRIDGES'][_openbridge]['STREAMS'][entry][0] }}:  {{ _table['OPENBRIDGES'][_openbridge]['STREAMS'][entry][1] }} >> TG {{ _table['OPENBRIDGES'][_openbridge]['STREAMS'][entry][2]|safe }}] {% endfor %}
 {{ _openbridge}} 
Net ID: {{ _table['OPENBRIDGES'][_openbridge]['NETWORK_ID'] }}
{% for entry in _table['OPENBRIDGES'][_openbridge]['STREAMS']  %}[{{ _table['OPENBRIDGES'][_openbridge]['STREAMS'][entry][0] }}:  {{ _table['OPENBRIDGES'][_openbridge]['STREAMS'][entry][1] }} >> TG {{ _table['OPENBRIDGES'][_openbridge]['STREAMS'][entry][2]|safe }}] {% endfor %}

+  
   {% else %}
-         
-             
-             
-             
-            
Waiting for data from Server ...  or not defined on Server

- {% endif %}
+  
+    
+      
+    
+  
Waiting for data from Server ...  or not defined on Server

+  {% endif %}
 

diff --git a/templates/peers_table.html b/templates/peers_table.html
index 4760e9e..cb04510 100644
--- a/templates/peers_table.html
+++ b/templates/peers_table.html
@@ -1,37 +1,36 @@
 

- .: Peers status :. 
-{% if _table['PEERS']|length >0 %}
-
+   .: Peers status :. 
+  {% if _table['PEERS']|length >0 %}
+  

-        
-        
-        
-        
-        
-        
+      
+      
+      
+      
+      
+      
     {% for _peer, _pdata  in _table['PEERS'].items() %}
     
-        
-        
-        
-        
-        
-        
-        
-        
+      
+      
+      
+      
+      
+      
+      
-        
+      
-  {% endfor %}
-

     
HB Protocol
Peer Systems		Callsign (DMR Id)
Info		Connected
TX/RX/Lost		SlotSourceDestinationHB Protocol
Peer Systems		Callsign (DMR Id)
Info		Connected
TX/RX/Lost		SlotSourceDestination
     
 {{ _peer}}
Mode: {{ _table['PEERS'][_peer]['MODE'] }}
{{_table['PEERS'][_peer]['CALLSIGN']}} (Id: {{ _table['PEERS'][_peer]['RADIO_ID'] }})   Linked Time Slot: {{ _table['PEERS'][_peer]['SLOTS'] }}

{{_table['PEERS'][_peer]['LOCATION']}}
{{ _table['PEERS'][_peer]['STATS']['CONNECTED'] }}
{{ _table['PEERS'][_peer]['STATS']['PINGS_SENT'] }} / {{ _table['PEERS'][_peer]['STATS']['PINGS_ACKD'] }} / {{ _table['PEERS'][_peer]['STATS']['PINGS_SENT'] - _table['PEERS'][_peer]['STATS']['PINGS_ACKD'] }}
TS1{{ _pdata[1]['SUB']|safe }}{{ _pdata[1]['DEST']|safe }}
 {{ _peer}}
Mode: {{ _table['PEERS'][_peer]['MODE'] }}
{{_table['PEERS'][_peer]['CALLSIGN']}} (Id: {{ _table['PEERS'][_peer]['RADIO_ID'] }})   Linked Time Slot: {{ _table['PEERS'][_peer]['SLOTS'] }}

{{_table['PEERS'][_peer]['LOCATION']}}
{{ _table['PEERS'][_peer]['STATS']['CONNECTED'] }}
{{ _table['PEERS'][_peer]['STATS']['PINGS_SENT'] }} / {{ _table['PEERS'][_peer]['STATS']['PINGS_ACKD'] }} / {{ _table['PEERS'][_peer]['STATS']['PINGS_SENT'] - _table['PEERS'][_peer]['STATS']['PINGS_ACKD'] }}
TS1{{ _pdata[1]['SUB']|safe }}{{ _pdata[1]['DEST']|safe }}

         TS2
         {{ _pdata[2]['SUB']|safe }}
         {{ _pdata[2]['DEST']|safe }}

     

- {% else %}
-         
-             
-             
-             
-            
Waiting for data from the Server ... or not defined on Server

- {% endif %}
+    {% endfor %}
+  
+  {% else %}
+  
+    
+      
+    
+  
Waiting for data from the Server ... or not defined on Server

+  {% endif %}