From 18488563fa67b009ec3bc3360c54b9737dff08c7 Mon Sep 17 00:00:00 2001
From: starfighter83 <unknown@kiln.example.com>
Date: Tue, 14 Sep 2010 11:29:23 +0000
Subject: [PATCH] WIP installer refactor, image uploader check for valid image

[TFS Changeset #77173]
---
 .../LiveEditing/Modules/SkinModule/ImageUploader.aspx    | 1 +
 .../LiveEditing/Modules/SkinModule/ImageUploader.aspx.cs | 3 ++-
 .../Modules/SkinModule/ImageUploader.aspx.designer.cs    | 9 +++++++++
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/umbraco/presentation/umbraco/LiveEditing/Modules/SkinModule/ImageUploader.aspx b/umbraco/presentation/umbraco/LiveEditing/Modules/SkinModule/ImageUploader.aspx
index 10dab83e77..2f3cac5ff8 100644
--- a/umbraco/presentation/umbraco/LiveEditing/Modules/SkinModule/ImageUploader.aspx
+++ b/umbraco/presentation/umbraco/LiveEditing/Modules/SkinModule/ImageUploader.aspx
@@ -155,6 +155,7 @@
     <asp:Button ID="bt_upload" runat="server" Text="Upload" 
         onclick="bt_upload_Click" /><br />
 
+        <asp:Literal ID="lit_notvalid" runat="server" Text="Please upload a valid image file" Visible="false"></asp:Literal>
 
      <br />
 
diff --git a/umbraco/presentation/umbraco/LiveEditing/Modules/SkinModule/ImageUploader.aspx.cs b/umbraco/presentation/umbraco/LiveEditing/Modules/SkinModule/ImageUploader.aspx.cs
index 065f62f1fa..7159199397 100644
--- a/umbraco/presentation/umbraco/LiveEditing/Modules/SkinModule/ImageUploader.aspx.cs
+++ b/umbraco/presentation/umbraco/LiveEditing/Modules/SkinModule/ImageUploader.aspx.cs
@@ -25,6 +25,7 @@ namespace umbraco.presentation.umbraco.LiveEditing.Modules.SkinModule
         {
             if (FileUpload1.HasFile)
             {
+                lit_notvalid.Visible = false;
                 
                 Guid g = Guid.NewGuid();
                 DirectoryInfo updir = new DirectoryInfo(IO.IOHelper.MapPath("~/media/upload/" + g));
@@ -62,7 +63,7 @@ namespace umbraco.presentation.umbraco.LiveEditing.Modules.SkinModule
                     }
                 }
                 else
-                    throw new Exception("Not a valid image");
+                    lit_notvalid.Visible = true;
             }
         }
 
diff --git a/umbraco/presentation/umbraco/LiveEditing/Modules/SkinModule/ImageUploader.aspx.designer.cs b/umbraco/presentation/umbraco/LiveEditing/Modules/SkinModule/ImageUploader.aspx.designer.cs
index c26954c4d4..cd787cce6c 100644
--- a/umbraco/presentation/umbraco/LiveEditing/Modules/SkinModule/ImageUploader.aspx.designer.cs
+++ b/umbraco/presentation/umbraco/LiveEditing/Modules/SkinModule/ImageUploader.aspx.designer.cs
@@ -129,6 +129,15 @@ namespace umbraco.presentation.umbraco.LiveEditing.Modules.SkinModule {
         /// </remarks>
         protected global::System.Web.UI.WebControls.Button bt_upload;
         
+        /// <summary>
+        /// lit_notvalid control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Literal lit_notvalid;
+        
         /// <summary>
         /// pnl_crop control.
         /// </summary>