diff options
| author | Yoggzo <yogg@epsina.com> | 2016-02-04 23:54:00 +0100 |
|---|---|---|
| committer | Yoggzo <yogg@epsina.com> | 2016-02-04 23:54:00 +0100 |
| commit | ae8e5e7d1c1c4a15ab4d7bd5045b31556feb17de (patch) | |
| tree | 90352502aa1346f011348e692507239aaa7db2d7 /client/index.html | |
| parent | ab6e45d5e152518fd07c7bbce6f5eb2f42b30e07 (diff) | |
| parent | b39f5c1cd4631be3259b272e1f6cbe9b4915410b (diff) | |
Merge branch 'develop' into Evan
mise a jour de la branche
Diffstat (limited to 'client/index.html')
| -rw-r--r-- | client/index.html | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/client/index.html b/client/index.html index 0c02623..a4845e8 100644 --- a/client/index.html +++ b/client/index.html @@ -18,11 +18,14 @@ <body> + <!-- MAIN GRID --> <div class="container-lg"> <!-- Status bar --> <div class="row" ng-controller="statusCtrl"> <div class="col-lg-12"> + <!-- Login Overlay --> + <div ng-include="'./partials/login.html'"></div> <!-- Nav --> <div ng-include="'./partials/nav.html'"></div> </div> @@ -57,16 +60,26 @@ <!-- Include JQuery --> - <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.3/jquery.min.js"></script> + <script src="./vendors/jquery/jquery-2.2.0.min.js"></script> + <!-- Include Bootstrap --> <script src="./vendors/bootstrap/js/bootstrap.min.js"></script> + <!-- Include AngularJS and dependencies--> <script src="./vendors/angularjs/angular.min.js"></script> - <script src="./vendors/angularjs/angular-route.js"></script> + <script src="./vendors/angularjs/angular-route.min.js"></script> + <script src="./vendors/angularjs/angular-sanitize.min.js"></script> <script src="./js/app.js"></script> - <script src="./js/controllers/home.js"></script> - <script src="./js/controllers/network.js"></script> + + <!-- Include resquest dependencies --> + <script src="./js/requests/identity.js"></script> + + <!-- Include controller --> + <script src="./js/controllers/login.js"></script> <script src="./js/controllers/status.js"></script> + <script src="./js/controllers/home/main.js"></script> + <script src="./js/controllers/network/main.js"></script> + |