Fixed styling of plupload to match the rest of the ui
authorChristos Stathis <chstath@ebs.gr>
Mon, 6 Feb 2012 16:47:55 +0000 (18:47 +0200)
committerChristos Stathis <chstath@ebs.gr>
Mon, 6 Feb 2012 16:47:55 +0000 (18:47 +0200)
src/gr/grnet/pithos/web/client/FileUploadDialog.java
src/gr/grnet/pithos/web/public/pithos.css
src/gr/grnet/pithos/web/public/plupload/js/jquery.plupload.queue/css/jquery.plupload.queue.css

index 7532ef0..919c4fd 100644 (file)
@@ -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()();
        }-*/;
 }
index 625d7c2..39b784f 100644 (file)
@@ -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;
index 8581fdd..3acc0ac 100644 (file)
@@ -5,36 +5,38 @@
 .plupload_button {\r
        display: -moz-inline-box; /* FF < 3*/\r
        display: inline-block;\r
-       font: normal 12px sans-serif;\r
+/*     font: normal 12px sans-serif;*/\r
        text-decoration: none;\r
-    color: #42454a;\r
-    border: 1px solid #bababa;\r
-    padding: 2px 8px 3px 20px;\r
+/*    color: #42454a;*/\r
+/*    border: 1px solid #bababa;*/\r
+/*    padding: 2px 8px 3px 20px;*/\r
+       padding: 5px 6px;\r
        margin-right: 4px;\r
-    background: #f3f3f3 url('../img/buttons.png') no-repeat 0 center;\r
+/*    background: #f3f3f3 url('../img/buttons.png') no-repeat 0 center;*/\r
+       background-color: #4085A5;\r
        outline: 0;\r
 \r
     /* Optional rounded corners for browsers that support it */\r
-    -moz-border-radius: 3px;\r
+/*    -moz-border-radius: 3px;\r
     -khtml-border-radius: 3px;\r
     -webkit-border-radius: 3px;\r
-    border-radius: 3px;\r
+    border-radius: 3px;*/\r
 }\r
 \r
 .plupload_button:hover {\r
-       color: #000;\r
-       text-decoration: none;\r
+/*     color: #000;\r
+       text-decoration: none;*/\r
 }\r
 \r
 .plupload_disabled, a.plupload_disabled:hover {\r
     color: #737373;\r
     border-color: #c5c5c5;\r
-    background: #ededed url('../img/buttons-disabled.png') no-repeat 0 center;\r
+/*    background: #ededed url('../img/buttons-disabled.png') no-repeat 0 center;*/\r
        cursor: default;\r
 }\r
 \r
 .plupload_add {\r
-       background-position: -181px center;\r
+/*     background-position: -181px center;*/\r
 }\r
 \r
 .plupload_wrapper {\r
@@ -43,8 +45,8 @@
 }\r
 \r
 .plupload_container {\r
-       padding: 8px;\r
-       background: url('../img/transp50.png');\r
+/*     padding: 8px;*/\r
+/*     background: url('../img/transp50.png');*/\r
        /*-moz-border-radius: 5px;*/\r
 }\r
 \r
        width: 98%;\r
 }\r
 \r
-.plupload_header {background: #2A2C2E url('../img/backgrounds.gif') repeat-x;}\r
+.plupload_header {/*background: #2A2C2E url('../img/backgrounds.gif') repeat-x;*/}\r
 .plupload_header_content {\r
-       background: url('../img/backgrounds.gif') no-repeat 0 -317px;\r
+/*/    background: url('../img/backgrounds.gif') no-repeat 0 -317px;*/\r
        min-height: 56px;\r
-       padding-left: 60px;\r
-       color: #FFF;\r
+/*     padding-left: 60px;*/\r
+/*     color: #FFF;*/\r
 }\r
 .plupload_header_title {\r
        font: normal 18px sans-serif;\r
 }\r
 \r
 .plupload_filelist_header, .plupload_filelist_footer {\r
-       background: #DFDFDF;\r
+/*     background: #DFDFDF;*/\r
+       background: #74aec9;\r
        padding: 8px 8px;\r
-       color: #42454A;\r
+/*     color: #42454A;*/\r
 }\r
 .plupload_filelist_header {    \r
        border-top: 1px solid #EEE;\r
        border-bottom: 1px solid #CDCDCD;\r
 }\r
 \r
-.plupload_filelist_footer {border-top: 1px solid #FFF; height: 22px; line-height: 20px; vertical-align: middle;}\r
+.plupload_filelist_footer {/*border-top: 1px solid #FFF; height: 22px; line-height: 20px;*/ vertical-align: middle;}\r
 .plupload_file_name {float: left; overflow: hidden}\r
-.plupload_file_status {color: #777;}\r
-.plupload_file_status span {color: #42454A;}\r
+.plupload_file_status {/*color: #777;*/}\r
+.plupload_file_status span {/*color: #42454A;*/}\r
 .plupload_file_size, .plupload_file_status, .plupload_progress {\r
        float: right;\r
        width: 80px;\r
        height: 16px;\r
 }\r
 \r
-li.plupload_uploading {background: #ECF3DC url('../img/backgrounds.gif') repeat-x 0 -238px;}\r
+li.plupload_uploading {\r
+       background: #ECF3DC url('../img/backgrounds.gif') repeat-x 0 -238px;\r
+       background-color: #A1C8DB;\r
+}\r
 li.plupload_done {color:#AAA}\r
 \r
 li.plupload_delete a {\r