Merge branch 'master' into Eole

5 files changed, 50 insertions, 0 deletions

diff --git a/client/js/app.js b/client/js/app.js
index e69de29..7fedb32 100644
--- a/client/js/app.js
+++ b/client/js/app.js
@@ -0,0 +1,18 @@
+
+// Declare main app
+var mainApp=angular.module("mainApp",['ngRoute']);
+
+
+mainApp.config(['$routeProvider', function($routeProvider){
+        $routeProvider.
+                when('/home',{
+                    templateUrl: 'partials/home.html',
+                    controller: 'homeCtrl'
+        }).
+                when('/network',{
+                    templateUrl: 'partials/network.html',
+                    controller: 'networkCtrl'
+        }).otherwise({
+            redirectTo: '/home'
+        });
+}]);
\ No newline at end of file
diff --git a/client/js/controllers/empty b/client/js/controllers/empty
deleted file mode 100644
index e69de29..0000000
--- a/client/js/controllers/empty
+++ /dev/null
diff --git a/client/js/controllers/home.js b/client/js/controllers/home.js
new file mode 100644
index 0000000..d4e1b0e
--- /dev/null
+++ b/client/js/controllers/home.js
@@ -0,0 +1,10 @@
+/*
+ * home Controller
+ */
+
+
+
+mainApp.controller('homeCtrl', function ($scope)
+{
+     $scope.test="Home view";
+});
\ No newline at end of file
diff --git a/client/js/controllers/network.js b/client/js/controllers/network.js
new file mode 100644
index 0000000..c2a9794
--- /dev/null
+++ b/client/js/controllers/network.js
@@ -0,0 +1,10 @@
+/*
+ * network Controller
+ */
+
+
+
+mainApp.controller('networkCtrl', function ($scope)
+{
+     $scope.test="Network View";
+});
\ No newline at end of file
diff --git a/client/js/controllers/status.js b/client/js/controllers/status.js
new file mode 100644
index 0000000..3534912
--- /dev/null
+++ b/client/js/controllers/status.js
@@ -0,0 +1,12 @@
+/*
+ * mainApp Controller
+ */
+
+
+
+mainApp.controller('statusCtrl', function ($scope)
+{
+     $scope.username="User 1";
+     $scope.connection="Online";
+     $scope.lastconnection="1 Septembre";
+});
\ No newline at end of file