Merged with v8/dev

src/Umbraco.Web/Models/ContentEditing/ContentItemBasic.cs

@@ -38,6 +38,8 @@ namespace Umbraco.Web.Models.ContentEditing
         [DataMember(Name = "updater")]
         public UserProfile Updater { get; set; }
 
+        public int ContentTypeId { get; set; }
+
         [DataMember(Name = "contentTypeAlias", IsRequired = true)]
         [Required(AllowEmptyStrings = false)]
         public string ContentTypeAlias { get; set; }

src/Umbraco.Web/Models/ContentEditing/ContentItemDisplay.cs

@@ -108,6 +108,9 @@ namespace Umbraco.Web.Models.ContentEditing
         [DataMember(Name = "treeNodeUrl")]
         public string TreeNodeUrl { get; set; }
 
+        [DataMember(Name = "contentTypeId")]
+        public int ContentTypeId { get; set; }
+
         [DataMember(Name = "contentTypeAlias", IsRequired = true)]
         [Required(AllowEmptyStrings = false)]
         public string ContentTypeAlias { get; set; }

src/Umbraco.Web/Models/ContentEditing/ContentPropertyBasic.cs

@@ -1,4 +1,5 @@
-using System.ComponentModel;
+using System;
+using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 using System.Runtime.Serialization;
 using Umbraco.Core.PropertyEditors;
@@ -21,6 +22,10 @@ namespace Umbraco.Web.Models.ContentEditing
         [Required]
         public int Id { get; set; }
 
+        [DataMember(Name = "dataTypeKey", IsRequired = false)]
+        [ReadOnly(true)]
+        public Guid DataTypeKey { get; set; }
+
         [DataMember(Name = "value")]
         public object Value { get; set; }
 

src/Umbraco.Web/Models/ContentEditing/PropertyTypeBasic.cs

@@ -1,4 +1,5 @@
 using System;
+using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 using System.Runtime.Serialization;
 
@@ -43,6 +44,10 @@ namespace Umbraco.Web.Models.ContentEditing
         [Required]
         public int DataTypeId { get; set; }
 
+        [DataMember(Name = "dataTypeKey")]
+        [ReadOnly(true)]
+        public Guid DataTypeKey { get; set; }
+
         //SD: Is this really needed ?
         [DataMember(Name = "groupId")]
         public int GroupId { get; set; }

src/Umbraco.Web/Models/ContentEditing/UrlAndAnchors.cs

@@ -0,0 +1,21 @@
+using System.Collections.Generic;
+using System.Runtime.Serialization;
+
+namespace Umbraco.Web.Models.ContentEditing
+{
+    [DataContract(Name = "urlAndAnchors", Namespace = "")]
+    public class UrlAndAnchors
+    {
+        public UrlAndAnchors(string url, IEnumerable<string> anchorValues)
+        {
+            Url = url;
+            AnchorValues = anchorValues;
+        }
+
+        [DataMember(Name = "url")]
+        public string Url { get; }
+
+        [DataMember(Name = "anchorValues")]
+        public IEnumerable<string> AnchorValues { get;  }
+    }
+}