From 71ecfdcb1b2fa2a295983dc887cb885986fcc083 Mon Sep 17 00:00:00 2001
From: Kyle Johnson <kjohnson@gnulnx.net>
Date: Wed, 11 Feb 2015 14:34:10 -0500
Subject: [PATCH] Clean up more paths

---
 web/js/app.js         | 10 +++++-----
 web/js/controllers.js |  6 +++---
 web/views/event.html  |  2 +-
 web/views/header.html |  2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/web/js/app.js b/web/js/app.js
index eb5bde309..9891cdfec 100644
--- a/web/js/app.js
+++ b/web/js/app.js
@@ -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) {
diff --git a/web/js/controllers.js b/web/js/controllers.js
index 91298560c..43bb30b20 100644
--- a/web/js/controllers.js
+++ b/web/js/controllers.js
@@ -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 = "/"; });
 	};
 });
 
diff --git a/web/views/event.html b/web/views/event.html
index 87b320d42..b6c870aac 100644
--- a/web/views/event.html
+++ b/web/views/event.html
@@ -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">
diff --git a/web/views/header.html b/web/views/header.html
index 72dccb71c..c666da59a 100644
--- a/web/views/header.html
+++ b/web/views/header.html
@@ -16,4 +16,4 @@
 				</ul>
 			</div>
     </nav>
-<div ng-include="'/skins/bootstrap/views/state.html'"></div>
+<div ng-include="'/views/state.html'"></div>