From fa6f27ae2d5ae9e1ff5e51496846cb5490921e29 Mon Sep 17 00:00:00 2001
From: stan <stan@e3e1d417-86f3-4887-817a-d78f3d33393f>
Date: Wed, 5 Nov 2003 16:44:17 +0000
Subject: [PATCH] Added frames listing to main events window and tweaked
 colors.

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@684 e3e1d417-86f3-4887-817a-d78f3d33393f
---
 web/zm_html_view_events.php      |  4 ++--
 web/zm_html_view_frames.php      |  2 +-
 web/zm_html_view_watchevents.php | 20 ++++++++++----------
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/web/zm_html_view_events.php b/web/zm_html_view_events.php
index 4f0541520..258053659 100644
--- a/web/zm_html_view_events.php
+++ b/web/zm_html_view_events.php
@@ -368,8 +368,8 @@ location.replace( '<?= $PHP_SELF ?>?view=events&mid=<?= $mid ?>&page=<?= $page ?
 <td align="center" class="text"><a href="javascript: eventWindow( '<?= $PHP_SELF ?>?view=event&mid=<?= $mid ?>&eid=<?= $event[Id] ?>', 'zmEvent' );"><span class="<?= $textclass ?>"><?= "$event[Name]" ?><?php if ( $event[Archived] ) echo "*" ?></span></a></td>
 <td align="center" class="text"><?= strftime( "%m/%d %H:%M:%S", strtotime($event[StartTime]) ) ?></td>
 <td align="center" class="text"><?= $event[Length] ?></td>
-<td align="center" class="text"><?= $event[Frames] ?></td>
-<td align="center" class="text"><?= $event[AlarmFrames] ?></td>
+<td align="center" class="text"><a href="javascript: newWindow( '<?= $PHP_SELF ?>?view=frames&mid=<?= $mid ?>&eid=<?= $event[Id] ?>', 'zmFrames', <?= $jws['frames']['w'] ?>, <?= $jws['frames']['h'] ?> );"><?= $event[Frames] ?></a></td>
+<td align="center" class="text"><a href="javascript: newWindow( '<?= $PHP_SELF ?>?view=frames&mid=<?= $mid ?>&eid=<?= $event[Id] ?>', 'zmFrames', <?= $jws['frames']['w'] ?>, <?= $jws['frames']['h'] ?> );"><?= $event[AlarmFrames] ?></a></td>
 <td align="center" class="text"><?= $event[TotScore] ?></td>
 <td align="center" class="text"><?= $event[AvgScore] ?></td>
 <td align="center" class="text"><a href="javascript: newWindow( '<?= $PHP_SELF ?>?view=image&eid=<?= $event[Id] ?>&fid=0', 'zmImage', <?= $monitor[Width]+$jws['image']['w'] ?>, <?= $monitor[Height]+$jws['image']['h'] ?> );"><?= $event[MaxScore] ?></a></td>
diff --git a/web/zm_html_view_frames.php b/web/zm_html_view_frames.php
index a281e6fd0..6d096087e 100644
--- a/web/zm_html_view_frames.php
+++ b/web/zm_html_view_frames.php
@@ -47,7 +47,7 @@ function closeWindow()
 		foreach ( $frames as $frame )
 		{
 ?>
-<tr bgcolor="<?= $frame[AlarmFrame]?'#FF6347':'#FFFFFF' ?>">
+<tr bgcolor="<?= $frame[AlarmFrame]?'#FA8072':'#FFFFFF' ?>">
 <td class="text" align="center"><?= $frame[FrameId] ?></td>
 <td class="text" align="center"><?= $frame[AlarmFrame]?"yes":"no" ?></td>
 <td class="text" align="center"><?= date( "H:i:s", $frame[UnixTimeStamp] ) ?></td>
diff --git a/web/zm_html_view_watchevents.php b/web/zm_html_view_watchevents.php
index 6936aadd7..2740e84d3 100644
--- a/web/zm_html_view_watchevents.php
+++ b/web/zm_html_view_watchevents.php
@@ -108,10 +108,10 @@ window.setTimeout( "window.location.replace( '<?= "$PHP_SELF?view=watchevents&mi
 	{
 		die( mysql_error() );
 	}
-	$n_rows = mysql_num_rows( $result );
+	$n_events = mysql_num_rows( $result );
 ?>
 <tr>
-<td class="text"><b>Last <?= $n_rows ?> events</b></td>
+<td class="text"><b>Last <?= $n_events ?> events</b></td>
 <td align="center" class="text"><a href="javascript: newWindow( '<?= $PHP_SELF ?>?view=events&mid=<?= $monitor[Id] ?>&page=1&filter=1&trms=0', 'zmEvents<?= $monitor[Name] ?>', <?= $jws['events']['w'] ?>, <?= $jws['events']['h'] ?> );">All</a></td>
 <td align="center" class="text"><a href="javascript: newWindow( '<?= $PHP_SELF ?>?view=events&mid=<?= $monitor[Id] ?>&page=1&filter=1&trms=1&attr1=Archived&val1=1', 'zmEvents<?= $monitor[Name] ?>', <?= $jws['events']['w'] ?>, <?= $jws['events']['h'] ?> );">Archive</a></td>
 <td align="right" class="text"><?php if ( canEdit( 'Events' ) ) { ?><a href="javascript: checkAll( document.event_form, 'mark_eids' );">Check All</a><?php } else { ?>&nbsp;<?php } ?></td>
@@ -128,17 +128,17 @@ window.setTimeout( "window.location.replace( '<?= "$PHP_SELF?view=watchevents&mi
 <td class="text">Mark</td>
 </tr>
 <?php
-	while( $row = mysql_fetch_assoc( $result ) )
+	while( $event = mysql_fetch_assoc( $result ) )
 	{
 ?>
 <tr bgcolor="#FFFFFF">
-<td align="center" class="text"><a href="javascript: newWindow( '<?= $PHP_SELF ?>?view=event&mid=<?= $mid ?>&eid=<?= $row[Id] ?>', 'zmEvent', <?= $jws['event']['w'] ?>, <?= $jws['event']['h'] ?> );"><?= $row[Id] ?></a></td>
-<td align="center" class="text"><a href="javascript: newWindow( '<?= $PHP_SELF ?>?view=event&mid=<?= $mid ?>&eid=<?= $row[Id] ?>', 'zmEvent', <?= $jws['event']['w'] ?>, <?= $jws['event']['h'] ?> );"><?= $row[Name] ?></a></td>
-<td align="center" class="text"><?= strftime( "%m/%d %H:%M:%S", strtotime($row[StartTime]) ) ?></td>
-<td align="center" class="text"><?= $row[Length] ?></td>
-<td align="center" class="text"><a href="javascript: newWindow( '<?= $PHP_SELF ?>?view=frames&mid=<?= $mid ?>&eid=<?= $row[Id] ?>', 'zmFrames', <?= $jws['frames']['w'] ?>, <?= $jws['frames']['h'] ?> );"><?= $row[Frames] ?>/<?= $row[AlarmFrames] ?></a></td>
-<td align="center" class="text"><a href="javascript: newWindow( '<?= $PHP_SELF ?>?view=image&eid=<?= $row[Id] ?>&fid=0', 'zmImage', <?= $monitor[Width]+$jws['image']['w'] ?>, <?= $monitor[Height]+$jws['image']['h'] ?> );"><?= $row[AvgScore] ?>/<?= $row[MaxScore] ?></a></td>
-<td align="center" class="text"><input type="checkbox" name="mark_eids[]" value="<?= $row[Id] ?>" onClick="configureButton( document.event_form, 'mark_eids' );"<?php if ( !canEdit( 'Events' ) ) { ?> disabled<?php } ?>></td>
+<td align="center" class="text"><a href="javascript: newWindow( '<?= $PHP_SELF ?>?view=event&mid=<?= $mid ?>&eid=<?= $event[Id] ?>', 'zmEvent', <?= $jws['event']['w'] ?>, <?= $jws['event']['h'] ?> );"><?= $event[Id] ?></a></td>
+<td align="center" class="text"><a href="javascript: newWindow( '<?= $PHP_SELF ?>?view=event&mid=<?= $mid ?>&eid=<?= $event[Id] ?>', 'zmEvent', <?= $jws['event']['w'] ?>, <?= $jws['event']['h'] ?> );"><?= $event[Name] ?></a></td>
+<td align="center" class="text"><?= strftime( "%m/%d %H:%M:%S", strtotime($event[StartTime]) ) ?></td>
+<td align="center" class="text"><?= $event[Length] ?></td>
+<td align="center" class="text"><a href="javascript: newWindow( '<?= $PHP_SELF ?>?view=frames&mid=<?= $mid ?>&eid=<?= $event[Id] ?>', 'zmFrames', <?= $jws['frames']['w'] ?>, <?= $jws['frames']['h'] ?> );"><?= $event[Frames] ?>/<?= $event[AlarmFrames] ?></a></td>
+<td align="center" class="text"><a href="javascript: newWindow( '<?= $PHP_SELF ?>?view=image&eid=<?= $event[Id] ?>&fid=0', 'zmImage', <?= $monitor[Width]+$jws['image']['w'] ?>, <?= $monitor[Height]+$jws['image']['h'] ?> );"><?= $event[AvgScore] ?>/<?= $event[MaxScore] ?></a></td>
+<td align="center" class="text"><input type="checkbox" name="mark_eids[]" value="<?= $event[Id] ?>" onClick="configureButton( document.event_form, 'mark_eids' );"<?php if ( !canEdit( 'Events' ) ) { ?> disabled<?php } ?>></td>
 </tr>
 <?php
 	}