diff options
| author | Yoggzo <yogg@epsina.com> | 2016-03-08 17:30:26 +0100 |
|---|---|---|
| committer | Yoggzo <yogg@epsina.com> | 2016-03-08 17:30:26 +0100 |
| commit | 89f2c4ac8cd6b0f7766170d588eae2407124f8fc (patch) | |
| tree | 6275b180b1c1f45caba3e84437119f784f5ebfba /client/index.html | |
| parent | 66baa3ffc8bd119558eeb1e87cb05c6008df9d6f (diff) | |
| parent | 3b569b6d008d5b1936ee04948cf5c1cc08790f39 (diff) | |
Merge branch 'develop' into Evan
Diffstat (limited to 'client/index.html')
| -rw-r--r-- | client/index.html | 32 |
1 files changed, 17 insertions, 15 deletions
diff --git a/client/index.html b/client/index.html index 8ca2b9f..a06994c 100644 --- a/client/index.html +++ b/client/index.html @@ -11,27 +11,28 @@ <link rel="stylesheet" href="./css/style.css"> - <!--[if lt IE 9]> - <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script> - <![endif]--> + <!--[if lt IE 9]> + <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script> + <![endif]--> </head> <body> - + + <!-- Overlay --> + <div ng-include="'./partials/login.html'"></div> + <div ng-include="'./partials/home/machineDetails.html'"></div> + <div ng-include="'./partials/loading.html'"></div> + + + <!-- 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> - <!-- Machine Details Overlay --> - <div ng-include="'./partials/home/machineDetails.html'"></div> - <div ng-include="'./partials/loading.html'"></div> - - <!-- Nav --> - <div ng-include="'./partials/nav.html'"></div> + <!-- Status bar --> + <div ng-include="'./partials/status.html'"></div> </div> </div> <!-- Page content --> @@ -56,7 +57,7 @@ </div> </div> </div> - </div> + </div> </div> </div> </div> @@ -85,9 +86,10 @@ <!-- 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/home/home.js"></script> <script src="./js/controllers/home/machineDetails.js"></script> - <script src="./js/controllers/network/main.js"></script> + <script src="./js/controllers/network/network.js"></script> + <script src="./js/controllers/image/image.js"></script> |