From 2c3c6ce39132ab884bf99f16078a0ed086712703 Mon Sep 17 00:00:00 2001
From: starfighter83 <unknown@kiln.example.com>
Date: Tue, 21 Dec 2010 11:52:14 -0100
Subject: [PATCH] fixes #29745: New Installer, if you don't install starter
 kit, don't show 'Preview your new site' option

---
 .../presentation/install/steps/theend.ascx    | 29 +++++++++++++++----
 .../presentation/install/steps/theend.ascx.cs |  6 ++--
 .../install/steps/theend.ascx.designer.cs     |  9 ++++++
 3 files changed, 35 insertions(+), 9 deletions(-)

diff --git a/umbraco/presentation/install/steps/theend.ascx b/umbraco/presentation/install/steps/theend.ascx
index 795fbae571..f68a8425b7 100644
--- a/umbraco/presentation/install/steps/theend.ascx
+++ b/umbraco/presentation/install/steps/theend.ascx
@@ -28,7 +28,7 @@ jQuery(document).ready(function () {
 			<br />
 			Now why not get configuring your new installed skin?</p>
 		<ul class="btn-web">
-			<li class="btn-preview-web"><a href="<%= umbraco.IO.IOHelper.ResolveUrl(umbraco.IO.SystemDirectories.Umbraco) %>/canvas.aspx?redir=<%= this.ResolveUrl("~/")  %>&umbSkinning=true&umbSkinningConfigurator=true" target="_blank"><span>Set up your new website</span></a></li>
+			<li class="btn-preview-web" id="customizeSite" runat="server"><a href="<%= umbraco.IO.IOHelper.ResolveUrl(umbraco.IO.SystemDirectories.Umbraco) %>/canvas.aspx?redir=<%= this.ResolveUrl("~/")  %>&umbSkinning=true&umbSkinningConfigurator=true" target="_blank"><span>Set up your new website</span></a></li>
 			<li class="btn-set"><a href="<%= umbraco.IO.IOHelper.ResolveUrl(umbraco.IO.SystemDirectories.Umbraco) %>/umbraco.aspx"><span>Launch umbraco</span></a></li>
 		</ul>
 	</div>
@@ -36,10 +36,29 @@ jQuery(document).ready(function () {
 		<div class="t">
 			&nbsp;</div>
 		<div class="hold">
-			<aside class="col1">
				<h2>Useful links</h2>
				<p>We’ve put together some useful links to help you get started with Umbraco.</p>
				<nav class="links">
					<ul>
						<li><a href="http://our.umbraco.org?ref=ourFromInstaller">our.umbraco.org</a></li>
					</ul>

-					<ul>
						<li><a href="http://our.umbraco.org/wiki?ref=LatestDocsFromInstaller">New documentation</a></li>
						<li><a href="http://our.umbraco.org/projects?ref=LatestProjectsFromInstaller">New Projects</a></li>
						<li><a href="http://our.umbraco.org/forum?ref=LatesTalkFromInstaller">Forum Talk</a></li>
					</ul>
				</nav>
			</aside>
-			<aside class="col2">
				<h2>Community blogs </h2>
                <div  id="ajax-blogs"><small>Loading...</small></div>
			</aside>
-			<aside class="col3">
			<h2>Twitter</h2>
                <div id="ajax-twitter"><small>Loading...</small></div>
			</aside>
+			<aside class="col1">
+				<h2>Useful links</h2>
+				<p>We’ve put together some useful links to help you get started with Umbraco.</p>
+				<nav class="links">
+					<ul>
+						<li><a href="http://our.umbraco.org?ref=ourFromInstaller">our.umbraco.org</a></li>
+					</ul>
+
+					<ul>
+						<li><a href="http://our.umbraco.org/wiki?ref=LatestDocsFromInstaller">New documentation</a></li>
+						<li><a href="http://our.umbraco.org/projects?ref=LatestProjectsFromInstaller">New Projects</a></li>
+						<li><a href="http://our.umbraco.org/forum?ref=LatesTalkFromInstaller">Forum Talk</a></li>
+					</ul>
+				</nav>
+			</aside>
+			<aside class="col2">
+				<h2>Community blogs </h2>
+                <div  id="ajax-blogs"><small>Loading...</small></div>
+			</aside>
+			<aside class="col3">
+			<h2>Twitter</h2>
+                <div id="ajax-twitter"><small>Loading...</small></div>
+			</aside>
 		</div>
 	</div>
 </div>
diff --git a/umbraco/presentation/install/steps/theend.ascx.cs b/umbraco/presentation/install/steps/theend.ascx.cs
index 4ceca00a06..760e71bc1c 100644
--- a/umbraco/presentation/install/steps/theend.ascx.cs
+++ b/umbraco/presentation/install/steps/theend.ascx.cs
@@ -27,10 +27,8 @@ namespace umbraco.presentation.install.steps
                 //errorLiteral.Text = ex.ToString();
             }
 
-            if (cms.businesslogic.skinning.Skinning.IsStarterKitInstalled())
-            {
-                ///viewSite.Visible = true;
-            }
+            if (!cms.businesslogic.skinning.Skinning.IsStarterKitInstalled())
+                customizeSite.Visible = false;
 
 
         }
diff --git a/umbraco/presentation/install/steps/theend.ascx.designer.cs b/umbraco/presentation/install/steps/theend.ascx.designer.cs
index 14b19468e1..091694a4f7 100644
--- a/umbraco/presentation/install/steps/theend.ascx.designer.cs
+++ b/umbraco/presentation/install/steps/theend.ascx.designer.cs
@@ -11,5 +11,14 @@ namespace umbraco.presentation.install.steps {
     
     
     public partial class theend {
+        
+        /// <summary>
+        /// customizeSite control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlGenericControl customizeSite;
     }
 }