ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/ZoneMinder/ZoneMinder into plugin_support

This commit is contained in:
Emmanuel Papin 2015-06-04 20:57:34 +02:00
parent 1b42dd90ef c8e41319e6
commit e2957702b5
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
web/skins/classic/js/flat.js
View File

@ -59,7 +59,7 @@ var popupSizes = {
'plugin': { 'addWidth': 50, 'addHeight': 120 }, 'plugin': { 'addWidth': 50, 'addHeight': 120 },
'preset': { 'width': 300, 'height': 120 }, 'preset': { 'width': 300, 'height': 120 },
'settings': { 'width': 220, 'height': 225 }, 'settings': { 'width': 220, 'height': 225 },
'state': { 'width': 370, 'height': 134 }, 'state': { 'width': 400, 'height': 170 },
'stats': { 'width': 840, 'height': 200 }, 'stats': { 'width': 840, 'height': 200 },
'timeline': { 'width': 760, 'height': 540 }, 'timeline': { 'width': 760, 'height': 540 },
'user': { 'width': 360, 'height': 420 }, 'user': { 'width': 360, 'height': 420 },

2
web/skins/classic/views/frames.php
View File

@ -61,7 +61,7 @@ if ( count($frames) )
$class = strtolower($frame['Type']); $class = strtolower($frame['Type']);
?> ?>
<tr class="<?php echo $class ?>"> <tr class="<?php echo $class ?>">
<td class="colId"><?php echo makePopupLink( '?view=frame&amp;eid='.$event['Id'].'&amp;fid='.$frame['FrameId'], 'zmImage', array( 'image', $event['Width'], $event['Height'] ), $frame['FrameId'] ) ?></td> <td class="colId"><?php echo makePopupLink( '?view=frame&amp;eid='.$event['Id'].'&amp;fid='.$frame['FrameId'], 'zmImage', array( 'frame', $event['Width'], $event['Height'] ), $frame['FrameId'] ) ?></td>
<td class="colType"><?php echo $frame['Type'] ?></td> <td class="colType"><?php echo $frame['Type'] ?></td>
<td class="colTimeStamp"><?php echo strftime( STRF_FMT_TIME, $frame['UnixTimeStamp'] ) ?></td> <td class="colTimeStamp"><?php echo strftime( STRF_FMT_TIME, $frame['UnixTimeStamp'] ) ?></td>
<td class="colTimeDelta"><?php echo number_format( $frame['Delta'], 2 ) ?></td> <td class="colTimeDelta"><?php echo number_format( $frame['Delta'], 2 ) ?></td>