From 0d81a588d42c73c92d313f853461b433f8543ae4 Mon Sep 17 00:00:00 2001 From: Pliable Pixels Date: Sat, 12 May 2018 08:12:23 -0400 Subject: file formatting --- www/templates/devoptions.html | 380 ++++++++++++++++------------- www/templates/events-date-time-filter.html | 50 ++-- www/templates/events-graphs.html | 119 ++++----- www/templates/events-modal.html | 333 +++++++++++++------------ www/templates/events-modalgraph.html | 14 +- www/templates/events-popover.html | 22 +- www/templates/events.html | 55 ++--- www/templates/eventserversettings.html | 106 ++++---- www/templates/first-use.html | 71 +++--- www/templates/help.html | 23 +- www/templates/image-modal.html | 7 +- www/templates/important_message.html | 65 ++--- www/templates/invalidapi.html | 55 +++-- www/templates/log.html | 85 +++---- www/templates/login.html | 198 +++++++-------- www/templates/lowversion.html | 46 ++-- www/templates/menu.html | 287 +++++++++++----------- www/templates/moment-mask.html | 46 ++-- www/templates/moment-popover.html | 29 ++- www/templates/moment.html | 38 +-- www/templates/monitors-modal.html | 10 +- www/templates/monitors.html | 116 ++++----- www/templates/montage-history.html | 5 +- www/templates/montage.html | 285 ++++++++++++---------- www/templates/news.html | 45 ++-- www/templates/refresh.html | 30 +-- www/templates/reorder-modal.html | 44 ++-- www/templates/state.html | 105 ++++---- www/templates/timeline-modal.html | 88 +++---- www/templates/timeline-popover.html | 34 +-- www/templates/timeline.html | 6 +- www/templates/wizard.html | 183 +++++++------- www/templates/zm-portal-login.html | 47 ++-- 33 files changed, 1588 insertions(+), 1439 deletions(-) (limited to 'www/templates') diff --git a/www/templates/devoptions.html b/www/templates/devoptions.html index 86c19561..e81e536f 100644 --- a/www/templates/devoptions.html +++ b/www/templates/devoptions.html @@ -1,48 +1,63 @@ - - -   - - - - - -
- - {{'kDeveloperOptionsFor'|translate}} {{loginData.serverName}} + + +   + + + + + + +
+ + {{'kDeveloperOptionsFor'|translate}} {{loginData.serverName}} + +
+ {{'kFrameUpdate'|translate}} ({{'kSec'|translate}}.)  + +
+ +
- +
+ {{'kEventMontageImageScale'|translate}}(%)  + +
+
+ {{'kMaxItemsForTimeline' | translate}}  + +
+
+
+ {{'kMinAlarmCount' | translate}}  + +
+
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + +
+ {{'kCycleMonitorsInterval'|translate}}({{'kSec'|translate}}.)  + +
+ +
+ {{'kCycleMontageInterval'|translate}}({{'kSec'|translate}}.)  + +
+ + + + + +
+ diff --git a/www/templates/events-date-time-filter.html b/www/templates/events-date-time-filter.html index 2aa2d6d5..395c29d2 100644 --- a/www/templates/events-date-time-filter.html +++ b/www/templates/events-date-time-filter.html @@ -1,27 +1,27 @@ - - - - - -
-
- - -
- + + + + + +
+
+ + +
+ diff --git a/www/templates/events-graphs.html b/www/templates/events-graphs.html index 0e14016f..573bf6ad 100644 --- a/www/templates/events-graphs.html +++ b/www/templates/events-graphs.html @@ -1,65 +1,66 @@ - - - - - - - -
- - - - -
- - -
- - - - - - - -
-
- - -
-
- - - - - - - -
-
- - -
-
- - - - - - - -
-
- - -
-
- - - - + +
+ + + + +
+ + +
+ + + + + + + +
+
+ + +
+
+ + + + + + + +
+
+ + +
+
+ + + + + + + +
+
+ + +
+
+ + + + diff --git a/www/templates/events-modal.html b/www/templates/events-modal.html index e372929b..c51ef443 100644 --- a/www/templates/events-modal.html +++ b/www/templates/events-modal.html @@ -1,163 +1,186 @@
- - - - - - -
- -
- -
- -
- -
- - -
+ + + + + + +
+ +
+ +
+ +
+ +
+ + +
+ + +
+ +
+ +
+ +
+ + +
+ + + + + + +
+ +
+ {{eventWarning}} +
+
- -
- -
- -
- -
- - -
- - - - - - -
- -
{{eventWarning}}
-
- - - -
-   {{'kPaused' | translate}}  -
-
-
- -
-
- - -
- - - - - - - - {{ videoTime(event.Event.StartTime, currentTime ); }} - - - - - - {{ timeLeft | date:'mm:ss':'+0000' }} - - - - - - - -
-
- +
+
+ + +
+ + + + + + + + {{ videoTime(event.Event.StartTime, currentTime ); }} + + + + + + {{ timeLeft | date:'mm:ss':'+0000' }} + + + + + + + +
+
+ -
-
- - +
+
+ + + - -
-
- +
+ -
- -
-
- -
-
-
- @{{currentRate}}x {{'kAt' | translate}}:{{currentProgress.progress}}s -
-
- - - - - - - - -
- - - -
{{mName}}  {{videoDynamicTime}} ({{humanizeTime}}) [{{d_eventId}}] {{eventWarning}}
-
-
-
+ +
+
+ +
+
+
+ @{{currentRate}}x {{'kAt' | translate}}:{{currentProgress.progress}}s +
+
+ + + + + + + + +
+ + + +
{{mName}}  +  {{videoDynamicTime}} ({{humanizeTime}}) [{{d_eventId}}] + {{eventWarning}} +
+ +
+
diff --git a/www/templates/events-modalgraph.html b/www/templates/events-modalgraph.html index 25b38543..75f2ec15 100644 --- a/www/templates/events-modalgraph.html +++ b/www/templates/events-modalgraph.html @@ -1,9 +1,9 @@
- - -
- -
- - + + +
+ +
+ +
diff --git a/www/templates/events-popover.html b/www/templates/events-popover.html index 43c3ee88..5c7e7c15 100644 --- a/www/templates/events-popover.html +++ b/www/templates/events-popover.html @@ -1,15 +1,15 @@ - -
- {{'kFilterByDateTime' | translate}} - - - {{'kRefresh' | translate}} - - {{'kShowAllEvents' | translate}} - {{'kShowAlarmedEvents' | translate}} -
- + + {{'kRefresh' | translate}} + + {{'kShowAllEvents' | translate}} + {{'kShowAlarmedEvents' | translate}} +
+ diff --git a/www/templates/events.html b/www/templates/events.html index a07d98a1..6167603e 100644 --- a/www/templates/events.html +++ b/www/templates/events.html @@ -44,32 +44,32 @@ depending on the cause of the event --> -   - - +   + + -   +   - +   - - + + - - - - - - -  {{event.Event.MonitorName}} - ({{event.Event.Id}})   -
+ + + + + + +  {{event.Event.MonitorName}} + ({{event.Event.Id}})   +
{{event.Event.Frames}}   {{event.Event.AlarmFrames}}   @@ -90,22 +90,21 @@ -
+ -
- - - -
- - -
+
+ + +
+ +
- + +
+
diff --git a/www/templates/eventserversettings.html b/www/templates/eventserversettings.html index 1eff634b..602f8ca4 100644 --- a/www/templates/eventserversettings.html +++ b/www/templates/eventserversettings.html @@ -1,55 +1,57 @@ - {{'kEventServer' | translate}}/{{getTitle();}} - - - - - - - - -
- {{'kEventServerConfig1' | translate }} -
- {{'kUseEventServer' | translate}} - - {{'kOnTapNavigate' | translate}}: {{defScreen}} + {{'kEventServer' | translate}}/{{getTitle();}} + + + + + + + + +
+ {{'kEventServerConfig1' | translate }} +
+ {{'kUseEventServer' | translate}} + + {{'kOnTapNavigate' | translate}}: {{defScreen}} + + + {{'kOnlyUseWebSocket'| translate }} +
+

{{'kDisablePush' | translate }}

+ + + {{'kVibrateOnPush'| translate }} + {{'kSoundOnPush'| translate }} + + +
+ +   {{monitor.Monitor.Name}} - - {{'kOnlyUseWebSocket'| translate }} -
-

{{'kDisablePush' | translate }}

- - - {{'kVibrateOnPush'| translate }} - {{'kSoundOnPush'| translate }} - - -
- -   {{monitor.Monitor.Name}} - - - - - {{'kReportEvents' | translate }} - - - - -
- -  {{'kMinimumIntervals' | translate}} -
- -
- - + + + + {{'kReportEvents' | translate }} + + + + +
+ +  {{'kMinimumIntervals' | translate}} +
+ +
+ + diff --git a/www/templates/first-use.html b/www/templates/first-use.html index 884fb0c9..aa1475bf 100644 --- a/www/templates/first-use.html +++ b/www/templates/first-use.html @@ -1,38 +1,39 @@ - -
-
-
-
-
- -
-
- -

Hi There!

-
-

{{'kThanksForUsing' | translate}} {{$root.appName}}.

- {{'kNeedToKnow' | translate}} -

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

Hi There!

+
+

{{'kThanksForUsing' | translate}} {{$root.appName}}. +
+
{{'kNeedToKnow' | translate}} +

+
+ + +
+
+ + +
+
+ +
+
+
+
+ diff --git a/www/templates/help.html b/www/templates/help.html index e9a9876b..8a497c5e 100644 --- a/www/templates/help.html +++ b/www/templates/help.html @@ -1,12 +1,15 @@ - - - - - -

{{$root.appName}} v{{zmAppVersion}}

-
-
-
- + + + + + +

+ {{$root.appName}} v{{zmAppVersion}} +

+
+
+
+ diff --git a/www/templates/image-modal.html b/www/templates/image-modal.html index 2ac07f40..c1e0e5e6 100644 --- a/www/templates/image-modal.html +++ b/www/templates/image-modal.html @@ -3,12 +3,11 @@
- - + + -
+
diff --git a/www/templates/important_message.html b/www/templates/important_message.html index f0fd245e..3838dd76 100644 --- a/www/templates/important_message.html +++ b/www/templates/important_message.html @@ -1,34 +1,37 @@ - - - - -
-
-
-
-
- -
-
- -

{{'kImpMsg1' | translate}}

-
-

{{'kImpMsg2' | translate}}

-
- {{'kImpMsg3' | translate}} v{{currentVersion}}.
v{{recommendedVersion}} {{'kImpMsg4' | translate}} -
- {{'kImpMsg5' | translate}}: v{{currentVersion}}
- {{'kImpMsg6' | translate}}:v{{recommendedVersion}}

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

{{'kImpMsg1' | translate}}

+
+

{{'kImpMsg2' | translate}}

+
{{'kImpMsg3' | translate}} v{{currentVersion}}. +
v{{recommendedVersion}} {{'kImpMsg4' | translate}} +
{{'kImpMsg5' | translate}}: + v{{currentVersion}} +
{{'kImpMsg6' | translate}}: + v{{recommendedVersion}} +
+
+ + + + + +
+
+
+ diff --git a/www/templates/invalidapi.html b/www/templates/invalidapi.html index af3a6977..032a8693 100644 --- a/www/templates/invalidapi.html +++ b/www/templates/invalidapi.html @@ -1,30 +1,31 @@ - - - - -
-
-
-
-
- -
-
- -

{{'kInvalidAPIHeader' | translate}}

-
-

{{'kInvalidAPIBody' | translate}}

- -

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

{{'kInvalidAPIHeader' | translate}}

+
+

{{'kInvalidAPIBody' | translate}}

+ +
+
+ + + + + +
+
+
+ diff --git a/www/templates/log.html b/www/templates/log.html index 144ada6a..e505bda1 100644 --- a/www/templates/log.html +++ b/www/templates/log.html @@ -1,42 +1,45 @@ - - - -   - - - - - - -
- -
-
- -
- - - -
- - - -
- -
- {{$root.appName}} {{'kVersion'|translate}}: {{zmAppVersion}} ({{$root.platformOS}}) -
- -
{{'kLogsCopyPaste' | translate }}
-
- ZoneMinder -
- - -
- - 
{{log.logString}}
- + + + +   + + + + + + + +
+ +
+
+ +
+ + + +
+ + + +
+ +
+ {{$root.appName}} {{'kVersion'|translate}}: {{zmAppVersion}} ({{$root.platformOS}}) +
+ +
{{'kLogsCopyPaste' | translate }}
+
+ ZoneMinder +
+ + +
+ + 
{{log.logString}}
+ diff --git a/www/templates/login.html b/www/templates/login.html index cbd5a024..e3c6e6fc 100644 --- a/www/templates/login.html +++ b/www/templates/login.html @@ -1,102 +1,110 @@ - -   - - - - - - - -
- {{'kServerName' | translate }}:  - + +   + + + + + + + +
+ {{'kServerName' | translate }}:  + +
+ + +
+ + + {{'kZMSettingsFor' | translate}} {{loginData.serverName || ('kUnknown' | translate)}} + +

{{'kDisableSamsung' | translate}}

+
+ {{'kUseZmAuth' | translate }} +
+ +
- - -
- - - {{'kZMSettingsFor' | translate}} {{loginData.serverName || ('kUnknown' | translate)}} - -

{{'kDisableSamsung' | translate}}

-
- {{'kUseZmAuth' | translate }} -
- - -
-
+
-
- {{'kUseBasicAuth' | translate }} -
- - -
-
+
+ {{'kUseBasicAuth' | translate }} +
+ + +
+
-

{{'kWarningBasicAuth' | translate}}

+

{{'kWarningBasicAuth' | translate}}

- - - - - - - {{'kFallback' | translate}} -

{{loginData.fallbackConfiguration}}

- - - - {{'kEventServer' | translate}} - -
- -
- -
- -
-
- + + + + + {{'kFallback' | translate}} +

{{loginData.fallbackConfiguration}}

+ + + + {{'kEventServer' | translate}} + +
+ +
+ +
+ +
+
+ diff --git a/www/templates/lowversion.html b/www/templates/lowversion.html index d6b9cb7e..50a3e978 100644 --- a/www/templates/lowversion.html +++ b/www/templates/lowversion.html @@ -1,25 +1,27 @@ - -
-
-
-
-
- -
-
- -

{{'kZMUpgradeNeeded' | translate}}

-
-

{{'kVersionIncompatible' | translate }}

-
- {{'kReportedVersion' | translate}}: {{currentVersion}}
- {{'kMinVersion' | translate}}:{{requiredVersion}}
- - - -
-
+ +
+
+
+
+
+
- +
+ +

{{'kZMUpgradeNeeded' | translate}}

+
+

{{'kVersionIncompatible' | translate }}

+
{{'kReportedVersion' | translate}}: + {{currentVersion}} +
{{'kMinVersion' | translate}}: + {{requiredVersion}} +
+ + + +
+
+
+ diff --git a/www/templates/menu.html b/www/templates/menu.html index 5e189029..3b69b544 100644 --- a/www/templates/menu.html +++ b/www/templates/menu.html @@ -1,150 +1,153 @@
- + - - - - - - + + + + + + - -

{{'kMenuOptions'|translate}}

- - - - - - - - - - - {{'kMenuMontage'|translate}} - - - - - - - {{'kMenuTimeline'|translate}} - - - - - - - {{'kMenuEvents'|translate}} - - - - - - - {{'kMoment24Heading'|translate}} - - - - - - - {{'kMenuEventMontage'|translate}} - - - - - - - - {{'kMenuMonitors'|translate}} - - - - - - - {{'kMenuSystemStatus'|translate}} - - - - - - - {{'kMenuZMSettings'|translate}} - + + + + + + + + {{'kMenuMontage'|translate}} + + + + + + + {{'kMenuTimeline'|translate}} + + + + + + + {{'kMenuEvents'|translate}} + + + + + + + {{'kMoment24Heading'|translate}} + + + + + + + {{'kMenuEventMontage'|translate}} + + + + + + + + {{'kMenuMonitors'|translate}} + + + + + + + {{'kMenuSystemStatus'|translate}} + + + + + + + {{'kMenuZMSettings'|translate}} + -  {{$root.getProfileName();}}  - - - - - - - - {{'kMenuDevSettings'|translate}} - - - - - - {{'kLanguage'|translate}} - - - - - - - {{'kMenuHelp'|translate}} - - - - - - - - {{'kMenuWizard'|translate}} - - -
- - - - - {{'kMenuNews'|translate}} {{$root.newBlogPost}} - -
- - - - - - {{'kMenuLogs'|translate}} - - -
- - - - {{$root.newVersionAvailable}} - -
-
- - - - {{'kMenuExit'|translate}} - -
- - {{$root.getLocalTimeZone();}} -
- {{$root.getServerTimeZoneNow();}} - - - - +  {{$root.getProfileName();}}  + + + + + + + + {{'kMenuDevSettings'|translate}} + + + + + + {{'kLanguage'|translate}} + + + + + + + {{'kMenuHelp'|translate}} + + + + + + + + {{'kMenuWizard'|translate}} + + +
+ + + + + {{'kMenuNews'|translate}} + {{$root.newBlogPost}} + +
+ + + + + + {{'kMenuLogs'|translate}} + + +
+ + + + + {{$root.newVersionAvailable}} + +
+
+ + + + {{'kMenuExit'|translate}} + +
+ + {{$root.getLocalTimeZone();}} +
+ + {{$root.getServerTimeZoneNow();}} + + + + - +
diff --git a/www/templates/moment-mask.html b/www/templates/moment-mask.html index 51657b19..6493e4be 100644 --- a/www/templates/moment-mask.html +++ b/www/templates/moment-mask.html @@ -1,24 +1,30 @@ - -

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

+
+ + +
+ + +
+ - + -

{{item.Monitor.Name}}

{{'kId' | translate}}:{{item.Monitor.Id}}, {{'kMode' | translate}}:{{item.Monitor.Function}}

- - - - -
- + + + + +

+ {{item.Monitor.Name}} +

+

{{'kId' | translate}}:{{item.Monitor.Id}}, {{'kMode' | translate}}:{{item.Monitor.Function}}

+ + + + +
+ diff --git a/www/templates/moment-popover.html b/www/templates/moment-popover.html index 6d2f49fc..8cc8cab4 100644 --- a/www/templates/moment-popover.html +++ b/www/templates/moment-popover.html @@ -1,18 +1,23 @@ - -
- - - {{'kMomentMenuByTime' | translate}} - - + +
- {{'kMomentMenuByMonitor' | translate}} + + {{'kMomentMenuByTime' | translate}} + + - {{'kMomentMenuByScore' | translate}} + {{'kMomentMenuByMonitor' | translate}} + + - -
- + + {{'kMomentMenuByScore' | translate}} + + + + +
+ diff --git a/www/templates/moment.html b/www/templates/moment.html index f349bba5..6bc8d5da 100644 --- a/www/templates/moment.html +++ b/www/templates/moment.html @@ -1,8 +1,10 @@ - {{'kMoment24Heading' | translate}} + + {{'kMoment24Heading' | translate}} -   +   + @@ -25,10 +27,10 @@ -
 {{ 'kArrangingImages' | translate }}... 
+
 {{ 'kArrangingImages' | translate }}... 
+ +
 {{ 'kApiUpgrade' | translate }} 
-
 {{ 'kApiUpgrade' | translate }} 
-

@@ -49,9 +51,9 @@
  • - - - + + +
  • @@ -65,17 +67,20 @@
    • -    +   +  
    • -    +   +  
    • -    +   +  
      • @@ -99,13 +104,14 @@ {{moment.Event.collapseCount}}  - -
      - - +
      + +
       {{moment.Event.humanizeTime}} diff --git a/www/templates/monitors-modal.html b/www/templates/monitors-modal.html index 65d70dd4..980e2384 100644 --- a/www/templates/monitors-modal.html +++ b/www/templates/monitors-modal.html @@ -10,7 +10,7 @@
      - + - + + ng-click="controlPTZ(monitorId, ptzPresets[0].cmd);">{{ptzPresets[0].name}}
      @@ -158,7 +158,7 @@ - +
      -
      -
      -
      -
      -
      - - -
      -   - -
      -   - {{monitor.Monitor.Name}} -       - - - - -
      -
      -
      - - - {{monitor.Monitor.Name}} - - -
      -

      {{'kMode' | translate}} :{{monitor.Monitor.Function}} -
      {{'kResolution' | translate}}: {{monitor.Monitor.Width}}*{{monitor.Monitor.Height}} -
      {{'kMaxFPS' | translate}}: {{monitor.Monitor.MaxFPS}} -
      {{'kAlarmMaxFPS' | translate}}:{{monitor.Monitor.AlarmMaxFPS}} -
      {{'kAlarmFrameCount' |translate}}: {{monitor.Monitor.AlarmFrameCount}} -
      {{'kStatus' | translate}}: {{monitor.Monitor.isRunningText}} -
      {{'kId' | translate}}: {{monitor.Monitor.Id}} -
      {{'kEventRecording' | translate}}: {{(monitor.Monitor.VideoWriter>0?'kVideo':'kImages') | translate}} -
      -
      -

      - +
      + + + {{monitor.Monitor.Name}} + +
      +

      {{'kMode' | translate}} :{{monitor.Monitor.Function}} +
      {{'kResolution' | translate}}: {{monitor.Monitor.Width}}*{{monitor.Monitor.Height}} +
      {{'kMaxFPS' | translate}}: {{monitor.Monitor.MaxFPS}} +
      {{'kAlarmMaxFPS' | translate}}:{{monitor.Monitor.AlarmMaxFPS}} +
      {{'kAlarmFrameCount' |translate}}: {{monitor.Monitor.AlarmFrameCount}} +
      {{'kStatus' | translate}}: {{monitor.Monitor.isRunningText}} +
      {{'kId' | translate}}: {{monitor.Monitor.Id}} +
      {{'kEventRecording' | translate}}: {{(monitor.Monitor.VideoWriter>0?'kVideo':'kImages') | translate}} +
      +
      +

      + - - {{'kNoMonitors' | translate}} - - +
      +
      + + {{'kNoMonitors' | translate}} + + diff --git a/www/templates/montage-history.html b/www/templates/montage-history.html index 67f84630..742aeccc 100644 --- a/www/templates/montage-history.html +++ b/www/templates/montage-history.html @@ -12,8 +12,7 @@ - +
      {{'kFrom' | translate}}:{{prettifyDateTimeFirst(datetimeValueFrom.value)}} ({{humanizeTime(datetimeValueFrom.value)}})
      ({{'kChromeMax' | translate}})
      @@ -115,7 +114,7 @@
      ({{humanizeTime(datetimeValueFrom.value)}}) - +

      diff --git a/www/templates/montage.html b/www/templates/montage.html index 139799e7..876e1125 100644 --- a/www/templates/montage.html +++ b/www/templates/montage.html @@ -1,155 +1,182 @@ - - {{currentProfileName}} - - -   - - - - - - - {{timeNow}}  - - - - - - - -
       {{ 'kArrangingImages' | translate }}... 
      - - -
      - -
      -
      - +
      + +
      + +
      +
      + +
      +
      + +
      +
      + -
      -
        -
      • - -
        • -
      • - -
        • -
      • - -
        • - + +
        -
      -
      -
      + -
      -
      - -
      -
      - - +
      + + - -
      +
      + - +
      + +
      + +
      -
      - - - -
      - - -
      -
      - -
      - - +
        -
        - -    - {{monitor.Monitor.Name}}   + +   +   {{monitor.Monitor.Name}}  +   -
      +
      + +
      -
      - -
      - -
      - - {{'kNoMonitors' | translate}} - - -
      - {{ 'kLowBWDisplay' | translate }} + +
      -
      - - - - -
      -
      + + + + + +
      +
      diff --git a/www/templates/news.html b/www/templates/news.html index 98d0af12..2512bb4c 100644 --- a/www/templates/news.html +++ b/www/templates/news.html @@ -1,24 +1,25 @@ - - - - - - -
      - - - - - {{post.title}} -

      {{post.date}}

      - -       - -       -
      - {{'kLoading' | translate}}... -
      -
      -       + + + + + + +
      + + + + + {{post.title}} +

      {{post.date}}

      + +       + +       +
      + {{'kLoading' | translate}}... +
      +
      +       diff --git a/www/templates/refresh.html b/www/templates/refresh.html index e320f99b..d9081ffa 100644 --- a/www/templates/refresh.html +++ b/www/templates/refresh.html @@ -1,17 +1,17 @@ - -
      -
      -
      -
      -
      - -

      {{'kLoading' | translate}}

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

      {{'kLoading' | translate}}

      + + +       +
      +
      +
      +       diff --git a/www/templates/reorder-modal.html b/www/templates/reorder-modal.html index 4ed54fb6..d60133d9 100644 --- a/www/templates/reorder-modal.html +++ b/www/templates/reorder-modal.html @@ -1,23 +1,29 @@ - -

      -
      - - -
      -       - -
      - - + +

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

      {{item.Monitor.Name}}

      {{'kId' | translate}}:{{item.Monitor.Id}}, {{'kMode' | translate}}:{{item.Monitor.Function}}

      - -       - - -
      - + + +

      + {{item.Monitor.Name}} +

      +

      {{'kId' | translate}}:{{item.Monitor.Id}}, {{'kMode' | translate}}:{{item.Monitor.Function}}

      + + + +       +
      +       diff --git a/www/templates/state.html b/www/templates/state.html index bb41b876..d227bb5b 100644 --- a/www/templates/state.html +++ b/www/templates/state.html @@ -1,40 +1,41 @@ - - - - - - - - -
      -
      - -
      -
      - ZoneMinder: -
      + + + + + + + + +
      +
      + +
      +
      + ZoneMinder: +
      -
      - {{zmRun}} -

      {{customState}}

      -
      -
      -       - -
      -
      - -
      -
      - ZoneMinder {{'kLoad' | translate}}: -
      -
      - {{zmLoad}} -
      -
      -       - - - - - -       -       + + + + + + diff --git a/www/templates/timeline-modal.html b/www/templates/timeline-modal.html index a728541f..64b854ff 100644 --- a/www/templates/timeline-modal.html +++ b/www/templates/timeline-modal.html @@ -1,46 +1,50 @@ - -
      -
      -
      {{mName}}  {{'kEvent' | translate}}:{{eid}} ({{humanizeTime}}) - -
      -
      -
      {{'kEvent' | translate}} {{graphType}} {{'kFrames' | translate}}
      -

      {{'kTimelineMessage' | translate}}

      - {{errorDetails}} - -
      -
      - -
      - -
      - - - - -
      -
      f:{{alarm.fid}} scr:{{alarm.score}} @ {{alarm.time}}
      - - - -
      - -       - -
      -
      - - -       - - + +
      +
      +
      {{mName}}  +  {{'kEvent' | translate}}:{{eid}} ({{humanizeTime}}) + +
      +
      +
      {{'kEvent' | translate}} {{graphType}} {{'kFrames' | translate}}
      +

      {{'kTimelineMessage' | translate}}

      + {{errorDetails}} + +
      +
      + +
      + +
      + + + + +
      +
      f:{{alarm.fid}} scr:{{alarm.score}} @ {{alarm.time}}
      + + + +
      + +       + +
      +
      + + +       + +       diff --git a/www/templates/timeline-popover.html b/www/templates/timeline-popover.html index 373ea09e..b1bd802e 100644 --- a/www/templates/timeline-popover.html +++ b/www/templates/timeline-popover.html @@ -1,21 +1,21 @@ - + -
      - +
      - {{'kShowAllEvents' | translate}} - {{'kShowAlarmedEvents' | translate}} - {{'kMonth' | translate}} - - {{'kWeek' | translate}} - - - {{'kDay' | translate}} - - - {{'kCustomRange' | translate}} - -
      - + + {{'kShowAllEvents' | translate}} + {{'kShowAlarmedEvents' | translate}} + {{'kMonth' | translate}} + + {{'kWeek' | translate}} + + + {{'kDay' | translate}} + + + {{'kCustomRange' | translate}} + +
      +       diff --git a/www/templates/timeline.html b/www/templates/timeline.html index 80f83e8a..34847eea 100644 --- a/www/templates/timeline.html +++ b/www/templates/timeline.html @@ -38,9 +38,9 @@
      - + - - - - - -

      {{'kWelcomeWizard' | translate}}

      - -

      {{'kWizConfigPain' | translate}}

      -

      {{'kWizPortalUrl' | translate}}

      - -

      {{'kDisableSamsung' | translate}}

      - {{wizard.tiptext}} -
      - {{'kWizTip' | translate}}: {{'kWizPortalTip' | translate}} -
      - -
      -
      - -       - - -

      {{'kWizPortalAuth' | translate}}

      - -

      {{'kWizPortalText' | translate}}

      - {{'kWizUseAuth' | translate}} - {{'kWizZMAuth' | translate}} -
      - - -
      - {{'kWizBasicAuth' | translate}}

      {{'kWarningBasicAuth'|translate}}

       - - - - {{wizard.tiptext}} -
      - {{'kWizTip'| translate}} {{'kWizAuthText1' | translate}} -
      {{'kWizAuthText2' | translate}} -
      -
      - - -       - -
      -
      -

      {{'kWizResults' | translate}}

      -  {{wizard.portalValidText}}
       -  {{wizard.apiValidText}}
       -  {{wizard.streamingValidText}}
       -
      -
      - {{'kWizNextStep1' | translate}}: -
        -
      • {{'kWizNextStep2' | translate}}
        • -
      • {{'kWizNextStep3' | translate}}
        • -
      -
      -
      -
      - - -       -       -       + + + + + + + +

      + {{'kWelcomeWizard' | translate}}

      + +

      {{'kWizConfigPain' | translate}}

      +

      {{'kWizPortalUrl' | translate}}

      + +

      {{'kDisableSamsung' | translate}}

      + {{wizard.tiptext}} +
      + {{'kWizTip' | translate}}: {{'kWizPortalTip' | translate}} +
      + +
      +
      + +       + + +

      {{'kWizPortalAuth' | translate}}

      + +

      {{'kWizPortalText' | translate}}

      + {{'kWizUseAuth' | translate}} + {{'kWizZMAuth' | translate}} +
      + + +
      + {{'kWizBasicAuth' | translate}} +

      {{'kWarningBasicAuth'|translate}}

      +       + + + + {{wizard.tiptext}} +
      + {{'kWizTip'| translate}} {{'kWizAuthText1' | translate}} +
      {{'kWizAuthText2' | translate}} +
      +
      + + +       + +
      +
      +

      {{'kWizResults' | translate}}

      + +  {{wizard.portalValidText}} +
      +       + +  {{wizard.apiValidText}} +
      +       + +  {{wizard.streamingValidText}} +
      +       +
      +
      + {{'kWizNextStep1' | translate}}: +
        +
      • {{'kWizNextStep2' | translate}}
        • +
      • {{'kWizNextStep3' | translate}}
        • +
      +
      +
      +
      + + +       +       +       diff --git a/www/templates/zm-portal-login.html b/www/templates/zm-portal-login.html index 877dbb97..903ae7c6 100644 --- a/www/templates/zm-portal-login.html +++ b/www/templates/zm-portal-login.html @@ -1,26 +1,27 @@ - -
      -
      -
      -
      -
      - -
      -
      - {{'kEnterPin' | translate}} -
      - -
      -
      {{pindata.status}} -
      - -
      -
      {{'kPortalNotice' | translate}} -
      -
      {{'kPortalNoticeSub' | translate}}
      -
      + +
      +
      +
      +
      +
      +
      - +
      + {{'kEnterPin' | translate}} +
      + +
      +
      + {{pindata.status}} +
      + +
      +
      {{'kPortalNotice' | translate}} +
      +
      {{'kPortalNoticeSub' | translate}}
      +
      +
      +       -- cgit v1.2.3