From fc0a453162c1dcb6b236d11214c43c1bf66317f1 Mon Sep 17 00:00:00 2001
From: Aarni <aarni.halinen@aalto.fi>
Date: Mon, 1 Aug 2016 20:16:19 +0300
Subject: [PATCH] Controllers moved to js-file

---
 members/static/js/controllers.js | 27 ++++++++++++++++++++++++++
 members/templates/index.html     | 33 ++------------------------------
 2 files changed, 29 insertions(+), 31 deletions(-)
 create mode 100644 members/static/js/controllers.js

diff --git a/members/static/js/controllers.js b/members/static/js/controllers.js
new file mode 100644
index 0000000..2e79194
--- /dev/null
+++ b/members/static/js/controllers.js
@@ -0,0 +1,27 @@
+var memberlistApp=angular.module("memberlistApp", ['ngRoute']);
+memberlistApp.config(['$routeProvider', function($routeProvider)
+{
+	$routeProvider
+	.when('/list', 
+	{
+		templateUrl: 'viewStudents.htm',
+		controller: 'ViewStudentsController'
+	})
+	.when('/add', 
+	{
+		templateUrl: 'addStudent.htm',
+		controller: 'AddStudentController'
+	})
+	.otherwise(
+	{
+		redirectTo: '/list'
+	});
+}]);
+memberlistApp.controller('AddStudentController', function($scope) 
+{
+	$scope.content="This page will be used to display add student form";
+});
+memberlistApp.controller('ViewStudentsController', function($scope) 
+{
+	$scope.content="This page will be used to display all the students";
+});
\ No newline at end of file
diff --git a/members/templates/index.html b/members/templates/index.html
index b88f88f..1c04c50 100644
--- a/members/templates/index.html
+++ b/members/templates/index.html
@@ -125,35 +125,7 @@
 			</script>
 		</div>
 		<!-- /#page-content -->
-
-      <script>
-         var memberlistApp=angular.module("memberlistApp", ['ngRoute']);
-         memberlistApp.config(['$routeProvider', function($routeProvider) {
-            $routeProvider.
-            
-            when('/list', {
-               templateUrl: 'viewStudents.htm',
-               controller: 'ViewStudentsController'
-            }).
-            
-            when('/add', {
-               templateUrl: 'addStudent.htm',
-               controller: 'AddStudentController'
-            }).
-            
-            otherwise({
-               redirectTo: '/list'
-            });
-         }]);
-         
-         memberlistApp.controller('AddStudentController', function($scope) {
-            $scope.content="This page will be used to display add student form";
-         });
-         
-         memberlistApp.controller('ViewStudentsController', function($scope) {
-            $scope.content="This page will be used to display all the students";
-         });
-      </script>
+		<script src="../static/js/controllers.js"></script>
 
 
 		<!--<script src="../static/appData.js"></script>
@@ -161,8 +133,7 @@
 		<script src="lib/angular/angular.js"></script>
 
 		<script src="../static/js/app.js"></script>
-		<script src="../static/js/services.js"></script>
-		<script src="../static/js/controllers.js"></script>-->
+		<script src="../static/js/services.js"></script>-->
 	</div>
 </body>
 </html>