Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also .

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also .
  • 3 commits
  • 21 files changed
  • 0 commit comments
  • 1 contributor
@@ -30,6 +30,9 @@ Config = {
/* Time in seconds to wait to show the force stop button for the VM's */
timeForceButton: 10,

/* Ignore search requests with string of length < this number */
minCharsSearch: 3,

/* Here you can define the rules by which the UI decides if metrics are good or bad.
* 'type' values of warning or error are shown as a big red X, values of info are
* just listed.
@@ -28,7 +28,10 @@ angular.module('fifoApp')
var filterData = function() {
var p = $scope.tableParams;

var data = $scope.searchQuery ? $filter('filter')($scope.vms, $scope.searchQuery) : $scope.vms;
var data = $scope.searchQuery && $scope.searchQuery.length >= (Config.minCharsSearch || 3)
? $filter('filter')($scope.vms, $scope.searchQuery)
: $scope.vms;

data = p.sorting()? $filter('orderBy')(data, p.orderBy()) : data

$scope.vmsFiltered = data.slice((p.page() - 1) * p.count(), p.page() * p.count());
@@ -121,7 +124,7 @@ angular.module('fifoApp')

$scope.tableParams = new ngTableParams({
page: 1,
count: 30,
count: 25,
total: 0, //0=disable
sorting: {
'config.alias': 'desc' //Could save this in the user metadata.. :P
@@ -80,6 +80,8 @@ angular.module('fifoApp')
.on('mouseover', function(h) {
$scope.vm = h
$scope.$digest()
angular.element('#popover_vm').css('left', (210 + h.x) + 'px')
angular.element('#popover_vm').css('top', (-30 + h.y) + 'px')
})
.on('mouseout', function() {
$scope.vm = undefined
@@ -134,6 +136,8 @@ angular.module('fifoApp')
.on('mouseover', function(h) {
$scope.hyper = h
$scope.$digest()
angular.element('#popover_hyper').css('left', (210 + h.x) + 'px')
angular.element('#popover_hyper').css('top', (-30 + h.y) + 'px')
})
.on('mouseout', function() {
$scope.hyper = undefined
@@ -51,9 +51,12 @@ angular.module('fifoApp')
switch (vm.state) {
case 'failed':
vm.state_description = "Could not create the VM with vmadm.";
vm.state = 'failed';
vm._state_label = 'danger';
break;
case 'pooled':
vm.state_description = "Enqueued to be created on a server.";
vm._state_label = 'default';
break;
case 'failed-get_ips':
vm.state_description = "No IP address for the machine could be obtained.";
vm.state = 'failed';
@@ -234,7 +234,7 @@ angular.module('fifoApp').factory('wiggle', function ($resource, $http, $cacheFa
}
}},
query: {method: 'GET', isArray: true, headers: withToken({'x-full-list': true})},
queryFull: {method: 'GET', isArray: true, headers: withToken({'x-full-list': true}), interceptor: {
queryFull: {method: 'GET', isArray: true, headers: withToken({'x-full-list': "true", 'x-full-list-fields': 'uuid,datset,package,config,hypervisor,owner,metadata,state'}), interceptor: {
response: function(res) {
res.resource.forEach(additionalVmData)
res.resource.hash = hashFromArray(res.resource)
@@ -34,8 +34,8 @@

</div>

<div class="popover right"
style="display: {{vm && 'block' || 'none'}}; position: absolute; top: {{vm.y}}px; left: {{vm.x+210}}px;">
<div id='popover_vm' class="popover right"
style="display: {{vm && 'block' || 'none'}}; position: absolute;">
<div class="arrow"></div>
<div class="popover-inner">
<h3 class="popover-title">
@@ -54,8 +54,8 @@ <h3 class="popover-title">
</div>
</div>

<div class="popover right"
style="display: {{hyper && 'block' || 'none'}}; position: absolute; top: {{hyper.y-10}}px; left: {{hyper.x+210}}px;">
<div id='popover_hyper' class="popover right"
style="display: {{hyper && 'block' || 'none'}}; position: absolute;">
<div class="arrow"></div>
<div class="popover-inner">
<h3 class="popover-title">
@@ -11,7 +11,7 @@
</head>
<body>

<script src="scripts/166e54bc.console.js"></script>
<script src="scripts/2e7f404f.console.js"></script>

</body>
</html>
@@ -15,12 +15,12 @@
</div>
<div class="ng-view-include container" ng-view></div>

<script src="scripts/4bea0a84.bower_components.js"></script>
<script src="scripts/5d0b108f.bower_components.js"></script>

<script src="scripts/config.js"></script>
<script src="scripts/0e96e10f.main.js"></script>
<script src="scripts/79010612.main.js"></script>

<script src="scripts/ce98c266.vendor.js"></script>
<script src="scripts/c1af14c1.vendor.js"></script>

</body>
</html>

This file was deleted.

This file was deleted.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

This file was deleted.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

This file was deleted.

@@ -30,6 +30,9 @@ Config = {
/* Time in seconds to wait to show the force stop button for the VM's */
timeForceButton: 10,

/* Ignore search requests with string of length < this number */
minCharsSearch: 3,

/* Here you can define the rules by which the UI decides if metrics are good or bad.
* 'type' values of warning or error are shown as a big red X, values of info are
* just listed.
@@ -34,8 +34,8 @@

</div>

<div class="popover right"
style="display: {{vm && 'block' || 'none'}}; position: absolute; top: {{vm.y}}px; left: {{vm.x+210}}px;">
<div id='popover_vm' class="popover right"
style="display: {{vm && 'block' || 'none'}}; position: absolute;">
<div class="arrow"></div>
<div class="popover-inner">
<h3 class="popover-title">
@@ -54,8 +54,8 @@ <h3 class="popover-title">
</div>
</div>

<div class="popover right"
style="display: {{hyper && 'block' || 'none'}}; position: absolute; top: {{hyper.y-10}}px; left: {{hyper.x+210}}px;">
<div id='popover_hyper' class="popover right"
style="display: {{hyper && 'block' || 'none'}}; position: absolute;">
<div class="arrow"></div>
<div class="popover-inner">
<h3 class="popover-title">
@@ -41,9 +41,9 @@
</footer>
<script type="application/javascript">INCLUDE_URI="vendor/vnc/";</script>

<script src="scripts/1f69a46e.vnc_lib.js"></script>
<script src="scripts/8199e600.vnc_lib.js"></script>

<script src="scripts/90492b24.vnc.js"></script>
<script src="scripts/3012d626.vnc.js"></script>



No commit comments for this range

You can’t perform that action at this time.