diff options
| author | manzerbredes <loic.guegan_secondary@yahoo.fr> | 2016-03-02 21:03:25 +0100 |
|---|---|---|
| committer | manzerbredes <loic.guegan_secondary@yahoo.fr> | 2016-03-02 21:03:25 +0100 |
| commit | dde482df6492e874ffb30c3c5127e620c418c57b (patch) | |
| tree | c140423cc3d396a8a3507496b392894cbe47fecf /client/partials/home/machineDetails.html | |
| parent | 6ce1bbc7be91aa6441c3ff168a734ed25479eb72 (diff) | |
| parent | 85222e1246b3805100428717874d15aafd682d26 (diff) | |
Correct conflicts
Diffstat (limited to 'client/partials/home/machineDetails.html')
| -rw-r--r-- | client/partials/home/machineDetails.html | 32 |
1 files changed, 9 insertions, 23 deletions
diff --git a/client/partials/home/machineDetails.html b/client/partials/home/machineDetails.html index 606edcf..c4c8a38 100644 --- a/client/partials/home/machineDetails.html +++ b/client/partials/home/machineDetails.html @@ -21,12 +21,12 @@ <div class="form-group"> <label class="control-label col-sm-2" for="pwd">State</label> <div class="col-sm-10"> - <span ng-if="machine.online">Online</span> - <span ng-if="!machine.online">Offline</span> + <span ng-if="machine.status=='ACTIVE'">Online</span> + <span ng-if="machine.status!=='ACTIVE'">Offline</span> - <button class="btn btn-danger" ng-if="machine.online" ng-click="toggleMachineState()">Turn Off</button> - <button class="btn btn-success" ng-if="!machine.online" ng-click="toggleMachineState()">Turn On</button> - <img src="images/spin/32x32/Preloader_1.gif" id="waitingForToggleMachine"></span> + <button class="btn btn-danger" ng-if="machine.status=='ACTIVE'" ng-click="toggleMachineState()">Turn Off</button> + <button class="btn btn-success" ng-if="machine.status!=='ACTIVE'" ng-click="toggleMachineState()">Turn On</button> + <img src="images/spin/32x32/Preloader_1.gif" ng-if="machineIsStarting"></span> </div> @@ -34,36 +34,22 @@ <fieldset class="form-group"> <label class="control-label col-sm-2">RAM</label> <select class="col-sm-20" id="ramSelected"> - <option>128 MB</option> - <option>512 MB</option> - <option>1024 MB</option> - <option>2048 MB</option> - <option>4096 MB</option> + <option ng-repeat="ram in axioms.ram" ng-selected="machine.ram == ram">{{ ram }}</option> </select> + <span>MB</span> </fieldset> <fieldset class="form-group"> <label class="control-label col-sm-2">Disk</label> <select class="col-sm-20" id="ramSelected"> - <option>1 Go</option> - <option>2 Go</option> - <option>5 Go</option> - <option>10 Go</option> - <option>25 Go</option> - <option>50 Go</option> - <option>100 Go</option> - <option>150 Go</option> - <option>200 Go</option> + <option ng-repeat="disk in axioms.disk" ng-selected="machine.disk == disk">{{ disk }}</option> </select> </fieldset> <fieldset class="form-group"> <label class="control-label col-sm-2">Image</label> <select class="col-sm-20" id="ramSelected"> - <option>Cirros</option> - <option>Debian</option> - <option>Tiny Core</option> - <option>Centos</option> + <option ng-repeat="image in axioms.images" ng-selected="machine.imageId == Object.keys(image)">{{ image.name }}</option> </select> </fieldset> |