loic/istic-openstack
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' into Eole_Graph

Browse source 
Conflicts:
	client/index.html
	client/js/controllers/home/home.js
	client/partials/home/home.html
This commit is contained in:
Eole 2016-04-27 16:42:28 +02:00
commit 49f416dc50
317 changed files with 5578 additions and 33526 deletions
Download patch file Download diff file Expand all files Collapse all files

39
client/index.html Normal file → Executable file
View file

@ -13,27 +13,27 @@
<link rel="stylesheet" href="./css/graph.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 -->
<!-- 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/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">
<!-- Status bar -->
<!-- Status bar -->
<div ng-include="'./partials/status.html'"></div>
</div>
</div>
@ -59,39 +59,42 @@
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</body>
<!-- Include JQuery -->
<script src="./vendors/jquery/jquery-2.2.0.min.js"></script>
<script src="./vendors/jquery/dmuploader.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.min.js"></script>
<script src="./vendors/angularjs/angular-sanitize.min.js"></script>
<script src="./vendors/angularjs/angular-cookies.min.js"></script>
<script src="./vendors/angularjs/angular-upload.min.js"></script>
<script src="./js/app.js"></script>
<!-- Include services -->
<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/home.js"></script>
<script src="./js/controllers/home/machineDetails.js"></script>
<script src="./js/controllers/network/network.js"></script>
<script src="./js/controllers/image/image.js"></script>
<script src="./js/controllers/image/image.js"></script>
<script src="./js/controllers/image/upload.js"></script>
<!-- Includes and dependencies for jointJS -->
@ -101,10 +104,6 @@
<script src="./vendors/jointjs/lib/dagre.min.js"></script>
<script src="./vendors/jointjs/lib/graphlib.min.js"></script>
<script src="./vendors/jointjs/plugins/joint.layout.DirectedGraph.min.js"></script>