Merge branch 'loic-image-edition' into loic

This commit is contained in:
Loic GUEGAN 2016-04-27 17:03:29 +02:00
commit 9a93133272
7 changed files with 135 additions and 28 deletions

View file

@ -0,0 +1,46 @@
<div class="modal fade" id="editImageModal" ng-controller="editImageCtrl">
<div class="modal-dialog">
<div class="modal-content"></div>
</div>
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<!--<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>-->
<h4 class="modal-title">Edit Image</h4>
</div>
<div class="modal-body">
<form class="form-horizontal" role="form">
<div class="form-group">
<label class="control-label col-sm-2">Name</label>
<div class="col-sm-20">
<input type="text" value="{{ image.name}}" />
</div>
</div>
<fieldset class="form-group">
<label class="control-label col-sm-2">Visibility</label>
<select class="col-sm-20" id="visibilitySelected" ng-model="data.visibility">
<option ng-repeat="visibility in axioms.visibility" ng-selected="image.visibility == visibility">{{ visibility}}</option>
</select>
</fieldset>
<fieldset class="form-group">
<label class="control-label col-sm-2">Protected</label>
<select class="col-sm-20" id="protectedSelected" ng-model="data.protected">
<option ng-repeat="protected in axioms.protected" ng-selected="image.protected == protected">{{ protected}}</option>
</select>
</fieldset>
</form>
<div class="modal-footer">
<!--<a href="#" data-dismiss="modal" class="btn btn-default">Close</a>-->
<a class="btn btn-lg btn-primary btn-block" ng-click="applyEdition(image)" >Apply</a>
</div>
</div>
</div>
</div>
</div>

View file

@ -6,33 +6,36 @@
</div>
<div class="panel-body">
<div class="btn-group btn-group-md" role="group" aria-label="...">
<button type="button" class="btn btn-default" data-toggle="modal" data-target="#uploadImageModal"">Upload</button>
<button type="button" class="btn btn-default">Download</button>
</div>
<p></p>
<table class="table table-hover">
<thead>
<tr>
<th>Name</th>
<th>Size</th>
<th>Action</th>
</tr>
</thead>
<tbody>
<tr ng-repeat="image in images">
<td>{{ image.name }}</td>
<td>{{ (image.size / 1048576).toFixed(2) }} MB</td>
<td><button type="button" class="btn btn-danger">Remove</button></td>
</tr>
</tbody>
</table>
<div class="btn-group btn-group-md" role="group" aria-label="...">
<button type="button" class="btn btn-default" data-toggle="modal" data-target="#uploadImageModal">Upload</button>
<button type="button" class="btn btn-default">Download</button>
</div>
<p></p>
<table class="table table-hover">
<thead>
<tr>
<th>Name</th>
<th>Size</th>
<th>Action</th>
</tr>
</thead>
<tbody>
<tr ng-repeat="image in images">
<td>{{ image.name}}</td>
<td>{{ (image.size / 1048576).toFixed(2)}} MB</td>
<td>
<button type="button" class="btn btn-primary" ng-click="edit(image)">Edit</button>
<button type="button" class="btn btn-danger">Remove</button>
</td>
</tr>
</tbody>
</table>
</div>
</div>

View file

@ -16,11 +16,12 @@
<input type="hidden" name="task" value="image" />
<input type="hidden" name="token" value="{{ token }}" />
<input type="hidden" name="action" value="uploadImage" />
<input type="hidden" name="id" value="2564" />
<input type="hidden" name="id" value="60ed9403-419e-4ea8-933f-dd1750d97360" />
<input type="hidden" name="file_name" value="bob.iso" />
<input name="file" type="file" />
<input type="submit" value="Upload" />
</form>
<div class="modal-footer">
<!--<a href="#" data-dismiss="modal" class="btn btn-default">Close</a>-->