ZoneMinder
/
zoneminder
mirror of https://github.com/ZoneMinder/zoneminder.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Consolidate the sidebar for Monitors and Events index.

pull/180/head
Kyle Johnson 2013-09-27 20:45:25 -04:00
parent a2122b9755
commit 983aece616
4 changed files with 55 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
web/app/Controller/EventsController.php
View File

@ -46,6 +46,13 @@ public function index() {
$thumbData[$key] = $this->Frame->createListThumbnail($value['Event']);
$this->set('thumbData', $thumbData);
}
$prepend = array('00','01','02','03','04','05','06','07','08','09');
$hours = array_merge($prepend,range(10, 23));
$minutes = array_merge($prepend,range(10, 59));
$seconds = $minutes;
$this->set('hours', $hours);
$this->set('minutes', $minutes);
}
public function view($id = null) {

79
web/app/View/Events/index.ctp
View File

@ -1,3 +1,4 @@
<?php $this->assign('title', 'Events'); ?>
<?php $this->start('sidebar'); ?>
<div id="sidebar">
<?php
@ -9,51 +10,57 @@ echo $this->Form->create('Events', array('default' => false, 'inputDefaults' =>
)));
?>
<div id="events_monitors">
<fieldset>
<legend>Monitors</legend>
<ol id="selectable">
<ul class="list-group">
<?php foreach ($monitors as $monitor): ?>
<li id="Monitor_<?php echo $monitor['Monitor']['Id']; ?>"><?php echo $this->Form->input($monitor['Monitor']['Name'], array('type' => 'checkbox', 'label' => $monitor['Monitor']['Name'])); ?></li>
<li class="list-group-item" id="Monitor_<?php echo $monitor['Monitor']['Id']; ?>">
<?php echo $this->Form->input($monitor['Monitor']['Name'], array('type' => 'checkbox', 'label' => $monitor['Monitor']['Name'])); ?>
</li>
<?php
endforeach;
unset($monitor);
?>
</ol>
</fieldset>
</ul>
</div>
<div id="events_date_time">
<fieldset>
<legend>Date Range</legend>
<fieldset>
<?php
$prepend = array('00','01','02','03','04','05','06','07','08','09');
$hours = array_merge($prepend,range(10, 23));
$minutes = array_merge($prepend,range(10, 59));
$seconds = $minutes;
echo $this->Form->input('Start Date', array('id' => 'EventStartDate', 'required' => true));
echo $this->Form->inputs(array(
'legend' => false,
'fieldset' => false,
'Hour' => array('type' => 'select', 'id' => 'EventStartHour', 'options' => $hours),
'Minute' => array('type' => 'select', 'id' => 'EventStartMinute', 'options' => $minutes)
));
?>
</fieldset>
<fieldset>
<?php
echo $this->Form->input('End Date', array('id' => 'EventEndDate', 'required' => true));
echo $this->Form->inputs(array(
'legend' => false,
'fieldset' => false,
'Hour' => array('type' => 'select', 'id' => 'EventEndHour', 'options' => $hours),
'Minute' => array('type' => 'select', 'id' => 'EventEndMinute', 'options' => $minutes)
));
?>
</fieldset>
<div class="panel panel-default">
<div class="panel-heading">Start Time</div>
<div class="list-group">
<div class="list-group-item"><?php echo $this->Form->input('Start Date', array('id' => 'EventStartDate', 'required' => true)); ?></div>
<div class="list-group-item">
<?php echo $this->Form->inputs(array(
'legend' => false,
'fieldset' => false,
'Hour' => array('type' => 'select', 'id' => 'EventStartHour', 'options' => $hours),
'Minute' => array('type' => 'select', 'id' => 'EventStartMinute', 'options' => $minutes)
)); ?>
</div>
</div>
</div>
<div class="panel panel-default">
<div class="panel-heading">End Time</div>
<div class="list-group">
<div class="list-group-item"><?php echo $this->Form->input('End Date', array('id' => 'EventEndDate', 'required' => true)); ?></div>
<div class="list-group-item">
<?php echo $this->Form->inputs(array(
'legend' => false,
'fieldset' => false,
'Hour' => array('type' => 'select', 'id' => 'EventEndHour', 'options' => $hours),
'Minute' => array('type' => 'select', 'id' => 'EventEndMinute', 'options' => $minutes)
)); ?>
</div>
</div>
</div>
<?php echo $this->Form->end(array('label' => 'Search', 'id' => 'EventsButtonSearch', 'class' => 'btn btn-default')); ?>
<?php echo $this->Html->link('Delete Selected','#',array('class' => 'btn btn-default', 'onClick' => '$("#EventsDeleteSelectedForm").submit();')); ?>
</div>
<?php $this->end(); ?>
@ -104,4 +111,4 @@ foreach ($events as $key => $value) {
<ul class="pagination">
<?php echo $this->Paginator->numbers(array('tag' => 'li', 'separator' => false, 'currentClass' => 'active', 'currentTag' => 'span')); ?>
</ul>
</ul>

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

@ -71,7 +71,10 @@ $cakeDescription = __d('cake_dev', 'CakePHP: the rapid development php framework
<div class="row">
<div class="col-sm-2 col-md-2 col-lg-2 sidebar-offcanvas" id="sidebar">
<div class="sidebar-nav">
<?php echo $this->fetch('sidebar'); ?>
<div class="panel panel-default">
<div class="panel-heading"><?php echo $this->fetch('title'); ?></div>
<?php echo $this->fetch('sidebar'); ?>
</div>
</div>
</div>
<div class="col-sm-10 col-md-10 col-lg-10">

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

@ -1,11 +1,9 @@
<?php $this->assign('title', 'Monitors'); ?>
<?php $this->start('sidebar'); ?>
<div class="panel panel-default">
<div class="panel-heading">Monitors</div>
<ul class="list-group">
<li class="list-group-item"><?php echo $this->Html->link( 'Add Monitor', array('controller' => 'monitors', 'action' => 'add')); ?></li>
<li class="list-group-item"><?php echo $this->Html->link( 'Delete Monitor', array('controller' => 'monitors', 'action' => 'delete')); ?></li>
</ul>
</div>
<?php $this->end(); ?>
<div id="monitors">