better output formatting, somefixes

3 files changed, 6 insertions, 6 deletions

diff --git a/module/web/templates/default/collector.html b/module/web/templates/default/collector.html
index b0d5b1839..09725103b 100644
--- a/module/web/templates/default/collector.html
+++ b/module/web/templates/default/collector.html
@@ -121,12 +121,12 @@ document.addEvent("domready", function(){
     {% for lid, child in package.links.iteritems %}

     <div class="child" id="file_{{lid}}">

         <span class="child_status">

-            <img src="/media/default/img/status_{{child.status_type}}.png" style="width: 12px; height:12px;"/>

+            <img src="/media/default/img/{{child.icon}}" style="width: 12px; height:12px;"/>

         </span>

         <span style="font-size: 15px">{{ child.name }}</span><br />

     <div class="child_secrow">

         <span class="child_status">{{ child.status }}</span>{{child.error}}&nbsp;

-        <span class="child_status">{{ child.size }} KB</span>

+        <span class="child_status">{{ child.format_size }}/span>

         <span class="child_status">{{ child.plugin }}</span>

         <span class="child_status">{% trans "Folder:" %} {{child.folder}}</span>

         &nbsp;&nbsp;

diff --git a/module/web/templates/default/home.html b/module/web/templates/default/home.html
index 76f87b203..b4602f021 100644
--- a/module/web/templates/default/home.html
+++ b/module/web/templates/default/home.html
@@ -171,7 +171,7 @@ var LinkEntry = new Class({
                 this.elements.name.set('text', item.name);

                 this.elements.status.set('text', item.statusmsg);

                 this.elements.info.set('text', item.info);

-                this.elements.kbleft.set('text', HumanFileSize(item.size / (1024)));

+                this.elements.kbleft.set('text', item.format_size);

                 this.elements.percent.set('text', item.percent+ '% / '+ HumanFileSize((item.size-item.kbleft) / (1024)));

                 this.bar.start({

                     'width': item.percent,

@@ -210,7 +210,7 @@ var LinkEntry = new Class({
     <td id="link_{{ link.id }}_name">{{ link.name }}</td>

     <td id="link_{{ link.id }}_status">{{ link.status }}</td>

     <td id="link_{{ link.id }}_info">{{ link.info }}</td>

-    <td id="link_{{ link.id }}_kbleft">{{ link.size }}</td>

+    <td id="link_{{ link.id }}_kbleft">{{ link.format_size }}</td>

     <td>

         <font id="link_{{ link.id }}_percent">{{ link.percent }}% /{{ link.kbleft }}</font>

         <img id="link_{{ link.id }}_remove" style="vertical-align: middle; margin-right: -20px; margin-left: 5px; margin-top: -2px; cursor:pointer;" src="media/default/img/control_cancel.png"/>

diff --git a/module/web/templates/default/queue.html b/module/web/templates/default/queue.html
index 71285ddb8..2ca25e03d 100644
--- a/module/web/templates/default/queue.html
+++ b/module/web/templates/default/queue.html
@@ -109,12 +109,12 @@ document.addEvent("domready", function(){
     {% for lid, child in package.links.iteritems %}

     <div class="child" id="file_{{lid}}">

         <span class="child_status">

-            <img src="/media/default/img/status_{{child.status}}.png" style="width: 12px; height:12px;"/>

+            <img src="/media/default/img/{{child.icon}}" style="width: 12px; height:12px;"/>

         </span>

         <span style="font-size: 15px">{{ child.name }}</span><br />

     <div class="child_secrow">

         <span class="child_status">{{ child.statusmsg }}</span>{{child.error}}&nbsp;

-        <span class="child_status">{{ child.size }} KB</span>

+        <span class="child_status">{{ child.format_size }}</span>

         <span class="child_status">{{ child.plugin }}</span>

         <span class="child_status">{% trans "Folder:" %} {{package.folder}}</span>

         &nbsp;&nbsp;