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

View File

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

View File

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

View File

@ -15,7 +15,7 @@
</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 class="modal-footer">

View File

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