summaryrefslogtreecommitdiff
path: root/client/index.html
diff options
context:
space:
mode:
Diffstat (limited to 'client/index.html')
-rw-r--r--client/index.html34
1 files changed, 18 insertions, 16 deletions
diff --git a/client/index.html b/client/index.html
index 8ca2b9f..08be038 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>
+<div ng-include="'./partials/image/upload.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>
@@ -65,7 +66,7 @@
<!-- Include JQuery -->
<script src="./vendors/jquery/jquery-2.2.0.min.js"></script>
-
+
<!-- Include Bootstrap -->
<script src="./vendors/bootstrap/js/bootstrap.min.js"></script>
@@ -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>