From cf462bd28e7f14fdd02f9cb3e2317aa3f20d0bae Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Wed, 25 Sep 2013 18:49:19 +1000
Subject: [PATCH] Fixes starter kit installer with no skins

---
 src/Umbraco.Web.UI/config/Dashboard.config    | 25 +-------
 .../developer/Packages/StarterKits.aspx       | 15 +----
 .../developer/Packages/StarterKits.aspx.cs    | 62 ++++++++++++++-----
 .../Packages/StarterKits.aspx.designer.cs     | 18 ------
 4 files changed, 49 insertions(+), 71 deletions(-)

diff --git a/src/Umbraco.Web.UI/config/Dashboard.config b/src/Umbraco.Web.UI/config/Dashboard.config
index bfb791d134..d609c78bc8 100644
--- a/src/Umbraco.Web.UI/config/Dashboard.config
+++ b/src/Umbraco.Web.UI/config/Dashboard.config
@@ -104,28 +104,5 @@
       <control>/umbraco/dashboard/ExamineManagement.ascx</control>
     </tab>
   </section>
-  <section id="contour">
-    <areas>
-      <area>contour</area>
-    </areas>
-    <tab caption="Umbraco Contour">
-      <control>/umbraco/plugins/umbracocontour/formsdashboard.ascx</control>
-    </tab>
-  </section>
-  <section alias="Comments">
-    <areas>
-      <area>content</area>
-    </areas>
-    <tab caption="Comments">
-      <control>/usercontrols/blog/CommentModeration.ascx</control>
-    </tab>
-  </section>
-  <section alias="Comments">
-    <areas>
-      <area>content</area>
-    </areas>
-    <tab caption="Comments">
-      <control>/usercontrols/blog/CommentModeration.ascx</control>
-    </tab>
-  </section>
+
 </dashBoard>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI/umbraco/developer/Packages/StarterKits.aspx b/src/Umbraco.Web.UI/umbraco/developer/Packages/StarterKits.aspx
index 202e256622..059e0f727a 100644
--- a/src/Umbraco.Web.UI/umbraco/developer/Packages/StarterKits.aspx
+++ b/src/Umbraco.Web.UI/umbraco/developer/Packages/StarterKits.aspx
@@ -60,19 +60,6 @@
   <cc1:UmbracoPanel id="Panel1" Text="Starter kit" runat="server" Width="612px" Height="600px" hasMenu="false">
     <cc1:Feedback ID="fb" runat="server" />
     
-    <cc1:Pane id="StarterKitInstalled" Text="Install skin" runat="server">
-        <h3>Available skins</h3>
-        <p>You can choose from the following skins.</p>        
-        <div class="progress-status">Please wait...</div>
-        <div id="connectionError"></div>
-        <div id="serverError"></div>        
-        <div class="install-dialog">
-            <asp:PlaceHolder ID="ph_skins" runat="server"></asp:PlaceHolder>
-        </div>
-    </cc1:Pane>
-    
-    
-    
     <cc1:Pane id="StarterKitNotInstalled" Text="Install starter kit" runat="server">
         <h3>Available starter kits</h3>
         <p>You can choose from the following starter kits, each having specific functionality.</p>        
@@ -89,7 +76,7 @@
     </cc1:Pane>
     
     <cc1:Pane id="InstallationDirectoryNotAvailable" Text="Unable to install" runat="server" Visible="false">
-        <p>We can not install starterkits when the install directory is not present.</p>
+        <p>We can not install starterkits when the install directory or package repository is not present.</p>
     </cc1:Pane>
       
 
diff --git a/src/Umbraco.Web.UI/umbraco/developer/Packages/StarterKits.aspx.cs b/src/Umbraco.Web.UI/umbraco/developer/Packages/StarterKits.aspx.cs
index af31f42143..e5cb1acc7d 100644
--- a/src/Umbraco.Web.UI/umbraco/developer/Packages/StarterKits.aspx.cs
+++ b/src/Umbraco.Web.UI/umbraco/developer/Packages/StarterKits.aspx.cs
@@ -1,19 +1,63 @@
 using System;
 using System.Linq;
 using Umbraco.Core.IO;
+using Umbraco.Core.Logging;
 using Umbraco.Web.UI.Install.Steps.Skinning;
 using Umbraco.Web.UI.Pages;
+using System.IO;
+using umbraco.cms.businesslogic.packager;
 
 namespace Umbraco.Web.UI.Umbraco.Developer.Packages
 {
-    using System.IO;
+    
 
     public partial class StarterKits : UmbracoEnsuredPage
     {
+        private const string RepoGuid = "65194810-1f85-11dd-bd0b-0800200c9a66";
 
         protected void Page_Load(object sender, EventArgs e)
         {
-            ShowStarterKits();
+            //check if a starter kit is already isntalled
+
+            var installed = InstalledPackage.GetAllInstalledPackages();
+
+            if (installed.Count == 0)
+            {
+                ShowStarterKits();
+                return;
+            }
+            
+            var repo = global::umbraco.cms.businesslogic.packager.repositories.Repository.getByGuid(RepoGuid);
+            if (repo.HasConnection())
+            {
+                try
+                {
+                    var kits = repo.Webservice.StarterKits();
+                    var kitIds = kits.Select(x => x.RepoGuid).ToArray();
+
+                    //if a starter kit is already installed show finish
+                    if (installed.Any(x => kitIds.Contains(Guid.Parse(x.Data.PackageGuid))))
+                    {
+                        StarterKitNotInstalled.Visible = false;
+                        installationCompleted.Visible = true;
+                    }
+                    else
+                    {
+                        ShowStarterKits();    
+                    }
+                }
+                catch (Exception ex)
+                {
+                    LogHelper.Error<StarterKits>("Cannot connect to package repository", ex);
+                    InstallationDirectoryNotAvailable.Visible = true;
+                    StarterKitNotInstalled.Visible = false;
+                }
+            }
+            else
+            {
+                InstallationDirectoryNotAvailable.Visible = true;
+                StarterKitNotInstalled.Visible = false;
+            }            
         }
 
         private void ShowStarterKits()
@@ -22,30 +66,18 @@ namespace Umbraco.Web.UI.Umbraco.Developer.Packages
             {
                 InstallationDirectoryNotAvailable.Visible = true;
                 StarterKitNotInstalled.Visible = false;
-                StarterKitInstalled.Visible = false;
             
                 return;
             }
 
 
             var starterkitsctrl = (LoadStarterKits)LoadControl(SystemDirectories.Install + "/steps/Skinning/loadStarterKits.ascx");
-            starterkitsctrl.StarterKitInstalled += StarterkitsctrlStarterKitInstalled;
-
+            
             ph_starterkits.Controls.Add(starterkitsctrl);
 
             StarterKitNotInstalled.Visible = true;
-            StarterKitInstalled.Visible = false;
 
         }
         
-        void StarterkitsctrlStarterKitInstalled()
-        {
-            StarterKitNotInstalled.Visible = false;
-            StarterKitInstalled.Visible = false;
-
-            installationCompleted.Visible = true;
-
-        }
-
     }
 }
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI/umbraco/developer/Packages/StarterKits.aspx.designer.cs b/src/Umbraco.Web.UI/umbraco/developer/Packages/StarterKits.aspx.designer.cs
index efc1a04906..105a8ff5df 100644
--- a/src/Umbraco.Web.UI/umbraco/developer/Packages/StarterKits.aspx.designer.cs
+++ b/src/Umbraco.Web.UI/umbraco/developer/Packages/StarterKits.aspx.designer.cs
@@ -39,24 +39,6 @@ namespace Umbraco.Web.UI.Umbraco.Developer.Packages {
         /// </remarks>
         protected global::umbraco.uicontrols.Feedback fb;
         
-        /// <summary>
-        /// StarterKitInstalled control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::umbraco.uicontrols.Pane StarterKitInstalled;
-        
-        /// <summary>
-        /// ph_skins 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.PlaceHolder ph_skins;
-        
         /// <summary>
         /// StarterKitNotInstalled control.
         /// </summary>