From a71d0f58cb2f51631f1b779d1185ab9ad7ff8f2e Mon Sep 17 00:00:00 2001
From: starfighter83 <unknown@kiln.example.com>
Date: Tue, 12 Oct 2010 12:14:11 +0000
Subject: [PATCH] WIP installer refactor

[TFS Changeset #78305]
---
 .../umbraco/LiveEditing/Css/LiveEditing.css   |  7 ++++++-
 .../SkinModule/ModuleInstaller.aspx.cs        |  2 --
 .../Modules/SkinModule/ModuleSelector.ascx    |  8 ++++++--
 .../Modules/SkinModule/ModuleSelector.ascx.cs |  2 +-
 .../Modules/SkinModule/SkinModule.cs          | 20 -------------------
 .../Modules/SkinModule/js/ModuleInjection.js  | 14 +++++++++----
 6 files changed, 23 insertions(+), 30 deletions(-)

diff --git a/umbraco/presentation/umbraco/LiveEditing/Css/LiveEditing.css b/umbraco/presentation/umbraco/LiveEditing/Css/LiveEditing.css
index b9a1aac955..3f3f527a9a 100644
--- a/umbraco/presentation/umbraco/LiveEditing/Css/LiveEditing.css
+++ b/umbraco/presentation/umbraco/LiveEditing/Css/LiveEditing.css
@@ -327,5 +327,10 @@ html {
     cursor:pointer;
 }
 
-
+p#installingModule img
+{
+    float:none;
+    margin:0;
+    padding:0;
+}
 		
diff --git a/umbraco/presentation/umbraco/LiveEditing/Modules/SkinModule/ModuleInstaller.aspx.cs b/umbraco/presentation/umbraco/LiveEditing/Modules/SkinModule/ModuleInstaller.aspx.cs
index dffe5bce7a..5b6a9fe182 100644
--- a/umbraco/presentation/umbraco/LiveEditing/Modules/SkinModule/ModuleInstaller.aspx.cs
+++ b/umbraco/presentation/umbraco/LiveEditing/Modules/SkinModule/ModuleInstaller.aspx.cs
@@ -36,8 +36,6 @@ namespace umbraco.presentation.umbraco.LiveEditing.Modules.SkinModule
                     installer.InstallCleanUp(packageId, tempDir);
                     library.RefreshContent();
 
-
-
                     if (cms.businesslogic.skinning.Skinning.IsPackageInstalled(new Guid(Request["guid"])) ||
                     cms.businesslogic.skinning.Skinning.IsPackageInstalled(Request["name"]))
                     {
diff --git a/umbraco/presentation/umbraco/LiveEditing/Modules/SkinModule/ModuleSelector.ascx b/umbraco/presentation/umbraco/LiveEditing/Modules/SkinModule/ModuleSelector.ascx
index 238e3f91ab..273553649c 100644
--- a/umbraco/presentation/umbraco/LiveEditing/Modules/SkinModule/ModuleSelector.ascx
+++ b/umbraco/presentation/umbraco/LiveEditing/Modules/SkinModule/ModuleSelector.ascx
@@ -25,10 +25,14 @@
    
 </asp:Repeater>
 
- <p id="installingModule" style="display:none;">Installing module...</p>
+ <p id="installingModule" style="display:none;">
+    <span class="selectedModule"></span><br />
+    <img src="/umbraco/LiveEditing/Modules/SkinModule/images/loader.gif" /> Installing module...
+    
+</p>
 
  <p id="moduleSelect" style="display:none;">
-    <span id="selectedModule"></span><br />
+    <span class="selectedModule"></span><br />
     Select where to place the module
  </p>
 
diff --git a/umbraco/presentation/umbraco/LiveEditing/Modules/SkinModule/ModuleSelector.ascx.cs b/umbraco/presentation/umbraco/LiveEditing/Modules/SkinModule/ModuleSelector.ascx.cs
index 1658cc6a82..2ae8281cda 100644
--- a/umbraco/presentation/umbraco/LiveEditing/Modules/SkinModule/ModuleSelector.ascx.cs
+++ b/umbraco/presentation/umbraco/LiveEditing/Modules/SkinModule/ModuleSelector.ascx.cs
@@ -75,7 +75,7 @@ namespace umbraco.presentation.umbraco.LiveEditing.Modules.SkinModule
                 {
                     link.Attributes.Add(
                         "onclick",
-                        "umbInstallModuleAndGetAlias('" + p.RepoGuid +"','"+p.Text+"');");
+                        "umbInstallModuleAndGetAlias('" + p.RepoGuid +"','"+p.Text+"',this);");
                 }
 
 
diff --git a/umbraco/presentation/umbraco/LiveEditing/Modules/SkinModule/SkinModule.cs b/umbraco/presentation/umbraco/LiveEditing/Modules/SkinModule/SkinModule.cs
index 14e1c96f9d..c5fe43cc67 100644
--- a/umbraco/presentation/umbraco/LiveEditing/Modules/SkinModule/SkinModule.cs
+++ b/umbraco/presentation/umbraco/LiveEditing/Modules/SkinModule/SkinModule.cs
@@ -138,26 +138,6 @@ namespace umbraco.presentation.umbraco.LiveEditing.Modules.SkinModule
                     {
                         //ok
 
-                        //presentation.templateControls.Macro m = new presentation.templateControls.Macro();
-
-                        //Hashtable DataValues = helper.ReturnAttributes(e.Message.Split(';')[1]);
-
-                        //m.Alias = DataValues["alias"].ToString();
-                        //m.MacroAttributes = DataValues;
-
-                        //StringBuilder sb = new StringBuilder();
-                        //StringWriter tw = new StringWriter(sb);
-                        //HtmlTextWriter hw = new HtmlTextWriter(tw);
-
-                        //m.RenderControl(hw);
-
-                        //string macroOutput = sb.ToString();
-
-                        //string placeMacroOutput = string.Format("jQuery('.umbModuleContainerPlaceHolder','#{0}').remove();jQuery('#{0}').{1}(\"{2}\");", e.Message.Split(';')[0], e.Message.Split(';')[2], macroOutput);
-
-
-                        //ScriptManager.RegisterClientScriptBlock(Page, GetType(), new Guid().ToString(), placeMacroOutput, true);
-                        
                     }
                     else
                     {
diff --git a/umbraco/presentation/umbraco/LiveEditing/Modules/SkinModule/js/ModuleInjection.js b/umbraco/presentation/umbraco/LiveEditing/Modules/SkinModule/js/ModuleInjection.js
index 62be37ce3c..4b8e760ac3 100644
--- a/umbraco/presentation/umbraco/LiveEditing/Modules/SkinModule/js/ModuleInjection.js
+++ b/umbraco/presentation/umbraco/LiveEditing/Modules/SkinModule/js/ModuleInjection.js
@@ -6,12 +6,13 @@ function umbSelectModule(alias,sender) {
     umbShowModuleContainerSelectors();
     umbModuleToInsertAlias = alias;
 
-    jQuery('#selectedModule').html(jQuery('span',sender).html());
+    jQuery('.selectedModule').html(jQuery('span',sender).html());
 
 }
-function umbInstallModuleAndGetAlias(guid,name) {
+function umbInstallModuleAndGetAlias(guid,name,sender) {
 
     jQuery('#modules').hide();
+    jQuery('.selectedModule').html(name);
     jQuery("#installingModule").show();
 
     jQuery.post("/umbraco/LiveEditing/Modules/SkinModule/ModuleInstaller.aspx?guid=" + guid + "&name=" + name,
@@ -25,13 +26,19 @@ function umbInstallModuleAndGetAlias(guid,name) {
              jQuery('#moduleSelect').show();
              umbShowModuleContainerSelectors();
              umbModuleToInsertAlias = data;
+
+             jQuery(sender).attr("onclick", "");
+
+             jQuery(sender).click(function () {
+                 umbSelectModule(data, this); 
+                 return false;
+             });
          }
 
 
      });
 
 }
-
 function umbShowModuleSelection() {
 
     jQuery("#moduleSelect").hide();
@@ -41,7 +48,6 @@ function umbShowModuleSelection() {
 
 }
 
-
 function umbShowModuleContainerSelectors() {
 
     jQuery(".umbModuleContainer").each(function () {