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

Migrate Log view to ui-router

This commit is contained in:
Kyle Johnson 2015-03-03 08:00:24 -05:00
parent 2ea43492bb
commit a4c5f83c8c
3 changed files with 15 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
web/js/app.js
View File

@ -88,6 +88,11 @@ ZoneMinder.config(function($stateProvider, $urlRouterProvider) {
templateUrl: '/views/host.html'
})
.state('log', {
url: '/log',
templateUrl: '/views/log.html'
})
///////////////////////////
// Zones - Edit and List //
///////////////////////////

2
web/views/header.html
View File

@ -17,7 +17,7 @@
<li ui-sref-active="active"><a ui-sref="events">Events</a></li>
<li ui-sref-active="active"><a href="?view=timeline">Timeline</a></li>
<li ui-sref-active="active"><a ui-sref="options.system">Options</a></li>
<li ui-sref-active="active"><a href="?view=log">Logs</span></a></li>
<li ui-sref-active="active"><a ui-sref="log">Logs</span></a></li>
<li ui-sref-active="active"><a href="?view=devices">Devices</a></li>
<li ui-sref-active="active"><a ui-sref="host">Host</a></li>
<li>

27
web/views/log.php → web/views/log.html
View File

@ -1,17 +1,11 @@
<?php xhtmlHeaders(__FILE__, $SLANG['SystemLog'] ); ?>
<body>
<?php include("header.php"); ?>
<div class="container-fluid" ng-controller="LogController">
<div class="row">
<div class="container-fluid" ng-controller="LogController">
<div class="row">
<div class="col-md-2">
<div id="filters">
<div id="filters">
<div class="form-group">
<label class="sr-only" for="filter[Component]">Component</label>
<label class="sr-only" for="filter[Component]">Component</label>
<select class="form-control" id="filter[Component]" onchange="filterLog(this)"><option value="">Component</option></select>
</div>
@ -34,11 +28,10 @@
<label class="sr-only" for="filter[Line]">Line</label>
<select class="form-control" id="filter[Line]" onchange="filterLog(this)"><option value="">Line</option></select>
</div>
</div>
</div> <!-- End .col-md-2 -->
</div>
</div>
<div class="col-md-10">
<div class="col-md-10">
<dir-pagination-controls on-page-change="pageChanged(newPageNumber)"></dir-pagination-controls>
<table class="table table-striped table-condensed">
@ -61,9 +54,7 @@
<td>{{ log.Log.Line }}</td>
</tr>
</table>
</div> <!-- End .col-md-10 -->
</div>
</div>
</div> <!-- End .row -->
</div>
</body>
</html>