improved ui, render waiting files

1 files changed, 7 insertions, 3 deletions

diff --git a/module/web/templates/default/base.html b/module/web/templates/default/base.html
index ebaac59e9..f8dd10c4e 100644
--- a/module/web/templates/default/base.html
+++ b/module/web/templates/default/base.html
@@ -40,7 +40,7 @@
     </script>

     <script type="text/template" id="template-header">

         <%= if downloads %>

-            <% downloads %> downloads running (<% formatSize speed %>/s)

+            <% downloads %> downloads running <%= if speed %>(<% formatSize speed %>/s)<%/if%>

         <% else %>

             No running tasks

         <%/if%>

@@ -64,9 +64,13 @@
         <div class="progress">

             <div class="bar" style="width: <% percent %>%"></div>

         </div>

-        <% formatSize done %> of <% formatSize total %> (<% formatSize download.speed %>/s)

+        <%= if downloading %>

+            <% formatSize done %> of <% formatSize total %> (<% formatSize download.speed %>/s)

+        <% else %>

+            <% statusmsg %>

+        <%/if%>

         <span class="pull-right">

-            <% percent %>%

+{#            <% percent %>%#}

             <% formatTime eta %>

         </span>

     </script>