From: Christos Stathis <chstath@ebs.gr>
Date: Mon, 6 Feb 2012 16:47:55 +0000 (+0200)
Subject: Fixed styling of plupload to match the rest of the ui
X-Git-Tag: v0.2~8
X-Git-Url: https://code.grnet.gr/git/pithos-web-client/commitdiff_plain/5d69baf7e24b182aa83c55e1f460713fbadc1845

Fixed styling of plupload to match the rest of the ui
---

diff --git a/src/gr/grnet/pithos/web/client/FileUploadDialog.java b/src/gr/grnet/pithos/web/client/FileUploadDialog.java
index 7532ef0..919c4fd 100644
--- a/src/gr/grnet/pithos/web/client/FileUploadDialog.java
+++ b/src/gr/grnet/pithos/web/client/FileUploadDialog.java
@@ -201,28 +201,7 @@ public class FileUploadDialog extends DialogBox {
 				}
 			}
 		});
-	
-		// Client side form validation
-//		$wnd.$('form').submit(function(e) {
-//	        var uploader = $wnd.$('#uploader').pluploadQueue();
-//	
-//	        // Files in queue upload them first
-//	        if (uploader.files.length > 0) {
-//	            // When all files are uploaded submit form
-//	            uploader.bind('StateChanged', function() {
-//	                if (uploader.files.length === (uploader.total.uploaded + uploader.total.failed)) {
-//	                    $wnd.$('form')[0].submit();
-//	                }
-//	            });
-//	                
-//	            uploader.start();
-//	        } else {
-//	            alert('You must queue at least one file.');
-//	        }
-//	
-//	        return false;
-//	    });
-	    
+
 	    dlg.@gr.grnet.pithos.web.client.FileUploadDialog::center()();
 	}-*/;
 }
diff --git a/src/gr/grnet/pithos/web/public/pithos.css b/src/gr/grnet/pithos/web/public/pithos.css
index 625d7c2..39b784f 100644
--- a/src/gr/grnet/pithos/web/public/pithos.css
+++ b/src/gr/grnet/pithos/web/public/pithos.css
@@ -554,10 +554,6 @@ div#toolbar a {
     width: 100%;
 }
 
-/*button styles*/
-.pithos-dialogbox .button {
-}
-
 /*button position within the overlay content*/
 .dialogMiddleCenterInner .button {
     margin-left: 2px;
diff --git a/src/gr/grnet/pithos/web/public/plupload/js/jquery.plupload.queue/css/jquery.plupload.queue.css b/src/gr/grnet/pithos/web/public/plupload/js/jquery.plupload.queue/css/jquery.plupload.queue.css
index 8581fdd..3acc0ac 100644
--- a/src/gr/grnet/pithos/web/public/plupload/js/jquery.plupload.queue/css/jquery.plupload.queue.css
+++ b/src/gr/grnet/pithos/web/public/plupload/js/jquery.plupload.queue/css/jquery.plupload.queue.css
@@ -5,36 +5,38 @@
 .plupload_button {
 	display: -moz-inline-box; /* FF < 3*/
 	display: inline-block;
-	font: normal 12px sans-serif;
+/*	font: normal 12px sans-serif;*/
 	text-decoration: none;
-    color: #42454a;
-    border: 1px solid #bababa;
-    padding: 2px 8px 3px 20px;
+/*    color: #42454a;*/
+/*    border: 1px solid #bababa;*/
+/*    padding: 2px 8px 3px 20px;*/
+	padding: 5px 6px;
 	margin-right: 4px;
-    background: #f3f3f3 url('../img/buttons.png') no-repeat 0 center;
+/*    background: #f3f3f3 url('../img/buttons.png') no-repeat 0 center;*/
+	background-color: #4085A5;
 	outline: 0;
 
     /* Optional rounded corners for browsers that support it */
-    -moz-border-radius: 3px;
+/*    -moz-border-radius: 3px;
     -khtml-border-radius: 3px;
     -webkit-border-radius: 3px;
-    border-radius: 3px;
+    border-radius: 3px;*/
 }
 
 .plupload_button:hover {
-	color: #000;
-	text-decoration: none;
+/*	color: #000;
+	text-decoration: none;*/
 }
 
 .plupload_disabled, a.plupload_disabled:hover {
     color: #737373;
     border-color: #c5c5c5;
-    background: #ededed url('../img/buttons-disabled.png') no-repeat 0 center;
+/*    background: #ededed url('../img/buttons-disabled.png') no-repeat 0 center;*/
 	cursor: default;
 }
 
 .plupload_add {
-	background-position: -181px center;
+/*	background-position: -181px center;*/
 }
 
 .plupload_wrapper {
@@ -43,8 +45,8 @@
 }
 
 .plupload_container {
-	padding: 8px;
-	background: url('../img/transp50.png');
+/*	padding: 8px;*/
+/*	background: url('../img/transp50.png');*/
 	/*-moz-border-radius: 5px;*/
 }
 
@@ -54,12 +56,12 @@
 	width: 98%;
 }
 
-.plupload_header {background: #2A2C2E url('../img/backgrounds.gif') repeat-x;}
+.plupload_header {/*background: #2A2C2E url('../img/backgrounds.gif') repeat-x;*/}
 .plupload_header_content {
-	background: url('../img/backgrounds.gif') no-repeat 0 -317px;
+/*/	background: url('../img/backgrounds.gif') no-repeat 0 -317px;*/
 	min-height: 56px;
-	padding-left: 60px;
-	color: #FFF;
+/*	padding-left: 60px;*/
+/*	color: #FFF;*/
 }
 .plupload_header_title {
 	font: normal 18px sans-serif;
@@ -88,19 +90,20 @@
 }
 
 .plupload_filelist_header, .plupload_filelist_footer {
-	background: #DFDFDF;
+/*	background: #DFDFDF;*/
+	background: #74aec9;
 	padding: 8px 8px;
-	color: #42454A;
+/*	color: #42454A;*/
 }
 .plupload_filelist_header {	
 	border-top: 1px solid #EEE;
 	border-bottom: 1px solid #CDCDCD;
 }
 
-.plupload_filelist_footer {border-top: 1px solid #FFF; height: 22px; line-height: 20px; vertical-align: middle;}
+.plupload_filelist_footer {/*border-top: 1px solid #FFF; height: 22px; line-height: 20px;*/ vertical-align: middle;}
 .plupload_file_name {float: left; overflow: hidden}
-.plupload_file_status {color: #777;}
-.plupload_file_status span {color: #42454A;}
+.plupload_file_status {/*color: #777;*/}
+.plupload_file_status span {/*color: #42454A;*/}
 .plupload_file_size, .plupload_file_status, .plupload_progress {
 	float: right;
 	width: 80px;
@@ -122,7 +125,10 @@
 	height: 16px;
 }
 
-li.plupload_uploading {background: #ECF3DC url('../img/backgrounds.gif') repeat-x 0 -238px;}
+li.plupload_uploading {
+	background: #ECF3DC url('../img/backgrounds.gif') repeat-x 0 -238px;
+	background-color: #A1C8DB;
+}
 li.plupload_done {color:#AAA}
 
 li.plupload_delete a {