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

Merge pull request #155 from WDKevin/modern 

Added missing jquery-2.0.1.min.map file and fix monitor sorting
This commit is contained in:
Kyle Johnson 2013-09-18 10:58:00 -07:00
parent 08e224f2af 0f25bec1d6
commit d0a8d86e3c
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
web/app/Controller/MonitorsController.php
View File

@ -175,9 +175,8 @@
public function reorder() { public function reorder() {
foreach ($this->data['Monitor'] as $key => $value) { foreach ($this->data['Monitor'] as $key => $value) {
$this->log($value);
$this->Monitor->id = $value; $this->Monitor->id = $value;
$this->Monitor->saveField('Sequence', $key + 1); $this->Monitor->saveField('Sequence', $key+1);
} }
exit(); exit();
} }

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

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

1
web/app/webroot/js/jquery-2.0.1.min.map Normal file
View File

File diff suppressed because one or more lines are too long