From bd976506276a5e85530e53878e72f6535300acee Mon Sep 17 00:00:00 2001
From: mariusbaumann <baumann.marius@gmail.com>
Date: Sun, 5 Apr 2015 14:10:43 +0200
Subject: Revert "Merge branch 'pr/2' into stable"

This reverts commit 7c21c6f9417bb19ba240f1f4bbde9ace7dc0f6ef, reversing
changes made to 10b65f5319c679bac3a596eb30946fd2e89a3da7.
---
 module/web/templates/default/queue.html | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

(limited to 'module/web/templates/default/queue.html')

diff --git a/module/web/templates/default/queue.html b/module/web/templates/default/queue.html
index fbda48f7a..62d0be777 100644
--- a/module/web/templates/default/queue.html
+++ b/module/web/templates/default/queue.html
@@ -52,18 +52,20 @@ document.addEvent("domready", function(){
     </div>
     {% set progress = (package.linksdone * 100) / package.linkstotal %}
 
-    <div id="progress" class="progress" style="float:left; width: 50%; margin-top: -5px; color:#fff; font-weight: 700; font-size:12px;">
-        <div class="progress-bar" role="progressbar" style="width: {{ progress }}%; height: 100%; position: relative; z-index: 1;">
-            <label>{{ package.linksdone }} / {{ package.linkstotal }}</label>
+    <div id="progress" class="progress" style="float:left; width: 50%; margin-top: -5px;">
+        <div class="progress-bar" role="progressbar" style="width: {{ progress }}%; height: 100%;">
+                <label>
+                {{ package.linksdone }} / {{ package.linkstotal }}</label>
         </div>
-        <label style="right: 30px; position: absolute; z-index: 2; color:#fff;">
-            {{ package.sizedone|formatsize }} / {{ package.sizetotal|formatsize }}</label>
+        <label style="padding-right: 5px ;float: right;">
+        {{ package.sizedone|formatsize }} / {{ package.sizetotal|formatsize }}</label>
         </div>
     <div style="clear: both; margin-bottom: -10px"></div>
 
     <div id="children_{{package.pid}}" style="display: none; margin-bottom: 15px;" class="children">
-        <span class="child_secrow" style="margin-bottom: 30px; margin-top: 5px;">{{_("Folder:")}} <span class="folder">{{package.folder}}</span> | {{_("Password:")}} <span class="password">{{package.password}}</span></span>
-        <ul id="sort_children_{{package.pid}}" style="list-style: none; padding-left: 0"></ul>
+    <span class="child_secrow" style="margin-bottom: 30px; margin-top: 5px;">{{_("Folder:")}} <span class="folder">{{package.folder}}</span> | {{_("Password:")}} <span class="password">{{package.password}}</span></span>
+    <ul id="sort_children_{{package.pid}}" style="list-style: none; padding-left: 0">
+    </ul>
     </div>
 </div>
     </li>
@@ -104,4 +106,4 @@ document.addEvent("domready", function(){
     </form>
 
 </div>
-{% endblock %}
+{% endblock %}
\ No newline at end of file
-- 
cgit v1.2.3