From 315192a0ab42b80ec2b83d8450dc91ef7c3ad68e Mon Sep 17 00:00:00 2001
From: godofdream <soilfiction@gmail.com>
Date: Tue, 14 Aug 2012 23:18:20 +0200
Subject: improved QueueLayout

---
 module/web/static/css/default/queue.css | 28 +++++++++++++++++++---------
 module/web/templates/default/queue.html |  5 +++--
 2 files changed, 22 insertions(+), 11 deletions(-)

(limited to 'module')

diff --git a/module/web/static/css/default/queue.css b/module/web/static/css/default/queue.css
index 645beadae..23af09403 100644
--- a/module/web/static/css/default/queue.css
+++ b/module/web/static/css/default/queue.css
@@ -20,7 +20,7 @@
 	cursor: pointer;
     border: 2px solid #000000;
     margin: 0px;
-	height: 23px;
+	height: 25px;
 	-moz-border-radius-topleft: 10px;
 	-moz-border-radius-topright: 10px;
 	-webkit-border-top-left-radius: 10px;
@@ -33,25 +33,35 @@
 	cursor: move; 
 	height: 20px;
 	float: left;
-	margin-left: 5px;
-	padding-left: 25px;
+	margin: 2px 7px;
+	padding: 0 0 0 20px;
 	background: url("../../img/default/icon_folder.png")no-repeat;
 }
 
 .pack_name{
+	float: left;
+	vertical-align: middle;
+	color: #FFFFFF;
+}
+
+.pack_progressbar_wrapper{
+	float: left;
+    margin: 4px auto 4px auto;
+	text-align: center;
 	vertical-align: middle;
-	color: #D5D5D5;
+	width: 50%;
+	height: 15px;
 }
 
 .pack_progressbar{
-    height: 8px;
-    margin: 8px 5px;
+    height: 15px;
 }
 
 .pack_toolbar{
-	height: 24px;
-	float: left;
-	padding-left: 22px;
+	height: 20px;
+	float: right;
+	padding: 0 0 0 20px;
+	margin: 2px 7px;
 }
 
 .pack_toolbar  div{
diff --git a/module/web/templates/default/queue.html b/module/web/templates/default/queue.html
index 50d1d3418..d13cca776 100644
--- a/module/web/templates/default/queue.html
+++ b/module/web/templates/default/queue.html
@@ -43,14 +43,15 @@ document.addEvent("domready", function(){
 		<div class="pack_header">
 			<div class="pack_icon"></div>
 			<span class="pack_name">TestPackage</span>
-			
+			<div class="pack_progressbar_wrapper">
+				<div id="pack_progress_1" class="pack_progressbar"></div>
+			</div>
 			<div class="pack_toolbar">
 				<div class="pack_toolbar_delete" title='{{_("Delete Package")}}'></div>
 				<div class="pack_toolbar_restart" title='{{_("Restart Package")}}'></div>
 				<div class="pack_toolbar_edit" title='{{_("Edit Package")}}'></div>
 			</div>
 		</div>
-		<div id="pack_progress_1" class="pack_progressbar"></div>
 		
 		<div id="children_1" class="pack_children">
 			<span class="child_secrow">{{_("Folder:")}} <span class="folder">TestPackage/</span> | {{_("Password:")}} <span class="password">trololo</span></span>
-- 
cgit v1.2.3