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

Clean up more paths

This commit is contained in:
Kyle Johnson 2015-02-11 14:34:10 -05:00
parent 9cf8262eca
commit 71ecfdcb1b
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
web/js/app.js
View File

@ -11,16 +11,16 @@ ZoneMinder.config(['$routeProvider', '$locationProvider', function($routeProvide
$locationProvider.html5Mode(true); $locationProvider.html5Mode(true);
$routeProvider $routeProvider
.when('/skins/bootstrap/', { .when('/', {
templateUrl: '/skins/bootstrap/views/console.html' templateUrl: '/views/console.html'
}) })
.when('/#events', { .when('/events', {
templateUrl: '/skins/bootstrap/views/events.html' templateUrl: '/views/events.html'
}); });
}]); }]);
ZoneMinder.config(function(paginationTemplateProvider) { ZoneMinder.config(function(paginationTemplateProvider) {
paginationTemplateProvider.setPath('skins/bootstrap/js/dirPagination.tpl.html'); paginationTemplateProvider.setPath('/js/dirPagination.tpl.html');
}); });
ZoneMinder.factory('Monitor', function($http) { ZoneMinder.factory('Monitor', function($http) {

6
web/js/controllers.js
View File

@ -8,7 +8,7 @@ ZoneMinder.controller('StateController', function($scope, State, Header) {
$scope.changeState = function(newState) { $scope.changeState = function(newState) {
State.change(newState) State.change(newState)
// Redirect to the dashboard on success // Redirect to the dashboard on success
.success(function(data) { window.location = "/index.php?view=console"; }); .success(function(data) { window.location = "/"; });
}; };
Header.getDaemonStatus(function(results) { Header.getDaemonStatus(function(results) {
@ -122,7 +122,7 @@ ZoneMinder.controller('EventsController', function($scope, Events, Console, $mod
var event = $scope.events[index]; var event = $scope.events[index];
var modalInstance = $modal.open({ var modalInstance = $modal.open({
templateUrl: '/skins/bootstrap/views/event.html', templateUrl: '/views/event.html',
controller: 'EventController', controller: 'EventController',
size: 'lg', size: 'lg',
resolve: { resolve: {
@ -249,7 +249,7 @@ ZoneMinder.controller('MonitorController', function($scope, $http, $location, Mo
$scope.submitMonitor = function() { $scope.submitMonitor = function() {
Monitor.saveMonitor($scope.monitor) Monitor.saveMonitor($scope.monitor)
// Redirect to the dashboard on success // Redirect to the dashboard on success
.success(function(data) { window.location = "/index.php?view=console"; }); .success(function(data) { window.location = "/"; });
}; };
}); });

2
web/views/event.html
View File

@ -15,7 +15,7 @@
</div> </div>
</div> </div>
</div> </div>
<div ng-include="'/skins/bootstrap/views/event-frames-stills.html'"></div> <div ng-include="'/views/event-frames-stills.html'"></div>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">

2
web/views/header.html
View File

@ -16,4 +16,4 @@
</ul> </ul>
</div> </div>
</nav> </nav>
<div ng-include="'/skins/bootstrap/views/state.html'"></div> <div ng-include="'/views/state.html'"></div>