From 7eb5a9281ff24f13e50c0cd068df96660b1a1d81 Mon Sep 17 00:00:00 2001 From: Pliable Pixels Date: Wed, 9 Nov 2016 14:32:36 -0500 Subject: Added event time progression to video #362 --- www/templates/events-modal.html | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) (limited to 'www/templates') diff --git a/www/templates/events-modal.html b/www/templates/events-modal.html index 58573026..caa87e9e 100644 --- a/www/templates/events-modal.html +++ b/www/templates/events-modal.html @@ -4,6 +4,8 @@
+ +
@@ -17,17 +19,21 @@
-
+ + +
- - < - - + + + + + {{ videoTime(event.Event.StartTime, currentTime ); }} @@ -75,7 +81,7 @@ -
{{mName}}  {{humanizeTime}} ({{d_eventId}})
+
{{mName}}  {{videoDynamicTime}} ({{humanizeTime}}) [{{d_eventId}}]
  • -- cgit v1.2.3 From 8b4c11e4e234f1eb52bb16322bacd00c455879f0 Mon Sep 17 00:00:00 2001 From: Pliable Pixels Date: Wed, 9 Nov 2016 16:41:28 -0500 Subject: some more tweaks to h264 video display given its all the rage now --- 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 caa87e9e..24078df7 100644 --- a/www/templates/events-modal.html +++ b/www/templates/events-modal.html @@ -46,9 +46,9 @@
-
+
-- cgit v1.2.3 From a11e9426dcbbec7c5df39c29b99befa360feaea8 Mon Sep 17 00:00:00 2001 From: Pliable Pixels Date: Thu, 10 Nov 2016 09:37:06 -0500 Subject: added text-wrap for input items to manage larger strings (problem when translated to some languages like russian) --- www/templates/devoptions.html | 43 ++++++++++++++++++---------------- www/templates/eventserversettings.html | 2 +- www/templates/login.html | 16 ++++++------- 3 files changed, 32 insertions(+), 29 deletions(-) (limited to 'www/templates') diff --git a/www/templates/devoptions.html b/www/templates/devoptions.html index cf207327..0ce3d11c 100644 --- a/www/templates/devoptions.html +++ b/www/templates/devoptions.html @@ -18,14 +18,14 @@
-
+ + + +
{{'kMaxMonitorsMontage' | translate }} 
--> -
+
{{'kMontageImageScale' | translate}}(%) 
-
+
{{'kEventSingleImageScale' | translate}}(%) 
-
+
{{'kMonitorSingleImageScale' | translate}}(%) 
--> -
+
{{'kEventMontageImageScale'|translate}}(%) 
-
+
{{'kMaxItemsForTimeline' | translate}} 
-
+
{{'kMinAlarmCount' | translate}} 
-
+
{{'kCycleMonitorsInterval'|translate}}({{'kSec'|translate}}.) 
diff --git a/www/templates/eventserversettings.html b/www/templates/eventserversettings.html index e6ec4614..7612a584 100644 --- a/www/templates/eventserversettings.html +++ b/www/templates/eventserversettings.html @@ -37,7 +37,7 @@ {{'kVibrateOnPush'| translate }} - {{'kSoundOnPush'| translate }} + {{'kSoundOnPush'| translate }} - +
@@ -18,15 +18,8 @@
- - - -
- - +
+
@@ -45,6 +38,7 @@ +
- - -
{{'kMaxMonitorsMontage' | translate }}