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

Merge branch 'modern' of github.com:ZoneMinder/ZoneMinder into modern

This commit is contained in:
Kyle Johnson 2013-09-17 09:13:03 -04:00
parent e694616702 dc316b0aee
commit 17b60bf25f
6 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
web/app/Controller/AppController.php
View File

@ -66,11 +66,13 @@ class AppController extends Controller {
}
Configure::write('SCALE_BASE', 100);
if ($this->AppModel->daemonStatus()) {
$this->set('daemonStatus', ('<span class="alert alert-success">Running</span>'));
$this->set('daemonStatusHtml', ('<span class="alert alert-success">Running</span>'));
} else {
$this->set('daemonStatus', ('<span class="alert alert-danger">Stopped</span>'));
$this->set('daemonStatusHtml', ('<span class="alert alert-danger">Stopped</span>'));
}
$this->set('daemonStatus', $this->AppModel->daemonStatus());
if (Configure::read('ZM_DYN_LAST_VERSION') > Configure::read('ZM_VERSION')) {
$zmVersion = '<span class="label label-info">' . Configure::read('ZM_VERSION') . '</span>';
} else {

7
web/app/View/Helper/LiveStreamHelper.php
View File

@ -2,9 +2,14 @@
App::uses('AppHelper', 'View/Helper');
class LiveStreamHelper extends AppHelper {
public function makeLiveStream($name, $src, $id, $width) {
public function makeLiveStream($name, $src, $id, $width=0) {
$liveStream = "<img id=\"liveStream_$id\" alt=\"Live Stream of $name\" src=\"$src&monitor=$id\" width=\"$width\">";
return $liveStream;
}
public function showNoImage($name, $src, $id, $width=0) {
$liveStream = "<img id=\"liveStream_$id\" alt=\"Live Stream of $name\" src=\"/img/no-image.jpg".width?"width=\"$width">";
return $liveStream;
}
}
?>

2
web/app/View/Layouts/default.ctp
View File

@ -45,7 +45,7 @@ $cakeDescription = __d('cake_dev', 'CakePHP: the rapid development php framework
</head>
<body>
<div class="navbar navbar-default" role="navigation">
<p class="navbar-text navbar-right"><?php echo $daemonStatus; ?></p>
<p class="navbar-text navbar-right"><?php echo $daemonStatusHtml; ?></p>
<p class="navbar-text navbar-right">Used Event Storage: <?php echo $diskSpace; ?>%</p>
<p class="navbar-text navbar-right">CPU Load: <?php echo $systemLoad; ?></p>
<div class="container">

7
web/app/View/Monitors/index.ctp
View File

@ -7,7 +7,12 @@
<?php foreach ($monitors as $monitor => $mon): ?>
<div class="col-sm-6 col-md-3">
<div class="thumbnail">
<?php echo $this->LiveStream->makeLiveStream($mon['Monitor']['Name'], $streamSrc[$monitor], $mon['Monitor']['Id'], $width); ?>
<?php
if($daemonStatus && $mon['Monitor']['Function'] != "None" && $mon['Monitor']['Enabled'])
echo $this->LiveStream->makeLiveStream($mon['Monitor']['Name'], $streamSrc[$monitor], $mon['Monitor']['Id'], $width);
else
echo $this->LiveStream->showNoImage($mon['Monitor']['Name'], $streamSrc[$monitor], $mon['Monitor']['Id'], $width);
?>
<div class="caption">
<h3><?php echo $this->Html->link($mon['Monitor']['Name'],array('controller' => 'monitors', 'action' => 'view', $mon['Monitor']['Id'])); ?></h3>
<p><?php echo $this->Html->link($mon['Monitor']['Function'], array('action' => 'edit', $mon['Monitor']['Id'])); ?></p>

7
web/app/View/Monitors/view.ctp
View File

@ -1,3 +1,8 @@
<h2><?php echo $monitor['Monitor']['Name']; ?> Live Stream</h2>
<?php echo $this->LiveStream->makeLiveStream($monitor['Monitor']['Name'], $streamSrc, $monitor['Monitor']['Id']); ?>
<?php
if($daemonStatus && $mon['Monitor']['Function'] != "None" && $mon['Monitor']['Enabled'])
echo $this->LiveStream->makeLiveStream($monitor['Monitor']['Name'], $streamSrc, $monitor['Monitor']['Id']);
else
echo $this->LiveStream->showNoImage($monitor['Monitor']['Name'], $streamSrc, $monitor['Monitor']['Id']);
?>

BIN
web/app/webroot/img/no-image.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 900 KiB