From b86bbb0e82de1404f89b6cd9bc2e6d289bf5b731 Mon Sep 17 00:00:00 2001
From: "Matt@MBP13-PC" <unknown@kiln.example.com>
Date: Tue, 21 Aug 2012 07:06:07 -0100
Subject: [PATCH] Tweaked some file uploader styles

---
 .../FolderBrowser/Css/folderbrowser.css          |  9 +++++++++
 .../FolderBrowser/Js/folderbrowser.js            | 16 +++++++++++++---
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/src/Umbraco.Web.UI/umbraco_client/FolderBrowser/Css/folderbrowser.css b/src/Umbraco.Web.UI/umbraco_client/FolderBrowser/Css/folderbrowser.css
index 8483779b3b..118f378233 100644
--- a/src/Umbraco.Web.UI/umbraco_client/FolderBrowser/Css/folderbrowser.css
+++ b/src/Umbraco.Web.UI/umbraco_client/FolderBrowser/Css/folderbrowser.css
@@ -91,6 +91,15 @@
     vertical-align: middle;
 }
 
+.upload-panel .buttons {
+    text-align: right;
+}
+
+.upload-panel .buttons span {
+    display: block;
+    float: left;
+}
+
 .umbFolderBrowser .breadcrumb {
     margin: 20px 20px 15px;
     padding: 0 0 10px;
diff --git a/src/Umbraco.Web.UI/umbraco_client/FolderBrowser/Js/folderbrowser.js b/src/Umbraco.Web.UI/umbraco_client/FolderBrowser/Js/folderbrowser.js
index 669ee65002..9bafbefc33 100644
--- a/src/Umbraco.Web.UI/umbraco_client/FolderBrowser/Js/folderbrowser.js
+++ b/src/Umbraco.Web.UI/umbraco_client/FolderBrowser/Js/folderbrowser.js
@@ -188,10 +188,15 @@ Umbraco.Sys.registerNamespace("Umbraco.Controls");
                 "<span class='progress'><span data-bind=\"style: { width: progress() + '%' }\"></span></span>" +
                 "<a href='' data-bind='click: cancel'><img src='images/delete.png' /></a>" +
                 "</li></ul>" +
+                "<div class='buttons'>" +
+                "<span>" +
                 "<button class='button upload' data-bind='enable: queued().length > 0'>Upload</button>" +
-                "<input type='checkbox' id='replaceExisting' />" +
-                "<label for='replaceExisting'>Overwrite existing?</label>" +
-                "<a href='#' class='cancel'>Cancel</a>" +
+                "<input type='checkbox' id='replaceExisting' data-bind='enable: queued().length > 0' />" +
+                "<label for='replaceExisting'>Overwrite existing?</label> " +
+                "</span>" +
+                "<a href='#' class='cancel'>Cancel All</a> &nbsp; " +
+                "<a href='#' class='close'>Close</a>" +
+                "</div>" +
                 "</div>" +
                 "</div>");
 
@@ -262,6 +267,11 @@ Umbraco.Sys.registerNamespace("Umbraco.Controls");
                 e.preventDefault();
                 $("#fileupload").fileUploader("cancelAll");
             });
+            
+            $(".upload-overlay .close").click(function (e) {
+                e.preventDefault();
+                $(".upload-overlay").hide();
+            });
 
             // Listen for drag events
             $(".umbFolderBrowser").live('dragenter dragover', function (e) {