diff options
| author | Yoggzo <yogg@epsina.com> | 2016-03-02 10:58:01 +0100 |
|---|---|---|
| committer | Yoggzo <yogg@epsina.com> | 2016-03-02 10:58:01 +0100 |
| commit | d1bd9b4a0c3168eec28ea1c3992748afe1953218 (patch) | |
| tree | 538ef3d0b37e1dcb0528ce6395c3a82a672a5089 /client/partials | |
| parent | ae1100c16880d4bae77513ec433ac6734da8dea4 (diff) | |
| parent | b6d7d2c30efe5e9758072bb82ea3a947bda7fd1d (diff) | |
Merge branch 'develop' into Evan
Diffstat (limited to 'client/partials')
| -rw-r--r-- | client/partials/home/machineDetails.html | 30 | ||||
| -rw-r--r-- | client/partials/home/main.html | 9 | ||||
| -rw-r--r-- | client/partials/loading.html | 18 |
3 files changed, 31 insertions, 26 deletions
diff --git a/client/partials/home/machineDetails.html b/client/partials/home/machineDetails.html index 606edcf..47a65fb 100644 --- a/client/partials/home/machineDetails.html +++ b/client/partials/home/machineDetails.html @@ -21,11 +21,11 @@ <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> + <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" id="waitingForToggleMachine"></span> @@ -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> diff --git a/client/partials/home/main.html b/client/partials/home/main.html index 37638d3..f9f8878 100644 --- a/client/partials/home/main.html +++ b/client/partials/home/main.html @@ -3,9 +3,10 @@ Home </div> <div class="panel-body"> - Main Content - <button ng-click="raiseShowMachineDetailsEvent()" > Show Machine details</button> - <div id="test"> - </div> + + Pour charger les machines, recharger la page (temporaire)<br /> + Selectionner une machine: + <div ng-repeat="machine in machines"> <a ng-click="raiseShowMachineDetailsEvent(machine.id)"> {{ machine.name }}</a></div> + </div> </div> diff --git a/client/partials/loading.html b/client/partials/loading.html new file mode 100644 index 0000000..c978190 --- /dev/null +++ b/client/partials/loading.html @@ -0,0 +1,18 @@ +<div class="modal fade" id="loadingModal" ng-controller="loginCtrl"> + <div class="modal-dialog"> + <div class="modal-content"></div> + </div> + <div class="modal-dialog" style="width:200px;"> + <div class="modal-content"> + + <div class="modal-body" > + <div align="center"> + <img src="images/spin/128x128/Preloader_8.gif" /> + </div> + + + </div> + + </div> + </div> +</div> |