summaryrefslogtreecommitdiff
path: root/client/index.html
diff options
context:
space:
mode:
authorroot <root@kabir-PC>2016-03-02 15:11:56 +0100
committerroot <root@kabir-PC>2016-03-02 15:11:56 +0100
commitdac5c28a6795984a32687fe21c41783de2e85d8b (patch)
treebb5b719f923b33e31d5a0880d1d50dbe49543e45 /client/index.html
parent70fcf3553abb4a25672ee198dafb89e430e2bd79 (diff)
parentb6d7d2c30efe5e9758072bb82ea3a947bda7fd1d (diff)
Merge branch 'develop' of https://github.com/manzerbredes/istic-openstack into othmane
Diffstat (limited to 'client/index.html')
-rw-r--r--client/index.html9
1 files changed, 8 insertions, 1 deletions
diff --git a/client/index.html b/client/index.html
index ba183df..8ca2b9f 100644
--- a/client/index.html
+++ b/client/index.html
@@ -26,7 +26,11 @@
<div class="col-lg-12">
<!-- Login Overlay -->
<div ng-include="'./partials/login.html'"></div>
- <!-- Nav -->
+ <!-- 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>
</div>
</div>
@@ -76,12 +80,15 @@
<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>
<script src="./js/controllers/status.js"></script>
<script src="./js/controllers/home/main.js"></script>
+ <script src="./js/controllers/home/machineDetails.js"></script>
<script src="./js/controllers/network/main.js"></script>
+