From 89211bbbd526bbc587361085b119a19d296f6a7f Mon Sep 17 00:00:00 2001
From: Pliable Pixels <pliablepixels@gmail.com>
Date: Sat, 20 Oct 2018 19:17:21 -0400
Subject: #724 cleanup and making sure we take recordingURL for playback

---
 www/templates/monitors.html | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'www/templates/monitors.html')

diff --git a/www/templates/monitors.html b/www/templates/monitors.html
index fbd1ce26..8daf6fa8 100644
--- a/www/templates/monitors.html
+++ b/www/templates/monitors.html
@@ -48,6 +48,8 @@
           <br /> {{'kStatus' | translate}}: {{monitor.Monitor.isRunningText}}
           <br /> {{'kId' | translate}}: {{monitor.Monitor.Id}}
           <br /> {{'kEventRecording' | translate}}: {{(monitor.Monitor.VideoWriter>0?'kVideo':'kImages') | translate}}
+          <br />Streaming URL: {{monitor.Monitor.streamingURL}}
+          <br />Portal URL: {{monitor.Monitor.baseURL}}
           <br />
           <br />
         </p>
-- 
cgit v1.2.3


From bf0ef4d5f85e3c30f9890a8264ed8203e19c465f Mon Sep 17 00:00:00 2001
From: Pliable Pixels <pliablepixels@gmail.com>
Date: Tue, 23 Oct 2018 16:42:31 -0400
Subject: new keys for monitor status

---
 www/templates/monitors.html | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'www/templates/monitors.html')

diff --git a/www/templates/monitors.html b/www/templates/monitors.html
index 8daf6fa8..4e5023a9 100644
--- a/www/templates/monitors.html
+++ b/www/templates/monitors.html
@@ -48,10 +48,11 @@
           <br /> {{'kStatus' | translate}}: {{monitor.Monitor.isRunningText}}
           <br /> {{'kId' | translate}}: {{monitor.Monitor.Id}}
           <br /> {{'kEventRecording' | translate}}: {{(monitor.Monitor.VideoWriter>0?'kVideo':'kImages') | translate}}
-          <br />Streaming URL: {{monitor.Monitor.streamingURL}}
-          <br />Portal URL: {{monitor.Monitor.baseURL}}
-          <br />
-          <br />
+          <br />{{'kMonStreamingURL' | translate}}: {{monitor.Monitor.streamingURL}}
+          <br />{{'kMonPortalURL' | translate}} {{monitor.Monitor.baseURL}}
+          <br />{{'kMonRecordingURL' | translate}} {{monitor.Monitor.controlURL}}
+          <br /> <br/>
+     
         </p>
         <div style="float:right;">
           <a class="button button-small icon icon-left icon ion-gear-a" href="" ng-click="changeConfig(monitor.Monitor.Name, monitor.Monitor.Id,monitor.Monitor.Enabled,monitor.Monitor.Function);">{{'kConfiguration'
-- 
cgit v1.2.3


From ecc85318c69c09b30382f0a26a7d461619d42c47 Mon Sep 17 00:00:00 2001
From: Pliable Pixels <pliablepixels@gmail.com>
Date: Tue, 23 Oct 2018 16:44:08 -0400
Subject: separators

---
 www/templates/monitors.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'www/templates/monitors.html')

diff --git a/www/templates/monitors.html b/www/templates/monitors.html
index 4e5023a9..0f9df892 100644
--- a/www/templates/monitors.html
+++ b/www/templates/monitors.html
@@ -49,8 +49,8 @@
           <br /> {{'kId' | translate}}: {{monitor.Monitor.Id}}
           <br /> {{'kEventRecording' | translate}}: {{(monitor.Monitor.VideoWriter>0?'kVideo':'kImages') | translate}}
           <br />{{'kMonStreamingURL' | translate}}: {{monitor.Monitor.streamingURL}}
-          <br />{{'kMonPortalURL' | translate}} {{monitor.Monitor.baseURL}}
-          <br />{{'kMonRecordingURL' | translate}} {{monitor.Monitor.controlURL}}
+          <br />{{'kMonPortalURL' | translate}}: {{monitor.Monitor.baseURL}}
+          <br />{{'kMonRecordingURL' | translate}}: {{monitor.Monitor.controlURL}}
           <br /> <br/>
      
         </p>
-- 
cgit v1.2.3


From 164ebf1745517bb2bc9be8eedb5bdf709168d801 Mon Sep 17 00:00:00 2001
From: Pliable Pixels <pliablepixels@gmail.com>
Date: Thu, 1 Nov 2018 11:20:41 -0400
Subject: #733 remove getMonitor dependency for monitor view, show the right
 loading message

---
 www/templates/monitors.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'www/templates/monitors.html')

diff --git a/www/templates/monitors.html b/www/templates/monitors.html
index 0f9df892..5da6b8db 100644
--- a/www/templates/monitors.html
+++ b/www/templates/monitors.html
@@ -64,7 +64,7 @@
       </div>
     </div>
     <ion-item ng-show="!monitors.length">
-      {{'kNoMonitors' | translate}}
+      {{monitorLoadStatus}}
     </ion-item>
   </ion-content>
 </ion-view>
-- 
cgit v1.2.3