Fixed progress bar alignment on Firefox.

diff --git a/apps/workbench/app/assets/stylesheets/application.css.scss b/apps/workbench/app/assets/stylesheets/application.css.scss
index 7a26c709ff678842597383190822b2933ec84ee4..f9173898e31757379358c734ad88594070fb8fe9 100644 (file)
--- a/apps/workbench/app/assets/stylesheets/application.css.scss
+++ b/apps/workbench/app/assets/stylesheets/application.css.scss
@@ -122,7 +122,7 @@ ul.arvados-nav li ul li {
 }
 
 .inline-progress-container {
-    width: 100px;
+    width: 100%;
     display:inline-block;
 }
 

diff --git a/apps/workbench/app/helpers/pipeline_instances_helper.rb b/apps/workbench/app/helpers/pipeline_instances_helper.rb
index 3a923e1e007e320ff3804290ccec5f58c9e85bf5..f3ac35dec38a88239a2a91f891ff62fc52df5f61 100644 (file)
--- a/apps/workbench/app/helpers/pipeline_instances_helper.rb
+++ b/apps/workbench/app/helpers/pipeline_instances_helper.rb
@@ -44,14 +44,14 @@ module PipelineInstancesHelper
   def render_pipeline_job pj
     if pj[:percent_done]
       pj[:progress_bar] = raw <<EOF
-<div class="progress" style="width:100px">
+<div class="progress" style="width:100%">
   <span class="progress-bar progress-bar-success" style="width:#{pj[:percent_done]}%"></span>
   <span class="progress-bar" style="width:#{pj[:percent_running]}%"></span>
 </div>
 EOF
     elsif pj[:progress]
       raw <<EOF
-<div class="progress" style="width:100px">
+<div class="progress" style="width:100%">
 <span class="progress-bar" style="width:#{pj[:progress]*100}%">
 </span>
 </div>

diff --git a/apps/workbench/app/views/users/_tables.html.erb b/apps/workbench/app/views/users/_tables.html.erb
index 320f32c5716f67a346eef72bd03dfd65478fc572..f9e3b6c8bec38c36482f99224af7f296cea3b463 100644 (file)
--- a/apps/workbench/app/views/users/_tables.html.erb
+++ b/apps/workbench/app/views/users/_tables.html.erb
@@ -12,7 +12,8 @@
           <col width="20%" />
           <col width="20%" />
           <col width="13%" />
-          <col width="27%" />
+          <col width="13%" />
+          <col width="20%" />
         </colgroup>
 
         <tr>
@@ -21,6 +22,7 @@
          <th>Log</th>
          <th>Age</th>
          <th>Status</th>
+         <th>Progress</th>
        </tr>
 
         <% @my_jobs[0..6].each do |j| %>
@@ -82,8 +84,10 @@
   <% else %>
     <span class="label">queued</span>
   <% end %>
+</td>
+<td>
   <% percent_total_tasks = 100 / (j.tasks_summary[:running] + j.tasks_summary[:done] + j.tasks_summary[:todo]) rescue 0 %>
-  <div class="inline-progress-container pull-right">
+  <div class="inline-progress-container">
     <div class="progress">
       <span class="progress-bar progress-bar-success" style="width: <%= j.tasks_summary[:done] * percent_total_tasks rescue 0 %>%;">
       </span>
@@ -115,7 +119,8 @@
         <col width="30%" />
         <col width="30%" />
         <col width="13%" />
-        <col width="27%" />
+        <col width="13%" />
+        <col width="20%" />
       </colgroup>
 
       <tr>
@@ -123,6 +128,7 @@
        <th>Template</th>
        <th>Age</th>
        <th>Status</th>
+       <th>Progress</th>
       </tr>
 
       <% @my_pipelines[0..6].each do |p| %>
@@ -158,9 +164,10 @@
             <% else %>
               <span class="label">queued</span>
             <% end %>
-
+          </td>
+          <td>
             <% summary = pipeline_summary p %>
-            <div class="inline-progress-container pull-right">
+            <div class="inline-progress-container">
               <div class="progress">
                 <span class="progress-bar progress-bar-success" style="width: <%= summary[:percent_done] %>%;">
                 </span>