diff options
| author | Loic GUEGAN <loic@Manzerbredes.home> | 2016-05-06 14:06:56 +0200 |
|---|---|---|
| committer | Loic GUEGAN <loic@Manzerbredes.home> | 2016-05-06 14:06:56 +0200 |
| commit | 664cddd4fa519c2e8a9233a36c0fd020f7142cd6 (patch) | |
| tree | 9fdd2953d6aa704d7f3f20e3d1df044fb1f19810 /client/partials | |
| parent | 43e76785f0fca02b47b7aef9bd1b6ebb00a0c870 (diff) | |
Add status to image
Diffstat (limited to 'client/partials')
| -rw-r--r-- | client/partials/image/image.html | 6 | ||||
| -rw-r--r-- | client/partials/image/upload.html | 1 |
2 files changed, 5 insertions, 2 deletions
diff --git a/client/partials/image/image.html b/client/partials/image/image.html index 9c17c2f..a789ae8 100644 --- a/client/partials/image/image.html +++ b/client/partials/image/image.html @@ -8,7 +8,7 @@ <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" ng-click="showUploadImageModal()">Upload</button> <button type="button" class="btn btn-default">Download</button> </div> <p></p> @@ -16,6 +16,7 @@ <thead> <tr> <th>Name</th> + <th>Status</th> <th>Size</th> <th>Action</th> </tr> @@ -23,6 +24,9 @@ <tbody> <tr ng-repeat="image in images"> <td>{{ image.name}}</td> + <td ng-if="image.status == 'queued'"><font color="red">{{ image.status}}</font></td> + <td ng-if="image.status != 'queued'"><font color="green">{{ image.status}}</font></td> + <td>{{ (image.size / 1048576).toFixed(2)}} MB</td> <td> <button type="button" class="btn btn-primary" ng-click="edit(image)">Edit</button> diff --git a/client/partials/image/upload.html b/client/partials/image/upload.html index 641646b..b3e8767 100644 --- a/client/partials/image/upload.html +++ b/client/partials/image/upload.html @@ -11,7 +11,6 @@ </div> <div class="modal-body"> - <form action="../server/index.php" method="post"> <input type="hidden" name="task" value="image" /> <input type="hidden" name="token" value="{{ token }}" /> |