diff options
| -rw-r--r-- | client/index.php | 12 | ||||
| -rw-r--r-- | client/js/controllers/main.js | 10 | ||||
| -rw-r--r-- | client/js/controllers/mainApp.js | 10 | ||||
| -rw-r--r-- | client/js/controllers/status.js | 12 | ||||
| -rw-r--r-- | client/partials/nav.html | 6 |
5 files changed, 32 insertions, 18 deletions
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 @@ </head> - <body ng-controller="mainAppCtrl"> + <body> <!-- MAIN GRID --> <div class="container-lg"> <!-- Status bar --> - <div class="row"> + <div class="row" ng-controller="statusCtrl"> <div class="col-lg-12"> <!-- Nav --> <div ng-include="'./partials/nav.html'"></div> @@ -39,13 +39,13 @@ <!-- Left Menu --> <div ng-include="'./partials/menu.html'"></div> </div> - <div class="col-lg-10"> + <div class="col-lg-10" ng-controller="mainCtrl"> <div class="container-lg" > <div class="row"> <div class="col-lg-12"> <div class="panel panel-default"> <div class="panel-heading"> - Content test + {{ test }} </div> <div class="panel-body"> Main Content @@ -70,7 +70,9 @@ <!-- Include AngularJS and dependencies--> <script src="./vendors/angularjs/angular.min.js"></script> <script src="./js/app.js"></script> - <script src="./js/controllers/mainApp.js"></script> + <script src="./js/controllers/main.js"></script> + <script src="./js/controllers/status.js"></script> + </html>
\ 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 @@ <ul class="nav navbar-nav"> <li class="nav-divider"></li> - <li><a href="#">User : CurrentUser</a></li> - <li><a href="#">Last Connection : LastCon</a></li> - <li><a href="#">Connection : Online</a></li> + <li><a href="#">User : {{ username }}</a></li> + <li><a href="#">Last Connection : {{ lastconnection }}</a></li> + <li><a href="#">Connection : {{ connection }}</a></li> </ul> |