Compare commits
11 Commits
1.36.12_he
...
thumbnail_
Author | SHA1 | Date |
---|---|---|
Isaac Connor | ce4ea7d42e | |
Isaac Connor | 2f1e6cbd6b | |
Isaac Connor | 16953c6e2b | |
Isaac Connor | 5c2ee5a1c5 | |
Isaac Connor | c377c96367 | |
Isaac Connor | 010fcec990 | |
Isaac Connor | 51ef83dd94 | |
Isaac Connor | a407f9a0b7 | |
Isaac Connor | 0853f26062 | |
Isaac Connor | e7303ccb08 | |
Isaac Connor | 0d8c16bb56 |
|
@ -2,59 +2,5 @@
|
||||||
-- This updates a 1.29.0 database to 1.29.1
|
-- This updates a 1.29.0 database to 1.29.1
|
||||||
--
|
--
|
||||||
|
|
||||||
SET @s = (SELECT IF(
|
|
||||||
(SELECT COUNT(*)
|
|
||||||
FROM INFORMATION_SCHEMA.TABLES
|
|
||||||
WHERE table_name = 'Storage'
|
|
||||||
AND table_schema = DATABASE()
|
|
||||||
) > 0,
|
|
||||||
"SELECT 'Storage table exists'",
|
|
||||||
"CREATE TABLE `Storage` (
|
|
||||||
`Id` smallint(5) unsigned NOT NULL auto_increment,
|
|
||||||
`Path` varchar(64) NOT NULL default '',
|
|
||||||
`Name` varchar(64) NOT NULL default '',
|
|
||||||
PRIMARY KEY (`Id`)
|
|
||||||
)"
|
|
||||||
));
|
|
||||||
|
|
||||||
PREPARE stmt FROM @s;
|
|
||||||
EXECUTE stmt;
|
|
||||||
|
|
||||||
--
|
|
||||||
-- Add StorageId column to Monitors
|
|
||||||
--
|
|
||||||
|
|
||||||
SET @s = (SELECT IF(
|
|
||||||
(SELECT COUNT(*)
|
|
||||||
FROM INFORMATION_SCHEMA.COLUMNS
|
|
||||||
WHERE table_name = 'Monitors'
|
|
||||||
AND table_schema = DATABASE()
|
|
||||||
AND column_name = 'StorageId'
|
|
||||||
) > 0,
|
|
||||||
"SELECT 'Column StorageId exists in Monitors'",
|
|
||||||
"ALTER TABLE Monitors ADD `StorageId` smallint(5) unsigned AFTER `ServerId`"
|
|
||||||
));
|
|
||||||
|
|
||||||
PREPARE stmt FROM @s;
|
|
||||||
EXECUTE stmt;
|
|
||||||
|
|
||||||
--
|
|
||||||
-- Add StorageId column to Eventss
|
|
||||||
--
|
|
||||||
|
|
||||||
SET @s = (SELECT IF(
|
|
||||||
(SELECT COUNT(*)
|
|
||||||
FROM INFORMATION_SCHEMA.COLUMNS
|
|
||||||
WHERE table_name = 'Events'
|
|
||||||
AND table_schema = DATABASE()
|
|
||||||
AND column_name = 'StorageId'
|
|
||||||
) > 0,
|
|
||||||
"SELECT 'Column StorageId exists in Events'",
|
|
||||||
"ALTER TABLE Events ADD `StorageId` smallint(5) unsigned AFTER `MonitorId`"
|
|
||||||
));
|
|
||||||
|
|
||||||
PREPARE stmt FROM @s;
|
|
||||||
EXECUTE stmt;
|
|
||||||
|
|
||||||
-- Increase the size of the Pid field for FreeBSD
|
-- Increase the size of the Pid field for FreeBSD
|
||||||
ALTER TABLE Logs MODIFY Pid int(10);
|
ALTER TABLE Logs MODIFY Pid int(10);
|
||||||
|
|
|
@ -108,3 +108,57 @@ SELECT * FROM (SELECT NULL as Id,
|
||||||
WHERE NOT EXISTS (
|
WHERE NOT EXISTS (
|
||||||
SELECT Name FROM Controls WHERE name = 'Vivotek ePTZ'
|
SELECT Name FROM Controls WHERE name = 'Vivotek ePTZ'
|
||||||
) LIMIT 1;
|
) LIMIT 1;
|
||||||
|
|
||||||
|
SET @s = (SELECT IF(
|
||||||
|
(SELECT COUNT(*)
|
||||||
|
FROM INFORMATION_SCHEMA.TABLES
|
||||||
|
WHERE table_name = 'Storage'
|
||||||
|
AND table_schema = DATABASE()
|
||||||
|
) > 0,
|
||||||
|
"SELECT 'Storage table exists'",
|
||||||
|
"CREATE TABLE `Storage` (
|
||||||
|
`Id` smallint(5) unsigned NOT NULL auto_increment,
|
||||||
|
`Path` varchar(64) NOT NULL default '',
|
||||||
|
`Name` varchar(64) NOT NULL default '',
|
||||||
|
PRIMARY KEY (`Id`)
|
||||||
|
)"
|
||||||
|
));
|
||||||
|
|
||||||
|
PREPARE stmt FROM @s;
|
||||||
|
EXECUTE stmt;
|
||||||
|
|
||||||
|
--
|
||||||
|
-- Add StorageId column to Monitors
|
||||||
|
--
|
||||||
|
|
||||||
|
SET @s = (SELECT IF(
|
||||||
|
(SELECT COUNT(*)
|
||||||
|
FROM INFORMATION_SCHEMA.COLUMNS
|
||||||
|
WHERE table_name = 'Monitors'
|
||||||
|
AND table_schema = DATABASE()
|
||||||
|
AND column_name = 'StorageId'
|
||||||
|
) > 0,
|
||||||
|
"SELECT 'Column StorageId exists in Monitors'",
|
||||||
|
"ALTER TABLE Monitors ADD `StorageId` smallint(5) unsigned AFTER `ServerId`"
|
||||||
|
));
|
||||||
|
|
||||||
|
PREPARE stmt FROM @s;
|
||||||
|
EXECUTE stmt;
|
||||||
|
|
||||||
|
--
|
||||||
|
-- Add StorageId column to Eventss
|
||||||
|
--
|
||||||
|
|
||||||
|
SET @s = (SELECT IF(
|
||||||
|
(SELECT COUNT(*)
|
||||||
|
FROM INFORMATION_SCHEMA.COLUMNS
|
||||||
|
WHERE table_name = 'Events'
|
||||||
|
AND table_schema = DATABASE()
|
||||||
|
AND column_name = 'StorageId'
|
||||||
|
) > 0,
|
||||||
|
"SELECT 'Column StorageId exists in Events'",
|
||||||
|
"ALTER TABLE Events ADD `StorageId` smallint(5) unsigned AFTER `MonitorId`"
|
||||||
|
));
|
||||||
|
|
||||||
|
PREPARE stmt FROM @s;
|
||||||
|
EXECUTE stmt;
|
||||||
|
|
|
@ -1,3 +1,9 @@
|
||||||
|
zoneminder (1.30.2-trusty-2016050202) trusty; urgency=medium
|
||||||
|
|
||||||
|
* include thumnbails on console
|
||||||
|
|
||||||
|
-- Isaac Connor <iconnor@connortechnology.com> Mon, 02 May 2016 17:50:37 -0400
|
||||||
|
|
||||||
zoneminder (1.30.2-trusty-2016050201) trusty; urgency=medium
|
zoneminder (1.30.2-trusty-2016050201) trusty; urgency=medium
|
||||||
|
|
||||||
* add Servers support to API
|
* add Servers support to API
|
||||||
|
|
|
@ -0,0 +1,14 @@
|
||||||
|
Installation Guide
|
||||||
|
======================================
|
||||||
|
|
||||||
|
Contents:
|
||||||
|
|
||||||
|
.. toctree::
|
||||||
|
:maxdepth: 2
|
||||||
|
|
||||||
|
ubuntu
|
||||||
|
debian
|
||||||
|
fedora
|
||||||
|
centos
|
||||||
|
redhat
|
||||||
|
multiserver
|
|
@ -2078,7 +2078,7 @@ void Monitor::ReloadLinkedMonitors( const char *p_linked_monitors )
|
||||||
#if ZM_HAS_V4L
|
#if ZM_HAS_V4L
|
||||||
int Monitor::LoadLocalMonitors( const char *device, Monitor **&monitors, Purpose purpose ) {
|
int Monitor::LoadLocalMonitors( const char *device, Monitor **&monitors, Purpose purpose ) {
|
||||||
std::string sql = "select Id, Name, ServerId, StorageId, Function+0, Enabled, LinkedMonitors, Device, Channel, Format, V4LMultiBuffer, V4LCapturesPerFrame, Method, Width, Height, Colours, Palette, Orientation+0, Deinterlacing, SaveJPEGs, VideoWriter, EncoderParameters, RecordAudio, Brightness, Contrast, Hue, Colour, EventPrefix, LabelFormat, LabelX, LabelY, LabelSize, ImageBufferCount, WarmupCount, PreEventCount, PostEventCount, StreamReplayBuffer, AlarmFrameCount, SectionLength, FrameSkip, MotionFrameSkip, AnalysisFPS, AnalysisUpdateDelay, MaxFPS, AlarmMaxFPS, FPSReportInterval, RefBlendPerc, AlarmRefBlendPerc, TrackMotion, SignalCheckColour, Exif from Monitors where Function != 'None' and Type = 'Local'";
|
std::string sql = "select Id, Name, ServerId, StorageId, Function+0, Enabled, LinkedMonitors, Device, Channel, Format, V4LMultiBuffer, V4LCapturesPerFrame, Method, Width, Height, Colours, Palette, Orientation+0, Deinterlacing, SaveJPEGs, VideoWriter, EncoderParameters, RecordAudio, Brightness, Contrast, Hue, Colour, EventPrefix, LabelFormat, LabelX, LabelY, LabelSize, ImageBufferCount, WarmupCount, PreEventCount, PostEventCount, StreamReplayBuffer, AlarmFrameCount, SectionLength, FrameSkip, MotionFrameSkip, AnalysisFPS, AnalysisUpdateDelay, MaxFPS, AlarmMaxFPS, FPSReportInterval, RefBlendPerc, AlarmRefBlendPerc, TrackMotion, SignalCheckColour, Exif from Monitors where Function != 'None' and Type = 'Local'";
|
||||||
;
|
|
||||||
if ( device[0] ) {
|
if ( device[0] ) {
|
||||||
sql += " AND Device='";
|
sql += " AND Device='";
|
||||||
sql += device;
|
sql += device;
|
||||||
|
|
|
@ -303,6 +303,7 @@ int main( int argc, char *argv[] )
|
||||||
// Print errors if there was a problem
|
// Print errors if there was a problem
|
||||||
if ( n_bytes < 1 )
|
if ( n_bytes < 1 )
|
||||||
{
|
{
|
||||||
|
|
||||||
Error( "Only read %d bytes of %d\n", bytes_read, frame_header.image_length);
|
Error( "Only read %d bytes of %d\n", bytes_read, frame_header.image_length);
|
||||||
if ( n_bytes < 0 )
|
if ( n_bytes < 0 )
|
||||||
{
|
{
|
||||||
|
|
|
@ -474,22 +474,3 @@ input[type=submit]:disabled {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
|
||||||
* Console table for the main event table
|
|
||||||
*/
|
|
||||||
|
|
||||||
#consoleTable td, #consoleTable th {
|
|
||||||
padding: 5px;
|
|
||||||
border-bottom: 2px solid #f2f2f2;
|
|
||||||
}
|
|
||||||
|
|
||||||
#consoleTable input[type=button] {
|
|
||||||
margin-right: 3px !important;
|
|
||||||
}
|
|
||||||
|
|
||||||
#consoleTable tfoot {
|
|
||||||
background-color: #f2f2f2;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -40,46 +40,92 @@
|
||||||
|
|
||||||
#consoleTable {
|
#consoleTable {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
|
border-collapse: collapse;
|
||||||
|
display: table;
|
||||||
}
|
}
|
||||||
|
|
||||||
#consoleTable tr.highlight {
|
#consoleTable div.highlight {
|
||||||
background-color: #eeeeee;
|
background-color: #eeeeee;
|
||||||
}
|
}
|
||||||
|
|
||||||
#consoleTable thead th {
|
#consoleTable .thead .tr div {
|
||||||
padding-bottom: 4px;
|
|
||||||
vertical-align: middle;
|
vertical-align: middle;
|
||||||
}
|
}
|
||||||
|
|
||||||
#consoleTable tfoot td {
|
#consoleTable .MonitorInfo {
|
||||||
padding-top: 4px;
|
display: table-cell;
|
||||||
vertical-align: middle;
|
width: auto;
|
||||||
}
|
}
|
||||||
|
#consoleTable .MonitorInfo div {
|
||||||
#consoleTable th,td {
|
display: inline-block;
|
||||||
height: 16px;
|
|
||||||
text-align: left;
|
text-align: left;
|
||||||
|
width: 19%;
|
||||||
|
padding: 5px 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
#consoleTable .Events {
|
||||||
|
display: table-cell;
|
||||||
|
width: 381px;
|
||||||
|
}
|
||||||
|
#consoleTable .Events .Events {
|
||||||
|
width: 50px;
|
||||||
|
}
|
||||||
|
|
||||||
|
#consoleTable .Events div {
|
||||||
|
display: inline-block;
|
||||||
|
padding-bottom: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
#consoleTable .tfoot .tr {
|
||||||
|
padding-top: 4px;
|
||||||
|
}
|
||||||
|
#consoleTable .tfoot .tr div {
|
||||||
|
vertical-align: middle;
|
||||||
|
}
|
||||||
|
|
||||||
|
#consoleTable .tr div {
|
||||||
}
|
}
|
||||||
|
|
||||||
#consoleTable .colOrder {
|
#consoleTable .colOrder {
|
||||||
|
width: 47px;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
|
display: table-cell;
|
||||||
}
|
}
|
||||||
|
|
||||||
#consoleTable .colMark {
|
#consoleTable .colMark {
|
||||||
width: 32px;
|
width: 32px;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
|
display: table-cell;
|
||||||
}
|
}
|
||||||
|
|
||||||
#consoleTable .colEvents {
|
#consoleTable .colEvents {
|
||||||
text-align: right;
|
text-align: right;
|
||||||
}
|
}
|
||||||
|
#consoleTable .Hour {
|
||||||
|
width: 35px;
|
||||||
|
}
|
||||||
|
#consoleTable .Day {
|
||||||
|
width: 42px;
|
||||||
|
}
|
||||||
|
#consoleTable .Week {
|
||||||
|
width: 42px;
|
||||||
|
}
|
||||||
|
#consoleTable .Month {
|
||||||
|
width: 50px;
|
||||||
|
}
|
||||||
|
#consoleTable .Archived {
|
||||||
|
width: 62px;
|
||||||
|
}
|
||||||
|
|
||||||
#consoleTable .colZones {
|
#consoleTable .colZones {
|
||||||
|
width: 40px;
|
||||||
text-align: right;
|
text-align: right;
|
||||||
|
display: table-cell;
|
||||||
}
|
}
|
||||||
|
|
||||||
#consoleTable .colLeftButtons {
|
#consoleTable .colLeftButtons {
|
||||||
text-align: left;
|
text-align: left;
|
||||||
|
min-width:400px;
|
||||||
}
|
}
|
||||||
|
|
||||||
#consoleTable .colLeftButtons input {
|
#consoleTable .colLeftButtons input {
|
||||||
|
@ -88,10 +134,47 @@
|
||||||
|
|
||||||
#consoleTable .colRightButtons {
|
#consoleTable .colRightButtons {
|
||||||
text-align: right;
|
text-align: right;
|
||||||
padding-right: 8px;
|
min-width: 158px;
|
||||||
|
margin-right: -32px;
|
||||||
}
|
}
|
||||||
|
|
||||||
#consoleTable .colRightButtons input {
|
#consoleTable .colRightButtons input {
|
||||||
margin: 0 8px;
|
margin: 0 8px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Console table for the main event table
|
||||||
|
*/
|
||||||
|
|
||||||
|
#consoleTable .tr {
|
||||||
|
display: table-row;
|
||||||
|
}
|
||||||
|
|
||||||
|
#consoleTable .Monitor {
|
||||||
|
display: table-row;
|
||||||
|
}
|
||||||
|
|
||||||
|
#consoleTable .tr {
|
||||||
|
padding: 5px 0;
|
||||||
|
border-bottom: 2px solid #f2f2f2;
|
||||||
|
line-height: auto;
|
||||||
|
}
|
||||||
|
|
||||||
|
#consoleTable input[type=button] {
|
||||||
|
margin-right: 3px !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
#consoleTable .tfoot {
|
||||||
|
display: table-footer-group;
|
||||||
|
background-color: #f2f2f2;
|
||||||
|
}
|
||||||
|
#consoleTable .tbody {
|
||||||
|
display: table-row-group;
|
||||||
|
}
|
||||||
|
#consoleTable .thead {
|
||||||
|
display: table-header-group;
|
||||||
|
text-transform: uppercase;
|
||||||
|
font-size: 0.8em;
|
||||||
|
font-weight: 600;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,4 @@
|
||||||
<?php
|
<?php
|
||||||
require_once('includes/Server.php');
|
|
||||||
$servers = Server::find_all();
|
$servers = Server::find_all();
|
||||||
require_once('includes/Storage.php');
|
require_once('includes/Storage.php');
|
||||||
$storage_areas = Storage::find_all();
|
$storage_areas = Storage::find_all();
|
||||||
|
@ -11,72 +10,75 @@ xhtmlHeaders( __FILE__, translate('Console') );
|
||||||
<form name="monitorForm" method="get" action="<?php echo $_SERVER['PHP_SELF'] ?>">
|
<form name="monitorForm" method="get" action="<?php echo $_SERVER['PHP_SELF'] ?>">
|
||||||
<input type="hidden" name="view" value="<?php echo $view ?>"/>
|
<input type="hidden" name="view" value="<?php echo $view ?>"/>
|
||||||
<input type="hidden" name="action" value=""/>
|
<input type="hidden" name="action" value=""/>
|
||||||
|
|
||||||
<?php include("skins/$skin/views/header.php") ?>
|
<?php include("skins/$skin/views/header.php") ?>
|
||||||
|
<div id="content" class="container-fluid">
|
||||||
<div class="container-fluid">
|
<div id="consoleTable" cellspacing="0">
|
||||||
<table id="consoleTable" cellspacing="0">
|
<div class="thead">
|
||||||
<thead>
|
<div class="tr">
|
||||||
<tr>
|
<div class="MonitorInfo">
|
||||||
<th class="colName"><?php echo translate('Name') ?></th>
|
<div class="colName"><?php echo translate('Name') ?></div>
|
||||||
<th class="colFunction"><?php echo translate('Function') ?></th>
|
<div class="colFunction"><?php echo translate('Function') ?></div>
|
||||||
<?php if ( count($servers) ) { ?>
|
<?php if ( count($servers) ) { ?>
|
||||||
<th class="colServer"><?php echo translate('Server') ?></th>
|
<div class="colServer"><?php echo translate('Server') ?></div>
|
||||||
<?php } ?>
|
<?php } ?>
|
||||||
<th class="colSource"><?php echo translate('Source') ?></th>
|
<div class="colSource"><?php echo translate('Source') ?></div>
|
||||||
<?php if ( $show_storage_areas ) { ?>
|
<?php if ( $show_storage_areas ) { ?>
|
||||||
<th class="colStorage"><?php echo translate('Storage') ?></th>
|
<div class="colStorage"><?php echo translate('Storage') ?></div>
|
||||||
<?php } ?>
|
<?php } ?>
|
||||||
|
</div>
|
||||||
|
<div class="Events">
|
||||||
<?php
|
<?php
|
||||||
for ( $i = 0; $i < count($eventCounts); $i++ )
|
for ( $i = 0; $i < count($eventCounts); $i++ )
|
||||||
{
|
{
|
||||||
?>
|
?>
|
||||||
<th class="colEvents"><?php echo $eventCounts[$i]['title'] ?></th>
|
<div class="colEvents <?php echo $eventCounts[$i]['title'] ?>"><?php echo $eventCounts[$i]['title'] ?></div>
|
||||||
<?php
|
<?php
|
||||||
}
|
}
|
||||||
?>
|
?>
|
||||||
<th class="colZones"><?php echo translate('Zones') ?></th>
|
</div>
|
||||||
|
<div class="colZones"><?php echo translate('Zones') ?></div>
|
||||||
<?php
|
<?php
|
||||||
if ( canEdit('Monitors') )
|
if ( canEdit('Monitors') )
|
||||||
{
|
{
|
||||||
?>
|
?>
|
||||||
<th class="colOrder"><?php echo translate('Order') ?></th>
|
<div class="colOrder"><?php echo translate('Order') ?></div>
|
||||||
<?php
|
<?php
|
||||||
}
|
}
|
||||||
?>
|
?>
|
||||||
<th class="colMark"><?php echo translate('Mark') ?></th>
|
<div class="colMark"><?php echo translate('Mark') ?></div>
|
||||||
</tr>
|
</div>
|
||||||
</thead>
|
</div>
|
||||||
<tfoot>
|
<div class="tfoot">
|
||||||
<tr>
|
<div class="tr">
|
||||||
<td class="colLeftButtons" colspan="<?php $columns = 3;
|
<div class="colLeftButtons" colspan="<?php $columns = 3;
|
||||||
if ( count($servers) > 1 ) { $columns += 1; }
|
if ( count($servers) > 1 ) { $columns += 1; }
|
||||||
if ( $show_storage_areas ) { $columns += 1; }
|
if ( $show_storage_areas ) { $columns += 1; }
|
||||||
echo $columns;
|
echo $columns;
|
||||||
?>">
|
?>">
|
||||||
<input type="button" name="addBtn" value="<?php echo translate('AddNewMonitor') ?>" onclick="addMonitor( this )"/>
|
<input type="button" name="addBtn" value="<?php echo translate('AddNewMonitor') ?>" onclick="addMonitor( this )"/>
|
||||||
<!-- <?php echo makePopupButton( '?view=monitor', 'zmMonitor0', 'monitor', translate('AddNewMonitor'), (canEdit( 'Monitors' ) && !$user['MonitorIds']) ) ?> -->
|
<!-- <?php echo makePopupButton( '?view=monitor', 'zmMonitor0', 'monitor', translate('AddNewMonitor'), (canEdit( 'Monitors' ) && !$user['MonitorIds']) ) ?> -->
|
||||||
|
</div>
|
||||||
</td>
|
<div class="Events">
|
||||||
<?php
|
<?php
|
||||||
for ( $i = 0; $i < count($eventCounts); $i++ )
|
for ( $i = 0; $i < count($eventCounts); $i++ )
|
||||||
{
|
{
|
||||||
parseFilter( $eventCounts[$i]['filter'] );
|
parseFilter( $eventCounts[$i]['filter'] );
|
||||||
?>
|
?>
|
||||||
<td class="colEvents"><?php echo makePopupLink( '?view='.$eventsView.'&page=1'.$eventCounts[$i]['filter']['query'], $eventsWindow, $eventsView, $eventCounts[$i]['total'], canView( 'Events' ) ) ?></td>
|
<div class="colEvents <?php echo $eventCounts[$i]['title'] ?>"><?php echo makePopupLink( '?view='.$eventsView.'&page=1'.$eventCounts[$i]['filter']['query'], $eventsWindow, $eventsView, $eventCounts[$i]['total'], canView( 'Events' ) ) ?></div>
|
||||||
<?php
|
<?php
|
||||||
}
|
}
|
||||||
?>
|
?>
|
||||||
<td class="colZones"><?php echo $zoneCount ?></td>
|
</div>
|
||||||
<td class="colRightButtons" colspan="<?php echo canEdit('Monitors')?2:1 ?>"><input class="btn btn-default" type="button" name="editBtn" value="<?php echo translate('Edit') ?>" onclick="editMonitor( this )" disabled="disabled"/><input class="btn btn-default" type="button" name="deleteBtn" value="<?php echo translate('Delete') ?>" onclick="deleteMonitor( this )" disabled="disabled"/></td>
|
<div class="colZones"><?php echo $zoneCount ?></div>
|
||||||
</tr>
|
<div class="colRightButtons" colspan="<?php echo canEdit('Monitors')?2:1 ?>"><input class="btn btn-default" type="button" name="editBtn" value="<?php echo translate('Edit') ?>" onclick="editMonitor( this )" disabled="disabled"/><input class="btn btn-default" type="button" name="deleteBtn" value="<?php echo translate('Delete') ?>" onclick="deleteMonitor( this )" disabled="disabled"/></div>
|
||||||
</tfoot>
|
</div>
|
||||||
<tbody>
|
</div>
|
||||||
|
<div class="tbody">
|
||||||
<?php
|
<?php
|
||||||
foreach( $displayMonitors as $monitor )
|
foreach( $displayMonitors as $monitor )
|
||||||
{
|
{
|
||||||
?>
|
?>
|
||||||
<tr title="<?php echo $monitor['Id'] ?>">
|
<div class="tr" title="<?php echo $monitor['Id'] ?>">
|
||||||
<?php
|
<?php
|
||||||
if ( !$monitor['zmc'] )
|
if ( !$monitor['zmc'] )
|
||||||
$dclass = "errorText";
|
$dclass = "errorText";
|
||||||
|
@ -98,20 +100,21 @@ foreach( $displayMonitors as $monitor )
|
||||||
$fclass .= " disabledText";
|
$fclass .= " disabledText";
|
||||||
$scale = max( reScale( SCALE_BASE, $monitor['DefaultScale'], ZM_WEB_DEFAULT_SCALE ), SCALE_BASE );
|
$scale = max( reScale( SCALE_BASE, $monitor['DefaultScale'], ZM_WEB_DEFAULT_SCALE ), SCALE_BASE );
|
||||||
?>
|
?>
|
||||||
<td class="colName"><?php echo makePopupLink( '?view=watch&mid='.$monitor['Id'], 'zmWatch'.$monitor['Id'], array( 'watch', reScale( $monitor['Width'], $scale ), reScale( $monitor['Height'], $scale ) ), $monitor['Name'], $running && ($monitor['Function'] != 'None') && canView( 'Stream' ) ) ?></td>
|
<div class="MonitorInfo">
|
||||||
<td class="colFunction"><?php echo makePopupLink( '?view=function&mid='.$monitor['Id'], 'zmFunction', 'function', '<span class="'.$fclass.'">'.translate('Fn'.$monitor['Function']).( empty($monitor['Enabled']) ? ', disabled' : '' ) .'</span>', canEdit( 'Monitors' ) ) ?></td>
|
<div class="colName"><?php echo makePopupLink( '?view=watch&mid='.$monitor['Id'], 'zmWatch'.$monitor['Id'], array( 'watch', reScale( $monitor['Width'], $scale ), reScale( $monitor['Height'], $scale ) ), $monitor['Name'], $running && ($monitor['Function'] != 'None') && canView( 'Stream' ) ) ?></div>
|
||||||
|
<div class="colFunction"><?php echo makePopupLink( '?view=function&mid='.$monitor['Id'], 'zmFunction', 'function', '<span class="'.$fclass.'">'.translate('Fn'.$monitor['Function']).( empty($monitor['Enabled']) ? ', disabled' : '' ) .'</span>', canEdit( 'Monitors' ) ) ?></div>
|
||||||
<?php if ( count($servers) ) { ?>
|
<?php if ( count($servers) ) { ?>
|
||||||
<td class="colServer"><?php
|
<div class="colServer"><?php
|
||||||
$Server = new Server( $monitor['ServerId'] );
|
$Server = new Server( $monitor['ServerId'] );
|
||||||
echo $Server->Name();
|
echo $Server->Name();
|
||||||
?></td>
|
?></div>
|
||||||
<?php } ?>
|
<?php } ?>
|
||||||
<?php if ( $monitor['Type'] == "Local" ) { ?>
|
<?php if ( $monitor['Type'] == "Local" ) { ?>
|
||||||
<td class="colSource"><?php echo makePopupLink( '?view=monitor&mid='.$monitor['Id'], 'zmMonitor'.$monitor['Id'], 'monitor', '<span class="'.$dclass.'">'.$monitor['Device'].' ('.$monitor['Channel'].')</span>', canEdit( 'Monitors' ) ) ?></td>
|
<div class="colSource"><?php echo makePopupLink( '?view=monitor&mid='.$monitor['Id'], 'zmMonitor'.$monitor['Id'], 'monitor', '<span class="'.$dclass.'">'.$monitor['Device'].' ('.$monitor['Channel'].')</span>', canEdit( 'Monitors' ) ) ?></div>
|
||||||
<?php } elseif ( $monitor['Type'] == "Remote" ) { ?>
|
<?php } elseif ( $monitor['Type'] == "Remote" ) { ?>
|
||||||
<td class="colSource"><?php echo makePopupLink( '?view=monitor&mid='.$monitor['Id'], 'zmMonitor'.$monitor['Id'], 'monitor', '<span class="'.$dclass.'">'.preg_replace( '/^.*@/', '', $monitor['Host'] ).'</span>', canEdit( 'Monitors' ) ) ?></td>
|
<div class="colSource"><?php echo makePopupLink( '?view=monitor&mid='.$monitor['Id'], 'zmMonitor'.$monitor['Id'], 'monitor', '<span class="'.$dclass.'">'.preg_replace( '/^.*@/', '', $monitor['Host'] ).'</span>', canEdit( 'Monitors' ) ) ?></div>
|
||||||
<?php } elseif ( $monitor['Type'] == "File" ) { ?>
|
<?php } elseif ( $monitor['Type'] == "File" ) { ?>
|
||||||
<td class="colSource"><?php echo makePopupLink( '?view=monitor&mid='.$monitor['Id'], 'zmMonitor'.$monitor['Id'], 'monitor', '<span class="'.$dclass.'">'.preg_replace( '/^.*\//', '', $monitor['Path'] ).'</span>', canEdit( 'Monitors' ) ) ?></td>
|
<div class="colSource"><?php echo makePopupLink( '?view=monitor&mid='.$monitor['Id'], 'zmMonitor'.$monitor['Id'], 'monitor', '<span class="'.$dclass.'">'.preg_replace( '/^.*\//', '', $monitor['Path'] ).'</span>', canEdit( 'Monitors' ) ) ?></div>
|
||||||
<?php } elseif ( $monitor['Type'] == "Ffmpeg" || $monitor['Type'] == "Libvlc" ) {
|
<?php } elseif ( $monitor['Type'] == "Ffmpeg" || $monitor['Type'] == "Libvlc" ) {
|
||||||
$domain = parse_url( $monitor['Path'], PHP_URL_HOST );
|
$domain = parse_url( $monitor['Path'], PHP_URL_HOST );
|
||||||
$shortpath = $domain ? $domain : preg_replace( '/^.*\//', '', $monitor['Path'] );
|
$shortpath = $domain ? $domain : preg_replace( '/^.*\//', '', $monitor['Path'] );
|
||||||
|
@ -119,42 +122,41 @@ echo $Server->Name();
|
||||||
$shortpath = 'Monitor ' . $monitor['Id'];
|
$shortpath = 'Monitor ' . $monitor['Id'];
|
||||||
}
|
}
|
||||||
?>
|
?>
|
||||||
<td class="colSource"><?php echo makePopupLink( '?view=monitor&mid='.$monitor['Id'], 'zmMonitor'.$monitor['Id'], 'monitor', '<span class="'.$dclass.'">'.$shortpath.'</span>', canEdit( 'Monitors' ) ) ?></td>
|
<div class="colSource"><?php echo makePopupLink( '?view=monitor&mid='.$monitor['Id'], 'zmMonitor'.$monitor['Id'], 'monitor', '<span class="'.$dclass.'">'.$shortpath.'</span>', canEdit( 'Monitors' ) ) ?></div>
|
||||||
<?php } elseif ( $monitor['Type'] == "cURL" ) { ?>
|
<?php } elseif ( $monitor['Type'] == "cURL" ) { ?>
|
||||||
<td class="colSource"><?php echo makePopupLink( '?view=monitor&mid='.$monitor['Id'], 'zmMonitor'.$monitor['Id'], 'monitor', '<span class="'.$dclass.'">'.preg_replace( '/^.*\//', '', $monitor['Path'] ).'</span>', canEdit( 'Monitors' ) ) ?></td>
|
<div class="colSource"><?php echo makePopupLink( '?view=monitor&mid='.$monitor['Id'], 'zmMonitor'.$monitor['Id'], 'monitor', '<span class="'.$dclass.'">'.preg_replace( '/^.*\//', '', $monitor['Path'] ).'</span>', canEdit( 'Monitors' ) ) ?></div>
|
||||||
<?php } else { ?>
|
<?php } else { ?>
|
||||||
<td class="colSource"> </td>
|
<div class="colSource"> </div>
|
||||||
<?php } ?>
|
<?php } ?>
|
||||||
<?php if ( $show_storage_areas ) { ?>
|
<?php if ( $show_storage_areas ) { ?>
|
||||||
<td class="colStorage"><?php
|
<div class="colStorage"><?php $Storage = new Storage( $monitor['StorageId'] ); echo $Storage->Name(); ?></div>
|
||||||
$Storage = new Storage( $monitor['StorageId'] );
|
|
||||||
echo $Storage->Name();
|
|
||||||
?></td>
|
|
||||||
<?php } ?>
|
<?php } ?>
|
||||||
|
</div><div class="Events">
|
||||||
<?php
|
<?php
|
||||||
for ( $i = 0; $i < count($eventCounts); $i++ )
|
for ( $i = 0; $i < count($eventCounts); $i++ )
|
||||||
{
|
{
|
||||||
?>
|
?>
|
||||||
<td class="colEvents"><?php echo makePopupLink( '?view='.$eventsView.'&page=1'.$monitor['eventCounts'][$i]['filter']['query'], $eventsWindow, $eventsView, $monitor['EventCount'.$i], canView( 'Events' ) ) ?></td>
|
<div class="colEvents <?php echo $eventCounts[$i]['title'] ?>"><?php echo makePopupLink( '?view='.$eventsView.'&page=1'.$monitor['eventCounts'][$i]['filter']['query'], $eventsWindow, $eventsView, $monitor['EventCount'.$i], canView( 'Events' ) ) ?></div>
|
||||||
<?php
|
<?php
|
||||||
}
|
}
|
||||||
?>
|
?>
|
||||||
<td class="colZones"><?php echo makePopupLink( '?view=zones&mid='.$monitor['Id'], 'zmZones', array( 'zones', $monitor['Width'], $monitor['Height'] ), $monitor['ZoneCount'], canView( 'Monitors' ) ) ?></td>
|
</div>
|
||||||
|
<div class="colZones"><?php echo makePopupLink( '?view=zones&mid='.$monitor['Id'], 'zmZones', array( 'zones', $monitor['Width'], $monitor['Height'] ), $monitor['ZoneCount'], canView( 'Monitors' ) ) ?></div>
|
||||||
<?php
|
<?php
|
||||||
if ( canEdit('Monitors') )
|
if ( canEdit('Monitors') )
|
||||||
{
|
{
|
||||||
?>
|
?>
|
||||||
<td class="colOrder"><?php echo makeLink( '?view='.$view.'&action=sequence&mid='.$monitor['Id'].'&smid='.$seqIdUpList[$monitor['Id']], '<img src="'.$seqUpFile.'" alt="Up"/>', $monitor['Sequence']>$minSequence ) ?><?php echo makeLink( '?view='.$view.'&action=sequence&mid='.$monitor['Id'].'&smid='.$seqIdDownList[$monitor['Id']], '<img src="'.$seqDownFile.'" alt="Down"/>', $monitor['Sequence']<$maxSequence ) ?></td>
|
<div class="colOrder"><?php echo makeLink( '?view='.$view.'&action=sequence&mid='.$monitor['Id'].'&smid='.$seqIdUpList[$monitor['Id']], '<img src="'.$seqUpFile.'" alt="Up"/>', $monitor['Sequence']>$minSequence ) ?><?php echo makeLink( '?view='.$view.'&action=sequence&mid='.$monitor['Id'].'&smid='.$seqIdDownList[$monitor['Id']], '<img src="'.$seqDownFile.'" alt="Down"/>', $monitor['Sequence']<$maxSequence ) ?></div>
|
||||||
<?php
|
<?php
|
||||||
}
|
}
|
||||||
?>
|
?>
|
||||||
<td class="colMark"><input type="checkbox" name="markMids[]" value="<?php echo $monitor['Id'] ?>" onclick="setButtonStates( this )"<?php if ( !canEdit( 'Monitors' ) ) { ?> disabled="disabled"<?php } ?>/></td>
|
<div class="colMark"><input type="checkbox" name="markMids[]" value="<?php echo $monitor['Id'] ?>" onclick="setButtonStates( this );"<?php if ( !canEdit( 'Monitors' ) ) { ?> disabled="disabled"<?php } ?>/></div>
|
||||||
</tr>
|
</div>
|
||||||
<?php
|
<?php
|
||||||
}
|
}
|
||||||
?>
|
?>
|
||||||
</tbody>
|
</div>
|
||||||
</table>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div id="footer">
|
<div id="footer">
|
||||||
|
|
|
@ -1,22 +1,27 @@
|
||||||
var jsTranslatedAddText;
|
var jsTranslatedAddText;
|
||||||
var jsTranslatedCloneText;
|
var jsTranslatedCloneText;
|
||||||
|
|
||||||
function setButtonStates( element )
|
function setButtonStates( element ) {
|
||||||
{
|
|
||||||
var form = element.form;
|
var form = element.form;
|
||||||
var checked = 0;
|
var checked = 0;
|
||||||
for ( var i = 0; i < form.elements.length; i++ )
|
for ( var i = 0, i_length=form.elements.length; i < i_length; i++ ) {
|
||||||
{
|
if ( form.elements[i].type == "checkbox" ) {
|
||||||
if ( form.elements[i].type == "checkbox" )
|
if ( form.elements[i].checked ) {
|
||||||
{
|
if ( checked++ > 1 )
|
||||||
if ( form.elements[i].checked )
|
break;
|
||||||
{
|
}
|
||||||
|
} else if ( form.elements[i].length ) {
|
||||||
|
for( var j = 0, j_length = form.elements[i].length; j < j_length; j += 1 ) {
|
||||||
|
if ( form.elements[j].type == "checkbox" ) {
|
||||||
|
if ( form.elements[j].checked ) {
|
||||||
if ( checked++ > 1 )
|
if ( checked++ > 1 )
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
} // end foreach element
|
||||||
}
|
}
|
||||||
$(element).getParent( 'tr' ).toggleClass( 'highlight' );
|
} /// end for each element
|
||||||
|
$(element).getParent( '.tr' ).toggleClass( 'highlight' );
|
||||||
form.editBtn.disabled = (checked!=1);
|
form.editBtn.disabled = (checked!=1);
|
||||||
form.addBtn.value = (checked==1) ? jsTranslatedCloneText:jsTranslatedAddText;
|
form.addBtn.value = (checked==1) ? jsTranslatedCloneText:jsTranslatedAddText;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue