From 4094ef56e050c3d8739ed0646b8eb2d17a7e65f4 Mon Sep 17 00:00:00 2001
From: RaNaN <Mast3rRaNaN@hotmail.de>
Date: Wed, 17 Jul 2013 13:56:06 +0200
Subject: improved progressbar rendering

---
 .../web/app/templates/default/header/progress.html | 12 ++++------
 .../templates/default/header/progressStatus.html   |  8 +++++++
 .../app/templates/default/header/progressSub.html  |  6 +++++
 .../app/templates/default/header/progressSup.html  | 10 ++++++++
 .../app/templates/default/header/progressbar.html  | 27 +++++++---------------
 5 files changed, 36 insertions(+), 27 deletions(-)
 create mode 100644 pyload/web/app/templates/default/header/progressStatus.html
 create mode 100644 pyload/web/app/templates/default/header/progressSub.html
 create mode 100644 pyload/web/app/templates/default/header/progressSup.html

(limited to 'pyload/web/app/templates/default/header')

diff --git a/pyload/web/app/templates/default/header/progress.html b/pyload/web/app/templates/default/header/progress.html
index 4ef5a1cd6..740e18a4c 100644
--- a/pyload/web/app/templates/default/header/progress.html
+++ b/pyload/web/app/templates/default/header/progress.html
@@ -4,11 +4,7 @@
 <div class="progress">
     <div class="bar" style="width: {{ percent }}%"></div>
 </div>
-{{#if downloading }}
-{{ formatSize done }} of {{ formatSize total }} ({{ formatSize download.speed }}/s)
-{{ else }}
-{{ statusmsg }}
-{{/if}}
-<span class="pull-right">
-    {{ formatTime eta }}
-</span>
\ No newline at end of file
+
+<div class="progress-status">
+    <!-- rendered by progressInfo template -->
+</div>
diff --git a/pyload/web/app/templates/default/header/progressStatus.html b/pyload/web/app/templates/default/header/progressStatus.html
new file mode 100644
index 000000000..020ed2e96
--- /dev/null
+++ b/pyload/web/app/templates/default/header/progressStatus.html
@@ -0,0 +1,8 @@
+{{#if downloading }}
+    {{ formatSize done }} of {{ formatSize total }} ({{ formatSize download.speed }}/s)
+{{ else }}
+    {{ statusmsg }}
+{{/if}}
+<span class="pull-right">
+    {{ formatTime eta }}
+</span>
\ No newline at end of file
diff --git a/pyload/web/app/templates/default/header/progressSub.html b/pyload/web/app/templates/default/header/progressSub.html
new file mode 100644
index 000000000..3400ee011
--- /dev/null
+++ b/pyload/web/app/templates/default/header/progressSub.html
@@ -0,0 +1,6 @@
+{{#if linksqueue }}
+    {{ linksqueue }} downloads left ({{ formatSize sizequeue }})
+{{/if}}
+<span class="pull-right">
+    {{ formatTime etaqueue }}
+</span>
\ No newline at end of file
diff --git a/pyload/web/app/templates/default/header/progressSup.html b/pyload/web/app/templates/default/header/progressSup.html
new file mode 100644
index 000000000..f2c0ac734
--- /dev/null
+++ b/pyload/web/app/templates/default/header/progressSup.html
@@ -0,0 +1,10 @@
+{{#if single }}
+    {{ truncate name 32}} ({{ statusmsg }})
+{{ else }}
+    {{#if downloads }}
+        {{ downloads }} downloads running {{#if speed }}({{ formatSize speed }}/s){{/if}}
+    {{ else }}
+        No running tasks
+    {{/if}}
+{{/if}}
+<i class="icon-list pull-right"></i>
\ No newline at end of file
diff --git a/pyload/web/app/templates/default/header/progressbar.html b/pyload/web/app/templates/default/header/progressbar.html
index a36fb5684..2775e664b 100644
--- a/pyload/web/app/templates/default/header/progressbar.html
+++ b/pyload/web/app/templates/default/header/progressbar.html
@@ -1,14 +1,7 @@
-{{#if single }}
-    {{ truncate name 32}} ({{ statusmsg }})
-{{ else }}
-    {{#if downloads }}
-        {{ downloads }} downloads running {{#if speed }}({{ formatSize speed }}/s){{/if}}
-    {{ else }}
-        No running tasks
-    {{/if}}
-{{/if}}
-<i class="icon-list pull-right"></i>
-<!-- TODO active animation -->
+
+<div class="sup">
+</div>
+
 <div class="progress" id="globalprogress">
     {{#if single }}
     <div class="bar" style="width: {{ percent }}%">
@@ -17,11 +10,7 @@
             {{/if}}
         </div>
     </div>
-    <div class="sub">
-        {{#if linksqueue }}
-        {{ linksqueue }} downloads left ({{ formatSize sizequeue }})
-        {{/if}}
-    <span class="pull-right">
-        {{ formatTime etaqueue }}
-    </span>
-    </div>
\ No newline at end of file
+</div>
+
+<div class="sub">
+</div>
\ No newline at end of file
-- 
cgit v1.2.3