From a059014b1bb87fe18f3079c4ab1dfefc728a0e34 Mon Sep 17 00:00:00 2001 From: manzerbredes Date: Sun, 24 Jan 2016 15:10:13 +0100 Subject: [PATCH] Edit controller --- client/index.php | 12 +++++++----- client/js/controllers/main.js | 10 ++++++++++ client/js/controllers/mainApp.js | 10 ---------- client/js/controllers/status.js | 12 ++++++++++++ client/partials/nav.html | 6 +++--- 5 files changed, 32 insertions(+), 18 deletions(-) create mode 100644 client/js/controllers/main.js delete mode 100644 client/js/controllers/mainApp.js create mode 100644 client/js/controllers/status.js diff --git a/client/index.php b/client/index.php index 8c29a9b..fa53c19 100644 --- a/client/index.php +++ b/client/index.php @@ -17,11 +17,11 @@ - +
-
+
@@ -39,13 +39,13 @@
-
+
- Content test + {{ test }}
Main Content @@ -70,7 +70,9 @@ - + + + \ No newline at end of file diff --git a/client/js/controllers/main.js b/client/js/controllers/main.js new file mode 100644 index 0000000..78d5849 --- /dev/null +++ b/client/js/controllers/main.js @@ -0,0 +1,10 @@ +/* + * mainApp Controller + */ + + + +mainApp.controller('mainCtrl', function ($scope) +{ + $scope.test="Test title"; +}); \ No newline at end of file diff --git a/client/js/controllers/mainApp.js b/client/js/controllers/mainApp.js deleted file mode 100644 index 6ff39a9..0000000 --- a/client/js/controllers/mainApp.js +++ /dev/null @@ -1,10 +0,0 @@ -/* - * mainApp Controller - */ - - - -mainApp.controller('mainAppCtrl', function ($scope) -{ - // TODO -}); \ 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 diff --git a/client/partials/nav.html b/client/partials/nav.html index 5664b38..a765daa 100644 --- a/client/partials/nav.html +++ b/client/partials/nav.html @@ -18,9 +18,9 @@