Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0

perploug · perploug · commit aa75a6bf9f23 · 2013-11-21T11:14:25.000+01:00
diff --git a/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSeven/UpdateRelatedLinksData.cs b/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSeven/UpdateRelatedLinksData.cs
@@ -6,6 +6,7 @@
 using System.Threading.Tasks;
 using System.Web.Script.Serialization;
 using System.Xml;
+using Newtonsoft.Json;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models.Rdbms;
@@ -33,6 +34,8 @@ public static string UpdateRelatedLinksDataDo(Database database)
                     {
                         if (!string.IsNullOrEmpty(data.Text))
                         {
+                             //var cs = ApplicationContext.Current.Services.ContentService;
+
                             //fetch the current data (that's in xml format)
                             var xml = new XmlDocument();
                             xml.LoadXml(data.Text);
@@ -58,11 +61,27 @@ public static string UpdateRelatedLinksDataDo(Database database)
                                     link.Add("edit", false);
                                     link.Add("isInternal", type.Equals("internal"));
 
+                                    //try
+                                    //{
+                                    //    if (type.Equals("internal"))
+                                    //    {
+                                    //        int nodeId;
+                                    //        if (int.TryParse(lnk, out nodeId))
+                                    //            link.Add("internalName", cs.GetById(nodeId).Name);
+                                    //    }
+                                    //}
+                                    //catch (Exception ex)
+                                    //{
+                                    //    LogHelper.Error<UpdateRelatedLinksData>("Exception was thrown when trying to update related links property data, fetching internal node id", ex);
+                                    //}
+
                                     links.Add((ExpandoObject) link);
                                 }
 
                                 //store the serialized data
-                                data.Text = new JavaScriptSerializer().Serialize(links);
+                                data.Text = JsonConvert.SerializeObject(links);
+
+                                database.Update(data);
                             }
                         }
                     }
diff --git a/src/Umbraco.Web.UI/install/steps/StarterKits.ascx b/src/Umbraco.Web.UI/install/steps/StarterKits.ascx
@@ -78,8 +78,7 @@
 <div class="tab main-tabinfo">
 <div class="container">
 	<h1>Starter kits</h1>
-	<p>To help you get started here are some basic starter kits. They have been tailored to suit common site configurations and install useful functionality.<br />
-	Mouse over the icons to learn more about what the starter kits will install.</p>
+	<p>To help you get started here are some basic starter kits. They have been tailored to suit common site configurations and install useful functionality.</p>
 </div>
 <!-- menu -->
 <asp:PlaceHolder ID="ph_starterKits" runat="server" />
diff --git a/src/Umbraco.Web.UI/install/steps/theend.ascx b/src/Umbraco.Web.UI/install/steps/theend.ascx
@@ -24,13 +24,8 @@ jQuery(document).ready(function () {
 <!-- done box -->
 <div class="tab main-tabinfo">
 	<div class="container">
-		<h1>
-			You�re done...now what?</h1>
-		<p>
-			Excellent, you are now ready to start using Umbraco, one of the worlds most popular open
-			source .NET CMS.
-			<br />
-			If you installed a starter kit you can start by configuring your new site, just click &quot;Preview your new website&quot; and follow the instructions. Or to start adding content right away click &quot;Set up your new website&quot; </p>
+		<h1>You�re done...now what?</h1>
+		<p>Excellent, you are now ready to start using Umbraco, one of the worlds most popular open source .NET CMS.</p>
 		<ul class="btn-web">			
 			<li class="btn-set"><a href="<%= IOHelper.ResolveUrl(SystemDirectories.Umbraco) %>/"><span>Launch umbraco</span></a></li>
 		</ul>
