Skip to content

Commit

Permalink
Version 71:
Browse files Browse the repository at this point in the history
* Added alert list icons for Sentry-verified alerts and continued alerts.
  • Loading branch information
bp2008 committed Apr 12, 2019
1 parent ca86be7 commit 33808ef
Show file tree
Hide file tree
Showing 8 changed files with 229 additions and 24 deletions.
2 changes: 1 addition & 1 deletion ui3.htm
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
};
</script>
<script type="text/javascript">
var ui_version = "70";
var ui_version = "71";
var bi_version = "%%VERSION%%";
var combined_version = ui_version + "-" + bi_version;
//if (!!navigator.userAgent.match(/ Android /))
Expand Down
3 changes: 3 additions & 0 deletions ui3/icons-src/sentry_human.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
68 changes: 68 additions & 0 deletions ui3/icons-src/sentry_human_src.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions ui3/icons-src/sentry_logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
78 changes: 78 additions & 0 deletions ui3/icons-src/sentry_logo_src.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions ui3/icons.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
61 changes: 39 additions & 22 deletions ui3/ui3.css
Original file line number Diff line number Diff line change
Expand Up @@ -1964,6 +1964,17 @@ div.invisibleLabel
color: #95C7FC;
}

.clipIconWrapper .clipicon.icon_trigger_sentry_occupied
{
color: #F66476;
}

.cliptile.selected .clipIconWrapper .clipicon.icon_trigger_sentry_occupied,
.cliptile.selected:hover .clipIconWrapper .clipicon.icon_trigger_sentry_occupied
{
color: #ff98a5;
}

.sizeMedium .cliptile,
.sizeMedium .datetile,
.sizeMedium .clipListText
Expand Down Expand Up @@ -3248,6 +3259,7 @@ body + div
border-radius: 50%;
display: none;
}

.cornerStatusIconWrapper.big
{
width: 64px;
Expand All @@ -3273,19 +3285,20 @@ body + div
{
pointer-events: none;
}

@media all and (min-width: 800px) and (min-height: 600px)
{
.cornerStatusIconWrapper
{
width: 30px;
height: 30px;
}
.cornerStatusIconWrapper.big
{
width: 96px;
height: 96px;
}

.cornerStatusIconWrapper.big
{
width: 96px;
height: 96px;
}
}

@media all and (min-width: 600px) and (min-height: 800px)
Expand All @@ -3295,24 +3308,27 @@ body + div
width: 30px;
height: 30px;
}
.cornerStatusIconWrapper.big
{
width: 96px;
height: 96px;
}

.cornerStatusIconWrapper.big
{
width: 96px;
height: 96px;
}
}

@media all and (min-width: 1600px) and (min-height: 1200px)
{
.cornerStatusIconWrapper
{
width: 40px;
height: 40px;
}
.cornerStatusIconWrapper.big
{
width: 128px;
height: 128px;
}

.cornerStatusIconWrapper.big
{
width: 128px;
height: 128px;
}
}

@media all and (min-width: 1200px) and (min-height: 1600px)
Expand All @@ -3322,11 +3338,12 @@ body + div
width: 40px;
height: 40px;
}
.cornerStatusIconWrapper.big
{
width: 128px;
height: 128px;
}

.cornerStatusIconWrapper.big
{
width: 128px;
height: 128px;
}
}

/* Question Dialog */
Expand Down Expand Up @@ -4368,4 +4385,4 @@ div::-webkit-scrollbar-corner
.nonMatchingNativeRes, .dprTag
{
color: #e6e660;
}
}
32 changes: 31 additions & 1 deletion ui3/ui3.js
Original file line number Diff line number Diff line change
Expand Up @@ -832,6 +832,20 @@ var defaultSettings =
, label: '<svg class="icon clipicon noflip"><use xlink:href="#svg_mio_quilt"></use></svg> for group-triggered alerts'
, category: "Clip / Alert Icons"
}
, {
key: "ui3_clipicon_trigger_sentry"
, value: "1"
, inputType: "checkbox"
, label: '<svg class="icon clipicon noflip"><use xlink:href="#sentry_logo"></use></svg> for Sentry-verified alerts'
, category: "Clip / Alert Icons"
}
, {
key: "ui3_clipicon_trigger_sentry_occupied"
, value: "1"
, inputType: "checkbox"
, label: '<svg class="icon clipicon noflip"><use xlink:href="#sentry_human"></use></svg> for Sentry-verified alerts that continue a previous alert'
, category: "Clip / Alert Icons"
}
, {
key: "ui3_clipicon_clip_audio"
, value: "1"
Expand Down Expand Up @@ -6712,6 +6726,10 @@ function ClipLoader(clipsBodySelector)
var GetClipIcons = function (clipData)
{
var icons = [];
if ((clipData.flags & alert_flag_sentry_trigger) > 0 && settings.ui3_clipicon_trigger_sentry == "1")
icons.push(self.GetClipIcon("trigger_sentry"));
if ((clipData.flags & alert_flag_sentry_occupied) > 0 && settings.ui3_clipicon_trigger_sentry_occupied == "1")
icons.push(self.GetClipIcon("trigger_sentry_occupied"));
if ((clipData.flags & alert_flag_trigger_motion) > 0 && settings.ui3_clipicon_trigger_motion == "1")
icons.push(self.GetClipIcon("trigger_motion"));
if ((clipData.flags & alert_flag_trigger_audio) > 0 && settings.ui3_clipicon_trigger_audio == "1")
Expand All @@ -6734,8 +6752,12 @@ function ClipLoader(clipsBodySelector)
{
switch (name)
{
case "trigger_sentry":
return GetClipIcon_Internal(name, "#sentry_logo", true, "Sentry-verified alert");
case "trigger_sentry_occupied":
return GetClipIcon_Internal(name, "#sentry_human", true, "Sentry-verified continuation of a previous alert");
case "trigger_motion":
return GetClipIcon_Internal(name, "#svg_mio_run", true, "Triggered by motion detection")
return GetClipIcon_Internal(name, "#svg_mio_run", true, "Triggered by motion detection");
case "trigger_audio":
return GetClipIcon_Internal(name, "#svg_mio_volumeUp", true, "Triggered by audio");
case "trigger_external":
Expand Down Expand Up @@ -15465,6 +15487,10 @@ function ClipProperties()
else
$camprop.append(GetInfo("Zones", clipData.rawData.zones));

if ((clipData.flags & alert_flag_sentry_trigger) > 0)
$camprop.append(GetIcon("trigger_sentry", "Sentry-verified alert"));
if ((clipData.flags & alert_flag_sentry_occupied) > 0)
$camprop.append(GetIcon("trigger_sentry_occupied", "Sentry-verified continuation of a previous alert"));
if ((clipData.flags & alert_flag_trigger_motion) > 0)
$camprop.append(GetIcon("trigger_motion", "Triggered by motion detection"));
if ((clipData.flags & alert_flag_trigger_audio) > 0)
Expand Down Expand Up @@ -20757,6 +20783,8 @@ var b0010_0000 = 32;
var b0100_0000 = 64;
var b1000_0000 = 128;
var b0001_0000_0000 = 256;
var b0000_0000_0100_0000_0000_0000 = 16384;
var b0000_0000_1000_0000_0000_0000 = 32768;
var b0000_0001_0000_0000_0000_0000 = 65536;
var b0000_0010_0000_0000_0000_0000 = 131072;
var b0000_0100_0000_0000_0000_0000 = 262144;
Expand All @@ -20771,6 +20799,8 @@ var clip_flag_protect = b0000_0100;
var clip_flag_backingup = b0100_0000;
var clip_flag_backedup = b1000_0000;
var clip_flag_is_recording = b0001_0000_0000;
var alert_flag_sentry_trigger = b0000_0000_0100_0000_0000_0000;
var alert_flag_sentry_occupied = b0000_0000_1000_0000_0000_0000;
var alert_flag_offsetMs = b0000_0001_0000_0000_0000_0000;
var alert_flag_trigger_motion = b0000_0010_0000_0000_0000_0000;
var alert_flag_nosignal = b0000_0100_0000_0000_0000_0000;
Expand Down

0 comments on commit 33808ef

Please sign in to comment.