X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/12b9d77ecca3043b65015860359ce447b68fccfb..a06f90e1dcaa2c4ce2613e066e7c1348ec129ba8:/apps/workbench/app/views/collections/_show_upload.html.erb

diff --git a/apps/workbench/app/views/collections/_show_upload.html.erb b/apps/workbench/app/views/collections/_show_upload.html.erb
index f85f628ae4..40bef52ea3 100644
--- a/apps/workbench/app/views/collections/_show_upload.html.erb
+++ b/apps/workbench/app/views/collections/_show_upload.html.erb
@@ -1,46 +1,50 @@
 <div class="arv-log-refresh-control"
-     data-load-throttle="86486400000" <%# 1001 nights %>
+     data-load-throttle="86486400000" <%# 1001 nights (in milliseconds) %>
      ></div>
 <div ng-cloak ng-controller="UploadToCollection" arv-uuid="<%= @object.uuid %>">
   <div class="panel panel-primary">
     <div class="panel-body">
       <div class="row">
         <div class="col-sm-4">
-          <input type="file" multiple ng-model="incoming" onchange="angular.element(this).scope().addFilesToQueue(this.files); $(this).val('');">
+          <input type="file" multiple id="file_selector" ng-model="incoming" onchange="angular.element(this).scope().addFilesToQueue(this.files); $(this).val('');">
           <div class="btn-group btn-group-sm" role="group" style="margin-top: 1.5em">
-            <button type="button" class="btn btn-default" ng-click="stop()" ng-disabled="uploader.state != 'Running'"><i class="fa fa-fw fa-pause"></i> Pause</button>
-            <button type="button" class="btn btn-primary" ng-click="go()" ng-disabled="uploader.state == 'Running' || uploadQueue.length == 0"><i class="fa fa-fw fa-play"></i> Start</button>
+            <button type="button" class="btn btn-default" ng-click="stop()" ng-disabled="uploader.state !== 'Running'"><i class="fa fa-fw fa-pause"></i> Pause</button>
+            <button type="button" class="btn btn-primary" ng-click="go()" ng-disabled="uploader.state === 'Running' || countInStates(['Paused', 'Queued']) === 0"><i class="fa fa-fw fa-play"></i> Start</button>
           </div>
         </div>
         <div class="col-sm-8">
-          <div ng-show="uploader.state == 'Running'"
+          <div ng-show="uploader.state === 'Running'"
                class="alert alert-info"
                ><i class="fa fa-gear"></i>
             Upload in progress.
-            <span ng-show="countDone() > 0">
-              {{countDone()}} file{{countDone()>1?'s':''}} finished.
+            <span ng-show="countInStates(['Done']) > 0">
+              {{countInStates(['Done'])}} file{{countInStates(['Done'])>1?'s':''}} finished.
             </span>
           </div>
-          <div ng-show="uploader.state == 'Idle' && uploader.stateReason"
+          <div ng-show="uploader.state === 'Idle' && uploader.stateReason"
                class="alert alert-success"
-               ><i class="fa fa-flag-checkered"></i> {{uploader.stateReason}}
+               ><i class="fa fa-fw fa-flag-checkered"></i> &nbsp; {{uploader.stateReason}}
           </div>
-          <div ng-show="uploader.state == 'Failed'"
+          <div ng-show="uploader.state === 'Failed'"
                class="alert alert-danger"
-               ><i class="fa fa-warning"></i> {{uploader.stateReason}}
+               ><i class="fa fa-fw fa-warning"></i> &nbsp; {{uploader.stateReason}}
+          </div>
+          <div ng-show="uploader.state === 'Stopped'"
+               class="alert alert-info"
+               ><i class="fa fa-fw fa-info"></i> &nbsp; Paused. Click the Start button to resume uploading.
           </div>
         </div>
       </div>
     </div>
   </div>
-  <div ng-repeat="upload in uploadQueue" class="row" ng-class="{lighten: upload.committed}">
+  <div ng-repeat="upload in uploadQueue" class="row" ng-class="{lighten: upload.state==='Done'}">
     <div class="col-sm-1">
       <button class="btn btn-xs btn-default"
-              ng-show="!upload.committed"
+              ng-show="upload.state!=='Done'"
               ng-click="removeFileFromQueue($index)"
               title="cancel"><i class="fa fa-fw fa-times"></i></button>
       <span class="label label-success label-info"
-            ng-show="upload.committed">finished</span>
+            ng-show="upload.state==='Done'">finished</span>
     </div>
     <div class="col-sm-4 nowrap" style="overflow-x:hidden;text-overflow:ellipsis">
       <span title="{{upload.file.name}}">
@@ -48,14 +52,14 @@
       </span>
     </div>
     <div class="col-sm-1" style="text-align: right">
-      {{upload.file.size/1024 | number:0}}K
+      {{upload.file.size/1024 | number:0}}&nbsp;KiB
     </div>
     <div class="col-sm-2">
       <div class="progress">
         <span class="progress-bar" style="width: {{upload.progress}}%"></span>
       </div>
     </div>
-    <div class="col-sm-4" ng-class="{lighten: upload.state != 'Uploading'}">
+    <div class="col-sm-4" ng-class="{lighten: upload.state !== 'Uploading'}">
       {{upload.statistics}}
     </div>
   </div>