Updated to show multiline notes.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2063 e3e1d417-86f3-4887-817a-d78f3d33393fpull/27/merge
parent
1b8269f233
commit
612eadd5c8
|
@ -781,7 +781,7 @@ function getSlotLoadImageBehaviour( $slot )
|
|||
"<br>".strftime( STRF_FMT_DATETIME_SHORT, strtotime($slot['event']['StartTime']) ).
|
||||
" - ".$slot['event']['Length']."s".
|
||||
"<br>".htmlentities($slot['event']['Cause']).
|
||||
(!empty($slot['event']['Notes'])?("<br>".htmlentities($slot['event']['Notes'])):"").
|
||||
(!empty($slot['event']['Notes'])?("<br>".preg_replace( "/\n/", "<br>", htmlentities($slot['event']['Notes']))):"").
|
||||
(!empty($slot['event']['Archived'])?("<br>".$zmSlangArchived):"");
|
||||
if ( $slot['event']['Archived'] )
|
||||
$annotation .= "</em>";
|
||||
|
@ -941,14 +941,13 @@ function zoomTimeline( min_time, max_time )
|
|||
top: 0px;
|
||||
left: 50%;
|
||||
width: 40%;
|
||||
height: 60px;
|
||||
height: 90px;
|
||||
padding: 0px;
|
||||
margin: auto;
|
||||
line-height: 16px;
|
||||
color: #016A9D;
|
||||
font-size: 11px;
|
||||
font-weight: bold;
|
||||
line-height: 20px;
|
||||
line-height: 14px;
|
||||
background-color: #f8f8f8;
|
||||
}
|
||||
#ChartBox #TopPanel #Key {
|
||||
|
|
|
@ -0,0 +1,82 @@
|
|||
<?php
|
||||
//
|
||||
// ZoneMinder web watch pos view file, $Date$, $Revision$
|
||||
// Copyright (C) 2003, 2004, 2005, 2006 Philip Coombes
|
||||
//
|
||||
// This program is free software; you can redistribute it and/or
|
||||
// modify it under the terms of the GNU General Public License
|
||||
// as published by the Free Software Foundation; either version 2
|
||||
// of the License, or (at your option) any later version.
|
||||
//
|
||||
// This program is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU General Public License for more details.
|
||||
//
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with this program; if not, write to the Free Software
|
||||
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
//
|
||||
|
||||
if ( !canView( 'Events' ) )
|
||||
{
|
||||
$view = "error";
|
||||
return;
|
||||
}
|
||||
|
||||
define( "ZM_POS_REFRESH", 3 );
|
||||
|
||||
if ( ZM_WEB_REFRESH_METHOD == "http" )
|
||||
header("Refresh: ".ZM_POS_REFRESH."; URL=$PHP_SELF?view=watchpos&mid=$mid" );
|
||||
noCacheHeaders();
|
||||
|
||||
$result = mysql_query( "select * from Events where MonitorId = '$mid' order by Id desc limit 1" );
|
||||
if ( !$result )
|
||||
die( mysql_error() );
|
||||
$event = mysql_fetch_assoc( $result );
|
||||
mysql_free_result( $result );
|
||||
|
||||
?>
|
||||
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
|
||||
<html>
|
||||
<head>
|
||||
<title><?= ZM_WEB_TITLE_PREFIX ?> - <?= $monitor['Name'] ?> - <?= $zmSlangPosData ?></title>
|
||||
<link rel="stylesheet" href="zm_html_styles.css" type="text/css">
|
||||
<script type="text/javascript">
|
||||
function closeWindow()
|
||||
{
|
||||
top.window.close();
|
||||
}
|
||||
<?php
|
||||
if ( ZM_WEB_REFRESH_METHOD == "javascript" )
|
||||
{
|
||||
?>
|
||||
window.setTimeout( "window.location.replace( '<?= "$PHP_SELF?view=watchpos&mid=$mid" ?>' )", <?= ZM_POS_REFRESH*1000 ?> );
|
||||
<?php
|
||||
}
|
||||
?>
|
||||
</script>
|
||||
</head>
|
||||
<body>
|
||||
<center><table width="96%" align="center" border="0" cellspacing="1" cellpadding="0">
|
||||
<tr>
|
||||
<td width="20%"> </td>
|
||||
<td><table width="96%" align="center" border="0" cellspacing="3" cellpadding="0">
|
||||
<tr>
|
||||
<td align="left" class="head"><b><?= $zmSlangPosData ?></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td colspan="3" class="text"> </td></tr>
|
||||
</tr>
|
||||
<tr>
|
||||
<td align="left" class="text"><?= htmlentities($event['Cause']) ?></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td align="left" class="text"><?= preg_replace( "/\n/", "<br>", htmlentities($event['Notes'])) ?></td>
|
||||
</tr>
|
||||
</table>
|
||||
</td>
|
||||
</tr>
|
||||
</table></center>
|
||||
</body>
|
||||
</html>
|
Loading…
Reference in New Issue