From a84ed1903f9ebd2d7e0c31543fe90e222126c668 Mon Sep 17 00:00:00 2001 From: Pliable Pixels Date: Tue, 16 Oct 2018 14:52:49 -0400 Subject: menu option to toggle event summary (iPhoneX ui interference) --- www/templates/events-popover.html | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'www/templates') diff --git a/www/templates/events-popover.html b/www/templates/events-popover.html index d61f8f5b..2620c9b3 100644 --- a/www/templates/events-popover.html +++ b/www/templates/events-popover.html @@ -11,8 +11,13 @@ {{'kShowAllEvents' | translate}} + {{'kShowAlarmedEvents' | translate}} + + + {{ 'kToggleSummary' | translate}} + -- cgit v1.2.3 From e7c927d71902e132b3f43bc0de9d3a723f1e7a0b Mon Sep 17 00:00:00 2001 From: Pliable Pixels Date: Wed, 17 Oct 2018 16:44:29 -0400 Subject: don't call push notification handler till auth is done --- www/templates/monitors-modal.html | 2 ++ 1 file changed, 2 insertions(+) (limited to 'www/templates') diff --git a/www/templates/monitors-modal.html b/www/templates/monitors-modal.html index f039780a..a83db944 100644 --- a/www/templates/monitors-modal.html +++ b/www/templates/monitors-modal.html @@ -7,6 +7,8 @@ zooming="true" direction="xy" style="width: 100%;" overflow-scroll="false"> + + {{constructSingleStream()}}
-- cgit v1.2.3 From e783c4dbad748f6597d8f15e93a22ad8fa1b5082 Mon Sep 17 00:00:00 2001 From: Pliable Pixels Date: Thu, 18 Oct 2018 12:50:20 -0400 Subject: other cleanup --- www/templates/monitors-modal.html | 1 - 1 file changed, 1 deletion(-) (limited to 'www/templates') diff --git a/www/templates/monitors-modal.html b/www/templates/monitors-modal.html index a83db944..72ed2baa 100644 --- a/www/templates/monitors-modal.html +++ b/www/templates/monitors-modal.html @@ -8,7 +8,6 @@ - {{constructSingleStream()}}
-- cgit v1.2.3 From 89211bbbd526bbc587361085b119a19d296f6a7f Mon Sep 17 00:00:00 2001 From: Pliable Pixels Date: Sat, 20 Oct 2018 19:17:21 -0400 Subject: #724 cleanup and making sure we take recordingURL for playback --- www/templates/events.html | 4 ++-- www/templates/moment.html | 2 +- www/templates/monitors.html | 2 ++ www/templates/timeline-modal.html | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) (limited to 'www/templates') diff --git a/www/templates/events.html b/www/templates/events.html index b312a79c..71522fa0 100644 --- a/www/templates/events.html +++ b/www/templates/events.html @@ -152,13 +152,13 @@
- +
:{{alarm.frameid}}, :{{alarm.score}}, : {{prettifyTimeSec(alarm.time)}}
+ style="width: auto; height: auto;max-width: 100%;max-height: 170px" on-tap="showImage(event.Event.recordingURL, alarm.fname, alarm.frameid, event.Event.Id, event.Event.imageMode, alarm.id, alarm_images, $index)" />
diff --git a/www/templates/moment.html b/www/templates/moment.html index 45cdbd13..0f0f55c4 100644 --- a/www/templates/moment.html +++ b/www/templates/moment.html @@ -113,7 +113,7 @@ ng-click="togglePin(moment.Event.Id)">
- +
 {{moment.Event.humanizeTime}} {{hourmin(moment.Event.StartTime)}} 
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 @@
{{'kStatus' | translate}}: {{monitor.Monitor.isRunningText}}
{{'kId' | translate}}: {{monitor.Monitor.Id}}
{{'kEventRecording' | translate}}: {{(monitor.Monitor.VideoWriter>0?'kVideo':'kImages') | translate}} +
Streaming URL: {{monitor.Monitor.streamingURL}} +
Portal URL: {{monitor.Monitor.baseURL}}

diff --git a/www/templates/timeline-modal.html b/www/templates/timeline-modal.html index 3ae0aba7..5b6c8694 100644 --- a/www/templates/timeline-modal.html +++ b/www/templates/timeline-modal.html @@ -27,7 +27,7 @@
f:{{alarm.fid}} scr:{{alarm.score}} @ {{alarm.time}}
-- cgit v1.2.3 From 3f549f3d6ea3dac1fbf862e236549ce0dd7fd570 Mon Sep 17 00:00:00 2001 From: Pliable Pixels Date: Sun, 21 Oct 2018 10:33:47 -0400 Subject: #724 more cleanup --- www/templates/events-modal.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'www/templates') diff --git a/www/templates/events-modal.html b/www/templates/events-modal.html index 164c3f62..ad3266a8 100644 --- a/www/templates/events-modal.html +++ b/www/templates/events-modal.html @@ -33,14 +33,14 @@
- +
- -- cgit v1.2.3 From bf0ef4d5f85e3c30f9890a8264ed8203e19c465f Mon Sep 17 00:00:00 2001 From: Pliable Pixels 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') 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 @@
{{'kStatus' | translate}}: {{monitor.Monitor.isRunningText}}
{{'kId' | translate}}: {{monitor.Monitor.Id}}
{{'kEventRecording' | translate}}: {{(monitor.Monitor.VideoWriter>0?'kVideo':'kImages') | translate}} -
Streaming URL: {{monitor.Monitor.streamingURL}} -
Portal URL: {{monitor.Monitor.baseURL}} -
-
+
{{'kMonStreamingURL' | translate}}: {{monitor.Monitor.streamingURL}} +
{{'kMonPortalURL' | translate}} {{monitor.Monitor.baseURL}} +
{{'kMonRecordingURL' | translate}} {{monitor.Monitor.controlURL}} +

+

{{'kConfiguration' -- cgit v1.2.3 From ecc85318c69c09b30382f0a26a7d461619d42c47 Mon Sep 17 00:00:00 2001 From: Pliable Pixels 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') 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 @@
{{'kId' | translate}}: {{monitor.Monitor.Id}}
{{'kEventRecording' | translate}}: {{(monitor.Monitor.VideoWriter>0?'kVideo':'kImages') | translate}}
{{'kMonStreamingURL' | translate}}: {{monitor.Monitor.streamingURL}} -
{{'kMonPortalURL' | translate}} {{monitor.Monitor.baseURL}} -
{{'kMonRecordingURL' | translate}} {{monitor.Monitor.controlURL}} +
{{'kMonPortalURL' | translate}}: {{monitor.Monitor.baseURL}} +
{{'kMonRecordingURL' | translate}}: {{monitor.Monitor.controlURL}}

-- cgit v1.2.3 From da1db311fb6835e8d0b60cf073cd8803e96fe0a6 Mon Sep 17 00:00:00 2001 From: Pliable Pixels Date: Thu, 25 Oct 2018 13:06:47 -0400 Subject: fix live playback url, show snapshot instead of auto play #725 --- www/templates/events-modal.html | 1 + 1 file changed, 1 insertion(+) (limited to 'www/templates') diff --git a/www/templates/events-modal.html b/www/templates/events-modal.html index ad3266a8..319f8366 100644 --- a/www/templates/events-modal.html +++ b/www/templates/events-modal.html @@ -40,6 +40,7 @@
+ Date: Sat, 27 Oct 2018 07:38:31 -0400 Subject: attach logs instead of pasting --- www/templates/log.html | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'www/templates') diff --git a/www/templates/log.html b/www/templates/log.html index 0ad840d8..c67cab4c 100644 --- a/www/templates/log.html +++ b/www/templates/log.html @@ -4,7 +4,10 @@   + ng-click="selectToggle()">   + + + @@ -13,7 +16,7 @@
- +
@@ -32,6 +35,9 @@ + + +
-- cgit v1.2.3 From d5e7a99c63213ad3b62a9e8e95cb57f0bb0c7e6a Mon Sep 17 00:00:00 2001 From: Pliable Pixels Date: Mon, 29 Oct 2018 10:45:16 -0400 Subject: desktop logs rework --- www/templates/log.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'www/templates') diff --git a/www/templates/log.html b/www/templates/log.html index c67cab4c..99de95d3 100644 --- a/www/templates/log.html +++ b/www/templates/log.html @@ -19,7 +19,7 @@
- +
-- cgit v1.2.3 From 836f2d1c187047c8c6f4182c91a8ffb48d7c0de6 Mon Sep 17 00:00:00 2001 From: Pliable Pixels Date: Mon, 29 Oct 2018 16:52:27 -0400 Subject: #733 initial rough in --- www/templates/state.html | 100 +++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 84 insertions(+), 16 deletions(-) (limited to 'www/templates') diff --git a/www/templates/state.html b/www/templates/state.html index f5bff536..7791cd7b 100644 --- a/www/templates/state.html +++ b/www/templates/state.html @@ -6,6 +6,24 @@ + + + + + +
@@ -35,23 +53,73 @@
+ - - -
-
-
- {{'kChangeState'|translate}} - {{'kRestart' - | translate}} - {{'kStop' - | translate}} - {{'kStart' - | translate}} -
-
+ + +
+
+ + {{'kStateStorage' | translate}}
- - +
+
+ + {{store.Storage.Name}} ({{store.Storage.Id}}) +
+
+ +
+ {{'kStatePath' | translate }}: {{store.Storage.Path}} +
+
+ {{'kStateDiskUsed' | translate }}: {{ humanFileSize(store.Storage.DiskSpace,true)}} +
+
+ {{'kScheme' | translate }}: {{ store.Storage.Scheme}} +
+
+ {{'kStateServer' | translate }}: {{ matchServer(store.Storage.ServerId)}} +
+ +
+
+ +
+ + {{'kStateServer' | translate}} +
+
+
+ + {{server.Server.Name}} ({{server.Server.Id}}) +
+
+ +
+ {{'kStateHost' | translate }}: {{server.Server.Hostname}} +
+
+ {{'kStatus' | translate }}: {{ server.Server.Status}} +
+
+ {{'kStateCpuLoad' | translate }}: {{ server.Server.CpuLoad}} +
+
+ {{'kStateTotalMem' | translate }}: {{ humanFileSize(server.Server.TotalMem, true)}} +
+
+ {{'kStateFreeMem' | translate }}: {{ humanFileSize(server.Server.FreeMem, true)}} +
+ + +
+
+
+ + + + + -- cgit v1.2.3 From b3789d4a753814e81672aa59dee4a6e0d5ce55b2 Mon Sep 17 00:00:00 2001 From: Pliable Pixels Date: Tue, 30 Oct 2018 08:14:41 -0400 Subject: line height fix --- www/templates/state.html | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'www/templates') diff --git a/www/templates/state.html b/www/templates/state.html index 7791cd7b..b967c64c 100644 --- a/www/templates/state.html +++ b/www/templates/state.html @@ -69,16 +69,16 @@
-
+
{{'kStatePath' | translate }}: {{store.Storage.Path}}
-
+
{{'kStateDiskUsed' | translate }}: {{ humanFileSize(store.Storage.DiskSpace,true)}}
-
+
{{'kScheme' | translate }}: {{ store.Storage.Scheme}}
-
+
{{'kStateServer' | translate }}: {{ matchServer(store.Storage.ServerId)}}
@@ -96,19 +96,19 @@
-
+
{{'kStateHost' | translate }}: {{server.Server.Hostname}}
-
+
{{'kStatus' | translate }}: {{ server.Server.Status}}
-
+
{{'kStateCpuLoad' | translate }}: {{ server.Server.CpuLoad}}
-
+
{{'kStateTotalMem' | translate }}: {{ humanFileSize(server.Server.TotalMem, true)}}
-
+
{{'kStateFreeMem' | translate }}: {{ humanFileSize(server.Server.FreeMem, true)}}
-- cgit v1.2.3 From bbbf935e2abd9b603a090c594d09ea91d7a92f6e Mon Sep 17 00:00:00 2001 From: Pliable Pixels Date: Tue, 30 Oct 2018 11:21:39 -0400 Subject: #733 other cleanup --- www/templates/state.html | 47 ++++++++++++++++++++++++++--------------------- 1 file changed, 26 insertions(+), 21 deletions(-) (limited to 'www/templates') diff --git a/www/templates/state.html b/www/templates/state.html index b967c64c..b534b693 100644 --- a/www/templates/state.html +++ b/www/templates/state.html @@ -4,7 +4,7 @@ - + @@ -24,6 +24,7 @@
+
@@ -56,67 +57,71 @@ - +
-
- + + +
+ + {{'kStateStorage' | translate}}
-
- +
+ {{store.Storage.Name}} ({{store.Storage.Id}})
-
+
{{'kStatePath' | translate }}: {{store.Storage.Path}}
-
+
{{'kStateDiskUsed' | translate }}: {{ humanFileSize(store.Storage.DiskSpace,true)}}
-
+
{{'kScheme' | translate }}: {{ store.Storage.Scheme}}
-
+
{{'kStateServer' | translate }}: {{ matchServer(store.Storage.ServerId)}}
-
- + +
+ + {{'kStateServer' | translate}}
-
- +
+ {{server.Server.Name}} ({{server.Server.Id}})
-
+
{{'kStateHost' | translate }}: {{server.Server.Hostname}}
-
+
{{'kStatus' | translate }}: {{ server.Server.Status}}
-
+
{{'kStateCpuLoad' | translate }}: {{ server.Server.CpuLoad}}
-
+
{{'kStateTotalMem' | translate }}: {{ humanFileSize(server.Server.TotalMem, true)}}
-
+
{{'kStateFreeMem' | translate }}: {{ humanFileSize(server.Server.FreeMem, true)}}
-
- + -- cgit v1.2.3 From 164ebf1745517bb2bc9be8eedb5bdf709168d801 Mon Sep 17 00:00:00 2001 From: Pliable Pixels 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') 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 @@
- {{'kNoMonitors' | translate}} + {{monitorLoadStatus}} -- cgit v1.2.3 From 73014ac9a48fd584a4e0665358d240dde3024887 Mon Sep 17 00:00:00 2001 From: Pliable Pixels Date: Fri, 2 Nov 2018 14:32:25 -0400 Subject: add ZM version to display --- www/templates/log.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'www/templates') diff --git a/www/templates/log.html b/www/templates/log.html index 99de95d3..2884c4bb 100644 --- a/www/templates/log.html +++ b/www/templates/log.html @@ -34,14 +34,14 @@ - - +
+ ZoneMinder {{'kVersion'|translate}}: {{zmVersion}}
- {{$root.appName}} {{'kVersion'|translate}}: {{zmAppVersion}} ({{$root.platformOS}}) + {{$root.appName}} {{'kVersion'|translate}}: {{zmAppVersion}} ({{$root.platformOS}})
+ ZoneMinder {{'kVersion'|translate}}: {{zmVersion}}
{{'kLogsCopyPaste' | translate }}
-- cgit v1.2.3