yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
perploug
2013-11-21 11:14:25 +01:00
parent 14a0efde01 1c20496974
commit aa75a6bf9f
3 changed files with 23 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSeven/UpdateRelatedLinksData.cs
View File

@@ -6,6 +6,7 @@ using System.Text;
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 @@ namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSeven
{
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 @@ namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSeven
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);
}
}
}

3
src/Umbraco.Web.UI/install/steps/StarterKits.ascx
View File

@@ -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" />

9
src/Umbraco.Web.UI/install/steps/theend.ascx
View File

@@ -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>