Commit b28062e4 authored by Laura Figuerola's avatar Laura Figuerola
Browse files

#203 look and feel status column machine list improved

parent 83d6a80b
......@@ -84,10 +84,10 @@
<input type="checkbox" ng-hide="{{machine.is_public}}" ng-click="set_public(machine.id,1)" title="<%=l 'Make public' %>"></td>
<td class="lgMachActions">
<span style="float:right;" ng-show="{{machine.is_paused && machine.is_active}}" class="label label-warning" ng-cloak><%=l 'Paused' %></span>
<span style="float:left;" ng-show="{{!machine.is_paused && machine.is_active}}" class="label label-success" ng-cloak><%=l 'Running' %></span>
<span style="float:right;" ng-show="{{!machine.is_paused && machine.is_active}}" class="label label-success" ng-cloak><%=l 'Running' %></span>
<span style="float:right;" ng-show="{{!machine.is_active && !machine.is_hibernated}}" class="label label-danger" ng-cloak><%=l 'Down' %></span>
<span style="float:right;" ng-show="{{machine.is_hibernated}}" class="label label-warning" ng-cloak><%=l 'Hibernated' %></span>
<div ng-show="{{machine.is_active}}">{{machine.remote_ip}}</div>
<span style="float:right;" ng-show="{{machine.is_hibernated}}" class="label label-warning" ng-cloak><%=l 'Hibernated' %></span>
<br><span style="float:right;" ng-show="{{machine.is_active}}" class="label label-default">{{machine.remote_ip}}</span>
</td>
<td class="lgMachToggle">
......@@ -107,7 +107,7 @@
<a type="button" class="btn btn-danger btn-sm"
ng-click="action('machine','shutdown',machine.id)"
ng-disabled="!machine.is_active"
title="<%=l 'ShutDown' %>">
title="<%=l 'ShutDown' %>">
<i class="fa fa-power-off"></i>
</a>
<a type="button" class="btn btn-primary btn-sm"
......@@ -152,10 +152,10 @@
<input type="checkbox" ng-hide="{{child.is_public}}" ng-click="set_public(child.id,1)" title="Make public"></td>
<td class="lgMachActions">
<span style="float:right;" ng-show="{{child.is_paused && child.is_active}}" class="label label-warning" ng-cloak><%=l 'Paused' %></span>
<span style="float:left;" ng-show="{{!child.is_paused && child.is_active}}" class="label label-success" ng-cloak><%=l 'Running' %></span>
<span style="float:right;" ng-show="{{!child.is_paused && child.is_active}}" class="label label-success" ng-cloak><%=l 'Running' %></span>
<span style="float:right;" ng-show="{{!child.is_active && !child.is_hibernated}}" class="label label-danger" ng-cloak><%=l 'Down' %></span>
<span style="float:right;" ng-show="{{child.is_hibernated}}" class="label label-warning" ng-cloak><%=l 'Hibernated' %></span>
<div ng-show="{{child.is_active}}">{{child.remote_ip}}</div>
<br><span style="float:right;" ng-show="{{child.is_active}}" class="label label-default">{{machine.remote_ip}}</span>
</td>
<td class="lgMachToggle">
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment