diff options
| author | Yoggzo <yogg@epsina.com> | 2016-03-02 10:58:01 +0100 |
|---|---|---|
| committer | Yoggzo <yogg@epsina.com> | 2016-03-02 10:58:01 +0100 |
| commit | d1bd9b4a0c3168eec28ea1c3992748afe1953218 (patch) | |
| tree | 538ef3d0b37e1dcb0528ce6395c3a82a672a5089 /client/index.html | |
| parent | ae1100c16880d4bae77513ec433ac6734da8dea4 (diff) | |
| parent | b6d7d2c30efe5e9758072bb82ea3a947bda7fd1d (diff) | |
Merge branch 'develop' into Evan
Diffstat (limited to 'client/index.html')
| -rw-r--r-- | client/index.html | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/client/index.html b/client/index.html index 8d81ac3..8ca2b9f 100644 --- a/client/index.html +++ b/client/index.html @@ -28,8 +28,9 @@ <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 --> + <!-- Nav --> <div ng-include="'./partials/nav.html'"></div> </div> </div> @@ -79,6 +80,7 @@ <script src="./js/services/Identity.js"></script> <script src="./js/services/Image.js"></script> <script src="./js/services/Compute.js"></script> + <script src="./js/services/Loading.js"></script> <!-- Include controller --> <script src="./js/controllers/login.js"></script> |