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

build/NuSpecs/UmbracoCms.Core.nuspec

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <metadata>
         <id>UmbracoCms.Core</id>
@@ -20,12 +20,12 @@
             <dependency id="Microsoft.AspNet.Mvc.FixedDisplayModes" version="1.0.0" />
             <dependency id="MiniProfiler" version="[2.1.0, 3.0.0)" />
             <dependency id="HtmlAgilityPack" version="[1.4.6, 2.0.0)" />
-            <dependency id="Lucene.Net" version="[2.9.4.1]" />
+            <dependency id="Lucene.Net" version="[2.9.4.1, 3.0.0.0)" />
             <dependency id="SharpZipLib" version="[0.86.0, 1.0.0)" />
             <dependency id="MySql.Data" version="[6.6.5]" />
             <dependency id="xmlrpcnet" version="[2.5.0, 3.0.0)" />
-            <dependency id="ClientDependency" version="[1.7.0, 1.7.1)" />
-            <dependency id="ClientDependency-Mvc" version="[1.7.0, 1.7.1)" />
+            <dependency id="ClientDependency" version="[1.7.0, 2.0.0)" />
+            <dependency id="ClientDependency-Mvc" version="[1.7.0, 2.0.0)" />
             <dependency id="AutoMapper" version="[2.2.1, 3.0.0)" />
         </dependencies>
     </metadata>
@@ -68,4 +68,5 @@
         <file src="..\_BuildOutput\WebApp\bin\UmbracoExamine.dll" target="lib\UmbracoExamine.dll" />
         <file src="..\_BuildOutput\WebApp\bin\UrlRewritingNet.UrlRewriter.dll" target="lib\UrlRewritingNet.UrlRewriter.dll" />
     </files>
+</package>
 </package>

build/NuSpecs/UmbracoCms.nuspec

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <metadata>
         <id>UmbracoCms</id>

src/Umbraco.Core/DatabaseContext.cs

@@ -112,7 +112,7 @@ namespace Umbraco.Core
         public void ConfigureEmbeddedDatabaseConnection()
         {
             const string providerName = "System.Data.SqlServerCe.4.0";
-            const string connectionString = @"Data Source=|DataDirectory|\Umbraco.sdf;Flush Interval=1;File Access Retry Timeout=10";
+            const string connectionString = @"Data Source=|DataDirectory|\Umbraco.sdf;Flush Interval=1;";
 
             SaveConnectionString(connectionString, providerName);
 

src/Umbraco.Core/Models/MemberType.cs

@@ -114,5 +114,26 @@ namespace Umbraco.Core.Models
                 MemberTypePropertyTypes.Add(propertyTypeAlias, tuple);
             }
         }
+
+        /// <summary>
+        /// Method to call when Entity is being saved
+        /// </summary>
+        /// <remarks>Created date is set and a Unique key is assigned</remarks>
+        internal override void AddingEntity()
+        {
+            base.AddingEntity();
+
+            if (Key == Guid.Empty)
+                Key = Guid.NewGuid();
+        }
+
+        /// <summary>
+        /// Method to call when Entity is being updated
+        /// </summary>
+        /// <remarks>Modified Date is set and a new Version guid is set</remarks>
+        internal override void UpdatingEntity()
+        {
+            base.UpdatingEntity();
+        }
     }
 }

src/Umbraco.Core/Models/Rdbms/PropertyTypeReadOnlyDto.cs

@@ -17,7 +17,7 @@ namespace Umbraco.Core.Models.Rdbms
         [Column("contentTypeId")]
         public int ContentTypeId { get; set; }
 
-        [Column("propertyTypeGroupId")]
+        [Column("PropertyTypesGroupId")]
         public int? PropertyTypeGroupId { get; set; }
 
         [Column("Alias")]

src/Umbraco.Core/Persistence/Factories/MemberReadOnlyFactory.cs

@@ -61,7 +61,7 @@ namespace Umbraco.Core.Persistence.Factories
                                    ? propertyType.CreatePropertyFromValue(null)
                                    : propertyType.CreatePropertyFromRawValue(propertyDataDto.GetValue,
                                                                              propertyDataDto.VersionId,
-                                                                             propertyDataDto.Id);
+                                                                             propertyDataDto.PropertyDataId.Value);
                 //on initial construction we don't want to have dirty properties tracked
                 property.CreateDate = createDate;
                 property.UpdateDate = createDate;

src/Umbraco.Core/Persistence/Factories/MemberTypeReadOnlyFactory.cs

@@ -55,51 +55,75 @@ namespace Umbraco.Core.Persistence.Factories
 
         private PropertyGroupCollection GetPropertyTypeGroupCollection(MemberTypeReadOnlyDto dto, MemberType memberType)
         {
-            var propertyTypeGroupCollection = new PropertyGroupCollection();
-            foreach (var propertyTypeGroup in dto.PropertyTypeGroups.Where(x => x.Id.HasValue))
+            var propertyGroups = new PropertyGroupCollection();
+            foreach (var groupDto in dto.PropertyTypeGroups.Where(x => x.Id.HasValue))
             {
-                //Find PropertyTypes that belong to the current PropertyTypeGroup
-                var groupId = propertyTypeGroup.Id.Value;
-                var propertyTypesByGroup =
-                    dto.PropertyTypes.Where(
-                        x => x.Id.HasValue && x.PropertyTypeGroupId.HasValue && x.PropertyTypeGroupId.Value.Equals(groupId));
-                //Create PropertyTypeCollection for passing into the PropertyTypeGroup, and loop through the above result to create PropertyTypes
-                var propertyTypeCollection = new PropertyTypeCollection();
-                foreach (var propTypeDto in propertyTypesByGroup)
+                var group = new PropertyGroup();
+               
+                //Only assign an Id if the PropertyGroup belongs to this ContentType
+                if (groupDto.Id.HasValue 
+                    /*SD: I've commented this out since it's never correct, why would the group id be the same as the type??
+                     * && groupDto.Id == memberType.Id*/)
                 {
-                    //Internal dictionary for adding "MemberCanEdit" and "VisibleOnProfile" properties to each PropertyType
-                    memberType.MemberTypePropertyTypes.Add(propTypeDto.Alias,
-                        new Tuple<bool, bool, int>(propTypeDto.CanEdit, propTypeDto.ViewOnProfile, propTypeDto.Id.Value));
-                    //PropertyType Collection
-                    propertyTypeCollection.Add(new PropertyType(propTypeDto.PropertyEditorAlias,
-                        propTypeDto.DbType.EnumParse<DataTypeDatabaseType>(true))
-                                               {
-                                                   Alias = propTypeDto.Alias,
-                                                   DataTypeDefinitionId = propTypeDto.DataTypeId,
-                                                   Description = propTypeDto.Description,
-                                                   HelpText = propTypeDto.HelpText,
-                                                   Id = propTypeDto.Id.Value,
-                                                   Mandatory = propTypeDto.Mandatory,
-                                                   Name = propTypeDto.Name,
-                                                   SortOrder = propTypeDto.SortOrder,
-                                                   ValidationRegExp = propTypeDto.ValidationRegExp,
-                                                   PropertyGroupId = new Lazy<int>(() => propTypeDto.PropertyTypeGroupId.Value),
-                                                   CreateDate = dto.CreateDate,
-                                                   UpdateDate = dto.CreateDate
-                                               });
+                    group.Id = groupDto.Id.Value;
+
+                    if (groupDto.ParentGroupId.HasValue)
+                        group.ParentId = groupDto.ParentGroupId.Value;
+                }
+                else
+                {
+                    //If the PropertyGroup is inherited, we add a reference to the group as a Parent.
+                    group.ParentId = groupDto.Id;
                 }
 
-                var group = new PropertyGroup(propertyTypeCollection) {Id = groupId};
-                propertyTypeGroupCollection.Add(@group);
+                group.Name = groupDto.Text;
+                group.SortOrder = groupDto.SortOrder;
+                group.PropertyTypes = new PropertyTypeCollection();
+
+                //Because we are likely to have a group with no PropertyTypes we need to ensure that these are excluded
+                var typeDtos = dto.PropertyTypes.Where(x => x.Id.HasValue && x.Id > 0 && x.PropertyTypeGroupId.HasValue && x.PropertyTypeGroupId.Value == groupDto.Id.Value);
+                foreach (var typeDto in typeDtos)
+                {
+                    //Internal dictionary for adding "MemberCanEdit" and "VisibleOnProfile" properties to each PropertyType
+                    memberType.MemberTypePropertyTypes.Add(typeDto.Alias,
+                        new Tuple<bool, bool, int>(typeDto.CanEdit, typeDto.ViewOnProfile, typeDto.Id.Value));
+
+                    var tempGroupDto = groupDto;
+                    var propertyType = new PropertyType(typeDto.PropertyEditorAlias,
+                                                             typeDto.DbType.EnumParse<DataTypeDatabaseType>(true))
+                    {
+                        Alias = typeDto.Alias,
+                        DataTypeDefinitionId = typeDto.DataTypeId,
+                        Description = typeDto.Description,
+                        Id = typeDto.Id.Value,
+                        Name = typeDto.Name,
+                        HelpText = typeDto.HelpText,
+                        Mandatory = typeDto.Mandatory,
+                        SortOrder = typeDto.SortOrder,
+                        ValidationRegExp = typeDto.ValidationRegExp,
+                        PropertyGroupId = new Lazy<int>(() => tempGroupDto.Id.Value),
+                        CreateDate = memberType.CreateDate,
+                        UpdateDate = memberType.UpdateDate
+                    };
+                    //on initial construction we don't want to have dirty properties tracked
+                    // http://issues.umbraco.org/issue/U4-1946
+                    propertyType.ResetDirtyProperties(false);
+                    group.PropertyTypes.Add(propertyType);
+                }
+                //on initial construction we don't want to have dirty properties tracked
+                // http://issues.umbraco.org/issue/U4-1946
+                group.ResetDirtyProperties(false);
+                propertyGroups.Add(group);
             }
-            return propertyTypeGroupCollection;
+
+            return propertyGroups;
         }
 
         private List<PropertyType> GetPropertyTypes(MemberTypeReadOnlyDto dto, MemberType memberType)
         {
             //Find PropertyTypes that does not belong to a PropertyTypeGroup
             var propertyTypes = new List<PropertyType>();
-            foreach (var propertyType in dto.PropertyTypes.Where(x => x.PropertyTypeGroupId.HasValue == false && x.Id.HasValue))
+            foreach (var propertyType in dto.PropertyTypes.Where(x => (x.PropertyTypeGroupId.HasValue == false || x.PropertyTypeGroupId.Value == 0) && x.Id.HasValue))
             {
                 //Internal dictionary for adding "MemberCanEdit" and "VisibleOnProfile" properties to each PropertyType
                 memberType.MemberTypePropertyTypes.Add(propertyType.Alias,

src/Umbraco.Core/Persistence/Relators/PropertyDataRelator.cs

@@ -15,6 +15,8 @@ namespace Umbraco.Core.Persistence.Relators
             if (a == null)
                 return Current;
 
+            p.VersionId = a.VersionId;
+
             // Is this the same MemberReadOnlyDto as the current one we're processing
             if (Current != null && Current.UniqueId == a.UniqueId)
             {

src/Umbraco.Core/Persistence/Relators/PropertyTypePropertyGroupRelator.cs

@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System.Linq;
 using Umbraco.Core.Models.Rdbms;
 
 namespace Umbraco.Core.Persistence.Relators
@@ -21,7 +22,7 @@ namespace Umbraco.Core.Persistence.Relators
                 // Yes, just add this PropertyTypeReadOnlyDto to the current MemberTypeReadOnlyDto's collection
                 Current.PropertyTypes.Add(p);
 
-                if(g.Id.HasValue)
+                if (g.Id.HasValue && Current.PropertyTypeGroups != null && Current.PropertyTypeGroups.Any(x => x.Id == g.Id.Value) == false)
                     Current.PropertyTypeGroups.Add(g);
 
                 // Return null to indicate we're not done with this MemberTypeReadOnlyDto yet

src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs

@@ -229,10 +229,8 @@ namespace Umbraco.Core.Persistence.Repositories
             dto.NodeId = nodeDto.NodeId;
             Database.Insert(dto);
 
-            //TODO ContentType for the Member entity
-
             //Create the PropertyData for this version - cmsPropertyData
-            /*var propertyFactory = new PropertyFactory(entity.ContentType, entity.Version, entity.Id);
+            var propertyFactory = new PropertyFactory(entity.ContentType, entity.Version, entity.Id);
             var propertyDataDtos = propertyFactory.BuildDto(((Member)entity).Properties);
             var keyDictionary = new Dictionary<int, int>();
 
@@ -247,7 +245,7 @@ namespace Umbraco.Core.Persistence.Repositories
             foreach (var property in ((Member)entity).Properties)
             {
                 property.Id = keyDictionary[property.PropertyTypeId];
-            }*/
+            }
 
             ((Member)entity).ResetDirtyProperties();
         }
@@ -300,7 +298,7 @@ namespace Umbraco.Core.Persistence.Repositories
             //TODO ContentType for the Member entity
 
             //Create the PropertyData for this version - cmsPropertyData
-            /*var propertyFactory = new PropertyFactory(entity.ContentType, entity.Version, entity.Id);
+            var propertyFactory = new PropertyFactory(entity.ContentType, entity.Version, entity.Id);
             var propertyDataDtos = propertyFactory.BuildDto(((Member)entity).Properties);
             var keyDictionary = new Dictionary<int, int>();
 
@@ -325,7 +323,7 @@ namespace Umbraco.Core.Persistence.Repositories
                 {
                     property.Id = keyDictionary[property.PropertyTypeId];
                 }
-            }*/
+            }
 
             ((ICanBeDirty)entity).ResetDirtyProperties();
         }

src/Umbraco.Core/Persistence/Repositories/MemberTypeRepository.cs

@@ -101,7 +101,7 @@ namespace Umbraco.Core.Persistence.Repositories
             sql.Select("umbracoNode.*", "cmsContentType.*", "cmsPropertyType.id AS PropertyTypeId", "cmsPropertyType.Alias", 
                 "cmsPropertyType.Name", "cmsPropertyType.Description", "cmsPropertyType.helpText", "cmsPropertyType.mandatory",
                 "cmsPropertyType.validationRegExp", "cmsPropertyType.dataTypeId", "cmsPropertyType.sortOrder AS PropertyTypeSortOrder",
-                "cmsPropertyType.propertyTypeGroupId", "cmsMemberType.memberCanEdit", "cmsMemberType.viewOnProfile",
+                "cmsPropertyType.propertyTypeGroupId AS PropertyTypesGroupId", "cmsMemberType.memberCanEdit", "cmsMemberType.viewOnProfile",
                 "cmsDataType.propertyEditorAlias", "cmsDataType.dbType", "cmsPropertyTypeGroup.id AS PropertyTypeGroupId", 
                 "cmsPropertyTypeGroup.text AS PropertyGroupName", "cmsPropertyTypeGroup.parentGroupId", 
                 "cmsPropertyTypeGroup.sortorder AS PropertyGroupSortOrder")

src/Umbraco.Core/Services/IMemberService.cs

@@ -14,6 +14,8 @@ namespace Umbraco.Core.Services
         IEnumerable<IMember> GetMembersByMemberType(string memberTypeAlias);
         IEnumerable<IMember> GetMembersByGroup(string memberGroupName);
         IEnumerable<IMember> GetAllMembers(params int[] ids);
+
+        //TODO: Need to get all members that start with a certain letter
     }
 
     /// <summary>

src/Umbraco.Tests/App.config

@@ -66,7 +66,7 @@
   </appSettings>
   
   <connectionStrings>
-    <add name="umbracoDbDSN" connectionString="Datasource=|DataDirectory|UmbracoPetaPocoTests.sdf;Flush Interval=1;File Access Retry Timeout=10" providerName="System.Data.SqlServerCe.4.0"/>
+    <add name="umbracoDbDSN" connectionString="Datasource=|DataDirectory|UmbracoPetaPocoTests.sdf;Flush Interval=1;" providerName="System.Data.SqlServerCe.4.0"/>
   </connectionStrings>
 
   <system.data>

src/Umbraco.Tests/Migrations/Upgrades/SqlCeDataUpgradeTest.cs

@@ -57,7 +57,7 @@ namespace Umbraco.Tests.Migrations.Upgrades
 
         public override UmbracoDatabase GetConfiguredDatabase()
         {
-            return new UmbracoDatabase("Datasource=|DataDirectory|UmbracoPetaPocoTests.sdf;Flush Interval=1;File Access Retry Timeout=10", "System.Data.SqlServerCe.4.0");
+            return new UmbracoDatabase("Datasource=|DataDirectory|UmbracoPetaPocoTests.sdf;Flush Interval=1;", "System.Data.SqlServerCe.4.0");
         }
 
         public override DatabaseProviders GetDatabaseProvider()

src/Umbraco.Tests/Migrations/Upgrades/SqlCeUpgradeTest.cs

@@ -63,7 +63,7 @@ namespace Umbraco.Tests.Migrations.Upgrades
 
         public override UmbracoDatabase GetConfiguredDatabase()
         {
-            return new UmbracoDatabase("Datasource=|DataDirectory|UmbracoPetaPocoTests.sdf;Flush Interval=1;File Access Retry Timeout=10", "System.Data.SqlServerCe.4.0");
+            return new UmbracoDatabase("Datasource=|DataDirectory|UmbracoPetaPocoTests.sdf;Flush Interval=1;", "System.Data.SqlServerCe.4.0");
         }
 
         public override DatabaseProviders GetDatabaseProvider()

src/Umbraco.Tests/Migrations/Upgrades/ValidateOlderSchemaTest.cs

@@ -101,7 +101,7 @@ namespace Umbraco.Tests.Migrations.Upgrades
 
         public UmbracoDatabase GetConfiguredDatabase()
         {
-            return new UmbracoDatabase("Datasource=|DataDirectory|UmbracoPetaPocoTests.sdf;Flush Interval=1;File Access Retry Timeout=10", "System.Data.SqlServerCe.4.0");
+            return new UmbracoDatabase("Datasource=|DataDirectory|UmbracoPetaPocoTests.sdf;Flush Interval=1;", "System.Data.SqlServerCe.4.0");
         }
 
         public string GetDatabaseSpecificSqlScript()

src/Umbraco.Tests/Persistence/DatabaseContextTests.cs

@@ -69,7 +69,7 @@ namespace Umbraco.Tests.Persistence
             //Get the connectionstring settings from config
             var settings = ConfigurationManager.ConnectionStrings[Core.Configuration.GlobalSettings.UmbracoConnectionName];
 
-            //by default the conn string is: Datasource=|DataDirectory|UmbracoPetaPocoTests.sdf;Flush Interval=1;File Access Retry Timeout=10
+            //by default the conn string is: Datasource=|DataDirectory|UmbracoPetaPocoTests.sdf;Flush Interval=1;
             //we'll just replace the sdf file with our custom one:
             //Create the Sql CE database
             var engine = new SqlCeEngine(settings.ConnectionString.Replace("UmbracoPetaPocoTests", "DatabaseContextTests"));

src/Umbraco.Tests/Persistence/Repositories/MemberRepositoryTest.cs

@@ -15,6 +15,7 @@ using Umbraco.Core.Persistence.UnitOfWork;
 using Umbraco.Core.Publishing;
 using Umbraco.Core.Services;
 using Umbraco.Tests.TestHelpers;
+using Umbraco.Tests.TestHelpers.Entities;
 
 namespace Umbraco.Tests.Persistence.Repositories
 {
@@ -174,6 +175,31 @@ namespace Umbraco.Tests.Persistence.Repositories
             }
         }
 
+        [Test]
+        public void MemberRepository_Can_Persist_Member()
+        {
+            IMember sut;
+            var unitOfWork = UnitOfWorkProvider.GetUnitOfWork();
+            MemberTypeRepository memberTypeRepository;
+            using (var repository = CreateRepository(unitOfWork, out memberTypeRepository))
+            {
+                var memberType = MockedContentTypes.CreateSimpleMemberType();
+                memberTypeRepository.AddOrUpdate(memberType);
+                unitOfWork.Commit();
+
+                var member = MockedMember.CreateSimpleContent(memberType, "Johnny Hefty", "johnny@example.com", "123", "hefty", -1);
+                repository.AddOrUpdate(member);
+                unitOfWork.Commit();
+
+                sut = repository.Get(member.Id);
+
+                Assert.That(sut, Is.Not.Null);
+                Assert.That(sut.ContentType.PropertyGroups.Count(), Is.EqualTo(1));
+                Assert.That(sut.ContentType.PropertyTypes.Count(), Is.EqualTo(12));
+                Assert.That(sut.Properties.Count(), Is.EqualTo(12));
+            }
+        }
+
         [Test]
         public void Can_Create_Correct_Subquery()
         {

src/Umbraco.Tests/Persistence/Repositories/MemberTypeRepositoryTest.cs

@@ -29,7 +29,7 @@ namespace Umbraco.Tests.Persistence.Repositories
 
         public override string ConnectionString
         {
-            get { return @"server=.\SQLEXPRESS;database=Kloud-Website-Production;user id=umbraco;password=umbraco"; }
+            get { return @"server=.\SQLEXPRESS;database=EmptyForTest;user id=umbraco;password=umbraco"; }
         }
 
         public override string ProviderName

src/Umbraco.Tests/Persistence/SqlCeTableByTableTest.cs

@@ -35,12 +35,12 @@ namespace Umbraco.Tests.Persistence
             }
 
             //Create the Sql CE database
-            var engine = new SqlCeEngine("Datasource=|DataDirectory|test.sdf;Flush Interval=1;File Access Retry Timeout=10");
+            var engine = new SqlCeEngine("Datasource=|DataDirectory|test.sdf;Flush Interval=1;");
             engine.CreateDatabase();
             
             SqlSyntaxContext.SqlSyntaxProvider = SqlCeSyntax.Provider;
 
-            _database = new Database("Datasource=|DataDirectory|test.sdf;Flush Interval=1;File Access Retry Timeout=10",
+            _database = new Database("Datasource=|DataDirectory|test.sdf;Flush Interval=1;",
                                      "System.Data.SqlServerCe.4.0");
         }
 

src/Umbraco.Tests/PluginManagerTests.cs

@@ -296,7 +296,7 @@ namespace Umbraco.Tests
         public void Resolves_Trees()
         {
             var trees = PluginManager.Current.ResolveTrees();
-            Assert.AreEqual(36, trees.Count());
+            Assert.AreEqual(40, trees.Count());
         }
 
         [Test]

src/Umbraco.Tests/TestHelpers/BaseDatabaseFactoryTest.cs

@@ -111,7 +111,7 @@ namespace Umbraco.Tests.TestHelpers
         /// </summary>
         protected virtual string GetDbConnectionString()
         {
-            return @"Datasource=|DataDirectory|UmbracoPetaPocoTests.sdf;Flush Interval=1;File Access Retry Timeout=10";            
+            return @"Datasource=|DataDirectory|UmbracoPetaPocoTests.sdf;Flush Interval=1;";            
         }
 
         /// <summary>

src/Umbraco.Tests/TestHelpers/Entities/MockedContentTypes.cs

@@ -279,5 +279,32 @@ namespace Umbraco.Tests.TestHelpers.Entities
 
             return mediaType;
         }
+
+        public static MemberType CreateSimpleMemberType()
+        {
+            var contentType = new MemberType(-1)
+            {
+                Alias = "simple",
+                Name = "Simple Page",
+                Description = "ContentType used for simple text pages",
+                Icon = ".sprTreeDoc3",
+                Thumbnail = "doc.png",
+                SortOrder = 1,
+                CreatorId = 0,
+                Trashed = false
+            };
+
+            var contentCollection = new PropertyTypeCollection();
+            contentCollection.Add(new PropertyType(Constants.PropertyEditors.TextboxAlias, DataTypeDatabaseType.Ntext) { Alias = "title", Name = "Title", Description = "", Mandatory = false, SortOrder = 1, DataTypeDefinitionId = -88 });
+            contentCollection.Add(new PropertyType(Constants.PropertyEditors.TextboxAlias, DataTypeDatabaseType.Ntext) { Alias = "bodyText", Name = "Body Text", Description = "", Mandatory = false, SortOrder = 2, DataTypeDefinitionId = -87 });
+            contentCollection.Add(new PropertyType(Constants.PropertyEditors.TextboxAlias, DataTypeDatabaseType.Ntext) { Alias = "author", Name = "Author", Description = "Name of the author", Mandatory = false, SortOrder = 3, DataTypeDefinitionId = -88 });
+
+            contentType.PropertyGroups.Add(new PropertyGroup(contentCollection) { Name = "Content", SortOrder = 1 });
+
+            //ensure that nothing is marked as dirty
+            contentType.ResetDirtyProperties(false);
+
+            return contentType;
+        }
     }
 }

src/Umbraco.Tests/TestHelpers/Entities/MockedMember.cs

@@ -0,0 +1,26 @@
+using Umbraco.Core.Models;
+
+namespace Umbraco.Tests.TestHelpers.Entities
+{
+    public class MockedMember
+    {
+        public static Member CreateSimpleContent(IMemberType contentType, string name, string email, string password, string username, int parentId)
+        {
+            var member = new Member(name, parentId, contentType, new PropertyCollection())
+                         {
+                             CreatorId = 0,
+                             Email = email,
+                             Password = password,
+                             Username = username
+                         };
+
+            member.SetValue("title", name + " member");
+            member.SetValue("bodyText", "This is a subpage");
+            member.SetValue("author", "John Doe");
+
+            member.ResetDirtyProperties(false);
+
+            return member;
+        } 
+    }
+}

src/Umbraco.Tests/UI/LegacyDialogTests.cs

@@ -42,14 +42,12 @@ namespace Umbraco.Tests.UI
         [TestCase(typeof(memberTasks), DefaultApps.member)]
         [TestCase(typeof(MemberGroupTasks), DefaultApps.member)]
         [TestCase(typeof(MediaTypeTasks), DefaultApps.settings)]
-        [TestCase(typeof(mediaTasks), DefaultApps.media)]
         [TestCase(typeof(dictionaryTasks), DefaultApps.settings)]
         [TestCase(typeof(macroTasks), DefaultApps.developer)]
         [TestCase(typeof(languageTasks), DefaultApps.settings)]
         [TestCase(typeof(DLRScriptingTasks), DefaultApps.developer)]
         [TestCase(typeof(DataTypeTasks), DefaultApps.developer)]
         [TestCase(typeof(CreatedPackageTasks), DefaultApps.developer)]
-        [TestCase(typeof(contentTasks), DefaultApps.content)]
         [TestCase(typeof(PartialViewTasks), DefaultApps.settings)]
         public void Check_Assigned_Apps_For_Tasks(Type taskType, DefaultApps app)
         {

src/Umbraco.Tests/Umbraco.Tests.csproj

@@ -368,6 +368,7 @@
     <Compile Include="Publishing\PublishingStrategyTests.cs" />
     <Compile Include="Resolvers\ActionsResolverTests.cs" />
     <Compile Include="AsynchronousRollingFileAppenderTests.cs" />
+    <Compile Include="TestHelpers\Entities\MockedMember.cs" />
     <Compile Include="TestHelpers\Entities\MockedUser.cs" />
     <Compile Include="TestHelpers\Entities\MockedUserType.cs" />
     <Compile Include="TreesAndSections\SectionTests.cs" />

src/Umbraco.Web.UI.Client/src/common/resources/auth.resource.js

@@ -34,16 +34,28 @@ function authResource($q, $http, umbRequestHelper, angularHelper) {
                         "PostLogout")));
         },
         
-        /** Sends a request to the server to check if the current cookie value is valid for the user */
-        isAuthenticated: function () {
+        /** Sends a request to the server to get the current user details, will return a 401 if the user is not logged in  */
+        getCurrentUser: function () {
             
             return umbRequestHelper.resourcePromise(
                 $http.get(
                     umbRequestHelper.getApiUrl(
                         "authenticationApiBaseUrl",
                         "GetCurrentUser")),
-                'Server call failed for checking authorization'); 
-        }
+                'Server call failed for getting current user'); 
+        },
+        
+        /** Checks if the user is logged in or not - does not return 401 or 403 */
+        isAuthenticated: function () {
+
+            return umbRequestHelper.resourcePromise(
+                $http.get(
+                    umbRequestHelper.getApiUrl(
+                        "authenticationApiBaseUrl",
+                        "IsAuthenticated")),
+                'Server call failed for checking authentication');
+        },
+
     };
 }
 

src/Umbraco.Web.UI.Client/src/common/resources/member.resource.js

@@ -26,7 +26,7 @@ function memberResource($q, $http, umbDataFormatter, umbRequestHelper) {
       
         /**
          * @ngdoc method
-         * @name umbraco.resources.memberResource#getByLogin
+         * @name umbraco.resources.memberResource#getByKey
          * @methodOf umbraco.resources.memberResource
          *
          * @description
@@ -34,7 +34,7 @@ function memberResource($q, $http, umbDataFormatter, umbRequestHelper) {
          *
          * ##usage
          * <pre>
-         * memberResource.getByLogin("tom")
+         * memberResource.getByKey("0000-0000-000-00000-000")
          *    .then(function(member) {
          *        var mymember = member; 
          *        alert('its here!');
@@ -45,20 +45,20 @@ function memberResource($q, $http, umbDataFormatter, umbRequestHelper) {
          * @returns {Promise} resourcePromise object containing the member item.
          *
          */
-        getByLogin: function (loginName) {
+        getByKey: function (key) {
             
             return umbRequestHelper.resourcePromise(
                $http.get(
                    umbRequestHelper.getApiUrl(
                        "memberApiBaseUrl",
-                       "GetByLogin",
-                       [{ loginName: loginName }])),
-               'Failed to retreive data for member id ' + loginName);
+                       "GetByKey",
+                       [{ key: key }])),
+               'Failed to retreive data for member id ' + key);
         },
 
         /**
          * @ngdoc method
-         * @name umbraco.resources.memberResource#deleteByLogin
+         * @name umbraco.resources.memberResource#deleteByKey
          * @methodOf umbraco.resources.memberResource
          *
          * @description
@@ -66,7 +66,7 @@ function memberResource($q, $http, umbDataFormatter, umbRequestHelper) {
          *
          * ##usage
          * <pre>
-         * memberResource.deleteByLogin(1234)
+         * memberResource.deleteByKey("0000-0000-000-00000-000")
          *    .then(function() {
          *        alert('its gone!');
          *    });
@@ -76,14 +76,14 @@ function memberResource($q, $http, umbDataFormatter, umbRequestHelper) {
          * @returns {Promise} resourcePromise object.
          *
          */
-        deleteByLogin: function (id) {
+        deleteByKey: function (key) {
             return umbRequestHelper.resourcePromise(
                 $http.delete(
                     umbRequestHelper.getApiUrl(
                         "memberApiBaseUrl",
-                        "DeleteById",
-                        [{ id: id }])),
-                'Failed to delete item ' + id);
+                        "DeleteByKey",
+                        [{ key: key }])),
+                'Failed to delete item ' + key);
         },
 
         /**

src/Umbraco.Web.UI.Client/src/common/services/user.service.js

@@ -53,30 +53,20 @@ angular.module('umbraco.services')
 
     return {
 
+        /** Internal method to display the login dialog */
+        _showLoginDialog: function () {
+            openLoginDialog();
+        },
+
         /** Returns a promise, sends a request to the server to check if the current cookie is authorized  */
-        isAuthenticated: function (args) {
-            
-            return authResource.isAuthenticated()
-                .then(function(data) {
-
-                    //note, this can return null if they are not authenticated
-                    if (!data) {                        
-                        throw "Not authenticated";
-                    }
-                    else {
-
-                        var result = { user: data, authenticated: true, lastUserId: lastUserId };
-
-                        if (args.broadcastEvent) {
-                            //broadcast a global event, will inform listening controllers to load in the user specific data
-                            $rootScope.$broadcast("authenticated", result);
-                        }
-
-                        currentUser = data;
-                        currentUser.avatar = 'http://www.gravatar.com/avatar/' + data.emailHash + '?s=40&d=404';
-                        return result;
-                    }
-                });
+        isAuthenticated: function () {
+            //if we've got a current user then just return true
+            if (currentUser) {
+                var deferred = $q.defer();
+                deferred.resolve(true);
+                return deferred.promise;
+            }
+            return authResource.isAuthenticated();
         },
 
         /** Returns a promise, sends a request to the server to validate the credentials  */
@@ -97,6 +87,7 @@ angular.module('umbraco.services')
                 });
         },
 
+        /** Logs the user out and redirects to the login page */
         logout: function () {
             return authResource.performLogout()
                 .then(function (data) {                   
@@ -107,14 +98,38 @@ angular.module('umbraco.services')
                     //broadcast a global event
                     $rootScope.$broadcast("notAuthenticated");
 
-                    openLoginDialog();
+                    $location.path("/login").search({check: false});
+
                     return null;
                 });
         },
 
-        /** Returns the current user object, if null then calls to authenticated or authenticate must be called  */
-        getCurrentUser: function () {
-            return currentUser;
+        /** Returns the current user object in a promise  */
+        getCurrentUser: function (args) {
+            var deferred = $q.defer();
+            
+            if (!currentUser) {
+                authResource.getCurrentUser()
+                    .then(function(data) {
+
+                        var result = { user: data, authenticated: true, lastUserId: lastUserId };
+
+                        if (args.broadcastEvent) {
+                            //broadcast a global event, will inform listening controllers to load in the user specific data
+                            $rootScope.$broadcast("authenticated", result);
+                        }
+
+                        currentUser = data;
+                        currentUser.avatar = 'http://www.gravatar.com/avatar/' + data.emailHash + '?s=40&d=404';
+                        deferred.resolve(currentUser);
+                    });
+
+            }
+            else {
+                deferred.resolve(currentUser);
+            }
+            
+            return deferred.promise;
         }
     };
 

src/Umbraco.Web.UI.Client/src/routes.js

@@ -1,15 +1,62 @@
 app.config(function ($routeProvider) {
+
+    /** This checks if the user is authenticated for a route and what the isRequired is set to. 
+        Depending on whether isRequired = true, it first check if the user is authenticated and will resolve successfully
+        otherwise the route will fail and the $routeChangeError event will execute, in that handler we will redirect to the rejected
+        path that is resolved from this method and prevent default (prevent the route from executing) */
+    var checkAuth = function(isRequired) {
+        return {
+            isAuthenticated: function ($q, userService, $route) {
+                var deferred = $q.defer();
+
+                //don't need to check if we've redirected to login and we've already checked auth
+                if (!$route.current.params.section && $route.current.params.check === false) {
+                    deferred.resolve(true);
+                    return deferred.promise;
+                }
+                
+                userService.isAuthenticated()
+                    .then(function () {
+                        if (isRequired) {
+                            //this will resolve successfully so the route will continue
+                            deferred.resolve(true);
+                        }
+                        else {
+                            deferred.reject({ path: "/" });
+                        }
+                    }, function () {
+                        if (isRequired) {                            
+                            //the check=false is checked above so that we don't have to make another http call to check
+                            //if they are logged in since we already know they are not.
+                            deferred.reject({ path: "/login", search: { check: false } });
+                        }
+                        else {
+                            //this will resolve successfully so the route will continue
+                            deferred.resolve(true);
+                        }
+                    });                
+                return deferred.promise;
+            }
+        };
+    };
+
     $routeProvider
+        .when('/login', {
+            templateUrl: 'views/common/login.html',
+            //ensure auth is *not* required so it will redirect to /content otherwise
+            resolve: checkAuth(false)
+        })
         .when('/:section', {
             templateUrl: function (rp) {
-                if (rp.section === "default" || rp.section === "")
+                if (rp.section.toLowerCase() === "default" || rp.section.toLowerCase() === "umbraco" || rp.section === "")
                 {
                     rp.section = "content";
                 }
 
                 rp.url = "dashboard.aspx?app=" + rp.section;
                 return 'views/common/dashboard.html';
-            }
+            },
+            resolve: checkAuth(true)
         })
         .when('/framed/:url', {
             //This occurs when we need to launch some content in an iframe
@@ -18,7 +65,8 @@ app.config(function ($routeProvider) {
                     throw "A framed resource must have a url route parameter";
 
                 return 'views/common/legacy.html';
-            }
+            },
+            resolve: checkAuth(true)
         })
         .when('/:section/:method', {
             templateUrl: function(rp) {
@@ -32,7 +80,8 @@ app.config(function ($routeProvider) {
                 // dashboards (as tabs if we wanted) and each tab could actually be a route link to one of these views?
 
                 return 'views/' + rp.section + '/' + rp.method + '.html';
-            }
+            },
+            resolve: checkAuth(true)
         })
         .when('/:section/:tree/:method/:id', {
             templateUrl: function (rp) {
@@ -43,9 +92,10 @@ app.config(function ($routeProvider) {
                 //we don't need to put views into section folders since theoretically trees
                 // could be moved among sections, we only need folders for specific trees.
                 return 'views/' + rp.tree + '/' + rp.method + '.html';
-            }
+            },
+            resolve: checkAuth(true)
         })        
-        .otherwise({ redirectTo: '/content' });
+        .otherwise({ redirectTo: '/login' });
     }).config(function ($locationProvider) {
 
         //$locationProvider.html5Mode(false).hashPrefix('!'); //turn html5 mode off
@@ -53,10 +103,28 @@ app.config(function ($routeProvider) {
 });
 
 
-app.run(['userService', '$log', '$rootScope', function (userService, $log, $rootScope) {
+app.run(['userService', '$log', '$rootScope', '$location', function (userService, $log, $rootScope, $location) {
 
-    // Get the current user when the application starts
-    // (in case they are still logged in from a previous session)
+    var firstRun = true;
+
+    /** when we have a successful first route that is not the login page - meaning the user is authenticated
+        we'll get the current user from the user service and ensure it broadcasts it's events. If the route
+        is successful from after a login then this will not actually do anything since the authenticated event would
+        have alraedy fired, but if the user is loading the angularjs app for the first time and they are already authenticated
+        then this is when the authenticated event will be fired.
+    */
+    $rootScope.$on('$routeChangeSuccess', function (event, current, previous) {
+        if (firstRun && !$location.url().toLowerCase().startsWith("/login")) {
+            firstRun = false;
+            userService.getCurrentUser({ broadcastEvent: true });
+        }
+    });
+
+    /** When the route change is rejected - based on checkAuth - we'll prevent the rejected route from executing including
+        wiring up it's controller, etc... and then redirect to the rejected URL.   */
+    $rootScope.$on('$routeChangeError', function (event, current, previous, rejection) {
+        event.preventDefault();
+        $location.path(rejection.path).search(rejection.search);
+    });
 
-    userService.isAuthenticated({broadcastEvent: true});
 }]);  

src/Umbraco.Web.UI.Client/src/views/common/dialogs/user.controller.js

@@ -5,9 +5,9 @@ angular.module("umbraco")
         $scope.history = historyService.current;
 
         $scope.logout = function () {
-	        userService.logout();
-	        $scope.hide();
-	        $location.path("/");
+            userService.logout().then(function() {
+                $scope.hide();                
+            });
     	};
 
 	    $scope.gotoHistory = function (link) {

src/Umbraco.Web.UI.Client/src/views/common/login.controller.js

@@ -0,0 +1,11 @@
+/** This controller is simply here to launch the login dialog when the route is explicitly changed to /login */
+angular.module('umbraco').controller("Umbraco.LoginController", function ($scope, userService, $location) {
+
+    userService._showLoginDialog();
+    
+    //when a user is authorized redirect - this will only be handled here when we are actually on the /login route
+    $scope.$on("authenticated", function(evt, data) {
+        $location.path("/").search("");
+    });
+
+});

src/Umbraco.Web.UI.Client/src/views/common/login.html

@@ -0,0 +1,3 @@
+<div ng-controller="Umbraco.LoginController">
+    
+</div>

src/Umbraco.Web.UI.Client/src/views/common/main.controller.js

@@ -8,7 +8,7 @@
  * The main application controller
  * 
  */
-function MainController($scope, $routeParams, $rootScope, $timeout, $http, $log, notificationsService, userService, navigationService, legacyJsLoader) {
+function MainController($scope, $location, $routeParams, $rootScope, $timeout, $http, $log, notificationsService, userService, navigationService, legacyJsLoader) {
 
     var legacyTreeJsLoaded = false;
     
@@ -78,6 +78,12 @@ function MainController($scope, $routeParams, $rootScope, $timeout, $http, $log,
         $scope.authenticated = data.authenticated;
         $scope.user = data.user;
 
+        //if the user has changed we need to redirect to the root so they don't try to continue editing the
+        //last item in the URL
+        if (data.lastUserId && data.lastUserId !== data.user.id) {
+            $location.path("/").search("");
+        }
+
         //var url = "http://www.gravatar.com/avatar/" + $scope.user.emailHash + ".json?404=404";
         //$http.jsonp(url).then(function(response){
         //    $log.log("found: " + response);

src/Umbraco.Web.UI.Client/src/views/member/member.delete.controller.js

@@ -13,7 +13,7 @@ function MemberDeleteController($scope, memberResource, treeService, navigationS
         //mark it for deletion (used in the UI)
         $scope.currentNode.loading = true;
 
-        memberResource.deleteByLogin($scope.currentNode.id).then(function () {
+        memberResource.deleteByKey($scope.currentNode.id).then(function () {
             $scope.currentNode.loading = false;
 
             //TODO: Need to sync tree, etc...

src/Umbraco.Web.UI.Client/src/views/member/member.edit.controller.js

@@ -22,7 +22,7 @@ function MemberEditController($scope, $routeParams, $q, $timeout, $window, membe
     }
     else {
         //we are editing so get the content item from the server
-        memberResource.getByLogin($routeParams.id)
+        memberResource.getByKey($routeParams.id)
             .then(function(data) {
                 $scope.loaded = true;
                 $scope.content = data;

src/Umbraco.Web.UI.Client/src/views/propertyeditors/boolean/boolean.controller.js

@@ -1,14 +1,26 @@
 function booleanEditorController($scope, $rootScope, assetsService) {
-    $scope.renderModel = {
-        value: false
-    };
-    if ($scope.model && $scope.model.value && ($scope.model.value.toString() === "1" || angular.lowercase($scope.model.value) === "true")) {
-        $scope.renderModel.value = true;
+
+    function setupViewModel() {
+        $scope.renderModel = {
+            value: false
+        };
+        if ($scope.model && $scope.model.value && ($scope.model.value.toString() === "1" || angular.lowercase($scope.model.value) === "true")) {
+            $scope.renderModel.value = true;
+        }
     }
 
+    setupViewModel();
+
     $scope.$watch("renderModel.value", function (newVal) {
         $scope.model.value = newVal === true ? "1" : "0";
     });
+    
+    //here we declare a special method which will be called whenever the value has changed from the server
+    //this is instead of doing a watch on the model.value = faster
+    $scope.model.onValueChanged = function (newVal, oldVal) {
+        //update the display val again if it has changed from the server
+        setupViewModel();
+    };
 
 }
 angular.module("umbraco").controller("Umbraco.Editors.BooleanController", booleanEditorController);

src/Umbraco.Web.UI.Client/src/views/propertyeditors/checkboxlist/checkboxlist.controller.js

@@ -1,22 +1,27 @@
 angular.module("umbraco").controller("Umbraco.Editors.CheckboxListController",
     function($scope) {
-
-        $scope.selectedItems = [];
-                
+        
         if (!angular.isObject($scope.model.config.items)) {
             throw "The model.config.items property must be either a dictionary";
         }
-        
-        //now we need to check if the value is null/undefined, if it is we need to set it to "" so that any value that is set
-        // to "" gets selected by default
-        if ($scope.model.value === null || $scope.model.value === undefined) {
-            $scope.model.value = [];
+
+        function setupViewModel() {
+            $scope.selectedItems = [];
+
+            //now we need to check if the value is null/undefined, if it is we need to set it to "" so that any value that is set
+            // to "" gets selected by default
+            if ($scope.model.value === null || $scope.model.value === undefined) {
+                $scope.model.value = [];
+            }
+
+            for (var i in $scope.model.config.items) {
+                var isChecked = _.contains($scope.model.value, i);
+                $scope.selectedItems.push({ checked: isChecked, key: i, val: $scope.model.config.items[i] });
+            }
         }
 
-        for (var i in $scope.model.config.items) {
-            var isChecked = _.contains($scope.model.value, i);
-            $scope.selectedItems.push({ checked: isChecked, key: i, val: $scope.model.config.items[i] });
-        }
+        setupViewModel();
+        
 
         //update the model when the items checked changes
         $scope.$watch("selectedItems", function(newVal, oldVal) {
@@ -29,5 +34,12 @@ angular.module("umbraco").controller("Umbraco.Editors.CheckboxListController",
             }
 
         }, true);
+        
+        //here we declare a special method which will be called whenever the value has changed from the server
+        //this is instead of doing a watch on the model.value = faster
+        $scope.model.onValueChanged = function (newVal, oldVal) {
+            //update the display val again if it has changed from the server
+            setupViewModel();
+        };
 
     });

src/Umbraco.Web.UI.Client/src/views/propertyeditors/googlemaps/googlemaps.controller.js

@@ -1,75 +1,84 @@
 angular.module("umbraco")
 .controller("Umbraco.Editors.GoogleMapsController",
     function ($rootScope, $scope, notificationsService, dialogService, assetsService, $log, $timeout) {
-    
-    assetsService.loadJs('http://www.google.com/jsapi')
-        .then(function(){
-            google.load("maps", "3",
-                        {
-                            callback: initMap,
-                            other_params: "sensor=false"
+
+        assetsService.loadJs('http://www.google.com/jsapi')
+            .then(function () {
+                google.load("maps", "3",
+                            {
+                                callback: initMap,
+                                other_params: "sensor=false"
+                            });
+            });
+
+        function initMap() {
+            //Google maps is available and all components are ready to use.
+            var valueArray = $scope.model.value.split(',');
+            var latLng = new google.maps.LatLng(valueArray[0], valueArray[1]);
+            var mapDiv = document.getElementById($scope.model.alias + '_map');
+            var mapOptions = {
+                zoom: $scope.model.config.zoom,
+                center: latLng,
+                mapTypeId: google.maps.MapTypeId[$scope.model.config.mapType]
+            };
+            var geocoder = new google.maps.Geocoder();
+            var map = new google.maps.Map(mapDiv, mapOptions);
+
+            var marker = new google.maps.Marker({
+                map: map,
+                position: latLng,
+                draggable: true
+            });
+
+            google.maps.event.addListener(map, 'click', function (event) {
+
+                dialogService.mediaPicker({
+                    scope: $scope, callback: function (data) {
+                        var image = data.selection[0].src;
+
+                        var latLng = event.latLng;
+                        var marker = new google.maps.Marker({
+                            map: map,
+                            icon: image,
+                            position: latLng,
+                            draggable: true
                         });
-    });
 
-    function initMap(){
-        //Google maps is available and all components are ready to use.
-        var valueArray = $scope.model.value.split(',');
-        var latLng = new google.maps.LatLng(valueArray[0], valueArray[1]);      
-        var mapDiv = document.getElementById($scope.model.alias + '_map');
-        var mapOptions = {
-            zoom: $scope.model.config.zoom,
-            center: latLng,
-            mapTypeId: google.maps.MapTypeId[$scope.model.config.mapType]
-        };
-        var geocoder = new google.maps.Geocoder();
-        var map = new google.maps.Map(mapDiv, mapOptions);
+                        google.maps.event.addListener(marker, "dragend", function (e) {
+                            var newLat = marker.getPosition().lat();
+                            var newLng = marker.getPosition().lng();
 
-        var marker = new google.maps.Marker({
-            map: map,
-            position: latLng,
-            draggable: true
-        });
+                            codeLatLng(marker.getPosition(), geocoder);
 
-        google.maps.event.addListener(map, 'click', function(event) {
+                            //set the model value
+                            $scope.model.vvalue = newLat + "," + newLng;
+                        });
 
-            dialogService.mediaPicker({scope: $scope, callback: function(data){
-                var image = data.selection[0].src;
-
-                var latLng = event.latLng;
-                var marker = new google.maps.Marker({
-                    map: map,
-                    icon: image,
-                    position: latLng,
-                    draggable: true
+                    }
                 });
+            });
 
-                google.maps.event.addListener(marker, "dragend", function(e){
-                    var newLat = marker.getPosition().lat();
-                    var newLng = marker.getPosition().lng();
+            $('a[data-toggle="tab"]').on('shown', function (e) {
+                google.maps.event.trigger(map, 'resize');
+            });
+        }
 
-                    codeLatLng(marker.getPosition(), geocoder);
-
-                    //set the model value
-                    $scope.model.vvalue = newLat + "," + newLng;
-                });
-
-            }});
-        });
-
-        $('a[data-toggle="tab"]').on('shown', function (e) {
-            google.maps.event.trigger(map, 'resize');
-        });
-    }
-
-    function codeLatLng(latLng, geocoder) {
-        geocoder.geocode({'latLng': latLng},
-            function(results, status) {
-                if (status == google.maps.GeocoderStatus.OK) {
-                    var location = results[0].formatted_address;
+        function codeLatLng(latLng, geocoder) {
+            geocoder.geocode({ 'latLng': latLng },
+                function (results, status) {
+                    if (status == google.maps.GeocoderStatus.OK) {
+                        var location = results[0].formatted_address;
                         $rootScope.$apply(function () {
                             notificationsService.success("Peter just went to: ", location);
                         });
-                }
-            });
-    }
-});
+                    }
+                });
+        }
+
+        //here we declare a special method which will be called whenever the value has changed from the server
+        //this is instead of doing a watch on the model.value = faster
+        $scope.model.onValueChanged = function (newVal, oldVal) {
+            //update the display val again if it has changed from the server
+            initMap();
+        };
+    });

src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js

@@ -1,54 +1,68 @@
 //this controller simply tells the dialogs service to open a mediaPicker window
 //with a specified callback, this callback will receive an object with a selection on it
-angular.module('umbraco').controller("Umbraco.Editors.MediaPickerController", 
-	function($rootScope, $scope, dialogService, mediaResource, imageHelper, $log){
-	
-	
-	$scope.images = [];
-	$scope.ids = [];
+angular.module('umbraco').controller("Umbraco.Editors.MediaPickerController",
+    function($rootScope, $scope, dialogService, mediaResource, imageHelper, $log) {
 
-	if($scope.model.value){
-		$scope.ids = $scope.model.value.split(',');
 
-		mediaResource.getByIds($scope.ids).then(function(medias){
-			//img.media = media;
-			$(medias).each(function(i, media){
-				//shortcuts
-				//TODO, do something better then this for searching
-				var img = {};
-				img.src = imageHelper.getImagePropertyValue({imageModel: media});
-				img.thumbnail = imageHelper.getThumbnailFromPath(img.src);
-				$scope.images.push(img);
-			});
-		});
-	}
+        function setupViewModel() {
+            $scope.images = [];
+            $scope.ids = [];
 
-	$scope.remove = function(index){
-		$scope.images.splice(index, 1);
-		$scope.ids.splice(index, 1);
-		$scope.sync();
-	};
+            if ($scope.model.value) {
+                $scope.ids = $scope.model.value.split(',');
 
-	$scope.add = function(){
-		dialogService.mediaPicker({multipicker:true, callback: function(data){
-			$(data.selection).each(function(i, media){
-				//shortcuts
-				//TODO, do something better then this for searching
+                mediaResource.getByIds($scope.ids).then(function (medias) {
+                    //img.media = media;
+                    _.each(medias, function (media, i) {
+                        //shortcuts
+                        //TODO, do something better then this for searching
+                        var img = {};
+                        img.src = imageHelper.getImagePropertyValue({ imageModel: media });
+                        img.thumbnail = imageHelper.getThumbnailFromPath(img.src);
+                        $scope.images.push(img);
+                    });
+                });
+            }
+        }
 
-				var img = {};
-				img.id = media.id;
-				img.src = imageHelper.getImagePropertyValue({imageModel: media});
-				img.thumbnail = imageHelper.getThumbnailFromPath(img.src);
-				$scope.images.push(img);
-				$scope.ids.push(img.id);
-			});
+        setupViewModel();
 
-			$scope.sync();
-		}});
-	};
+        $scope.remove = function(index) {
+            $scope.images.splice(index, 1);
+            $scope.ids.splice(index, 1);
+            $scope.sync();
+        };
 
-	$scope.sync = function(){
-		$scope.model.value = $scope.ids.join();
-	};
+        $scope.add = function() {
+            dialogService.mediaPicker({
+                multipicker: true,
+                callback: function(data) {
+                    _.each(data.selection, function(media, i) {
+                        //shortcuts
+                        //TODO, do something better then this for searching
 
-});
+                        var img = {};
+                        img.id = media.id;
+                        img.src = imageHelper.getImagePropertyValue({ imageModel: media });
+                        img.thumbnail = imageHelper.getThumbnailFromPath(img.src);
+                        $scope.images.push(img);
+                        $scope.ids.push(img.id);
+                    });
+
+                    $scope.sync();
+                }
+            });
+        };
+
+        $scope.sync = function() {
+            $scope.model.value = $scope.ids.join();
+        };
+
+        //here we declare a special method which will be called whenever the value has changed from the server
+        //this is instead of doing a watch on the model.value = faster
+        $scope.model.onValueChanged = function (newVal, oldVal) {
+            //update the display val again if it has changed from the server
+            setupViewModel();
+        };
+
+    });

src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js

@@ -32,65 +32,79 @@ angular.module("umbraco")
         var plugins = "code";
 
         assetsService.loadJs("lib/tinymce/tinymce.min.js", $scope).then(function () {
-            //we need to add a timeout here, to force a redraw so TinyMCE can find
-            //the elements needed
-            $timeout(function () {
-                tinymce.DOM.events.domLoaded = true;
-                tinymce.init({
-                    mode: "exact",
-                    elements: $scope.model.alias + "_rte",
-                    skin: "umbraco",                    
-                    plugins: plugins,
-                    valid_elements: validElements,
-                    menubar: false,
-                    statusbar: false,
-                    height: 340,
-                    toolbar: toolbar,
-                    setup: function (editor) {
-                        
-                        //We need to listen on multiple things here because of the nature of tinymce, it doesn't 
-                        //fire events when you think!
-                        //The change event doesn't fire when content changes, only when cursor points are changed and undo points
-                        //are created. the blur event doesn't fire if you insert content into the editor with a button and then 
-                        //press save. 
-                        //We have a couple of options, one is to do a set timeout and check for isDirty on the editor, or we can 
-                        //listen to both change and blur and also on our own 'saving' event. I think this will be best because a 
-                        //timer might end up using unwanted cpu and we'd still have to listen to our saving event in case they clicked
-                        //save before the timeout elapsed.
-                        editor.on('change', function (e) {
-                            angularHelper.safeApply($scope, function() {
-                                $scope.model.value = editor.getContent();
-                            });                            
-                        });
-                        editor.on('blur', function (e) {
-                            angularHelper.safeApply($scope, function () {
+            
+            /** Loads in the editor */
+            function loadTinyMce() {
+                
+                //we need to add a timeout here, to force a redraw so TinyMCE can find
+                //the elements needed
+                $timeout(function () {
+                    tinymce.DOM.events.domLoaded = true;
+                    tinymce.init({
+                        mode: "exact",
+                        elements: $scope.model.alias + "_rte",
+                        skin: "umbraco",
+                        plugins: plugins,
+                        valid_elements: validElements,
+                        menubar: false,
+                        statusbar: false,
+                        height: 340,
+                        toolbar: toolbar,
+                        setup: function (editor) {
+
+                            //We need to listen on multiple things here because of the nature of tinymce, it doesn't 
+                            //fire events when you think!
+                            //The change event doesn't fire when content changes, only when cursor points are changed and undo points
+                            //are created. the blur event doesn't fire if you insert content into the editor with a button and then 
+                            //press save. 
+                            //We have a couple of options, one is to do a set timeout and check for isDirty on the editor, or we can 
+                            //listen to both change and blur and also on our own 'saving' event. I think this will be best because a 
+                            //timer might end up using unwanted cpu and we'd still have to listen to our saving event in case they clicked
+                            //save before the timeout elapsed.
+                            editor.on('change', function (e) {
+                                angularHelper.safeApply($scope, function () {
+                                    $scope.model.value = editor.getContent();
+                                });
+                            });
+                            editor.on('blur', function (e) {
+                                angularHelper.safeApply($scope, function () {
+                                    $scope.model.value = editor.getContent();
+                                });
+                            });
+                            var unsubscribe = $scope.$on("saving", function () {
                                 $scope.model.value = editor.getContent();
                             });
-                        });
-                        var unsubscribe = $scope.$on("saving", function() {
-                            $scope.model.value = editor.getContent();
-                        });
 
-                        //when the element is disposed we need to unsubscribe!
-                        // NOTE: this is very important otherwise if this is part of a modal, the listener still exists because the dom 
-                        // element might still be there even after the modal has been hidden.
-                        $element.bind('$destroy', function () {
-                            unsubscribe();
-                        });
+                            //when the element is disposed we need to unsubscribe!
+                            // NOTE: this is very important otherwise if this is part of a modal, the listener still exists because the dom 
+                            // element might still be there even after the modal has been hidden.
+                            $element.bind('$destroy', function () {
+                                unsubscribe();
+                            });
 
-                        //Create the insert media plugin
-                        tinyMceService.createMediaPicker(editor, $scope);
+                            //Create the insert media plugin
+                            tinyMceService.createMediaPicker(editor, $scope);
 
-                        //Create the insert icon plugin
-                        tinyMceService.createInsertEmbeddedMedia(editor, $scope);
+                            //Create the insert icon plugin
+                            tinyMceService.createInsertEmbeddedMedia(editor, $scope);
 
-                        //Create the insert macro plugin
-                        tinyMceService.createInsertMacro(editor, $scope);
+                            //Create the insert macro plugin
+                            tinyMceService.createInsertMacro(editor, $scope);
 
 
-                    }
-                });
-            }, 1);
+                        }
+                    });
+                }, 1);
+            }
+            
+            loadTinyMce();
+
+            //here we declare a special method which will be called whenever the value has changed from the server
+            //this is instead of doing a watch on the model.value = faster
+            $scope.model.onValueChanged = function (newVal, oldVal) {
+                //update the display val again if it has changed from the server
+                loadTinyMce();
+            };
 
         });
     });

src/Umbraco.Web.UI/Umbraco.Web.UI.csproj

@@ -46,6 +46,7 @@
     <IISExpressUseClassicPipelineMode />
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
+    <MvcProjectUpgradeChecked>true</MvcProjectUpgradeChecked>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <OutputPath>bin\</OutputPath>
@@ -421,13 +422,6 @@
     <Compile Include="Umbraco\controls\Images\ImageViewer.ascx.designer.cs">
       <DependentUpon>ImageViewer.ascx</DependentUpon>
     </Compile>
-    <Compile Include="Umbraco\Create.aspx.cs">
-      <DependentUpon>create.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="Umbraco\Create.aspx.designer.cs">
-      <DependentUpon>create.aspx</DependentUpon>
-    </Compile>
     <Compile Include="Umbraco\Create\PartialView.ascx.cs">
       <DependentUpon>PartialView.ascx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
@@ -587,13 +581,6 @@
     <Compile Include="Umbraco\TreeInit.aspx.designer.cs">
       <DependentUpon>treeInit.aspx</DependentUpon>
     </Compile>
-    <Compile Include="Umbraco\Umbraco.aspx.cs">
-      <DependentUpon>umbraco.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="Umbraco\Umbraco.aspx.designer.cs">
-      <DependentUpon>umbraco.aspx</DependentUpon>
-    </Compile>
     <Content Include="Umbraco_Client\IconPicker\iconpicker.js" />
     <Content Include="App_Plugins\MyPackage\Common\Js\MyPackage.js" />
     <Content Include="App_Plugins\MyPackage\PropertyEditors\Js\CsvEditor.js" />
@@ -694,7 +681,6 @@
     <Content Include="Umbraco\Config\Lang\ru.xml" />
     <Content Include="Umbraco\Config\Lang\zh.xml" />
     <Content Include="Umbraco\Controls\Tree\CustomTreeService.asmx" />
-    <Content Include="Umbraco\create.aspx" />
     <Content Include="Umbraco\Create\PartialViewMacro.ascx" />
     <Content Include="Umbraco\Dashboard\ExamineManagement.ascx" />
     <Content Include="Umbraco\Developer\RelationTypes\EditRelationType.aspx" />
@@ -2047,7 +2033,6 @@
     <Content Include="Install\Steps\welcome.ascx">
       <SubType>UserControl</SubType>
     </Content>
-    <Content Include="Umbraco\cacheBrowser.aspx" />
     <Content Include="Umbraco\Config\Create\UI.xml" />
     <Content Include="Umbraco\Config\Lang\en.xml">
       <SubType>Designer</SubType>
@@ -2181,7 +2166,6 @@
     <Content Include="Umbraco_Client\GenericProperty\genericproperty.css" />
     <Content Include="Umbraco\Css\splitter.gif" />
     <Content Include="Umbraco\Css\umbracoGui.css" />
-    <Content Include="Umbraco\dashboard.aspx" />
     <Content Include="Umbraco\Dashboard\LatestEdits.ascx" />
     <Content Include="Umbraco\Developer\Macros\assemblyBrowser.aspx" />
     <Content Include="Umbraco\Developer\autoDoc.aspx" />
@@ -2190,8 +2174,6 @@
     <Content Include="Umbraco\Developer\Xslt\getXsltStatus.asmx" />
     <Content Include="Umbraco\Developer\Xslt\xsltChooseExtension.aspx" />
     <Content Include="Umbraco\Developer\Xslt\xsltInsertValueOf.aspx" />
-    <Content Include="Umbraco\editContent.aspx" />
-    <Content Include="Umbraco\editMedia.aspx" />
     <Content Include="Umbraco\Images\arrawBack.gif" />
     <Content Include="Umbraco\Images\arrowDown.gif" />
     <Content Include="Umbraco\Images\arrowForward.gif" />
@@ -2396,8 +2378,6 @@
     <Content Include="Umbraco\Js\umbracoCheckKeys.js" />
     <Content Include="Umbraco\Js\xmlextras.js" />
     <Content Include="Umbraco\Js\xmlRequest.js" />
-    <Content Include="Umbraco\login.aspx" />
-    <Content Include="Umbraco\logout.aspx" />
     <Content Include="Umbraco\macroResultWrapper.aspx">
       <SubType>Form</SubType>
     </Content>
@@ -2421,7 +2401,6 @@
     <Content Include="Umbraco\Dialogs\sort.aspx" />
     <Content Include="Umbraco\tree.aspx" />
     <Content Include="Umbraco\treeInit.aspx" />
-    <Content Include="Umbraco\umbraco.aspx" />
     <Content Include="Umbraco\Users\EditUser.aspx" />
     <Content Include="Umbraco\Users\EditUserType.aspx" />
     <!--<Content Include="Umbraco\users\PermissionEditor.aspx" />-->

src/Umbraco.Web.UI/umbraco/Create.aspx.cs

@@ -1,39 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
-using System.Xml;
-using Umbraco.Core;
-using Umbraco.Core.IO;
-using umbraco.cms.presentation.Trees;
-
-namespace Umbraco.Web.UI.Umbraco
-{
-    public partial class CreateDialog : global::umbraco.cms.presentation.Create
-    {
-
-        protected override void OnLoad(EventArgs e)
-        {
-            if (SecurityCheck(Request.QueryString["nodeType"]))
-            {
-                //if we're allowed, then continue
-                base.OnLoad(e);
-            }
-            else
-            {
-                //otherwise show an error
-                UI.Visible = false;
-                AccessError.Visible = true;
-            }
-        }
-
-        private bool SecurityCheck(string nodeTypeAlias)
-        {
-            return LegacyDialogHandler.UserHasCreateAccess(
-                new HttpContextWrapper(Context),
-                getUser(),
-                nodeTypeAlias);
-        }
-
-    }
-}

src/Umbraco.Web.UI/umbraco/Create.aspx.designer.cs

@@ -1,25 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated. 
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace Umbraco.Web.UI.Umbraco {
-
-
-    public partial class CreateDialog
-    {
-        
-        /// <summary>
-        /// AccessError 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 AccessError;
-    }
-}

src/Umbraco.Web.UI/umbraco/Umbraco.aspx.cs

@@ -1,185 +0,0 @@
-using System;
-using System.IO;
-using System.Linq;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Web;
-using System.Web.UI;
-using Umbraco.Core.IO;
-using umbraco;
-using Umbraco.Core;
-
-namespace Umbraco.Web.UI.Umbraco
-{
-    public partial class Umbraco : Pages.UmbracoEnsuredPage
-	{        
-        public string DefaultApp { get; private set; }
-
-        protected void Page_Load(object sender, System.EventArgs e)
-        {
-            var apps = UmbracoUser.Applications.ToList();
-            bool userHasAccesstodefaultApp = apps.Any(x => x.alias == Constants.Applications.Content);
-
-            // Load user module icons ..
-            if (apps.Count() > 1)
-            {
-
-                var jsEvents = new StringBuilder();
-
-                PlaceHolderAppIcons.Text = ui.Text("main", "sections", UmbracoUser);
-                plcIcons.Text = "";
-                foreach (global::umbraco.BusinessLogic.Application a in apps.OrderBy(x => x.sortOrder))
-                {
-
-                    string appClass = a.icon.StartsWith(".") ? a.icon.Substring(1, a.icon.Length - 1) : a.alias;
-
-                    //adds client side event handlers to the icon buttons
-                    jsEvents.Append(@"jQuery('." + appClass + "').click(function() { appClick.call(this, '" + a.alias + "'); } );");
-                    jsEvents.Append(@"jQuery('." + appClass + "').dblclick(function() { appDblClick.call(this, '" + a.alias + "'); } );");
-
-                    string iconElement = String.Format("<li><a class=\"{0}\" title=\"" + ui.Text("sections", a.alias, UmbracoUser) + "\" href=\"javascript:void(0);\">", appClass);
-                    if (a.icon.StartsWith("."))
-                        iconElement +=
-                            "<img src=\"images/nada.gif\" class=\"trayHolder\" alt=\"\" /></a></li>";
-                    else
-                        iconElement += "<img src=\"images/tray/" + a.icon + "\" class=\"trayIcon\" alt=\"" + ui.Text("sections", a.alias, UmbracoUser) + "\"></a></li>";
-                    plcIcons.Text += iconElement;
-
-                }
-
-                //registers the jquery event handlers.
-                Page.ClientScript.RegisterStartupScript(this.GetType(), "AppIcons", "jQuery(document).ready(function() { " + jsEvents.ToString() + " } );", true);
-
-            }
-            else
-                PlaceHolderAppIcons.Visible = false;
-
-
-            //if user does not have access to content (ie, he's probably a translator)...
-            //then change the default tree app
-            if (!userHasAccesstodefaultApp)
-            {
-                JTree.App = apps[0].alias;
-                DefaultApp = apps[0].alias;
-            }
-            else
-            {
-                DefaultApp = Constants.Applications.Content;
-            }
-
-
-            // Load globalized labels
-            treeWindow.Text = ui.Text("main", "tree", UmbracoUser);
-
-            RenderActionJs();
-
-            // Version check goes here!
-
-            // zb-00004 #29956 : refactor cookies names & handling
-            var updChkCookie = new global::umbraco.BusinessLogic.StateHelper.Cookies.Cookie("UMB_UPDCHK", GlobalSettings.VersionCheckPeriod); // was "updateCheck"
-            string updateCheckCookie = updChkCookie.HasValue ? updChkCookie.GetValue() : "";
-
-            if (GlobalSettings.VersionCheckPeriod > 0 && String.IsNullOrEmpty(updateCheckCookie) && UmbracoUser.UserType.Alias == "admin")
-            {
-
-                // Add scriptmanager version check
-                ScriptManager sm = ScriptManager.GetCurrent(Page);
-                sm.Scripts.Add(new ScriptReference(SystemDirectories.Umbraco + "/js/umbracoUpgradeChecker.js"));
-                sm.Services.Add(new ServiceReference(SystemDirectories.WebServices + "/CheckForUpgrade.asmx"));
-
-                Page.ClientScript.RegisterClientScriptBlock(this.GetType(), "upgradeChecker", "jQuery(document).ready(function() {umbraco.presentation.webservices.CheckForUpgrade.CallUpgradeService(umbracoCheckUpgrade);});", true);
-
-                updChkCookie.SetValue("1");
-            }
-            DataBind();
-
-            AddIe9Meta();
-        }
-
-        private void AddIe9Meta()
-        {
-            if (Request.Browser.Browser == "IE" && Request.Browser.MajorVersion == 9)
-            {
-                var metadata = new StringBuilder();
-                metadata.AppendFormat(
-    @"<link rel='icon' href='{0}' type='image/x-icon'>
-                <link rel='shortcut icon' href='{0}' type='image/x-icon'> 
-                <meta name='application-name' content='Umbraco CMS - {1}' />
-                <meta name='msapplication-tooltip' content='Umbraco CMS - {1}' />
-                <meta name='msapplication-navbutton-color' content='#f36f21' />
-                <meta name='msapplication-starturl' content='./umbraco.aspx' />",
-    IOHelper.ResolveUrl(SystemDirectories.Umbraco + "/Images/PinnedIcons/umb.ico"),
-    HttpContext.Current.Request.Url.Host.ToLower().Replace("www.", ""));
-
-                var user = UmbracoUser;
-                if (user != null && user.Applications != null && user.Applications.Length > 0)
-                {
-                    foreach (var app in user.Applications)
-                    {
-                        metadata.AppendFormat(
-                            @"<meta name='msapplication-task' content='name={0}; action-uri={1}; icon-uri={2}' />",
-                            ui.Text("sections", app.alias, user),
-                            IOHelper.ResolveUrl(string.Format("{0}/umbraco.aspx#{1}", SystemDirectories.Umbraco, app.alias)),
-                            File.Exists(
-                                IOHelper.MapPath(
-                                    IOHelper.ResolveUrl(
-                                        string.Format("{0}/Images/PinnedIcons/task_{1}.ico", SystemDirectories.Umbraco, app.alias))))
-                                ? "/umbraco/Images/PinnedIcons/task_" + app.alias + ".ico"
-                                : "/umbraco/Images/PinnedIcons/task_default.ico");
-                    }
-                }
-
-                this.Header.Controls.Add(new LiteralControl(metadata.ToString()));
-            }
-        }
-
-        /// <summary>
-        /// Renders out all JavaScript references that have bee declared in IActions
-        /// </summary>
-        private void RenderActionJs()
-        {
-            var item = 0;
-            foreach (var jsFile in global::umbraco.BusinessLogic.Actions.Action.GetJavaScriptFileReferences())
-            {
-                //validate that this is a url, if it is not, we'll assume that it is a text block and render it as a text
-                //block instead.
-                var isValid = true;
-                try
-                {
-                    var jsUrl = new Uri(jsFile, UriKind.RelativeOrAbsolute);
-                    //ok it validates, but so does alert('hello'); ! so we need to do more checks
-
-                    //here are the valid chars in a url without escaping
-                    if (Regex.IsMatch(jsFile, @"[^a-zA-Z0-9-._~:/?#\[\]@!$&'\(\)*\+,%;=]"))
-                        isValid = false;
-
-                    //we'll have to be smarter and just check for certain js patterns now too!
-                    var jsPatterns = new string[] { @"\+\s*\=", @"\);", @"function\s*\(", @"!=", @"==" };
-                    if (jsPatterns.Any(p => Regex.IsMatch(jsFile, p)))
-                    {
-                        isValid = false;
-                    }
-
-                    if (isValid)
-                    {
-                        //add to page
-                        Page.ClientScript.RegisterClientScriptInclude(this.GetType(), item.ToString(), jsFile);
-                    }
-                }
-                catch (UriFormatException)
-                {
-                    isValid = false;
-                }
-
-                if (!isValid)
-                {
-                    //it is invalid, let's render it as a script block instead as devs may have written real Javascript instead
-                    //of a JS path
-                    Page.ClientScript.RegisterClientScriptBlock(this.GetType(), item.ToString(), jsFile, true);
-                }
-
-                item++;
-            }
-        }
-	}
-}

src/Umbraco.Web.UI/umbraco/Umbraco.aspx.designer.cs

@@ -1,286 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated. 
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace Umbraco.Web.UI.Umbraco {
-
-
-    public partial class Umbraco
-    {
-        
-        /// <summary>
-        /// ClientLoader control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::umbraco.uicontrols.UmbracoClientDependencyLoader ClientLoader;
-        
-        /// <summary>
-        /// CssInclude1 control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::ClientDependency.Core.Controls.CssInclude CssInclude1;
-        
-        /// <summary>
-        /// CssInclude2 control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::ClientDependency.Core.Controls.CssInclude CssInclude2;
-        
-        /// <summary>
-        /// JsInclude1 control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::ClientDependency.Core.Controls.JsInclude JsInclude1;
-        
-        /// <summary>
-        /// JSON2 control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::ClientDependency.Core.Controls.JsInclude JSON2;
-        
-        /// <summary>
-        /// JsInclude2 control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::ClientDependency.Core.Controls.JsInclude JsInclude2;
-        
-        /// <summary>
-        /// JsInclude3 control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::ClientDependency.Core.Controls.JsInclude JsInclude3;
-        
-        /// <summary>
-        /// JsInclude14 control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::ClientDependency.Core.Controls.JsInclude JsInclude14;
-        
-        /// <summary>
-        /// JsInclude5 control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::ClientDependency.Core.Controls.JsInclude JsInclude5;
-        
-        /// <summary>
-        /// JsInclude6 control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::ClientDependency.Core.Controls.JsInclude JsInclude6;
-        
-        /// <summary>
-        /// JsInclude13 control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::ClientDependency.Core.Controls.JsInclude JsInclude13;
-        
-        /// <summary>
-        /// JsInclude7 control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::ClientDependency.Core.Controls.JsInclude JsInclude7;
-        
-        /// <summary>
-        /// JsInclude8 control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::ClientDependency.Core.Controls.JsInclude JsInclude8;
-        
-        /// <summary>
-        /// JsInclude9 control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::ClientDependency.Core.Controls.JsInclude JsInclude9;
-        
-        /// <summary>
-        /// JsInclude10 control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::ClientDependency.Core.Controls.JsInclude JsInclude10;
-        
-        /// <summary>
-        /// JsInclude11 control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::ClientDependency.Core.Controls.JsInclude JsInclude11;
-        
-        /// <summary>
-        /// JsInclude4 control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::ClientDependency.Core.Controls.JsInclude JsInclude4;
-        
-        /// <summary>
-        /// JsInclude17 control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::ClientDependency.Core.Controls.JsInclude JsInclude17;
-        
-        /// <summary>
-        /// JsInclude12 control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::ClientDependency.Core.Controls.JsInclude JsInclude12;
-        
-        /// <summary>
-        /// JsInclude15 control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::ClientDependency.Core.Controls.JsInclude JsInclude15;
-        
-        /// <summary>
-        /// JsInclude16 control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::ClientDependency.Core.Controls.JsInclude JsInclude16;
-        
-        /// <summary>
-        /// Form1 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.HtmlForm Form1;
-        
-        /// <summary>
-        /// umbracoScriptManager control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.ScriptManager umbracoScriptManager;
-        
-        /// <summary>
-        /// FindDocuments 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.Panel FindDocuments;
-        
-        /// <summary>
-        /// Search control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::Umbraco.Web.UI.Umbraco.Search.QuickSearch Search;
-        
-        /// <summary>
-        /// treeWindow control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::umbraco.uicontrols.UmbracoPanel treeWindow;
-        
-        /// <summary>
-        /// JTree control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::umbraco.controls.Tree.TreeControl JTree;
-        
-        /// <summary>
-        /// PlaceHolderAppIcons control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::umbraco.uicontrols.UmbracoPanel PlaceHolderAppIcons;
-        
-        /// <summary>
-        /// plcIcons 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.Literal plcIcons;
-        
-        /// <summary>
-        /// bubbleText 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 bubbleText;
-    }
-}

src/Umbraco.Web.UI/umbraco/cacheBrowser.aspx

@@ -1,16 +0,0 @@
-<%@ Page language="c#" Codebehind="cacheBrowser.aspx.cs" AutoEventWireup="True" Inherits="umbraco.cms.presentation.cacheBrowser" trace="true" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" >
-<HTML>
-	<HEAD>
-		<title>cacheBrowser</title>
-		<meta content="Microsoft Visual Studio .NET 7.1" name="GENERATOR">
-		<meta content="C#" name="CODE_LANGUAGE">
-		<meta content="JavaScript" name="vs_defaultClientScript">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">
-	</HEAD>
-	<body>
-		<form id="Form1" method="post" runat="server">
-			<asp:Button id="Button1" runat="server" Text="Button" onclick="Button1_Click"></asp:Button>
-		</form>
-	</body>
-</HTML>

src/Umbraco.Web.UI/umbraco/config/create/UI.Release.xml

@@ -59,14 +59,6 @@
       <delete assembly="umbraco" type="XsltTasks" />
     </tasks>
   </nodeType>
-  <nodeType alias="content">
-    <header>Page</header>
-    <usercontrol>/create/content.ascx</usercontrol>
-    <tasks>
-      <create assembly="umbraco" type="contentTasks" />
-      <delete assembly="umbraco" type="contentTasks" />
-    </tasks>
-  </nodeType>
   <nodeType alias="users">
     <header>User</header>
     <usercontrol>/create/simple.ascx</usercontrol>
@@ -138,15 +130,7 @@
       <create assembly="umbraco" type="MediaTypeTasks" />
       <delete assembly="umbraco" type="MediaTypeTasks" />
     </tasks>
-  </nodeType>
-  <nodeType alias="media">
-    <header>Media</header>
-    <usercontrol>/create/media.ascx</usercontrol>
-    <tasks>
-      <create assembly="umbraco" type="mediaTasks" />
-      <delete assembly="umbraco" type="mediaTasks" />
-    </tasks>
-  </nodeType>
+  </nodeType>  
   <nodeType alias="initmember">
     <header>member</header>
     <usercontrol>/create/member.ascx</usercontrol>

src/Umbraco.Web.UI/umbraco/config/create/UI.xml

@@ -59,14 +59,6 @@
       <delete assembly="umbraco" type="XsltTasks" />
     </tasks>
   </nodeType>
-  <nodeType alias="content">
-    <header>Page</header>
-    <usercontrol>/create/content.ascx</usercontrol>
-    <tasks>
-      <create assembly="umbraco" type="contentTasks" />
-      <delete assembly="umbraco" type="contentTasks" />
-    </tasks>
-  </nodeType>
   <nodeType alias="users">
     <header>User</header>
     <usercontrol>/create/simple.ascx</usercontrol>
@@ -138,15 +130,7 @@
       <create assembly="umbraco" type="MediaTypeTasks" />
       <delete assembly="umbraco" type="MediaTypeTasks" />
     </tasks>
-  </nodeType>
-  <nodeType alias="media">
-    <header>Media</header>
-    <usercontrol>/create/media.ascx</usercontrol>
-    <tasks>
-      <create assembly="umbraco" type="mediaTasks" />
-      <delete assembly="umbraco" type="mediaTasks" />
-    </tasks>
-  </nodeType>
+  </nodeType>  
   <nodeType alias="initmember">
     <header>member</header>
     <usercontrol>/create/member.ascx</usercontrol>

src/Umbraco.Web.UI/umbraco/create.aspx

@@ -1,43 +0,0 @@
-<%@ Page Language="c#" MasterPageFile="masterpages/umbracoDialog.Master" Codebehind="CreateDialog.aspx.cs" AutoEventWireup="True" Inherits="Umbraco.Web.UI.Umbraco.CreateDialog" %>
-<%@ Register Namespace="umbraco" TagPrefix="umb" Assembly="umbraco" %>
-
-
-<asp:Content ContentPlaceHolderID="head" runat="server">
-  <script type="text/javascript">
-    var preExecute;
-    function doSubmit() { document.forms[0].submit(); }
-
-    var functionsFrame = this;
-    var tabFrame = this;
-    var isDialog = true;
-    var submitOnEnter = true;
-  </script>
-</asp:Content>
-
-<asp:Content runat="server" ContentPlaceHolderID="body">
-    <asp:PlaceHolder ID="UI" runat="server"></asp:PlaceHolder>
-    <asp:PlaceHolder runat="server" Visible="False" ID="AccessError">
-        <div class="error">
-            <p>
-                The current user does not have access to create this type of object
-            </p>
-        </div>
-    </asp:PlaceHolder>
-</asp:Content>
-
-<asp:Content runat="server" ContentPlaceHolderID="footer">
-  <script type="text/javascript">
-    function setFocusOnText() {
-          for (var i = 0; i < document.forms[0].length; i++) {
-            if (document.forms[0][i].type == 'text') {
-              document.forms[0][i].focus();
-              break;
-            }
-          }
-    }
-    
-    <%if (!IsPostBack) { %>
-    setTimeout("setFocusOnText()", 100);
-    <%} %>
-  </script>
-</asp:Content>

src/Umbraco.Web.UI/umbraco/dashboard.aspx

@@ -1,11 +0,0 @@
-<%@ Page language="c#" MasterPageFile="masterpages/umbracoPage.Master" Title="dashboard" Codebehind="dashboard.aspx.cs" AutoEventWireup="True" Inherits="umbraco.cms.presentation.dashboard" trace="false" validateRequest="false"%>
-<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
-
-<asp:Content ContentPlaceHolderID="body" ID="ContentBody" runat="server">
-			<cc1:UmbracoPanel id="Panel2" runat="server" Height="224px" Width="412px" hasMenu="false">
-				<div style="padding: 2px 15px 0px 15px">
-				<asp:PlaceHolder id="dashBoardContent" Runat="server"></asp:PlaceHolder>
-				</div>
-			</cc1:UmbracoPanel>
-			<cc1:TabView id="dashboardTabs" Width="400px" Visible="false" runat="server" />
-</asp:Content>

src/Umbraco.Web.UI/umbraco/editContent.aspx

@@ -1,62 +0,0 @@
-<%@ Page Title="Edit content" Language="c#" MasterPageFile="masterpages/umbracoPage.Master"
-    CodeBehind="editContent.aspx.cs" ValidateRequest="false" AutoEventWireup="True"
-    Inherits="umbraco.cms.presentation.editContent" Trace="false" %>
-
-<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
-<%@ Register TagPrefix="umb" Namespace="ClientDependency.Core.Controls" Assembly="ClientDependency.Core" %>
-<asp:Content ContentPlaceHolderID="head" runat="server">
-</asp:Content>
-<asp:Content ID="Content1" ContentPlaceHolderID="body" runat="server">
-    <umb:JsInclude ID="JsInclude1" runat="server" FilePath="js/umbracoCheckKeys.js" PathNameAlias="UmbracoRoot" />
-    <umb:JsInclude ID="JsInclude2" runat="server" FilePath="ui/jquery.js" PathNameAlias="UmbracoClient"
-        Priority="0" />
-    <umb:JsInclude ID="JsInclude3" runat="server" FilePath="ui/jqueryui.js" PathNameAlias="UmbracoClient"
-        Priority="1" />
-    <table style="height: 38px; width: 371px; border: none 0px;" cellspacing="0" cellpadding="0"
-        id="__controls">
-        <tr valign="top">
-            <td height="20">
-            </td>
-            <td>
-                <asp:PlaceHolder ID="plc" runat="server"></asp:PlaceHolder>
-            </td>
-        </tr>
-    </table>
-    <input id="doSave" type="hidden" name="doSave" runat="server" />
-    <input id="doPublish" type="hidden" name="doPublish" runat="server" />
-    <script type="text/javascript">
-		// Save handlers for IDataFields		
-		var saveHandlers = new Array();
-		
-		// A hack to make sure that any javascript can access page id and version
-		<asp:Literal id="jsIds" runat="server"></asp:Literal>
-		
-		// For short-cut keys
-		var isDialog = true;
-		var functionsFrame = this;
-		var disableEnterSubmit = true;
-		
-		function addSaveHandler(handler) {
-			saveHandlers[saveHandlers.length] = handler;
-		}		
-		
-		function invokeSaveHandlers() {
-			for (var i=0;i<saveHandlers.length;i++) {
-				eval(saveHandlers[i]);
-			}
-		}
-		
-		jQuery(function() {
-		    var inputs = $('#__controls input:not(.editorIcon), #__controls textarea');
-		    //Sys.Debug.traceDump(inputs);
-		    inputs.change(function() {
-		        UmbClientMgr.set_isDirty(true);
-		    });
-		    jQuery('input.editorIcon').click(function() { UmbClientMgr.set_isDirty(false); });
-		});
-
-        jQuery(document).ready(function () {
-            UmbClientMgr.appActions().bindSaveShortCut();
-        });
-    </script>
-</asp:Content>

src/Umbraco.Web.UI/umbraco/editMedia.aspx

@@ -1,28 +0,0 @@
-<%@ Page Language="c#" CodeBehind="editMedia.aspx.cs" ValidateRequest="false" MasterPageFile="masterpages/umbracoPage.Master"
-    AutoEventWireup="True" Inherits="umbraco.cms.presentation.editMedia" %>
-
-<asp:Content ContentPlaceHolderID="head" runat="server">
-    <script type="text/javascript">
-        // Save handlers for IDataFields		
-        var saveHandlers = new Array()
-
-        function addSaveHandler(handler) {
-            saveHandlers[saveHandlers.length] = handler;
-        }
-
-        function invokeSaveHandlers() {
-            for (var i = 0; i < saveHandlers.length; i++) {
-                eval(saveHandlers[i]);
-            }
-        }
-
-        jQuery(document).ready(function () {
-            UmbClientMgr.appActions().bindSaveShortCut();
-        });
-    </script>
-</asp:Content>
-<asp:Content ContentPlaceHolderID="body" runat="server">
-    <asp:PlaceHolder ID="plc" runat="server"></asp:PlaceHolder>
-    <input id="doSave" type="hidden" name="doSave" runat="server">
-    <input id="doPublish" type="hidden" name="doPublish" runat="server">
-</asp:Content>

src/Umbraco.Web.UI/umbraco/login.aspx

@@ -1,129 +0,0 @@
-<%@ Page Language="c#" CodeBehind="login.aspx.cs" AutoEventWireup="True" Inherits="umbraco.cms.presentation.login" %>
-
-<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
-<%@ Register Namespace="umbraco" TagPrefix="umb" Assembly="umbraco" %>
-<%@ Register TagPrefix="umb" Namespace="ClientDependency.Core.Controls" Assembly="ClientDependency.Core" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" >
-<html>
-<head runat="server">
-    <title>Login - Umbraco - <%=Request.Url.Host.ToLower().Replace("www.", "") %></title>
-    <cc1:UmbracoClientDependencyLoader runat="server" ID="ClientLoader" />
-    <umb:CssInclude ID="CssInclude1" runat="server" FilePath="ui/default.css" PathNameAlias="UmbracoClient" />
-    <umb:JsInclude ID="JsInclude1" runat="server" FilePath="ui/default.js" PathNameAlias="UmbracoClient" />
-    <umb:JsInclude ID="JsInclude3" runat="server" FilePath="ui/jquery.js" PathNameAlias="UmbracoClient"
-        Priority="0" />
-    <umb:JsInclude ID="JsInclude2" runat="server" FilePath="ui/jqueryui.js" PathNameAlias="UmbracoClient" />
-    <style type="text/css">
-        html
-        {
-            width: 100%;
-            height: 100%;
-        }
-        body
-        {
-            font-size: 11px;
-            width: 100%;
-            font-family: Trebuchet MS, verdana, arial, Lucida Grande;
-            text-align: center;
-            padding-top: 50px;
-            margin: 0px;
-        }
-        
-        #Panel1_content
-        {
-            background: url(images/loginBg.png) no-repeat 1px 5px;
-        }
-        #Panel1_innerContent
-        {
-            width: auto;
-            height: auto;
-            padding: 0px !important;
-        }
-        
-        label
-        {
-            padding-right: 20px;
-        }
-        .copyright
-        {
-            padding: 10px 0px 0px 0px;
-            font-size: 11px;
-        }
-        .copyright a
-        {
-            text-decoration: underline !important;
-            padding-left: 5px;
-        }
-    </style>
-</head>
-<body>
-    <form id="Form1" method="post" runat="server">
-    <cc1:UmbracoPanel Style="text-align: left;" ID="Panel1" runat="server" Height="347px"
-        Width="340px" Text="Umbraco login" AutoResize="false">
-        <div style="padding: 70px 0px 0px 0px;">
-            <p style="margin: 0px; padding: 5px 0px 20px 0px; color: #999">
-                <asp:Literal ID="TopText" runat="server"></asp:Literal>
-            </p>
-            <table id="loginTable" cellspacing="0" cellpadding="0" border="0">
-                <tr>
-                    <td align="right">
-                        <asp:Label ID="username" runat="server" AssociatedControlID="lname"></asp:Label>
-                    </td>
-                    <td>
-                        <asp:TextBox ID="lname" Style="padding-left: 3px; background: url(images/gradientBackground.png);
-                            _background: none; border-right: #999999 1px solid; border-top: #999999 1px solid;
-                            border-left: #999999 1px solid; border-bottom: #999999 1px solid; width: 180px;"
-                            runat="server"></asp:TextBox>
-                    </td>
-                </tr>
-                <tr>
-                    <td colspan="2" style="height: 12px;">
-                    </td>
-                </tr>
-                <tr>
-                    <td align="right">
-                        <asp:Label ID="password" runat="server" AssociatedControlID="passw"></asp:Label>
-                    </td>
-                    <td>
-                        <asp:TextBox ID="passw" Style="padding-left: 3px; background: url(images/gradientBackground.png);
-                            _background: none; border-right: #999999 1px solid; border-top: #999999 1px solid;
-                            border-left: #999999 1px solid; border-bottom: #999999 1px solid; width: 180px;"
-                            runat="server" TextMode="Password"></asp:TextBox>
-                    </td>
-                </tr>
-                <tr>
-                    <td colspan="2" style="height: 12px;">
-                    </td>
-                </tr>
-                <tr>
-                    <td align="right" colspan="2">
-                        <asp:Button ID="Button1" Style="font-weight: bold;" Text="" runat="server"
-                            OnClick="Button1_Click"></asp:Button>
-                    </td>
-                </tr>
-            </table>
-        </div>
-    </cc1:UmbracoPanel>
-    <small class="copyright">
-        <asp:Literal ID="BottomText" runat="server"></asp:Literal></small>
-    <asp:HiddenField ID="hf_height" runat="server" />
-    <asp:HiddenField ID="hf_width" runat="server" />
-    </form>
-    <asp:PlaceHolder ID="loginJavascript" runat="server">
-        <script type="text/javascript">
-            jQuery("#<%= lname.ClientID %>").focus();
-            jQuery('#<%= hf_height.ClientID %>').value = getViewportHeight();
-            jQuery('#<%= hf_width.ClientID %>').value = getViewportWidth();    
-        </script>
-    </asp:PlaceHolder>
-    <asp:PlaceHolder Visible="false" ID="loginError" runat="server">
-        <script type="text/javascript">
-            jQuery(document).ready(function () {
-                jQuery("#loginTable").effect("shake", { times: 5, distance: 5 }, 80);
-                jQuery("#<%= lname.ClientID %>").attr("style", jQuery("#<%= lname.ClientID %>").attr("style") + "; border: 2px solid red;");
-                jQuery("#<%= passw.ClientID %>").attr("style", jQuery("#<%= passw.ClientID %>").attr("style") + "; border: 2px solid red;");
-            });
-        </script>
-    </asp:PlaceHolder>
-</body>
-</html>

src/Umbraco.Web.UI/umbraco/logout.aspx

@@ -1,18 +0,0 @@
-<%@ Page language="c#" Codebehind="logout.aspx.cs" AutoEventWireup="True" Inherits="umbraco.logout" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" > 
-
-<html>
-  <head>
-    <title>logout</title>
-    <meta name="GENERATOR" Content="Microsoft Visual Studio .NET 7.1">
-    <meta name="CODE_LANGUAGE" Content="C#">
-    <meta name=vs_defaultClientScript content="JavaScript">
-    <meta name=vs_targetSchema content="http://schemas.microsoft.com/intellisense/ie5">
-  </head>
-  <body MS_POSITIONING="GridLayout">
-	
-    <form id="Form1" method="post" runat="server">
-	</form>
-	
-  </body>
-</html>

src/Umbraco.Web.UI/umbraco/umbraco.aspx

@@ -1,399 +0,0 @@
-<%@ Page Trace="false" Language="c#" CodeBehind="umbraco.aspx.cs" AutoEventWireup="True"
-    Inherits="Umbraco.Web.UI.Umbraco.Umbraco" %>
-
-<%@ Import Namespace="System.Web.Script.Serialization" %>
-
-<%@ Register Src="controls/Tree/TreeControl.ascx" TagName="TreeControl" TagPrefix="umbraco" %>
-<%@ Import Namespace="StackExchange.Profiling" %>
-<%@ Import Namespace="Umbraco.Core.Profiling" %>
-<%@ Import Namespace="Umbraco.Web" %>
-<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
-<%@ Register TagPrefix="uc1" TagName="quickSearch" Src="Search/QuickSearch.ascx" %>
-<%@ Register TagPrefix="umb" Namespace="ClientDependency.Core.Controls" Assembly="ClientDependency.Core" %>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head runat="server">
-    <title>Umbraco CMS -
-        <%=Request.Url.Host.ToLower().Replace("www.", "") %></title>
-    <meta content="IE=edge,chrome=1" http-equiv="X-UA-Compatible" />
-    <link rel="icon" type="image/png" href="<%#umbraco.GlobalSettings.Path + "/Images/PinnedIcons/umb.ico" %>" />
-    <cc1:UmbracoClientDependencyLoader runat="server" ID="ClientLoader" />
-    <umb:CssInclude ID="CssInclude1" runat="server" FilePath="css/umbracoGui.css" PathNameAlias="UmbracoRoot" />
-    <umb:CssInclude ID="CssInclude2" runat="server" FilePath="modal/style.css" PathNameAlias="UmbracoClient" />
-    <umb:JsInclude ID="JsInclude1" runat="server" FilePath="Application/NamespaceManager.js"
-        PathNameAlias="UmbracoClient" Priority="0" />
-    <umb:JsInclude ID="JSON2" runat="server" FilePath="ui/json2.js" PathNameAlias="UmbracoClient"
-        Priority="0" />
-    <umb:JsInclude ID="JsInclude2" runat="server" FilePath="ui/jquery.js" PathNameAlias="UmbracoClient"
-        Priority="0" />
-    <umb:JsInclude ID="JsInclude3" runat="server" FilePath="ui/jqueryui.js" PathNameAlias="UmbracoClient"
-        Priority="1" />
-    <umb:JsInclude ID="JsInclude14" runat="server" FilePath="Application/jQuery/jquery.ba-bbq.min.js"
-        PathNameAlias="UmbracoClient" Priority="2" />
-    <umb:JsInclude ID="JsInclude5" runat="server" FilePath="Application/UmbracoApplicationActions.js"
-        PathNameAlias="UmbracoClient" Priority="2" />
-    <umb:JsInclude ID="JsInclude6" runat="server" FilePath="Application/UmbracoUtils.js"
-        PathNameAlias="UmbracoClient" Priority="2" />
-    <umb:JsInclude ID="JsInclude13" runat="server" FilePath="Application/HistoryManager.js"
-        PathNameAlias="UmbracoClient" Priority="3" />
-    <umb:JsInclude ID="JsInclude7" runat="server" FilePath="Application/UmbracoClientManager.js"
-        PathNameAlias="UmbracoClient" Priority="4" />
-    <umb:JsInclude ID="JsInclude8" runat="server" FilePath="ui/default.js" PathNameAlias="UmbracoClient"
-        Priority="5" />
-    <umb:JsInclude ID="JsInclude9" runat="server" FilePath="ui/jQueryWresize.js" PathNameAlias="UmbracoClient" />
-    <umb:JsInclude ID="JsInclude10" runat="server" FilePath="js/guiFunctions.js" PathNameAlias="UmbracoRoot" />
-    <umb:JsInclude ID="JsInclude11" runat="server" FilePath="js/language.aspx" PathNameAlias="UmbracoRoot" />
-    <umb:JsInclude ID="JsInclude4" runat="server" FilePath="modal/modal.js" PathNameAlias="UmbracoClient"
-        Priority="10" />
-    <umb:JsInclude ID="JsInclude17" runat="server" FilePath="modal/jquery.simplemodal.1.4.1.custom.js"
-        PathNameAlias="UmbracoClient" Priority="10" />
-    <umb:JsInclude ID="JsInclude12" runat="server" FilePath="js/UmbracoSpeechBubbleBackend.js"
-        PathNameAlias="UmbracoRoot" />
-    <umb:JsInclude ID="JsInclude15" runat="server" FilePath="js/UmbracoSpeechBubbleBackend.js"
-        PathNameAlias="UmbracoRoot" />
-    <umb:JsInclude ID="JsInclude16" runat="server" FilePath="Application/jQuery/jquery.cookie.js"
-        PathNameAlias="UmbracoClient" Priority="1" />
-    <script type="text/javascript">
-        this.name = 'umbracoMain';
-    </script>
-</head>
-<body id="umbracoMainPageBody">
-    <form id="Form1" method="post" runat="server" style="margin: 0px; padding: 0px">
-    <asp:ScriptManager runat="server" ID="umbracoScriptManager" ScriptMode="Release">
-        <CompositeScript ScriptMode="Release">
-            <Scripts>
-                <asp:ScriptReference Path="js/dualSelectBox.js" />
-            </Scripts>
-        </CompositeScript>
-        <Services>
-            <asp:ServiceReference Path="webservices/legacyAjaxCalls.asmx" />
-            <asp:ServiceReference Path="webservices/nodeSorter.asmx" />
-        </Services>
-    </asp:ScriptManager>
-    </form>
-    <div style="position: relative;">
-        <div id="logout-warning" class="notice" style="display: none; text-align: center">
-            <h3 style="margin-bottom: 3px;">
-                <%= umbraco.ui.Text("lockout", "lockoutWillOccur")%>
-                <span id="logout-warning-counter"></span><a href="#" onclick="umbracoRenewSession();">
-                    <%= umbraco.ui.Text("lockout", "renewSession")%></a>.</h3>
-        </div>
-        <div class="topBar" id="topBar">
-            <div style="float: left">
-                <button id="buttonCreate" onclick="UmbClientMgr.appActions().launchCreateWizard();"
-                    class="topBarButton" accesskey="c">
-                    <img src="images/new.png" alt="<%=umbraco.ui.Text("general", "create")%>" /><span><%=umbraco.ui.Text("general", "create")%>...</span>
-                </button>
-            </div>
-            <asp:Panel ID="FindDocuments" runat="server">
-                <div style="float: left; margin-left: 20px;">
-                    <uc1:quickSearch ID="Search" runat="server"></uc1:quickSearch>
-                </div>
-            </asp:Panel>
-            <div class="topBarButtons">
-                <button onclick="UmbClientMgr.appActions().launchAbout();" class="topBarButton">
-                    <img src="images/aboutNew.png" alt="about" /><span><%=umbraco.ui.Text("general", "about")%></span></button>
-                <button onclick="UmbClientMgr.appActions().launchHelp('<%=UmbracoUser.Language%>', '<%=UmbracoUser.UserType.Name%>');"
-                    class="topBarButton">
-                    <img src="images/help.png" alt="Help" /><span><%=umbraco.ui.Text("general", "help")%></span></button>
-                <button onclick="UmbClientMgr.appActions().logout();" class="topBarButton">
-                    <img src="images/logout.png" alt="Log out" /><span><%=umbraco.ui.Text("general", "logout")%>:
-                        <%=UmbracoUser.Name%></span></button>
-            </div>
-        </div>
-    </div>
-    <a id="treeToggle" href="#" onclick="toggleTree(this); return false;" title="Hide Treeview">
-        &nbsp;</a>
-    <div id="uiArea">
-        <div id="leftDIV">
-            <cc1:UmbracoPanel AutoResize="false" ID="treeWindow" runat="server" Height="380px"
-                Width="200px" hasMenu="false">
-                <umbraco:TreeControl runat="server" ID="JTree" ManualInitialization="true"></umbraco:TreeControl>
-            </cc1:UmbracoPanel>
-            <cc1:UmbracoPanel ID="PlaceHolderAppIcons" Text="Sektioner" runat="server" Height="140px"
-                Width="200px" hasMenu="false" AutoResize="false">
-                <ul id="tray">
-                    <asp:Literal ID="plcIcons" runat="server"></asp:Literal>
-                </ul>
-            </cc1:UmbracoPanel>
-        </div>
-        <div id="rightDIV">
-            <!-- umbraco dashboard -->
-            <iframe name="right" id="right" marginwidth="0" marginheight="0" frameborder="0"
-                scrolling="no" style="display: none; width: 100%; height: 100%;"></iframe>
-        </div>
-    </div>
-    <script type="text/javascript">
-    	  <asp:PlaceHolder ID="bubbleText" Runat="server"/>
-    </script>
-    <div id="defaultSpeechbubble">
-    </div>
-    <div id="umbModalBox">
-        <div id="umbModalBoxHeader">
-        </div>
-        <a href="#" id="umbracModalBoxClose" class="jqmClose">&times;</a>
-        <div id="umbModalBoxContent">
-            <iframe frameborder="0" id="umbModalBoxIframe" src=""></iframe>
-        </div>
-    </div>
-    <div id="logout-refresh" style="display: none;">
-        <p>
-            <%= umbraco.ui.Text("general","locked").ToUpper() %></p>
-        <div id="sessionrefreshpassword">
-            <label for="sessionpass">
-                <%= umbraco.ui.Text("general","password") %></label><input name="sessionpass" type="password" />
-        </div>
-        <div id="sessionrefreshbuttons">
-            <button id="renew-session" onclick="javascript:umbracoSessionRenewCheckPassword();">
-                <%= umbraco.ui.Text("general","renew") %></button>
-            <%= umbraco.ui.Text("general","or") %>
-            <a href="#" onclick="javascript:umbracoSessionLogout();">
-                <%= umbraco.ui.Text("general","logout") %></a>
-        </div>
-    </div>
-    <script type="text/javascript">
-
-        //used for deeplinking to specific content whilst still showing the tree
-        var initApp = '<%=umbraco.presentation.UmbracoContext.Current.Request.QueryString["app"]%>';
-        var rightAction = '<%=umbraco.presentation.UmbracoContext.Current.Request.QueryString["rightAction"]%>';
-        var rightActionId = '<%=umbraco.presentation.UmbracoContext.Current.Request.QueryString["id"]%>';
-        var base = '<%=string.Format("{0}/", umbraco.IO.IOHelper.ResolveUrl(umbraco.IO.SystemDirectories.Umbraco))%>';
-        var url = ''
-        if (rightActionId && rightActionId != '') {
-            url = base + rightAction + ".aspx?id=" + rightActionId
-        } else {
-            url = base + rightAction;
-        }
-        jQuery(document).ready(function () {
-
-            UmbClientMgr.setUmbracoPath("<%=umbraco.IO.IOHelper.ResolveUrl(umbraco.IO.SystemDirectories.Umbraco) %>");
-
-            //call wresize first for IE/FF resize issues
-            jQuery(window).wresize(function () { resizePage(); });
-            resizePage();
-
-            jQuery("#umbracoMainPageBody").css("background", "#fff");
-
-            //wire up the history mgr
-            UmbClientMgr.historyManager().addEventHandler("navigating", function (e, app) {
-                //show modal wait dialog. TODO: Finish this
-                //jQuery("<div id='appLoading'>&nbsp;</div>").appendTo("body")
-                //    .ModalWindowShow("", false, 300, 100, 300, 0)
-                //    .closest(".umbModalBox").css("border", "none");
-
-                UmbClientMgr.appActions().shiftApp(app, uiKeys['sections_' + app] || app);
-            });
-
-
-            if (rightAction != '') {
-                //if an action is specified, then load it
-                UmbClientMgr.historyManager().addHistory(initApp != "" ? initApp :
-                                                        UmbClientMgr.historyManager().getCurrent() != "" ? UmbClientMgr.historyManager().getCurrent() :
-                                                        "<%=DefaultApp%>", true);
-
-                //use a small timeout to handle load delays
-                //ref: http://our.umbraco.org/forum/developers/api-questions/32249-Direct-link-to-back-office-page
-                var timer = setTimeout(function () {
-                    UmbClientMgr.contentFrame(url);
-                }, 200);
-                
-            }
-            else {
-                UmbClientMgr.historyManager().addHistory(initApp != "" ? initApp :
-                                                        UmbClientMgr.historyManager().getCurrent() != "" ? UmbClientMgr.historyManager().getCurrent() :
-                                                        "<%=DefaultApp%>", true);
-            }
-
-
-
-            jQuery("#right").show();
-
-
-        });
-
-
-        // *** NEW KEEP ALIVE - Should be moved to app manager *** */
-        var failedAttempts = 0;
-        var keepAliveInterval;
-        beginKeepAlive();
-
-        function beginKeepAlive() {
-            keepAliveInterval = window.setInterval(keepAlive, 10000);
-        }
-        function pauseKeepAlive() {
-            clearInterval(keepAliveInterval);
-        }
-
-        function keepAlive() {
-            umbraco.presentation.webservices.legacyAjaxCalls.GetSecondsBeforeUserLogout(validateUserTimeout, keepAliveError);
-        }
-
-        function validateUserTimeout(secondsBeforeTimeout) {
-            // at succesful attempts we'll always reset the failedAttempts variable
-            failedAttempts = 0;
-            var logoutElement = jQuery("#logout-warning");
-            // when five minutes left, show warning
-            if (secondsBeforeTimeout < 300) {
-                if (secondsBeforeTimeout <= 0) {
-                    umbracoShowSessionRenewModal();
-                } else {
-
-                    logoutElement.fadeIn();
-                    jQuery("#logout-warning-counter").html(secondsBeforeTimeout + ' seconds...');
-
-                    // when two mintutes left make warning RED
-                    if (secondsBeforeTimeout <= 120) {
-                        logoutElement.addClass('error');
-                        logoutElement.removeClass('notice');
-                    }
-                }
-            } else {
-                logoutElement.fadeOut().removeClass('error').addClass('notice');
-            }
-        }
-
-        // We add one failed attempt as tolerance level as a re-compilation could cause a timeout or an error with webservices not ready
-        function keepAliveError(err) {
-            if (failedAttempts == 0)
-                failedAttempts++;
-            else {
-                umbracoShowSessionRenewModal();
-            }
-        }
-
-        function umbracoRenewSession() {
-            umbraco.presentation.webservices.legacyAjaxCalls.RenewUmbracoSession(
-                function () {
-                    jQuery("#logout-warning").fadeOut().removeClass('error').addClass('notice');
-                },
-                umbracoShowSessionRenewModal);
-
-        }
-
-        function umbracoShowSessionRenewModal() {
-
-            pauseKeepAlive();
-            jQuery("#logout-warning").fadeOut().removeClass('error').addClass('notice');
-
-            jQuery("#sessionrefreshpassword input").attr("style", "");
-            jQuery("#sessionrefreshpassword label").click(function () { jQuery(this).hide(); jQuery(this).next("input").focus(); });
-            jQuery("#sessionrefreshpassword input").click(function () { jQuery(this).prev("label").hide(); });
-            jQuery("#sessionrefreshpassword input").blur(function () { if (jQuery(this).val() == "") { jQuery(this).prev("label").show(); } });
-
-            jQuery("#sessionrefreshpassword input").keypress(function (e) {
-                if (jQuery("#sessionrefreshpassword label").is(":visible")) {
-                    jQuery("#sessionrefreshpassword label").hide()
-                }
-                code = (e.keyCode ? e.keyCode : e.which);
-                if (code == 13) {
-                    jQuery("#renew-session").click();
-                    e.preventDefault();
-                    return false;
-                }
-
-            });
-
-            jQuery("#logout-refresh").fullmodal();
-        }
-
-        function umbracoSessionRenewCheckPassword() {
-            var password = jQuery("#sessionrefreshpassword input").val();
-
-            if (password != "") {
-
-                var data = {
-                    username: <%= new JavaScriptSerializer().Serialize(UmbracoUser.LoginName) %>, 
-                    password: password
-                };
-
-                jQuery.ajax({
-                    type: "POST",
-                    url: "<%=Umbraco.Core.IO.IOHelper.ResolveUrl(Umbraco.Core.IO.SystemDirectories.Umbraco) %>/webservices/legacyAjaxCalls.asmx/ValidateUser",
-                    data: JSON.stringify(data),
-                    processData: false, 
-                    success: function (result) {
-
-                        if (result.d == true) {
-                            // reset seconds
-                            umbraco.presentation.webservices.legacyAjaxCalls.RenewUmbracoSession();
-
-                            jQuery("#sessionrefreshpassword input").val("");
-                            jQuery.fullmodal.close();
-                            beginKeepAlive();
-                        }
-                        else {
-                            umbracoSessionRenewCheckPasswordFail();
-                        }
-
-                    }
-                });
-            }
-            else {
-                umbracoSessionRenewCheckPasswordFail();
-            }
-        }
-
-        function umbracoSessionRenewCheckPasswordFail() {
-            jQuery("#sessionrefreshpassword").effect("shake", { times: 5, distance: 5 }, 80);
-            jQuery("#sessionrefreshpassword input").attr("style", "border: 2px solid red;");
-
-        }
-        function umbracoSessionLogout() {
-
-            //alert('Session has expired on server - can\'t renew. Logging out!');
-            top.document.location.href = 'logout.aspx';
-        }
-
-        function blink($target) {
-            // Set the color the field should blink in 
-            var backgroundColor = '#FBC2C4';
-            var existingBgColor;
-
-            // Load the current background color 
-            existingBgColor = $target.css('background-color');
-
-            // Set the new background color 
-            $target.css('background-color', backgroundColor);
-
-            // Set it back to old color after 500 ms 
-            setTimeout(function () { $target.css('background-color', existingBgColor); }, 500);
-        }
-
-        // *** END *** */
-
-        // Handles single vs double click on application item icon buttons...
-        function appItemSingleClick(itemName) {
-            UmbClientMgr.historyManager().addHistory(itemName);
-            return false;
-        }
-        function appItemDoubleClick(itemName) {
-            //When double clicking, we'll clear the tree cache so that it loads the dashboard
-            UmbClientMgr.mainTree().clearTreeCache();
-            UmbClientMgr.historyManager().addHistory(itemName);
-            return false;
-        }
-        function appClick(appItem) {
-            var that = this;
-            setTimeout(function () {
-                var dblclick = parseInt($(that).data('double'), 10);
-                if (dblclick > 0) {
-                    $(that).data('double', dblclick - 1);
-                } else {
-                    appItemSingleClick.call(that, appItem);
-                }
-            }, 300);
-            return false;
-        }
-        function appDblClick(appItem) {
-            $(this).data('double', 2);
-            appItemDoubleClick.call(this, appItem);
-            return false;
-        }
-
-    </script>
-    <%if(string.IsNullOrEmpty(Request["umbDebug"]) == false && umbraco.GlobalSettings.DebugMode)
-      {
-          Response.Write(Html.RenderProfiler());
-      }%>
-</body>
-</html>

src/Umbraco.Web/Editors/AuthenticationController.cs

@@ -33,7 +33,26 @@ namespace Umbraco.Web.Editors
         }
 
         /// <summary>
-        /// Simply checks if the current user's cookie is valid and if so returns the user object associated
+        /// Checks if the current user's cookie is valid and if so returns OK or a 400 (BadRequest)
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        public HttpResponseMessage IsAuthenticated()
+        {
+            var attempt = UmbracoContext.Security.AuthorizeRequest();
+            if (attempt == ValidateRequestAttempt.Success)
+            {
+                return Request.CreateResponse(HttpStatusCode.OK);
+            }
+            //return Forbidden (403), we don't want to return a 401 because that get's intercepted 
+            // by our angular helper because it thinks that we need to re-perform the request once we are
+            // authorized.
+            return Request.CreateResponse(HttpStatusCode.Forbidden);
+        }
+
+
+        /// <summary>
+        /// Checks if the current user's cookie is valid and if so returns the user object associated
         /// </summary>
         /// <returns></returns>
         public UserDetail GetCurrentUser()

src/Umbraco.Web/Editors/ContentController.cs

@@ -366,55 +366,86 @@ namespace Umbraco.Web.Editors
         /// <summary>
         /// Change the sort order for media
         /// </summary>
-        /// <param name="sorted"></param>
+        /// <param name="move"></param>
         /// <returns></returns>
         [EnsureUserPermissionForContent("move.ParentId", 'M')]
-        public HttpResponseMessage PostMove(ContentMove move)
+        public HttpResponseMessage PostMove(MoveOrCopy move)
         {
-            if (move == null)
-            {
-                return Request.CreateResponse(HttpStatusCode.NotFound);
-            }
+            var toMove = ValidateMoveOrCopy(move);
 
-            var contentService = Services.ContentService;
-            try
-            {
-                contentService.Move(contentService.GetById(move.Id), move.ParentId);
-                return Request.CreateResponse(HttpStatusCode.OK);
-            }
-            catch (Exception ex)
-            {
-                LogHelper.Error<ContentController>("Could not move content", ex);
-                throw;
-            }
+            Services.ContentService.Move(toMove, move.ParentId);
+
+            return Request.CreateResponse(HttpStatusCode.OK);
         }
 
         /// <summary>
         /// Copies a 
         /// </summary>
-        /// <param name="sorted"></param>
+        /// <param name="copy"></param>
         /// <returns></returns>
         [EnsureUserPermissionForContent("copy.ParentId", 'C')]
-        public HttpResponseMessage PostCopy(ContentMove copy)
+        public HttpResponseMessage PostCopy(MoveOrCopy copy)
         {
-            if (copy == null)
+            var toCopy = ValidateMoveOrCopy(copy);
+
+            Services.ContentService.Copy(toCopy, copy.ParentId, copy.RelateToOriginal);
+
+            return Request.CreateResponse(HttpStatusCode.OK);
+        }
+
+        /// <summary>
+        /// Ensures the item can be moved/copied to the new location
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        private IContent ValidateMoveOrCopy(MoveOrCopy model)
+        {
+            if (model == null)
             {
-                return Request.CreateResponse(HttpStatusCode.NotFound);
+                throw new HttpResponseException(HttpStatusCode.NotFound);
             }
 
             var contentService = Services.ContentService;
-            try
+            var toMove = contentService.GetById(model.Id);
+            if (toMove == null)
             {
-                contentService.Copy(contentService.GetById(copy.Id), copy.ParentId, true);
-                return Request.CreateResponse(HttpStatusCode.OK);
+                throw new HttpResponseException(HttpStatusCode.NotFound);
             }
-            catch (Exception ex)
+            if (model.ParentId < 0)
             {
-                LogHelper.Error<ContentController>("Could not copy content", ex);
-                throw;
+                //cannot move if the content item is not allowed at the root
+                if (toMove.ContentType.AllowedAsRoot == false)
+                {
+                    throw new HttpResponseException(
+                        Request.CreateValidationErrorResponse(ui.Text("moveOrCopy", "notAllowedAtRoot", Security.CurrentUser)));
+                }
             }
-        }
+            else
+            {
+                var parent = contentService.GetById(model.ParentId);
+                if (parent == null)
+                {
+                    throw new HttpResponseException(HttpStatusCode.NotFound);
+                }
 
+                //check if the item is allowed under this one
+                if (parent.ContentType.AllowedContentTypes.Select(x => x.Id).ToArray()
+                    .Any(x => x.Value == toMove.ContentType.Id) == false)
+                {
+                    throw new HttpResponseException(
+                        Request.CreateValidationErrorResponse(ui.Text("moveOrCopy", "notAllowedByContentType", Security.CurrentUser)));
+                }
+
+                // Check on paths
+                if ((string.Format(",{0},", parent.Path)).IndexOf(string.Format(",{0},", toMove.Id), StringComparison.Ordinal) > -1)
+                {
+                    throw new HttpResponseException(
+                        Request.CreateValidationErrorResponse(ui.Text("moveOrCopy", "notAllowedByPath", Security.CurrentUser)));
+                }
+            }
+
+            return toMove;
+        }
 
         private void ShowMessageForStatus(PublishStatus status, ContentItemDisplay display)
         {

src/Umbraco.Web/Editors/MemberController.cs

@@ -1,6 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Net;
+using System.Net.Http;
 using System.Text;
 using System.Threading.Tasks;
 using System.Web.Http;
@@ -50,16 +52,16 @@ namespace Umbraco.Web.Editors
         /// <summary>
         /// Gets the content json for the member
         /// </summary>
-        /// <param name="loginName"></param>
+        /// <param name="key"></param>
         /// <returns></returns>
-        public MemberDisplay GetByLogin(string loginName)
+        public MemberDisplay GetByKey(Guid key)
         {
             if (Member.InUmbracoMemberMode())
             {
-                var foundMember = Services.MemberService.GetByUsername(loginName);
+                var foundMember = Services.MemberService.GetByKey(key);
                 if (foundMember == null)
                 {
-                    HandleContentNotFound(loginName);
+                    HandleContentNotFound(key);
                 }
                 return Mapper.Map<IMember, MemberDisplay>(foundMember);
             }
@@ -89,6 +91,11 @@ namespace Umbraco.Web.Editors
 
             UpdateName(contentItem);
 
+            //map the custom properties
+            contentItem.PersistedContent.Email = contentItem.Email;
+            //TODO: If we allow changing the alias then we'll need to change URLs, etc... in the editor, would prefer to use 
+            // a unique id but then need to figure out how to handle that with custom membership providers - waiting on feedback from morten.
+
             MapPropertyValues(contentItem);
 
             //We need to manually check the validation results here because:
@@ -130,5 +137,24 @@ namespace Umbraco.Web.Editors
 
             return display;
         }
+
+
+        /// <summary>
+        /// Permanently deletes a member
+        /// </summary>
+        /// <param name="key"></param>
+        /// <returns></returns>        
+        public HttpResponseMessage DeleteByKey(Guid key)
+        {
+            var foundMember = Services.MemberService.GetByKey(key);
+            if (foundMember == null)
+            {
+                return HandleContentNotFound(key, false);
+            }
+
+            Services.MemberService.Delete(foundMember);
+
+            return Request.CreateResponse(HttpStatusCode.OK);
+        }
     }
 }

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

@@ -8,10 +8,10 @@ using System.Text;
 namespace Umbraco.Web.Models.ContentEditing
 {
     /// <summary>
-    /// A model representing a new sort order for a content/media item
+    /// A model representing a model for moving or copying
     /// </summary>
     [DataContract(Name = "content", Namespace = "")]
-    public class ContentMove
+    public class MoveOrCopy
     {
         /// <summary>
         /// The Id of the node to move or copy to
@@ -21,11 +21,18 @@ namespace Umbraco.Web.Models.ContentEditing
         public int ParentId { get; set; }
 
         /// <summary>
-        /// ´The id of the node to move or copy
+        /// The id of the node to move or copy
         /// </summary>
         [DataMember(Name = "id", IsRequired = true)]
         [Required]
         public int Id { get; set; }
+
+        /// <summary>
+        /// Boolean indicating whether copying the object should create a relation to it's original
+        /// </summary>
+        [DataMember(Name = "relateToOriginal", IsRequired = true)]
+        [Required]
+        public bool RelateToOriginal { get; set; }
     }
 
 }

src/Umbraco.Web/Trees/ContentTreeController.cs

@@ -26,36 +26,13 @@ namespace Umbraco.Web.Trees
     {
         protected override TreeNode CreateRootNode(FormDataCollection queryStrings)
         {
-            TreeNode node;
-
-            //if the user's start node is not default, then return their start node as the root node.
+            var node = base.CreateRootNode(queryStrings); 
+            //if the user's start node is not default, then ensure the root doesn't have a menu
             if (Security.CurrentUser.StartContentId != Constants.System.Root)
             {
-                var currApp = queryStrings.GetValue<string>(TreeQueryStringParameters.Application);
-                var userRoot = Services.EntityService.Get(Security.CurrentUser.StartContentId, UmbracoObjectTypes.Document);
-                if (userRoot == null)
-                {
-                    throw new HttpResponseException(HttpStatusCode.NotFound);
-                }
-
-                node = new TreeNode(
-                    userRoot.Id.ToInvariantString(),
-                    "", //root nodes aren't expandable, no need to lookup the child nodes url
-                    Url.GetMenuUrl(GetType(), userRoot.Id.ToInvariantString(), queryStrings))
-                    {
-                        HasChildren = true,
-                        RoutePath = currApp,
-                        Title = userRoot.Name
-                    };
-
-
-            }
-            else
-            {
-                node = base.CreateRootNode(queryStrings);    
+                node.MenuUrl = "";
             }
             return node;
-            
         }
 
         protected override int RecycleBinId
@@ -68,6 +45,11 @@ namespace Umbraco.Web.Trees
             get { return Services.ContentService.RecycleBinSmells(); }
         }
 
+        protected override int UserStartNode
+        {
+            get { return Security.CurrentUser.StartContentId; }
+        }
+
         protected override TreeNodeCollection PerformGetTreeNodes(string id, FormDataCollection queryStrings)
         {
             var entities = GetChildEntities(id);
@@ -111,10 +93,17 @@ namespace Umbraco.Web.Trees
             {
                 var menu = new MenuItemCollection();
 
+                //if the user's start node is not the root then ensure the root menu is empty/doesn't exist
+                if (Security.CurrentUser.StartContentId != Constants.System.Root)
+                {
+                    return menu;
+                }
+
                 //set the default to create
                 menu.DefaultMenuAlias = ActionNew.Instance.Alias;
 
                 // we need to get the default permissions as you can't set permissions on the very root node
+                //TODO: Use the new services to get permissions
                 var nodeActions = global::umbraco.BusinessLogic.Actions.Action.FromString(
                     UmbracoUser.GetPermissions(Constants.System.Root.ToInvariantString()))
                                         .Select(x => new MenuItem(x));

src/Umbraco.Web/Trees/ContentTreeControllerBase.cs

@@ -23,6 +23,11 @@ namespace Umbraco.Web.Trees
         /// </summary>
         protected abstract bool RecycleBinSmells { get; }
 
+        /// <summary>
+        /// Returns the user's start node for this tree
+        /// </summary>
+        protected abstract int UserStartNode { get; }
+
         protected abstract TreeNodeCollection PerformGetTreeNodes(string id, FormDataCollection queryStrings);
         
         protected abstract MenuItemCollection PerformGetMenuForNode(string id, FormDataCollection queryStrings);
@@ -39,9 +44,11 @@ namespace Umbraco.Web.Trees
 
             //if a request is made for the root node data but the user's start node is not the default, then
             // we need to return their start node data
-            if (iid == Constants.System.Root && UmbracoUser.StartNodeId != Constants.System.Root)
+            if (iid == Constants.System.Root && UserStartNode != Constants.System.Root)
             {
-                return Services.EntityService.GetChildren(UmbracoUser.StartNodeId, UmbracoObjectType).ToArray();
+                //just return their single start node, it will show up under the 'Content' label
+                var startNode = Services.EntityService.Get(UserStartNode, UmbracoObjectType);
+                return new[] {startNode};
             }
 
             return Services.EntityService.GetChildren(iid, UmbracoObjectType).ToArray();
@@ -56,7 +63,7 @@ namespace Umbraco.Web.Trees
         /// <returns></returns>
         protected sealed override TreeNodeCollection GetTreeNodes(string id, FormDataCollection queryStrings)
         {
-            if (id == Constants.System.Root.ToInvariantString())
+            if (id == Constants.System.Root.ToInvariantString() && UserStartNode == Constants.System.Root)
             {
                 //we need to append the recycle bin to the end (if not in dialog mode)
                 var nodes = PerformGetTreeNodes(id, queryStrings);

src/Umbraco.Web/Trees/MediaTreeController.cs

@@ -1,11 +1,9 @@
 using System;
-using System.Globalization;
 using System.Linq;
 using System.Net;
 using System.Net.Http.Formatting;
 using System.Web;
 using System.Web.Http;
-using System.Web.Security;
 using Umbraco.Core;
 using Umbraco.Core.Models;
 using Umbraco.Core.Services;
@@ -14,91 +12,25 @@ using Umbraco.Web.Trees.Menu;
 using umbraco;
 using umbraco.BusinessLogic.Actions;
 using Constants = Umbraco.Core.Constants;
-using LegacyMember = umbraco.cms.businesslogic.member.Member;
 
 namespace Umbraco.Web.Trees
 {
-    [LegacyBaseTree(typeof (loadMembers))]
-    [Tree(Constants.Applications.Members, Constants.Trees.Members, "Members")]
-    [PluginController("UmbracoTrees")]
-    public class MemberTreeController : TreeController
-    {
-        protected override TreeNodeCollection GetTreeNodes(string id, FormDataCollection queryStrings)
-        {
-            var nodes = new TreeNodeCollection();
-
-            if (id == Constants.System.Root.ToInvariantString())
-            {
-                //list out all the letters
-                for (var i = 97; i < 123; i++)
-                {
-                    var charString = ((char) i).ToString(CultureInfo.InvariantCulture);
-                    nodes.Add(CreateTreeNode(charString, queryStrings, charString, "icon-folder-close", true));
-                }
-                //list out 'Others' if the membership provider is umbraco
-                if (LegacyMember.InUmbracoMemberMode())
-                {
-                    nodes.Add(CreateTreeNode("others", queryStrings, "Others", "icon-folder-close", true));
-                }
-            }
-            else
-            {
-                //if it is a letter
-                if (id.Length == 1 && char.IsLower(id, 0))
-                {
-                    if (LegacyMember.InUmbracoMemberMode())
-                    {
-                        //get the members from our member data layer
-                        nodes.AddRange(
-                            LegacyMember.getMemberFromFirstLetter(id.ToCharArray()[0])
-                                        .Select(m => CreateTreeNode(m.LoginName, queryStrings, m.Text, "icon-user")));
-                    }
-                    else
-                    {
-                        //get the members from the provider
-                        int total;
-                        nodes.AddRange(
-                            Membership.Provider.FindUsersByName(id + "%", 0, 9999, out total).Cast<MembershipUser>()
-                                      .Select(m => CreateTreeNode(m.UserName, queryStrings, m.UserName, "icon-user")));
-                    }
-                }
-                else if (id == "others")
-                {
-                    //others will only show up when in umbraco membership mode
-                    nodes.AddRange(
-                        LegacyMember.getAllOtherMembers()
-                                    .Select(m => CreateTreeNode(m.Id.ToInvariantString(), queryStrings, m.Text, "icon-user")));
-                }
-            }
-            return nodes;
-        }
-
-        protected override MenuItemCollection GetMenuForNode(string id, FormDataCollection queryStrings)
-        {
-            var menu = new MenuItemCollection();
-
-            if (id == Constants.System.Root.ToInvariantString())
-            {
-                //set default
-                menu.DefaultMenuAlias = ActionNew.Instance.Alias;
-
-                // root actions         
-                menu.AddMenuItem<ActionNew>();
-                menu.AddMenuItem<RefreshNode, ActionRefresh>(true);
-                return menu;
-            }
-
-            menu.AddMenuItem<ActionDelete>();
-            return menu;
-        }
-    }
-
-
     [LegacyBaseTree(typeof(loadMedia))]
     [Tree(Constants.Applications.Media, Constants.Trees.Media, "Media")]
     [PluginController("UmbracoTrees")]
     public class MediaTreeController : ContentTreeControllerBase
     {
+        protected override TreeNode CreateRootNode(FormDataCollection queryStrings)
+        {
+            var node = base.CreateRootNode(queryStrings);
+            //if the user's start node is not default, then ensure the root doesn't have a menu
+            if (Security.CurrentUser.StartMediaId != Constants.System.Root)
+            {
+                node.MenuUrl = "";
+            }
+            return node;
+        }
+
         protected override int RecycleBinId
         {
             get { return Constants.System.RecycleBinContent; }
@@ -109,6 +41,11 @@ namespace Umbraco.Web.Trees
             get { return Services.MediaService.RecycleBinSmells(); }
         }
 
+        protected override int UserStartNode
+        {
+            get { return Security.CurrentUser.StartMediaId; }
+        }
+
         protected override TreeNodeCollection PerformGetTreeNodes(string id, FormDataCollection queryStrings)
         {
             var entities = GetChildEntities(id);
@@ -132,6 +69,12 @@ namespace Umbraco.Web.Trees
 
             if (id == Constants.System.Root.ToInvariantString())
             {
+                //if the user's start node is not the root then ensure the root menu is empty/doesn't exist
+                if (Security.CurrentUser.StartMediaId != Constants.System.Root)
+                {
+                    return menu;
+                }
+
                 // root actions         
                 menu.AddMenuItem<ActionNew>();
                 menu.AddMenuItem<ActionSort>(true);

src/Umbraco.Web/Trees/MemberTreeController.cs

@@ -0,0 +1,92 @@
+using System.Globalization;
+using System.Linq;
+using System.Net.Http.Formatting;
+using System.Web.Security;
+using Umbraco.Core;
+using Umbraco.Web.Mvc;
+using Umbraco.Web.Trees.Menu;
+using umbraco;
+using umbraco.BusinessLogic.Actions;
+using umbraco.cms.businesslogic.member;
+using Constants = Umbraco.Core.Constants;
+
+namespace Umbraco.Web.Trees
+{
+    //TODO: Upgrade thsi to use the new Member Service!
+
+    [LegacyBaseTree(typeof (loadMembers))]
+    [Tree(Constants.Applications.Members, Constants.Trees.Members, "Members")]
+    [PluginController("UmbracoTrees")]
+    public class MemberTreeController : TreeController
+    {
+        protected override TreeNodeCollection GetTreeNodes(string id, FormDataCollection queryStrings)
+        {
+            var nodes = new TreeNodeCollection();
+
+            if (id == Constants.System.Root.ToInvariantString())
+            {
+                //list out all the letters
+                for (var i = 97; i < 123; i++)
+                {
+                    var charString = ((char) i).ToString(CultureInfo.InvariantCulture);
+                    nodes.Add(CreateTreeNode(charString, queryStrings, charString, "icon-folder-close", true));
+                }
+                //list out 'Others' if the membership provider is umbraco
+                if (Member.InUmbracoMemberMode())
+                {
+                    nodes.Add(CreateTreeNode("others", queryStrings, "Others", "icon-folder-close", true));
+                }
+            }
+            else
+            {
+                //if it is a letter
+                if (id.Length == 1 && char.IsLower(id, 0))
+                {
+                    if (Member.InUmbracoMemberMode())
+                    {
+                        //get the members from our member data layer
+                        nodes.AddRange(
+                            Member.getMemberFromFirstLetter(id.ToCharArray()[0])
+                                        .Select(m => CreateTreeNode(m.UniqueId.ToString("N"), queryStrings, m.Text, "icon-user")));
+                    }
+                    else
+                    {
+                        //get the members from the provider
+                        int total;
+                        nodes.AddRange(
+                            Membership.Provider.FindUsersByName(id + "%", 0, 9999, out total).Cast<MembershipUser>()
+                                      .Select(m => CreateTreeNode(m.ProviderUserKey.ToString(), queryStrings, m.UserName, "icon-user")));
+                    }
+                }
+                else if (id == "others")
+                {
+                    //others will only show up when in umbraco membership mode
+                    nodes.AddRange(
+                        Member.getAllOtherMembers()
+                                    .Select(m => CreateTreeNode(m.Id.ToInvariantString(), queryStrings, m.Text, "icon-user")));
+                }
+            }
+            return nodes;
+        }
+
+        protected override MenuItemCollection GetMenuForNode(string id, FormDataCollection queryStrings)
+        {
+            var menu = new MenuItemCollection();
+
+            if (id == Constants.System.Root.ToInvariantString())
+            {
+                //set default
+                menu.DefaultMenuAlias = ActionNew.Instance.Alias;
+
+                // root actions         
+                menu.AddMenuItem<ActionNew>();
+                menu.AddMenuItem<RefreshNode, ActionRefresh>(true);
+                return menu;
+            }
+
+            menu.AddMenuItem<ActionDelete>();
+            menu.AddMenuItem<RefreshNode, ActionRefresh>(true);
+            return menu;
+        }
+    }
+}

src/Umbraco.Web/Trees/TreeNode.cs

@@ -53,13 +53,6 @@ namespace Umbraco.Web.Trees
         [DataMember(Name = "name")]
         public string Title { get; set; }
 
-        //TODO: This doesn't seem to be used by anything!
-        /// <summary>
-        /// Gets or sets the node path.
-        /// </summary>
-        [DataMember(Name = "nodePath")]
-        public string NodePath { get; set; }
-
         /// <summary>
         /// The icon to use for the node, this can be either a path to an image or a Css class. 
         /// If a '/' is found in the string then it will be considered a path to an image.

src/Umbraco.Web/Umbraco.Web.csproj

@@ -313,7 +313,7 @@
     <Compile Include="Editors\LogController.cs" />
     <Compile Include="Editors\MacroController.cs" />
     <Compile Include="Models\ContentEditing\AuditLog.cs" />
-    <Compile Include="Models\ContentEditing\ContentMove.cs" />
+    <Compile Include="Models\ContentEditing\MoveOrCopy.cs" />
     <Compile Include="Models\ContentEditing\MacroParameter.cs" />
     <Compile Include="Models\ContentEditing\MemberDisplay.cs" />
     <Compile Include="Models\ContentEditing\MemberSave.cs" />
@@ -370,6 +370,7 @@
     <Compile Include="PropertyEditors\PropertyValueEditorWrapper.cs" />
     <Compile Include="Routing\UrlProviderExtensions.cs" />
     <Compile Include="Trees\DataTypeTreeController.cs" />
+    <Compile Include="Trees\MemberTreeController.cs" />
     <Compile Include="Trees\Menu\CreateChildEntity.cs" />
     <Compile Include="WebApi\Binders\MemberBinder.cs" />
     <Compile Include="WebApi\ControllerContextExtensions.cs" />
@@ -690,9 +691,6 @@
     </Compile>
     <Compile Include="umbraco.presentation\MacroCacheContent.cs" />
     <Compile Include="umbraco.presentation\ScriptingMacroResult.cs" />
-    <Compile Include="umbraco.presentation\umbraco\cacheBrowser.aspx.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
     <Compile Include="umbraco.presentation\umbraco\channels\wlwmanifest.aspx.cs">
       <SubType>ASPXCodeBehind</SubType>
     </Compile>
@@ -705,21 +703,9 @@
     <Compile Include="umbraco.presentation\umbraco\dialogs\sort.aspx.cs">
       <SubType>ASPXCodeBehind</SubType>
     </Compile>
-    <Compile Include="umbraco.presentation\umbraco\Create.aspx.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\dashboard.aspx.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
     <Compile Include="umbraco.presentation\umbraco\dialogs\publish.aspx.cs">
       <SubType>ASPXCodeBehind</SubType>
     </Compile>
-    <Compile Include="umbraco.presentation\umbraco\editContent.aspx.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\editMedia.aspx.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
     <Compile Include="umbraco.presentation\umbraco\endPreview.aspx.cs">
       <SubType>ASPXCodeBehind</SubType>
     </Compile>
@@ -727,12 +713,6 @@
       <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="umbraco.presentation\umbraco\Help.cs" />
-    <Compile Include="umbraco.presentation\umbraco\login.aspx.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\logout.aspx.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
     <Compile Include="umbraco.presentation\umbraco\macroResultWrapper.aspx.cs">
       <SubType>ASPXCodeBehind</SubType>
     </Compile>
@@ -1009,7 +989,6 @@
     </Compile>
     <Compile Include="umbraco.presentation\umbraco\create\contentItemTasks.cs" />
     <Compile Include="umbraco.presentation\umbraco\create\contentItemTypeTasks.cs" />
-    <Compile Include="umbraco.presentation\umbraco\create\contentTasks.cs" />
     <Compile Include="umbraco.presentation\umbraco\create\CreatedPackageTasks.cs" />
     <Compile Include="umbraco.presentation\umbraco\create\DataTypeTasks.cs" />
     <Compile Include="umbraco.presentation\umbraco\create\dictionaryTasks.cs" />
@@ -1022,7 +1001,6 @@
     </Compile>
     <Compile Include="umbraco.presentation\umbraco\create\DLRScriptingTasks.cs" />
     <Compile Include="umbraco.presentation\umbraco\create\macroTasks.cs" />
-    <Compile Include="umbraco.presentation\umbraco\create\mediaTasks.cs" />
     <Compile Include="umbraco.presentation\umbraco\create\MediaTypeTasks.cs" />
     <Compile Include="umbraco.presentation\umbraco\create\MemberGroupTasks.cs" />
     <Compile Include="umbraco.presentation\umbraco\create\memberTasks.cs" />
@@ -1559,9 +1537,6 @@
       <DesignTime>True</DesignTime>
       <DependentUpon>Resources.resx</DependentUpon>
     </Compile>
-    <Compile Include="umbraco.presentation\umbraco\timerModule.cs">
-      <SubType>Code</SubType>
-    </Compile>
     <Compile Include="umbraco.presentation\umbraco\translation\default.aspx.cs">
       <DependentUpon>default.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
@@ -1633,12 +1608,6 @@
     <Compile Include="umbraco.presentation\umbraco\Trees\XmlTree.cs">
       <DependentUpon>XmlTree.xsd</DependentUpon>
     </Compile>
-    <Compile Include="umbraco.presentation\umbraco\umbraco.aspx.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\umbWindow.cs">
-      <SubType>Code</SubType>
-    </Compile>
     <Compile Include="umbraco.presentation\umbraco\urlRewriter\UrlRewriterFormWriter.cs" />
     <Compile Include="umbraco.presentation\umbraco\users\EditUser.aspx.cs">
       <DependentUpon>EditUser.aspx</DependentUpon>

src/Umbraco.Web/WebApi/Binders/MemberBinder.cs

@@ -3,6 +3,8 @@ using AutoMapper;
 using Umbraco.Core;
 using Umbraco.Core.Models;
 using Umbraco.Web.Models.ContentEditing;
+using Umbraco.Web.WebApi.Filters;
+using System.Linq;
 
 namespace Umbraco.Web.WebApi.Binders
 {
@@ -23,9 +25,17 @@ namespace Umbraco.Web.WebApi.Binders
 
         protected override IMember GetExisting(MemberSave model)
         {
-            return ApplicationContext.Services.MemberService.GetByUsername(model.Username);
-        }
+            //TODO: We're going to remove the built-in member properties from this editor - not sure if we should be persisting them elsewhere ?
+            var toRemove = Constants.Conventions.Member.StandardPropertyTypeStubs.Select(x => x.Value.Alias).ToArray();
 
+            var member =  ApplicationContext.Services.MemberService.GetByUsername(model.Username);
+            foreach (var remove in toRemove)
+            {
+                member.Properties.Remove(remove);
+            }
+            return member;
+        }
+        
         protected override IMember CreateNew(MemberSave model)
         {
             var contentType = ApplicationContext.Services.ContentTypeService.GetMemberType(model.ContentTypeAlias);

src/Umbraco.Web/umbraco.presentation/umbraco/cacheBrowser.aspx.cs

@@ -1,42 +0,0 @@
-using System.Collections;
-using umbraco.BasePages;
-
-namespace umbraco.cms.presentation
-{
-    /// <summary>
-    /// Summary description for cacheBrowser.
-    /// </summary>
-    public partial class cacheBrowser : UmbracoEnsuredPage
-    {
-        public cacheBrowser()
-        {
-            CurrentApp = BusinessLogic.DefaultApps.developer.ToString();
-
-        }
-        protected void Page_Load(object sender, System.EventArgs e)
-        {
-            // Cache removal checks
-            if (Request.QueryString["clearByType"] != null)
-                ApplicationContext.ApplicationCache.ClearCacheObjectTypes(Request.QueryString["clearByType"]);
-            else if (Request.QueryString["clearByKey"] != null)
-                ApplicationContext.ApplicationCache.ClearCacheItem(Request.QueryString["clearByKey"]);
-
-            // Put user code to initialize the page here
-            Hashtable ht = cms.businesslogic.cache.Cache.ReturnCacheItemsOrdred();
-            foreach (string key in ht.Keys)
-            {
-                Response.Write("<a href=\"?key=" + key + "\">" + key + "</a>: " + ((ArrayList)ht[key]).Count.ToString() + " (<a href=\"?clearByType=" + key + "\">Delete</a>)<br />");
-                if (Request.QueryString["key"] == key)
-                    for (int i = 0; i < ((ArrayList)ht[key]).Count; i++)
-                        Response.Write(" - " + ((ArrayList)ht[key])[i] + " (<a href=\"?clearByKey=" + ((ArrayList)ht[key])[i] + "\">Delete</a>)<br />");
-            }
-        }
-        protected void Button1_Click(object sender, System.EventArgs e)
-        {
-            ApplicationContext.ApplicationCache.ClearAllCache();
-        }
-
-        protected System.Web.UI.HtmlControls.HtmlForm Form1;
-        protected System.Web.UI.WebControls.Button Button1;
-    }
-}

src/Umbraco.Web/umbraco.presentation/umbraco/create.aspx.cs

@@ -1,50 +0,0 @@
-using System;
-using System.Web.UI.WebControls;
-
-using System.Xml;
-using Umbraco.Core.IO;
-
-namespace umbraco.cms.presentation
-{
-    public class Create : BasePages.UmbracoEnsuredPage
-    {
-        [Obsolete("This property is no longer used")]
-        protected umbWindow createWindow;
-        protected Label helpText;
-        protected TextBox rename;
-        protected Label Label1;
-        protected ListBox nodeType;
-        protected PlaceHolder UI;
-
-        protected override void OnLoad(EventArgs e)
-        {
-            base.OnLoad(e);
-
-            // Load create definitions
-            var nodeType = Request.QueryString["nodeType"];
-
-            var createDef = new XmlDocument();
-            var defReader = new XmlTextReader(IOHelper.MapPath(SystemFiles.CreateUiXml));
-            createDef.Load(defReader);
-            defReader.Close();
-
-            // Find definition for current nodeType
-            var def = createDef.SelectSingleNode("//nodeType [@alias = '" + nodeType + "']");
-            if (def == null)
-            {
-                throw new ArgumentException("The create dialog for \"" + nodeType + "\" does not match anything defined in the \"" + SystemFiles.CreateUiXml + "\". This could mean an incorrectly installed package or a corrupt UI file");
-            }
-
-            try
-            {
-                var virtualPath = SystemDirectories.Umbraco + def.SelectSingleNode("./usercontrol").FirstChild.Value;
-                var mainControl = LoadControl(virtualPath);
-                UI.Controls.Add(mainControl);
-            }
-            catch (Exception ex)
-            {
-                throw new ArgumentException("ERROR CREATING CONTROL FOR NODETYPE: " + nodeType, ex);
-            }
-        }
-    }
-}

src/Umbraco.Web/umbraco.presentation/umbraco/create/contentTasks.cs

@@ -1,58 +0,0 @@
-using System;
-using System.Data;
-using System.Web.Security;
-using Umbraco.Web.UI;
-using umbraco.BusinessLogic;
-using umbraco.DataLayer;
-using umbraco.BasePages;
-using umbraco.IO;
-using umbraco.cms.businesslogic.member;
-
-namespace umbraco
-{
-    public class contentTasks : LegacyDialogTask
-    {
-        private string _returnUrl = "";
-
-        public override string ReturnUrl
-        {
-            get { return _returnUrl; }
-        }
-
-        public override string AssignedApp
-        {
-            get { return DefaultApps.content.ToString(); }
-        }
-
-        public override bool PerformSave()
-        {
-            var dt = new cms.businesslogic.web.DocumentType(TypeID);
-            var d = cms.businesslogic.web.Document.MakeNew(Alias, dt, User, ParentID);
-            if (d == null)
-            {
-                //TODO: Slace - Fix this to use the language files
-                BasePage.Current.ClientTools.ShowSpeechBubble(BasePage.speechBubbleIcon.error, "Document Creation", "Document creation was canceled");
-                return false;
-            }
-            else
-            {
-                _returnUrl = "editContent.aspx?id=" + d.Id.ToString() + "&isNew=true";
-                return true;
-            }
-        }
-
-        public override bool PerformDelete()
-        {
-            var d = new cms.businesslogic.web.Document(ParentID);
-
-            d.delete();
-
-            // Log
-            Log.Add(LogTypes.Delete, User.GetCurrent(), d.Id, "");
-
-            return true;
-
-        }
-
-    }
-}

src/Umbraco.Web/umbraco.presentation/umbraco/create/mediaTasks.cs

@@ -1,50 +0,0 @@
-using System;
-using System.Data;
-using System.Web.Security;
-using Umbraco.Core.Logging;
-using Umbraco.Web.UI;
-using umbraco.BusinessLogic;
-using umbraco.DataLayer;
-using umbraco.BasePages;
-using umbraco.IO;
-using umbraco.cms.businesslogic.member;
-
-namespace umbraco
-{
-    public class mediaTasks : LegacyDialogTask
-    {
-        private string _returnUrl = "";
-
-        public override string ReturnUrl
-        {
-            get { return _returnUrl; }
-        }
-
-        public override string AssignedApp
-        {
-            get { return DefaultApps.media.ToString(); }
-        }
-
-        public override bool PerformSave()
-        {
-            var dt = new cms.businesslogic.media.MediaType(TypeID);
-            var m = cms.businesslogic.media.Media.MakeNew(Alias, dt, User, ParentID);
-            _returnUrl = "editMedia.aspx?id=" + m.Id.ToString() + "&isNew=true";
-
-            return true;
-        }
-
-        public override bool PerformDelete()
-        {
-            var d = new cms.businesslogic.media.Media(ParentID);
-
-            // Log
-            LogHelper.Debug<mediaTasks>(string.Format("Delete media item {0} by user {1}", d.Id, User.GetCurrent().Id));
-
-            d.delete();
-            return true;
-
-        }
-
-    }
-}

src/Umbraco.Web/umbraco.presentation/umbraco/dashboard.aspx.cs

@@ -1,377 +0,0 @@
-using System;
-using System.Collections;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Reflection;
-using System.Web;
-using System.Web.SessionState;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-using System.IO;
-using System.Xml;
-using System.Xml.XPath;
-using umbraco.uicontrols;
-using umbraco.IO;
-using umbraco.cms.helpers;
-using umbraco.BusinessLogic;
-
-namespace umbraco.cms.presentation
-{
-    /// <summary>
-    /// Summary description for dashboard.
-    /// </summary>
-    /// 
-    
-    public partial class dashboard : BasePages.UmbracoEnsuredPage
-    {
-
-
-        private string _section = "";
-
-        protected void Page_Load(object sender, System.EventArgs e)
-        {
-            // Put user code to initialize the page here
-            Panel2.Text = ui.Text("dashboard", "welcome", UmbracoUser) + " " + UmbracoUser.Name;
-        }
-
-        private Control CreateDashBoardWrapperControl(Control control)
-        {
-            PlaceHolder placeHolder = new PlaceHolder();
-            placeHolder.Controls.Add(new LiteralControl("<br/><fieldSet style=\"padding: 5px\">"));
-            placeHolder.Controls.Add(control);
-            placeHolder.Controls.Add(new LiteralControl("</fieldSet>"));
-            return placeHolder;
-        }
-
-        override protected void OnInit(EventArgs e)
-        {
-
-            base.OnInit(e);
-
-            /*
-            // Load dashboard content
-            if (helper.Request("app") != "")
-                _section = helper.Request("app");
-            else if (getUser().Applications.Length > 0)
-                _section = "default";
-            else
-                _section = getUser().Applications[0].alias;
-
-            XmlDocument dashBoardXml = new XmlDocument();
-            dashBoardXml.Load(IOHelper.MapPath(SystemFiles.DashboardConfig));
-
-            var control = dashBoardXml.DocumentElement.SelectSingleNode("//control [areas/area = '" + _section.ToLower() + "']");
-            */
-            /*
-            // test for new tab interface
-            foreach (XmlNode section in dashBoardXml.DocumentElement.SelectNodes("//section [areas/area = '" + _section.ToLower() + "']"))
-            {
-                if (section != null && validateAccess(section))
-                {
-                    Panel2.Visible = false;
-                    dashboardTabs.Visible = true;
-
-                    foreach (XmlNode entry in section.SelectNodes("./tab"))
-                    {
-                        if (validateAccess(entry))
-                        {
-                            TabPage tab = dashboardTabs.NewTabPage(entry.Attributes.GetNamedItem("caption").Value);
-                            tab.HasMenu = true;
-                            tab.Style.Add("padding", "0 10px");
-
-                            foreach (XmlNode uc in entry.SelectNodes("./control"))
-                            {
-                                if (validateAccess(uc))
-                                {
-                                    string control = getFirstText(uc).Trim(' ', '\r', '\n');
-                                    string path = IOHelper.FindFile(control);
-
-
-                                    try
-                                    {
-                                        Control c = LoadControl(path);
-
-                                        // set properties
-                                        Type type = c.GetType();
-                                        if (type != null)
-                                        {
-                                            foreach (XmlAttribute att in uc.Attributes)
-                                            {
-                                                string attributeName = att.Name;
-                                                string attributeValue = parseControlValues(att.Value).ToString();
-                                                // parse special type of values
-
-
-                                                PropertyInfo prop = type.GetProperty(attributeName);
-                                                if (prop == null)
-                                                {
-                                                    continue;
-                                                }
-
-                                                prop.SetValue(c, Convert.ChangeType(attributeValue, prop.PropertyType),
-                                                              null);
-
-                                            }
-                                        }
-
-                                        //resolving files from dashboard config which probably does not map to a virtual fi
-                                        tab.Controls.Add(AddPanel(uc, c));
-                                    }
-                                    catch (Exception ee)
-                                    {
-                                        tab.Controls.Add(
-                                            new LiteralControl(
-                                                "<p class=\"umbracoErrorMessage\">Could not load control: '" + path +
-                                                "'. <br/><span class=\"guiDialogTiny\"><strong>Error message:</strong> " +
-                                                ee.ToString() + "</span></p>"));
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-                else
-                {
-
-
-                    foreach (
-                        XmlNode entry in dashBoardXml.SelectNodes("//entry [@section='" + _section.ToLower() + "']"))
-                    {
-                        PlaceHolder placeHolder = new PlaceHolder();
-                        if (entry == null || entry.FirstChild == null)
-                        {
-                            placeHolder.Controls.Add(
-                                CreateDashBoardWrapperControl(new LiteralControl("Error loading DashBoard Content")));
-                        }
-                        else
-                        {
-                            string path = IOHelper.FindFile(entry.FirstChild.Value);
-
-                            try
-                            {
-                                placeHolder.Controls.Add(CreateDashBoardWrapperControl(LoadControl(path)));
-                            }
-                            catch (Exception err)
-                            {
-                                Trace.Warn("Dashboard", string.Format("error loading control '{0}'",
-                                                                      path), err);
-                                placeHolder.Controls.Clear();
-                                placeHolder.Controls.Add(CreateDashBoardWrapperControl(new LiteralControl(string.Format(
-                                    "Error loading DashBoard Content '{0}'; {1}", path,
-                                    err.Message))));
-                            }
-                        }
-                        dashBoardContent.Controls.Add(placeHolder);
-                    }
-                }
-            }*/
-        }
-
-        private object parseControlValues(string value)
-        {
-            if (!String.IsNullOrEmpty(value))
-            {
-                if (value.StartsWith("[#"))
-                {
-                    value = value.Substring(2, value.Length - 3).ToLower();
-                    switch (value)
-                    {
-                        case "usertype":
-                            return BusinessLogic.User.GetCurrent().UserType.Alias;
-                        case "username":
-                            return BusinessLogic.User.GetCurrent().Name;
-                        case "userlogin":
-                            return BusinessLogic.User.GetCurrent().LoginName;
-                        case "usercontentstartnode":
-                            return BusinessLogic.User.GetCurrent().StartNodeId;
-                        case "usermediastartnode":
-                            return BusinessLogic.User.GetCurrent().StartMediaId;
-                        default:
-                            return value;
-                    }
-                }
-            }
-
-            return value;
-        }
-
-        private Control AddPanel(XmlNode node, Control c)
-        {
-            LiteralControl hide = AddShowOnceLink(node);
-            if (node.Attributes.GetNamedItem("addPanel") != null &&
-                node.Attributes.GetNamedItem("addPanel").Value == "true")
-            {
-                Pane p = new Pane();
-                PropertyPanel pp = new PropertyPanel();
-                if (node.Attributes.GetNamedItem("panelCaption") != null &&
-                    !String.IsNullOrEmpty(node.Attributes.GetNamedItem("panelCaption").Value))
-                {
-                    string panelCaption = node.Attributes.GetNamedItem("panelCaption").Value;
-                    if (panelCaption.StartsWith("#"))
-                    {
-                        panelCaption = ui.Text(panelCaption.Substring(1));
-                    }
-                    pp.Text = panelCaption;
-                }
-                // check for hide in the future link
-                if (!String.IsNullOrEmpty(hide.Text))
-                {
-                    pp.Controls.Add(hide);
-                }
-                pp.Controls.Add(c);
-                p.Controls.Add(pp);
-                return p;
-            }
-
-            if (!String.IsNullOrEmpty(hide.Text))
-            {
-                PlaceHolder ph = new PlaceHolder();
-                ph.Controls.Add(hide);
-                ph.Controls.Add(c);
-                return ph;
-            }
-            else
-            {
-                return c;
-            }
-        }
-
-        private LiteralControl AddShowOnceLink(XmlNode node)
-        {
-            LiteralControl onceLink = new LiteralControl();
-            if (node.Attributes.GetNamedItem("showOnce") != null &&
-                node.Attributes.GetNamedItem("showOnce").Value.ToLower() == "true")
-            {
-                onceLink.Text = "<a class=\"dashboardHideLink\" onclick=\"if(confirm('Are you sure you want remove this dashboard item?')){jQuery.cookie('" + generateCookieKey(node) + "','true'); jQuery(this).closest('.propertypane').fadeOut();return false;}\">" + ui.Text("dashboard", "dontShowAgain") + "</a>";
-            }
-            return onceLink;
-        }
-
-        private string getFirstText(XmlNode node)
-        {
-            foreach (XmlNode n in node.ChildNodes)
-            {
-                if (n.NodeType == XmlNodeType.Text)
-                    return n.Value;
-            }
-
-            return "";
-        }
-
-        private string generateCookieKey(XmlNode node)
-        {
-            string key = String.Empty;
-            if (node.Name.ToLower() == "control")
-            {
-                key = node.FirstChild.Value + "_" + generateCookieKey(node.ParentNode);
-            }
-            else if (node.Name.ToLower() == "tab")
-            {
-                key = node.Attributes.GetNamedItem("caption").Value;
-            }
-
-            return Casing.SafeAlias(key.ToLower());
-        }
-
-        private bool validateAccess(XmlNode node)
-        {
-            // check if this area should be shown at all
-            string onlyOnceValue = StateHelper.GetCookieValue(generateCookieKey(node));
-            if (!String.IsNullOrEmpty(onlyOnceValue))
-            {
-                return false;
-            }
-
-            // the root user can always see everything
-            if (CurrentUser.IsRoot())
-            {
-                return true;
-            }
-            else if (node != null)
-            {
-                XmlNode accessRules = node.SelectSingleNode("access");
-                bool retVal = true;
-                if (accessRules != null && accessRules.HasChildNodes)
-                {
-                    string currentUserType = CurrentUser.UserType.Alias.ToLowerInvariant();
-                    
-                    //Update access rules so we'll be comparing lower case to lower case always
-
-                    var denies = accessRules.SelectNodes("deny");
-                    foreach (XmlNode deny in denies)
-                    {
-                        deny.InnerText = deny.InnerText.ToLowerInvariant();
-                    }
-
-                    var grants = accessRules.SelectNodes("grant");
-                    foreach (XmlNode grant in grants)
-                    {
-                        grant.InnerText = grant.InnerText.ToLowerInvariant();
-                    }
-
-                    string allowedSections = ",";
-                    foreach (BusinessLogic.Application app in CurrentUser.Applications)
-                    {
-                        allowedSections += app.alias.ToLower() + ",";
-                    }
-                    XmlNodeList grantedTypes = accessRules.SelectNodes("grant");
-                    XmlNodeList grantedBySectionTypes = accessRules.SelectNodes("grantBySection");
-                    XmlNodeList deniedTypes = accessRules.SelectNodes("deny");
-
-                    // if there's a grant type, everyone who's not granted is automatically denied
-                    if (grantedTypes.Count > 0 || grantedBySectionTypes.Count > 0)
-                    {
-                        retVal = false;
-                        if (grantedBySectionTypes.Count > 0 && accessRules.SelectSingleNode(String.Format("grantBySection [contains('{0}', concat(',',.,','))]", allowedSections)) != null)
-                        {
-                            retVal = true;
-                        }
-                        else if (grantedTypes.Count > 0 && accessRules.SelectSingleNode(String.Format("grant [. = '{0}']", currentUserType)) != null)
-                        {
-                            retVal = true;
-                        }
-                    }
-                    // if the current type of user is denied we'll say nay
-                    if (deniedTypes.Count > 0 && accessRules.SelectSingleNode(String.Format("deny [. = '{0}']", currentUserType)) != null)
-                    {
-                        retVal = false;
-                    }
-
-                }
-
-                return retVal;
-            }
-            return false;
-        }
-
-        /// <summary>
-        /// Panel2 control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::umbraco.uicontrols.UmbracoPanel Panel2;
-
-        /// <summary>
-        /// dashBoardContent 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 dashBoardContent;
-
-        /// <summary>
-        /// dashboardTabs control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::umbraco.uicontrols.TabView dashboardTabs;
-
-    }
-}

src/Umbraco.Web/umbraco.presentation/umbraco/editContent.aspx.cs

@@ -1,642 +0,0 @@
-using System;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using Umbraco.Core.Models;
-using Umbraco.Core.Persistence.Caching;
-using Umbraco.Core.IO;
-using Umbraco.Core.Publishing;
-using Umbraco.Core.Services;
-using umbraco.BusinessLogic.Actions;
-using umbraco.uicontrols.DatePicker;
-using umbraco.BusinessLogic;
-using umbraco.cms.businesslogic.web;
-using umbraco.presentation;
-using System.Linq;
-using Image = System.Web.UI.WebControls.Image;
-using Umbraco.Core;
-
-namespace umbraco.cms.presentation
-{
-    public class editContent : BasePages.UmbracoEnsuredPage
-    {
-        protected uicontrols.TabView TabView1;
-        protected TextBox documentName;
-        private Document _document;
-        private bool _documentHasPublishedVersion = false;
-        protected Literal jsIds;
-        private readonly LiteralControl _dp = new LiteralControl();
-        private readonly DateTimePicker _dpRelease = new DateTimePicker();
-        private readonly DateTimePicker _dpExpire = new DateTimePicker();
-
-        private controls.ContentControl _cControl;
-
-        private readonly DropDownList _ddlDefaultTemplate = new DropDownList();
-
-        private readonly uicontrols.Pane _publishProps = new uicontrols.Pane();
-        private readonly uicontrols.Pane _linkProps = new uicontrols.Pane();
-
-        private readonly Button _unPublish = new Button();
-        private readonly Literal _littPublishStatus = new Literal();
-
-        private controls.ContentControl.publishModes _canPublish = controls.ContentControl.publishModes.Publish;
-
-        private int? _contentId = null;
-
-        override protected void OnInit(EventArgs e)
-        {
-            base.OnInit(e);
-
-            //validate!
-            int id;
-            if (int.TryParse(Request.QueryString["id"], out id) == false)
-            {
-                //if this is invalid show an error
-                this.DisplayFatalError("Invalid query string");
-                return;
-            }
-            _contentId = id;
-
-
-            _unPublish.Click += UnPublishDo;
-
-            //Loading Content via new public service to ensure that the Properties are loaded correct
-            var content = ApplicationContext.Current.Services.ContentService.GetById(id);
-            _document = new Document(content);
-
-            //check if the doc exists
-            if (string.IsNullOrEmpty(_document.Path))
-            {
-                //if this is invalid show an error
-                this.DisplayFatalError("No document found with id " + _contentId);
-                //reset the content id to null so processing doesn't continue on OnLoad
-                _contentId = null;
-                return;
-            }
-
-            // we need to check if there's a published version of this document
-            _documentHasPublishedVersion = _document.Content.HasPublishedVersion();
-
-            // Check publishing permissions
-            if (!UmbracoUser.GetPermissions(_document.Path).Contains(ActionPublish.Instance.Letter.ToString()))
-            {
-                // Check to see if the user has send to publish permissions
-                if (!UmbracoUser.GetPermissions(_document.Path).Contains(ActionToPublish.Instance.Letter.ToString()))
-                {
-                    //If no send to publish permission then revert to NoPublish mode
-                    _canPublish = controls.ContentControl.publishModes.NoPublish;
-                }
-                else
-                {
-                    _canPublish = controls.ContentControl.publishModes.SendToPublish;
-                }
-            }
-
-            _cControl = new controls.ContentControl(_document, _canPublish, "TabView1");
-
-            _cControl.ID = "TabView1";
-
-            _cControl.Width = Unit.Pixel(666);
-            _cControl.Height = Unit.Pixel(666);
-
-            // Add preview button
-
-            foreach (uicontrols.TabPage tp in _cControl.GetPanels())
-            {
-                AddPreviewButton(tp.Menu, _document.Id);
-            }
-
-            plc.Controls.Add(_cControl);
-
-
-            var publishStatus = new PlaceHolder();
-            if (_documentHasPublishedVersion)
-            {
-                _littPublishStatus.Text = ui.Text("content", "lastPublished", UmbracoUser) + ": " + _document.VersionDate.ToShortDateString() + "   ";
-
-                publishStatus.Controls.Add(_littPublishStatus);
-                if (UmbracoUser.GetPermissions(_document.Path).IndexOf("U") > -1)
-                    _unPublish.Visible = true;
-                else
-                    _unPublish.Visible = false;
-            }
-            else
-            {
-                _littPublishStatus.Text = ui.Text("content", "itemNotPublished", UmbracoUser);
-                publishStatus.Controls.Add(_littPublishStatus);
-                _unPublish.Visible = false;
-            }
-
-            _unPublish.Text = ui.Text("content", "unPublish", UmbracoUser);
-            _unPublish.ID = "UnPublishButton";
-            _unPublish.Attributes.Add("onClick", "if (!confirm('" + ui.Text("defaultdialogs", "confirmSure", UmbracoUser) + "')) return false; ");
-            publishStatus.Controls.Add(_unPublish);
-
-            _publishProps.addProperty(ui.Text("content", "publishStatus", UmbracoUser), publishStatus);
-
-            // Template
-            var template = new PlaceHolder();
-            var documentType = new DocumentType(_document.ContentType.Id);
-            _cControl.PropertiesPane.addProperty(ui.Text("documentType"), new LiteralControl(documentType.Text));
-
-
-            //template picker
-            _cControl.PropertiesPane.addProperty(ui.Text("template"), template);
-            int defaultTemplate;
-            if (_document.Template != 0)
-                defaultTemplate = _document.Template;
-            else
-                defaultTemplate = documentType.DefaultTemplate;
-
-            if (UmbracoUser.UserType.Name == "writer")
-            {
-                if (defaultTemplate != 0)
-                    template.Controls.Add(new LiteralControl(businesslogic.template.Template.GetTemplate(defaultTemplate).Text));
-                else
-                    template.Controls.Add(new LiteralControl(ui.Text("content", "noDefaultTemplate")));
-            }
-            else
-            {
-                _ddlDefaultTemplate.Items.Add(new ListItem(ui.Text("choose") + "...", ""));
-                foreach (var t in documentType.allowedTemplates)
-                {
-
-                    var tTemp = new ListItem(t.Text, t.Id.ToString());
-                    if (t.Id == defaultTemplate)
-                        tTemp.Selected = true;
-                    _ddlDefaultTemplate.Items.Add(tTemp);
-                }
-                template.Controls.Add(_ddlDefaultTemplate);
-            }
-
-
-            // Editable update date, release date and expire date added by NH 13.12.04
-            _dp.ID = "updateDate";
-            _dp.Text = _document.UpdateDate.ToShortDateString() + " " + _document.UpdateDate.ToShortTimeString();
-            _publishProps.addProperty(ui.Text("content", "updateDate", UmbracoUser), _dp);
-
-            _dpRelease.ID = "releaseDate";
-            _dpRelease.DateTime = _document.ReleaseDate;
-            _dpRelease.ShowTime = true;
-            _publishProps.addProperty(ui.Text("content", "releaseDate", UmbracoUser), _dpRelease);
-
-            _dpExpire.ID = "expireDate";
-            _dpExpire.DateTime = _document.ExpireDate;
-            _dpExpire.ShowTime = true;
-            _publishProps.addProperty(ui.Text("content", "expireDate", UmbracoUser), _dpExpire);
-
-            _cControl.Save += Save;
-            _cControl.SaveAndPublish += Publish;
-            _cControl.SaveToPublish += SendToPublish;
-
-            // Add panes to property page...
-            _cControl.tpProp.Controls.AddAt(1, _publishProps);
-            _cControl.tpProp.Controls.AddAt(2, _linkProps);
-
-            // add preview to properties pane too
-            AddPreviewButton(_cControl.tpProp.Menu, _document.Id);
-
-
-        }
-
-        protected void Page_Load(object sender, EventArgs e)
-        {
-            if (!_contentId.HasValue)
-                return;
-
-            if (!CheckUserValidation())
-                return;
-
-            // clear preview cookie
-            // zb-00004 #29956 : refactor cookies names & handling
-            StateHelper.Cookies.Preview.Clear();
-
-            if (!IsPostBack)
-            {
-
-                Log.Add(LogTypes.Open, UmbracoUser, _document.Id, "");
-                ClientTools.SyncTree(_document.Path, false);
-            }
-
-
-            jsIds.Text = "var umbPageId = " + _document.Id.ToString() + ";\nvar umbVersionId = '" + _document.Version.ToString() + "';\n";
-
-        }
-
-        protected override void OnPreRender(EventArgs e)
-        {
-            base.OnPreRender(e);
-            UpdateNiceUrls();
-        }
-
-        /// <summary>
-        /// Handles the Save event for the ContentControl.
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        /// <remarks>
-        /// This will set the document's properties and persist a new document revision
-        /// </remarks>
-        protected void Save(object sender, EventArgs e)
-        {
-            //NOTE: This is only here because we have to keep backwards compatibility with events in the ContentControl.
-            // see: http://issues.umbraco.org/issue/U4-1660
-            // in this case both Save and SaveAndPublish will fire when we are publishing but we only want to handle that once,
-            // so if this is actually doing a publish, we'll exit and rely on the SaveAndPublish handler to do all the work.
-            if (_cControl.DoesPublish)
-            {
-                return;
-            }
-
-            //update UI and set document properties
-            PerformSaveLogic();
-
-            //persist the document
-            _document.Save();
-
-            // Run Handler				
-            BusinessLogic.Actions.Action.RunActionHandlers(_document, ActionUpdate.Instance);
-
-            ClientTools.ShowSpeechBubble(
-                speechBubbleIcon.save, ui.Text("speechBubbles", "editContentSavedHeader"),
-                ui.Text("speechBubbles", "editContentSavedText"));
-
-            ClientTools.SyncTree(_document.Path, true);
-        }
-
-        /// <summary>
-        /// Handles the SendToPublish event
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        protected void SendToPublish(object sender, EventArgs e)
-        {
-            if (Page.IsValid)
-            {
-                ClientTools.ShowSpeechBubble(
-                    speechBubbleIcon.save, ui.Text("speechBubbles", "editContentSendToPublish", UmbracoUser),
-                    ui.Text("speechBubbles", "editContentSendToPublishText", UmbracoUser));
-                _document.SendToPublication(UmbracoUser);
-            }
-        }
-
-        /// <summary>
-        /// Handles the SaveAndPublish event
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        /// <remarks>
-        /// Sets the document's properties and if the page is valid continues to publish it, otherwise just saves a revision.
-        /// </remarks>
-        protected void Publish(object sender, EventArgs e)
-        {
-            //update UI and set document properties
-            PerformSaveLogic();
-
-            //the business logic here will check to see if the doc can actually be published and will return the 
-            // appropriate result so we can display the correct error messages (or success).
-            var savePublishResult = _document.SaveAndPublishWithResult(UmbracoUser);
-
-            ShowMessageForStatus(savePublishResult.Result);
-
-            if (savePublishResult.Success)
-            {
-                _littPublishStatus.Text = string.Format("{0}: {1}<br/>", ui.Text("content", "lastPublished", UmbracoUser), _document.VersionDate.ToString());
-
-                if (UmbracoUser.GetPermissions(_document.Path).IndexOf("U") > -1)
-                {
-                    _unPublish.Visible = true;
-                }
-
-                _documentHasPublishedVersion = _document.Content.HasPublishedVersion();
-            }
-
-            ClientTools.SyncTree(_document.Path, true);
-        }
-
-        private void ShowMessageForStatus(PublishStatus status)
-        {
-            switch (status.StatusType)
-            {
-                case PublishStatusType.Success:
-                case PublishStatusType.SuccessAlreadyPublished:
-                    ClientTools.ShowSpeechBubble(
-                        speechBubbleIcon.save,
-                        ui.Text("speechBubbles", "editContentPublishedHeader", UmbracoUser),
-                        ui.Text("speechBubbles", "editContentPublishedText", UmbracoUser));
-                    break;
-                case PublishStatusType.FailedPathNotPublished:
-                    ClientTools.ShowSpeechBubble(
-                        speechBubbleIcon.warning,
-                        ui.Text("publish"),
-                        ui.Text("publish", "contentPublishedFailedByParent",
-                                string.Format("{0} ({1})", status.ContentItem.Name, status.ContentItem.Id),
-                                UmbracoUser).Trim());
-                    break;
-                case PublishStatusType.FailedCancelledByEvent:
-                    ClientTools.ShowSpeechBubble(
-                        speechBubbleIcon.warning,
-                        ui.Text("publish"),
-                        ui.Text("speechBubbles", "contentPublishedFailedByEvent"));
-                    break;
-                case PublishStatusType.FailedHasExpired:
-                case PublishStatusType.FailedAwaitingRelease:
-                case PublishStatusType.FailedIsTrashed:
-                case PublishStatusType.FailedContentInvalid:
-                    ClientTools.ShowSpeechBubble(
-                        speechBubbleIcon.warning,
-                        ui.Text("publish"),
-                        ui.Text("publish", "contentPublishedFailedInvalid",
-                                new[]
-                                    {
-                                        string.Format("{0} ({1})", status.ContentItem.Name, status.ContentItem.Id),
-                                        string.Join(",", status.InvalidProperties.Select(x => x.Alias))
-                                    },
-                                UmbracoUser).Trim());
-                    break;
-                default:
-                    throw new IndexOutOfRangeException();
-            }
-        }
-
-        protected void UnPublishDo(object sender, EventArgs e)
-        {
-            _document.UnPublish();
-            _littPublishStatus.Text = ui.Text("content", "itemNotPublished", UmbracoUser);
-            _unPublish.Visible = false;
-            _documentHasPublishedVersion = false;
-
-            //library.UnPublishSingleNode(_document.Id);
-
-            Current.ClientTools.SyncTree(_document.Path, true);
-            ClientTools.ShowSpeechBubble(speechBubbleIcon.success, ui.Text("unpublish"), ui.Text("speechBubbles", "contentUnpublished"));
-
-            //newPublishStatus.Text = "0";
-        }
-
-        void UpdateNiceUrlProperties(string niceUrlText, string altUrlsText)
-        {
-            _linkProps.Controls.Clear();
-
-            var lit = new Literal();
-            lit.Text = niceUrlText;
-            _linkProps.addProperty(ui.Text("content", "urls", UmbracoUser), lit);
-
-            if (!string.IsNullOrWhiteSpace(altUrlsText))
-            {
-                lit = new Literal();
-                lit.Text = altUrlsText;
-                _linkProps.addProperty(ui.Text("content", "alternativeUrls", UmbracoUser), lit);
-            }
-        }
-
-        void UpdateNiceUrls()
-        {
-            if (_documentHasPublishedVersion == false)
-            {
-                UpdateNiceUrlProperties("<i>" + ui.Text("content", "itemNotPublished", UmbracoUser) + "</i>", null);
-                return;
-            }
-
-            var urlProvider = Umbraco.Web.UmbracoContext.Current.RoutingContext.UrlProvider;
-            var url = urlProvider.GetUrl(_document.Id);
-            string niceUrlText = null;
-            var altUrlsText = new System.Text.StringBuilder();
-
-            if (url == "#")
-            {
-                // document as a published version yet it's url is "#" => a parent must be
-                // unpublished, walk up the tree until we find it, and report.
-                var parent = _document;
-                do
-                {
-                    parent = parent.ParentId > 0 ? new Document(parent.ParentId) : null;
-                }
-                while (parent != null && parent.Published);
-
-                if (parent == null) // oops - internal error
-                    niceUrlText = "<i>" + ui.Text("content", "parentNotPublishedAnomaly", UmbracoUser) + "</i>";
-                else
-                    niceUrlText = "<i>" + ui.Text("content", "parentNotPublished", parent.Text, UmbracoUser) + "</i>";
-            }
-            else
-            {
-                niceUrlText = string.Format("<a href=\"{0}\" target=\"_blank\">{0}</a>", url);
-
-                foreach (var otherUrl in urlProvider.GetOtherUrls(_document.Id))
-                    altUrlsText.AppendFormat("<a href=\"{0}\" target=\"_blank\">{0}</a><br />", otherUrl);
-            }
-
-            UpdateNiceUrlProperties(niceUrlText, altUrlsText.ToString());
-        }
-
-        /// <summary>
-        /// When a document is saved or published all of this logic must be performed.
-        /// </summary>
-        /// <remarks>
-        /// This updates both UI controls and business logic object properties but does not persist any data to 
-        /// business logic repositories.
-        /// </remarks>
-        private void PerformSaveLogic()
-        {
-            // error handling test
-            if (!Page.IsValid)
-            {
-                foreach (uicontrols.TabPage tp in _cControl.GetPanels())
-                {
-                    tp.ErrorControl.Visible = true;
-                    tp.ErrorHeader = ui.Text("errorHandling", "errorButDataWasSaved");
-                    tp.CloseCaption = ui.Text("close");
-                }
-            }
-            else if (Page.IsPostBack)
-            {
-                // hide validation summaries
-                foreach (uicontrols.TabPage tp in _cControl.GetPanels())
-                {
-                    tp.ErrorControl.Visible = false;
-                }
-            }
-
-            if (_dpRelease.DateTime > new DateTime(1753, 1, 1) && _dpRelease.DateTime < new DateTime(9999, 12, 31))
-                _document.ReleaseDate = _dpRelease.DateTime;
-            else
-                _document.ReleaseDate = new DateTime(1, 1, 1, 0, 0, 0);
-            if (_dpExpire.DateTime > new DateTime(1753, 1, 1) && _dpExpire.DateTime < new DateTime(9999, 12, 31))
-                _document.ExpireDate = _dpExpire.DateTime;
-            else
-                _document.ExpireDate = new DateTime(1, 1, 1, 0, 0, 0);
-
-            // Update default template
-            if (_ddlDefaultTemplate.SelectedIndex > 0)
-            {
-                _document.Template = int.Parse(_ddlDefaultTemplate.SelectedValue);
-            }
-            else
-            {
-                if (new DocumentType(_document.ContentType.Id).allowedTemplates.Length == 0)
-                {
-                    _document.RemoveTemplate();
-                }
-            }
-
-            //The value of the properties has been set on IData through IDataEditor in the ContentControl
-            //so we need to 'retrieve' that value and set it on the property of the new IContent object.
-            //NOTE This is a workaround for the legacy approach to saving values through the DataType instead of the Property 
-            //- (The DataType shouldn't be responsible for saving the value - especically directly to the db).
-            foreach (var item in _cControl.DataTypes)
-            {
-                _document.getProperty(item.Key).Value = item.Value.Data.Value;
-            }
-
-            // Update the update date
-            _dp.Text = _document.UpdateDate.ToShortDateString() + " " + _document.UpdateDate.ToShortTimeString();
-        }
-
-        /// <summary>
-        /// Clears the page of all controls and shows a simple message. Used if users don't have visible access to the page.
-        /// </summary>
-        /// <param name="message"></param>        
-        private void ShowUserValidationError(string message)
-        {
-            this.Controls.Clear();
-            this.Controls.Add(new LiteralControl(String.Format("<link rel='stylesheet' type='text/css' href='../../umbraco_client/ui/default.css'><link rel='stylesheet' type='text/css' href='../../umbraco_client/tabview/style.css'><link rel='stylesheet' type='text/css' href='../../umbraco_client/propertypane/style.css'><div id='body_dashboardTabs' style='height: auto; width: auto;'><div class='header'><ul><li id='body_dashboardTabs_tab01' class='tabOn'><a id='body_dashboardTabs_tab01a' href='#' onclick='setActiveTab('body_dashboardTabs','body_dashboardTabs_tab01',body_dashboardTabs_tabs); return false;'><span><nobr>Access denied</nobr></span></a></li></ul></div><div id='' class='tabpagecontainer'><div id='body_dashboardTabs_tab01layer' class='tabpage' style='display: block;'><div class='menubar'></div><div class='tabpagescrollinglayer' id='body_dashboardTabs_tab01layer_contentlayer' style='width: auto; height: auto;'><div class='tabpageContent' style='padding:0 10px;'><div class='propertypane' style=''><div><div class='propertyItem' style=''><div class='dashboardWrapper'><h2>Access denied</h2><img src='./dashboard/images/access-denied.png' alt='Access denied' class='dashboardIcon'>{0}</div></div></div></div></div></div></div></div><div class='footer'><div class='status'><h2></h2></div></div></div>", message)));
-        }
-
-        /// <summary>
-        /// Checks if the user cannot view/browse this page/app and displays an html message to the user if this is not the case.
-        /// </summary>
-        /// <returns></returns>
-        private bool CheckUserValidation()
-        {
-            // Validate permissions
-            if (!base.ValidateUserApp(Constants.Applications.Content))
-            {
-                ShowUserValidationError("<h3>The current user doesn't have access to this application</h3><p>Please contact the system administrator if you think that you should have access.</p>");
-                return false;
-            }
-            if (!ValidateUserNodeTreePermissions(_document.Path, ActionBrowse.Instance.Letter.ToString()))
-            {
-                ShowUserValidationError(
-                    "<h3>The current user doesn't have permissions to browse this document</h3><p>Please contact the system administrator if you think that you should have access.</p>");
-                return false;
-            }
-            //TODO: Change this, when we add view capabilities, the user will be able to view but not edit!
-            if (!ValidateUserNodeTreePermissions(_document.Path, ActionUpdate.Instance.Letter.ToString()))
-            {
-                ShowUserValidationError("<h3>The current user doesn't have permissions to edit this document</h3><p>Please contact the system administrator if you think that you should have access.</p>");
-                return false;
-            }
-            return true;
-        }
-
-        private void AddPreviewButton(uicontrols.ScrollingMenu menu, int id)
-        {
-            uicontrols.MenuIconI menuItem;
-
-            // Find the first splitter in the Menu - Should be the rte toolbar's splitter
-            var startIndex = menu.FindSplitter(1);
-
-            if (startIndex == -1)
-            {
-                // No Splitter found - rte toolbar isn't loaded
-                menu.InsertSplitter();
-                menuItem = menu.NewIcon();
-            }
-            else
-            {
-                // Rte toolbar is loaded, inject after it's Splitter
-                menuItem = menu.NewIcon(startIndex + 1);
-                menu.InsertSplitter(startIndex + 2);
-            }
-
-            menuItem.ImageURL = SystemDirectories.Umbraco + "/images/editor/vis.gif";
-
-            if (EnablePreviewButton())
-            {
-                menuItem.AltText = ui.Text("buttons", "showPage", UmbracoUser);
-                menuItem.OnClickCommand = "window.open('dialogs/preview.aspx?id=" + id + "','umbPreview')";
-            }
-            else
-            {
-                var showPageDisabledText = ui.Text("buttons", "showPageDisabled", UmbracoUser);
-                if (showPageDisabledText.StartsWith("["))
-                    showPageDisabledText = ui.GetText("buttons", "showPageDisabled", null, "en");
-
-                menuItem.AltText = showPageDisabledText;
-                ((Image) menuItem).Attributes.Add("style", "opacity: 0.5");
-            }
-        }
-
-        private bool EnablePreviewButton()
-        {
-            // Fix for U4-862, if there's no template, disable the preview button
-            // Fixed again for U4-2587, apparently at some point "no template" changed from -1 to 0? -SJ
-            // Now also catches when template doesn't exist any more or is not allowed any more
-            // Don't think there's a better way to check if the template exists besides trying to instantiate it..
-            try
-            {
-                var template = new businesslogic.template.Template(_document.Template);
-                // If template is found check if it's in the list of allowed templates for this document
-                return _document.Content.ContentType.AllowedTemplates.ToList().Any(t => t.Id == template.Id);
-            }
-            catch (Exception) { }
-            
-            return false;
-        }
-
-        /// <summary>
-        /// JsInclude1 control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::ClientDependency.Core.Controls.JsInclude JsInclude1;
-
-        /// <summary>
-        /// JsInclude2 control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::ClientDependency.Core.Controls.JsInclude JsInclude2;
-
-        /// <summary>
-        /// JsInclude3 control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::ClientDependency.Core.Controls.JsInclude JsInclude3;
-
-        /// <summary>
-        /// plc 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 plc;
-
-        /// <summary>
-        /// doSave 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.HtmlInputHidden doSave;
-
-        /// <summary>
-        /// doPublish 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.HtmlInputHidden doPublish;
-
-    }
-}

src/Umbraco.Web/umbraco.presentation/umbraco/editMedia.aspx.cs

@@ -1,191 +0,0 @@
-using System;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Xml;
-using Umbraco.Core;
-using umbraco.cms.businesslogic.datatype.controls;
-using System.Collections.Generic;
-using System.Linq;
-using System.IO;
-using Umbraco.Core.IO;
-using umbraco.cms.businesslogic.property;
-using Umbraco.Core;
-
-namespace umbraco.cms.presentation
-{
-    /// <summary>
-    /// Summary description for editMedia.
-    /// </summary>
-    public partial class editMedia : BasePages.UmbracoEnsuredPage
-    {
-        private readonly uicontrols.Pane _mediaPropertiesPane = new uicontrols.Pane();
-        private readonly LiteralControl _updateDateLiteral = new LiteralControl();
-        private readonly LiteralControl _mediaFileLinksLiteral = new LiteralControl();
-
-        public editMedia()
-        {
-            CurrentApp = BusinessLogic.DefaultApps.media.ToString();
-        }
-
-        protected uicontrols.TabView TabView1;
-		protected TextBox documentName;
-		private businesslogic.media.Media _media;
-		controls.ContentControl _contentControl;
-        
-        override protected void OnInit(EventArgs e)
-        {
-            base.OnInit(e);
-
-            int id = int.Parse(Request.QueryString["id"]);
-
-            //Loading Media via new public service to ensure that the Properties are loaded correct
-            var media = ApplicationContext.Current.Services.MediaService.GetById(id);
-            _media = new cms.businesslogic.media.Media(media);
-
-            // Save media on first load
-            bool exists = SqlHelper.ExecuteScalar<int>("SELECT COUNT(nodeId) FROM cmsContentXml WHERE nodeId = @nodeId",
-                                       SqlHelper.CreateParameter("@nodeId", _media.Id)) > 0;
-            if (!exists)
-            {
-                _media.XmlGenerate(new XmlDocument());
-            }
-
-            _contentControl = new controls.ContentControl(_media, controls.ContentControl.publishModes.NoPublish, "TabView1");
-            _contentControl.Width = Unit.Pixel(666);
-            _contentControl.Height = Unit.Pixel(666);
-
-            //this must be set to false as we don't want to proceed to save anything if the page is invalid
-            _contentControl.SavePropertyDataWhenInvalid = false;
-
-            plc.Controls.Add(_contentControl);
-
-            _contentControl.Save += new System.EventHandler(Save);
-
-            this._updateDateLiteral.ID = "updateDate";
-            this._updateDateLiteral.Text = _media.VersionDate.ToShortDateString() + " " + _media.VersionDate.ToShortTimeString();
-
-            this._mediaFileLinksLiteral.ID = "mediaFileLinks";
-            _mediaPropertiesPane.addProperty(ui.Text("content", "updateDate", base.getUser()), this._updateDateLiteral);
-
-            this.UpdateMediaFileLinksLiteral();
-            _mediaPropertiesPane.addProperty(ui.Text("content", "mediaLinks"), this._mediaFileLinksLiteral);
-
-            // add the property pane to the page rendering
-            _contentControl.tpProp.Controls.AddAt(1, _mediaPropertiesPane);                       
-        }
-
-        protected void Page_Load(object sender, System.EventArgs e)
-        {
-            if (!IsPostBack)
-            {
-                ClientTools.SyncTree(_media.Path, false);
-            }
-        }
-
-		protected void Save(object sender, EventArgs e) 
-        {
-            // do not continue saving anything if the page is invalid!
-            // http://issues.umbraco.org/issue/U4-227
-            if (!Page.IsValid)
-            {
-                foreach (uicontrols.TabPage tp in _contentControl.GetPanels())
-                {
-                    tp.ErrorControl.Visible = true;
-                    tp.ErrorHeader = ui.Text("errorHandling", "errorHeader");
-                    tp.CloseCaption = ui.Text("close");
-                }
-            }
-            else
-            {
-                if (Page.IsPostBack)
-                {
-                    // hide validation summaries
-                    foreach (uicontrols.TabPage tp in _contentControl.GetPanels())
-                    {
-                        tp.ErrorControl.Visible = false;
-                    }
-                }    
-
-            //The value of the properties has been set on IData through IDataEditor in the ContentControl
-            //so we need to 'retrieve' that value and set it on the property of the new IContent object.
-            //NOTE This is a workaround for the legacy approach to saving values through the DataType instead of the Property 
-            //- (The DataType shouldn't be responsible for saving the value - especically directly to the db).
-            foreach (var item in _contentControl.DataTypes)
-            {
-                _media.getProperty(item.Key).Value = item.Value.Data.Value;
-            }
-
-                _media.Save();
-
-                this._updateDateLiteral.Text = _media.VersionDate.ToShortDateString() + " " + _media.VersionDate.ToShortTimeString();
-                this.UpdateMediaFileLinksLiteral();
-
-                _media.XmlGenerate(new XmlDocument());
-                ClientTools.ShowSpeechBubble(speechBubbleIcon.save, ui.Text("speechBubbles", "editMediaSaved"), ui.Text("editMediaSavedText"));
-                ClientTools.SyncTree(_media.Path, true);
-            }                               
-		}
-
-        private void UpdateMediaFileLinksLiteral()
-        {
-            var uploadField = DataTypesResolver.Current.GetById(new Guid(Constants.PropertyEditors.UploadField));
-
-            // always clear, incase the upload file was removed
-            this._mediaFileLinksLiteral.Text = string.Empty;
-
-            try
-            {
-                var uploadProperties = _media.GenericProperties
-                    .Where(p => p.PropertyType.DataTypeDefinition.DataType.Id == uploadField.Id
-                                && p.Value.ToString() != ""
-                                && File.Exists(IOHelper.MapPath(p.Value.ToString())));
-
-                var properties = uploadProperties as List<Property> ?? uploadProperties.ToList();
-
-                if (properties.Any())
-                {
-                    this._mediaFileLinksLiteral.Text += "<table>";
-
-                    foreach (var property in properties)
-                    {
-                        this._mediaFileLinksLiteral.Text += string.Format("<tr><td>{0}&nbsp;</td><td><a href=\"{1}\" target=\"_blank\">{1}</a></td></tr>", property.PropertyType.Name, property.Value);
-                    }
-
-                    this._mediaFileLinksLiteral.Text += "</table>";
-                }
-            }
-            catch
-            {
-                //the data type definition may not exist anymore at this point because another thread may
-                //have deleted it.
-            }
-        }
-
-        /// <summary>
-        /// plc 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 plc;
-
-        /// <summary>
-        /// doSave 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.HtmlInputHidden doSave;
-
-        /// <summary>
-        /// doPublish 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.HtmlInputHidden doPublish;
-    }
-}

src/Umbraco.Web/umbraco.presentation/umbraco/login.aspx.cs

@@ -1,307 +0,0 @@
-using System;
-using System.Collections;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Globalization;
-using System.Security;
-using System.Web;
-using System.Web.SessionState;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-using Umbraco.Core.Configuration;
-using Umbraco.Core.Logging;
-using Umbraco.Core.Models.Membership;
-using System.Web.Security;
-using umbraco.businesslogic.Exceptions;
-using umbraco.IO;
-using umbraco.cms.businesslogic.web;
-using System.Linq;
-using Umbraco.Core;
-using User = umbraco.BusinessLogic.User;
-
-namespace umbraco.cms.presentation
-{
-    /// <summary>
-    /// Summary description for login.
-    /// </summary>
-    [Obsolete("This class is no longer used and will be removed")]
-    public partial class login : BasePages.BasePage
-    {
-        [Obsolete("This property is no longer used")]
-        protected umbWindow treeWindow;
-
-        protected override void OnLoad(EventArgs e)
-        {
-            base.OnLoad(e);
-            ClientLoader.DataBind();
-
-            // validate redirect url
-            string redirUrl = Request["redir"];
-            if (!String.IsNullOrEmpty(redirUrl))
-            {
-                validateRedirectUrl(redirUrl);
-            }
-        }
-
-
-        protected override void OnPreRender(EventArgs e)
-        {
-            base.OnPreRender(e);
-            Button1.Text = ui.Text("general", "login");
-            Panel1.Text = ui.Text("general", "welcome");
-            Panel1.Style.Add("padding", "10px;");
-            username.Text = ui.Text("general", "username");
-            password.Text = ui.Text("general", "password");
-
-            // Add bottom and top texts
-            TopText.Text = ui.Text("login", "topText");
-
-
-            BottomText.Text = ui.Text("login", "bottomText", DateTime.Now.Year.ToString(CultureInfo.InvariantCulture));
-
-            //added this little hack to remove unessary formatting, without breaking all current language files.
-            if (BottomText.Text.Contains("</p>"))
-                BottomText.Text = BottomText.Text.Substring(29).Replace("<br />", "").Replace("</p>", "");
-        }
-
-
-        protected void Button1_Click(object sender, System.EventArgs e)
-        {
-            // Authenticate users by using the provider specified in umbracoSettings.config
-            if (Membership.Providers[UmbracoConfig.For.UmbracoSettings().Providers.DefaultBackOfficeUserProvider].ValidateUser(lname.Text, passw.Text))
-            {
-                if (Membership.Providers[UmbracoConfig.For.UmbracoSettings().Providers.DefaultBackOfficeUserProvider] is ActiveDirectoryMembershipProvider)
-                    ActiveDirectoryMapping(lname.Text, Membership.Providers[UmbracoConfig.For.UmbracoSettings().Providers.DefaultBackOfficeUserProvider].GetUser(lname.Text, false).Email);
-
-                var u = new User(lname.Text);
-                doLogin(u);
-                
-                if (hf_height.Value != "undefined")
-                {
-                    Session["windowHeight"] = hf_height.Value;
-                    Session["windowWidth"] = hf_width.Value;
-                }
-
-                string redirUrl = Request["redir"];
-
-                if (string.IsNullOrEmpty(redirUrl))
-                    Response.Redirect("umbraco.aspx");
-                else if (validateRedirectUrl(redirUrl))
-                {
-                    Response.Redirect(redirUrl, true);
-                }
-            }
-            else
-            {
-                loginError.Visible = true;
-            }
-        }
-
-        private bool validateRedirectUrl(string url)
-        {
-            if (!isUrlLocalToHost(url))
-            {
-                LogHelper.Info<login>(String.Format("Security warning: Login redirect was attempted to a site at another domain: '{0}'", url));
-
-                throw new UserAuthorizationException(
-                    String.Format(@"There was attempt to redirect to '{0}' which is another domain than where you've logged in. If you clicked a link to reach this login
-                    screen, please double check that the link came from someone you trust. You *might* have been exposed to an *attempt* to breach the security of your website. Nothing 
-                    have been compromised, though!", url));
-            }
-
-            return true;
-        }
-
-        private bool isUrlLocalToHost(string url)
-        {
-            if (String.IsNullOrEmpty(url))
-            {
-                return false;
-            }
-
-            Uri absoluteUri;
-            if (Uri.TryCreate(url, UriKind.Absolute, out absoluteUri))
-            {
-                return String.Equals(HttpContext.Current.Request.Url.Host, absoluteUri.Host,
-                            StringComparison.OrdinalIgnoreCase);
-            }
-
-            bool isLocal = !url.StartsWith("http:", StringComparison.OrdinalIgnoreCase)
-                           && !url.StartsWith("https:", StringComparison.OrdinalIgnoreCase)
-                           && Uri.IsWellFormedUriString(url, UriKind.Relative);
-            return isLocal;
-        }
-
-        /// <summary>
-        /// Maps active directory account to umbraco user account
-        /// </summary>
-        /// <param name="loginName">Name of the login.</param>
-        /// <param name="email">Email address of the user</param>
-        private void ActiveDirectoryMapping(string loginName, string email)
-        {
-            // Password is not copied over because it is stored in active directory for security!
-            // The user is create with default access to content and as a writer user type
-            if (BusinessLogic.User.getUserId(loginName) == -1)
-            {
-                BusinessLogic.User.MakeNew(loginName, loginName, string.Empty, email ?? "", BusinessLogic.UserType.GetUserType(2));
-                var u = new User(loginName);
-                u.addApplication(Constants.Applications.Content);
-            }
-        }
-
-        /// <summary>
-        /// ClientLoader control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::umbraco.uicontrols.UmbracoClientDependencyLoader ClientLoader;
-
-        /// <summary>
-        /// CssInclude1 control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::ClientDependency.Core.Controls.CssInclude CssInclude1;
-
-        /// <summary>
-        /// JsInclude1 control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::ClientDependency.Core.Controls.JsInclude JsInclude1;
-
-        /// <summary>
-        /// JsInclude3 control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::ClientDependency.Core.Controls.JsInclude JsInclude3;
-
-        /// <summary>
-        /// JsInclude2 control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::ClientDependency.Core.Controls.JsInclude JsInclude2;
-
-        /// <summary>
-        /// Form1 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.HtmlForm Form1;
-
-        /// <summary>
-        /// Panel1 control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::umbraco.uicontrols.UmbracoPanel Panel1;
-
-        /// <summary>
-        /// TopText 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.Literal TopText;
-
-        /// <summary>
-        /// username 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.Label username;
-
-        /// <summary>
-        /// lname 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.TextBox lname;
-
-        /// <summary>
-        /// password 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.Label password;
-
-        /// <summary>
-        /// passw 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.TextBox passw;
-
-        /// <summary>
-        /// Button1 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.Button Button1;
-
-        /// <summary>
-        /// BottomText 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.Literal BottomText;
-
-        /// <summary>
-        /// hf_height 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.HiddenField hf_height;
-
-        /// <summary>
-        /// hf_width 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.HiddenField hf_width;
-
-        /// <summary>
-        /// loginError 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 loginError;
-    }
-}

src/Umbraco.Web/umbraco.presentation/umbraco/logout.aspx.cs

@@ -1,28 +0,0 @@
-using System;
-using System.Collections;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Web;
-using System.Web.SessionState;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace umbraco
-{
-    /// <summary>
-    /// Summary description for logout.
-    /// </summary>
-    public partial class logout : BasePages.BasePage
-    {
-        protected void Page_Load(object sender, System.EventArgs e)
-        {
-            // Put user code to initialize the page here
-            if (umbracoUserContextID != "")
-                base.ClearLogin();
-        }
-
-        protected System.Web.UI.HtmlControls.HtmlForm Form1;
-    }
-}

src/Umbraco.Web/umbraco.presentation/umbraco/timerModule.cs

@@ -1,39 +0,0 @@
-using System.Data;
-using System.Threading;
-using System.Web;
-using Umbraco.Core.Logging;
-using umbraco.BusinessLogic;
-
-namespace umbraco
-{
-	/// <summary>
-	/// Summary description for timerModule.
-	/// </summary>
-	public class timerModule : IHttpModule
-	{
-		protected Timer t;
-
-		#region IHttpModule Members
-
-		public void Init(HttpApplication context)
-		{
-            LogHelper.Debug<timerModule>("timer init");
-
-			t = new Timer(new TimerCallback(this.doStuff), context.Context, 1000, 1000);
-		}
-
-		private void doStuff(object sender)
-		{
-            LogHelper.Debug<timerModule>("timer ping");
-		}
-
-		public void Dispose()
-		{
-			if(t != null)
-				t.Dispose();
-			t = null;
-		}
-
-		#endregion
-	}
-}

src/Umbraco.Web/umbraco.presentation/umbraco/umbWindow.cs

@@ -1,148 +0,0 @@
-using System;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.ComponentModel;
-
-namespace  umbraco
-{
-	/// <summary>
-	/// Summary description for umbWindow.
-	/// </summary>
-	[DefaultProperty("Text"), ToolboxData("<{0}:umbWindow runat=server></{0}:umbWindow>")]
-    [Obsolete("This class is no longer used and will be removed from the codebase in future versions")]
-	public class umbWindow : System.Web.UI.WebControls.PlaceHolder
-	{
-		private string content;
-		private string windowName;
-		private int width;
-		private int height;
-		private string margin;
-		private bool scroll;
-		private bool bottomLabel = false;
-		private string imageUrlPreFix = "";
-		private string label;
-	
-		[Bindable(true), 
-		Category("Umbraco"), 
-		DefaultValue("")] 
-		public string ImageUrlPreFix 
-		{
-			get {return imageUrlPreFix;}
-			set {imageUrlPreFix = value;}
-		}
-		
-		[Bindable(true), 
-		Category("Appearance"), 
-		DefaultValue("")] 
-		public string Content 
-		{
-			get {return content;}
-			set {content = value;}
-		}
-		[Bindable(true), 
-		Category("Appearance"), 
-		DefaultValue("")] 
-		public int Height 
-		{
-			get {return height;}
-			set {height = value;}
-		}
-		[Bindable(true), 
-		Category("Appearance"), 
-		DefaultValue("")] 
-		public int Width 
-		{
-			get {return width;}
-			set {width = value;}
-		}
-		[Bindable(true), 
-		Category("Appearance"), 
-		DefaultValue("")] 
-		public string Margin 
-		{
-			get {return margin;}
-			set {margin = value;}
-		}
-		[Bindable(true), 
-		Category("Appearance"), 
-		DefaultValue("")] 
-		public string Label 
-		{
-			get {return label;}
-			set {label = value;}
-		}
-		[Bindable(true), 
-		Category("Appearance"), 
-		DefaultValue("")] 
-		public bool Scroll 
-		{
-			get {return scroll;}
-			set {scroll = value;}
-		}
-		[Bindable(true), 
-		Category("Appearance"), 
-		DefaultValue("")] 
-		public bool ShowBottomLabel 
-		{
-			get {return bottomLabel;}
-			set {bottomLabel = value;}
-		}
-		[Bindable(true), 
-		Category("Appearance"), 
-		DefaultValue("")] 
-		public string WindowName 
-		{
-			get {return windowName;}
-			set {windowName = value;}
-		}
-
-		protected override void Render(HtmlTextWriter output)
-		{
-			output.Write(
-				"<table border=0 cellspacing=0 cellpadding=0><tr><td><table border=0 cellspacing=0 cellpadding=0 width=\"" + (width+10) + "\" height=\"21\" id=\"umbracoGui" + windowName + "Top\">" +
-				"<tr>" +
-				"<td width=\"11\"><img src=\"" + imageUrlPreFix + "images/c_tl.gif\" width=\"11\" height=\"21\" alt=\"\" border=\"0\"></td>" +
-				"<td background=\"" + imageUrlPreFix + "images/c_t.gif\" width=\"" + width + "\" id=\"umbracoGui" + windowName + "TopSpacer\" class=\"guiDialogTinyTop\"><img src=\"" + imageUrlPreFix + "images/nada.gif\" width=1 height=2 alt=\"\"><br /><span id=\"umbracoGui" + windowName + "Label\">" + label + "</span></td>" + 
-				"<td width=\"19\"><img src=\"" + imageUrlPreFix + "images/c_tr.gif\" width=\"19\" height=\"21\" alt=\"\" border=\"0\"></td>" + 
-				"</tr>" +
-				"</table>" +
-	
-				"<table border=0 cellspacing=0 cellpadding=0 width=\"" + (width+22) + "\" height=\"" + height + "\" id=\"umbracoGui" + windowName + "ContainerTable\">" +
-				"<tr>" + 
-				"<td width=\"1\" bgcolor=\"#A2A2A0\"><img src=\"" + imageUrlPreFix + "images/nada.gif\" width=\"1\" height=\"1\"></td>" + 
-				"<td width=\"" + width + "\" bgcolor=\"white\" class=\"windowText\" valign=\"top\" id=\"umbracoGui" + windowName + "ContainerTableSpacer\">");
-			if (scroll)
-				output.Write(
-					"		<div id=\"umbracoGui" + windowName + "\" class=\"umbracoGuiWindow\" style=\"overflow-x: auto; overflow-y: auto; width: " + width + "px; height: " + height + "; padding: " + margin + ";\">");
-			else
-				output.Write(
-					"		<div id=\"umbracoGui" + windowName + "\" class=\"umbracoGuiWindow\" style=\"overflow-x: hide; overflow-y: hide; width: " + width + "px; height: " + height + "; padding: " + margin + ";\">");
-
-			base.RenderChildren(output);
-			output.Write(
-				"</div>" +
-				"	</td>" +
-				"	<td background=\"" + imageUrlPreFix + "images/c_r.gif\" width=\"21\"><img src=\"" + imageUrlPreFix + "images/nada.gif\" width=\"21\" height=\"1\"></td>" +
-				"</tr>" +
-				"</table>" +
-				
-				"	<table border=0 cellspacing=0 cellpadding=0 width=\"" + (width+12) + "\" height=\"16\" id=\"umbracoGui" + windowName + "Bottom\">" +
-				"<tr>");
-
-			if (bottomLabel)
-				output.Write(
-				"<td width=\"15\"><img src=\"" + imageUrlPreFix + "images/c_bl_label.gif\" width=\"15\" height=\"32\" alt=\"\" border=\"0\"></td>" +
-				"<td background=\"" + imageUrlPreFix + "images/c_b_label.gif\" width=\"" + width + "\" id=\"umbracoGui" + windowName + "BottomSpacer\" class=\"guiDialogTiny\"><span id=\"umbracoGui" + windowName + "BottomLabel\">" + label + "</span></td>" +
-				"<td width=\"19\"><img src=\"" + imageUrlPreFix + "images/c_br_label.gif\" width=\"16\" height=\"32\" alt=\"\" border=\"0\"></td>");
-			else
-				output.Write(
-					"<td width=\"15\"><img src=\"" + imageUrlPreFix + "images/c_bl.gif\" width=\"15\" height=\"16\" alt=\"\" border=\"0\"></td>" +
-					"<td background=\"" + imageUrlPreFix + "images/c_b.gif\" width=\"" + width + "\" id=\"umbracoGui" + windowName + "BottomSpacer\"></td>" +
-					"<td width=\"19\"><img src=\"" + imageUrlPreFix + "images/c_br.gif\" width=\"16\" height=\"16\" alt=\"\" border=\"0\"></td>");
-
-			output.Write(
-				"</tr>" +
-				"</table></td></tr></table>");
-		}
-		}
-}

src/Umbraco.Web/umbraco.presentation/umbraco/umbraco.aspx.cs

@@ -1,460 +0,0 @@
-using System;
-using System.Collections;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.IO;
-using System.Web;
-using System.Web.SessionState;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-using Umbraco.Core.IO;
-using umbraco.BasePages;
-using System.Xml;
-using System.Xml.XPath;
-using umbraco.BusinessLogic.Actions;
-using ClientDependency.Core;
-using System.Linq;
-using System.Text;
-using ClientDependency.Core.Controls;
-using System.Text.RegularExpressions;
-
-namespace umbraco.cms.presentation
-{
-    /// <summary>
-    /// The back office rendering page
-    /// </summary>
-    public class _umbraco : UmbracoEnsuredPage
-    {
-        [Obsolete("This property is no longer used")]
-        protected umbWindow UmbWindow1;
-        protected System.Web.UI.WebControls.PlaceHolder bubbleText;
-
-        public string DefaultApp { get; private set; }
-
-        protected void Page_Load(object sender, System.EventArgs e)
-        {
-            var apps = UmbracoUser.Applications.ToList();
-            bool userHasAccesstodefaultApp = apps.Where(x => x.alias == Umbraco.Core.Constants.Applications.Content).Count() > 0;
-
-            // Load user module icons ..
-            if (apps.Count() > 1)
-            {
-
-                var jsEvents = new StringBuilder();
-
-                PlaceHolderAppIcons.Text = ui.Text("main", "sections", UmbracoUser);
-                plcIcons.Text = "";
-                foreach (var a in apps.OrderBy(x => x.sortOrder))
-                {
-
-                    string appClass = a.icon.StartsWith(".") ? a.icon.Substring(1, a.icon.Length - 1) : a.alias;
-
-                    //adds client side event handlers to the icon buttons
-                    jsEvents.Append(@"jQuery('." + appClass + "').click(function() { appClick.call(this, '" + a.alias + "'); } );");
-                    jsEvents.Append(@"jQuery('." + appClass + "').dblclick(function() { appDblClick.call(this, '" + a.alias + "'); } );");
-
-                    string iconElement = String.Format("<li><a class=\"{0}\" title=\"" + ui.Text("sections", a.alias, UmbracoUser) + "\" href=\"javascript:void(0);\">", appClass);
-                    if (a.icon.StartsWith("."))
-                        iconElement +=
-                            "<img src=\"images/nada.gif\" class=\"trayHolder\" alt=\"\" /></a></li>";
-                    else
-                        iconElement += "<img src=\"images/tray/" + a.icon + "\" class=\"trayIcon\" alt=\"" + ui.Text("sections", a.alias, UmbracoUser) + "\"></a></li>";
-                    plcIcons.Text += iconElement;
-
-                }
-
-                //registers the jquery event handlers.
-                Page.ClientScript.RegisterStartupScript(this.GetType(), "AppIcons", "jQuery(document).ready(function() { " + jsEvents.ToString() + " } );", true);
-
-            }
-            else
-                PlaceHolderAppIcons.Visible = false;
-
-
-            //if user does not have access to content (ie, he's probably a translator)...
-            //then change the default tree app
-            if (!userHasAccesstodefaultApp)
-            {
-                JTree.App = apps[0].alias;
-                DefaultApp = apps[0].alias;
-            }
-            else
-            {
-                DefaultApp = Umbraco.Core.Constants.Applications.Content;
-            }
-
-
-            // Load globalized labels
-            treeWindow.Text = ui.Text("main", "tree", UmbracoUser);
-
-            RenderActionJS();
-
-            // Version check goes here!
-
-            // zb-00004 #29956 : refactor cookies names & handling
-            var updChkCookie = new umbraco.BusinessLogic.StateHelper.Cookies.Cookie("UMB_UPDCHK", GlobalSettings.VersionCheckPeriod); // was "updateCheck"
-            string updateCheckCookie = updChkCookie.HasValue ? updChkCookie.GetValue() : "";
-
-            if (GlobalSettings.VersionCheckPeriod > 0 && String.IsNullOrEmpty(updateCheckCookie) && UmbracoUser.UserType.Alias == "admin")
-            {
-
-                // Add scriptmanager version check
-                ScriptManager sm = ScriptManager.GetCurrent(Page);
-                sm.Scripts.Add(new ScriptReference(SystemDirectories.Umbraco + "/js/umbracoUpgradeChecker.js"));
-                sm.Services.Add(new ServiceReference(SystemDirectories.WebServices + "/CheckForUpgrade.asmx"));
-
-                Page.ClientScript.RegisterClientScriptBlock(this.GetType(), "upgradeChecker", "jQuery(document).ready(function() {umbraco.presentation.webservices.CheckForUpgrade.CallUpgradeService(umbracoCheckUpgrade);});", true);
-
-                updChkCookie.SetValue("1");
-            }
-            DataBind();
-
-            AddIe9Meta();
-        }
-
-        private void AddIe9Meta()
-        {
-            if (Request.Browser.Browser == "IE" && Request.Browser.MajorVersion == 9)
-            {
-                StringBuilder metadata = new StringBuilder();
-                metadata.AppendFormat(
-    @"<link rel='icon' href='{0}' type='image/x-icon'>
-                <link rel='shortcut icon' href='{0}' type='image/x-icon'> 
-                <meta name='application-name' content='Umbraco CMS - {1}' />
-                <meta name='msapplication-tooltip' content='Umbraco CMS - {1}' />
-                <meta name='msapplication-navbutton-color' content='#f36f21' />
-                <meta name='msapplication-starturl' content='./umbraco.aspx' />",
-    IOHelper.ResolveUrl(SystemDirectories.Umbraco + "/images/pinnedIcons/umb.ico"),
-    HttpContext.Current.Request.Url.Host.ToLower().Replace("www.", ""));
-
-                var user = UmbracoUser;
-                if (user != null && user.Applications != null && user.Applications.Length > 0)
-                {
-                    foreach (var app in user.Applications)
-                    {
-                        metadata.AppendFormat(
-                            @"<meta name='msapplication-task' content='name={0}; action-uri={1}; icon-uri={2}' />",
-                            ui.Text("sections", app.alias, user),
-                            IOHelper.ResolveUrl(string.Format("{0}/umbraco.aspx#{1}", SystemDirectories.Umbraco, app.alias)),
-                            File.Exists(
-                                IOHelper.MapPath(
-                                    IOHelper.ResolveUrl(
-                                        string.Format("{0}/images/pinnedIcons/task_{1}.ico", SystemDirectories.Umbraco, app.alias))))
-                                ? "/umbraco/images/pinnedIcons/task_" + app.alias + ".ico"
-                                : "/umbraco/images/pinnedIcons/task_default.ico");
-                    }
-                }
-
-                this.Header.Controls.Add(new LiteralControl(metadata.ToString()));
-            }
-        }
-
-        /// <summary>
-        /// Renders out all JavaScript references that have bee declared in IActions
-        /// </summary>
-        private void RenderActionJS()
-        {
-            var item = 0;
-            foreach (var jsFile in umbraco.BusinessLogic.Actions.Action.GetJavaScriptFileReferences())
-            {
-                //validate that this is a url, if it is not, we'll assume that it is a text block and render it as a text
-                //block instead.
-                var isValid = true;
-                try
-                {
-                    var jsUrl = new Uri(jsFile, UriKind.RelativeOrAbsolute);
-                    //ok it validates, but so does alert('hello'); ! so we need to do more checks
-
-                    //here are the valid chars in a url without escaping
-                    if (Regex.IsMatch(jsFile, @"[^a-zA-Z0-9-._~:/?#\[\]@!$&'\(\)*\+,%;=]"))
-                        isValid = false;
-
-                    //we'll have to be smarter and just check for certain js patterns now too!
-                    var jsPatterns = new string[] { @"\+\s*\=", @"\);", @"function\s*\(", @"!=", @"==" };
-                    foreach (var p in jsPatterns)
-                    {
-                        if (Regex.IsMatch(jsFile, p))
-                        {
-                            isValid = false;
-                            break;
-                        }
-                    }
-
-                    if (isValid)
-                    {
-                        //add to page
-                        Page.ClientScript.RegisterClientScriptInclude(this.GetType(), item.ToString(), jsFile);
-                    }
-                }
-                catch (UriFormatException)
-                {
-                    isValid = false;
-                }
-
-                if (!isValid)
-                {
-                    //it is invalid, let's render it as a script block instead as devs may have written real Javascript instead
-                    //of a JS path
-                    Page.ClientScript.RegisterClientScriptBlock(this.GetType(), item.ToString(), jsFile, true);
-                }
-
-                item++;
-            }
-        }
-
-		/// <summary>
-		/// ClientLoader control.
-		/// </summary>
-		/// <remarks>
-		/// Auto-generated field.
-		/// To modify move field declaration from designer file to code-behind file.
-		/// </remarks>
-		protected global::umbraco.uicontrols.UmbracoClientDependencyLoader ClientLoader;
-
-		/// <summary>
-		/// CssInclude1 control.
-		/// </summary>
-		/// <remarks>
-		/// Auto-generated field.
-		/// To modify move field declaration from designer file to code-behind file.
-		/// </remarks>
-		protected global::ClientDependency.Core.Controls.CssInclude CssInclude1;
-
-		/// <summary>
-		/// CssInclude2 control.
-		/// </summary>
-		/// <remarks>
-		/// Auto-generated field.
-		/// To modify move field declaration from designer file to code-behind file.
-		/// </remarks>
-		protected global::ClientDependency.Core.Controls.CssInclude CssInclude2;
-
-		/// <summary>
-		/// JsInclude1 control.
-		/// </summary>
-		/// <remarks>
-		/// Auto-generated field.
-		/// To modify move field declaration from designer file to code-behind file.
-		/// </remarks>
-		protected global::ClientDependency.Core.Controls.JsInclude JsInclude1;
-
-		/// <summary>
-		/// JsInclude2 control.
-		/// </summary>
-		/// <remarks>
-		/// Auto-generated field.
-		/// To modify move field declaration from designer file to code-behind file.
-		/// </remarks>
-		protected global::ClientDependency.Core.Controls.JsInclude JsInclude2;
-
-		/// <summary>
-		/// JsInclude3 control.
-		/// </summary>
-		/// <remarks>
-		/// Auto-generated field.
-		/// To modify move field declaration from designer file to code-behind file.
-		/// </remarks>
-		protected global::ClientDependency.Core.Controls.JsInclude JsInclude3;
-
-		/// <summary>
-		/// JsInclude14 control.
-		/// </summary>
-		/// <remarks>
-		/// Auto-generated field.
-		/// To modify move field declaration from designer file to code-behind file.
-		/// </remarks>
-		protected global::ClientDependency.Core.Controls.JsInclude JsInclude14;
-
-		/// <summary>
-		/// JsInclude5 control.
-		/// </summary>
-		/// <remarks>
-		/// Auto-generated field.
-		/// To modify move field declaration from designer file to code-behind file.
-		/// </remarks>
-		protected global::ClientDependency.Core.Controls.JsInclude JsInclude5;
-
-		/// <summary>
-		/// JsInclude6 control.
-		/// </summary>
-		/// <remarks>
-		/// Auto-generated field.
-		/// To modify move field declaration from designer file to code-behind file.
-		/// </remarks>
-		protected global::ClientDependency.Core.Controls.JsInclude JsInclude6;
-
-		/// <summary>
-		/// JsInclude13 control.
-		/// </summary>
-		/// <remarks>
-		/// Auto-generated field.
-		/// To modify move field declaration from designer file to code-behind file.
-		/// </remarks>
-		protected global::ClientDependency.Core.Controls.JsInclude JsInclude13;
-
-		/// <summary>
-		/// JsInclude7 control.
-		/// </summary>
-		/// <remarks>
-		/// Auto-generated field.
-		/// To modify move field declaration from designer file to code-behind file.
-		/// </remarks>
-		protected global::ClientDependency.Core.Controls.JsInclude JsInclude7;
-
-		/// <summary>
-		/// JsInclude8 control.
-		/// </summary>
-		/// <remarks>
-		/// Auto-generated field.
-		/// To modify move field declaration from designer file to code-behind file.
-		/// </remarks>
-		protected global::ClientDependency.Core.Controls.JsInclude JsInclude8;
-
-		/// <summary>
-		/// JsInclude9 control.
-		/// </summary>
-		/// <remarks>
-		/// Auto-generated field.
-		/// To modify move field declaration from designer file to code-behind file.
-		/// </remarks>
-		protected global::ClientDependency.Core.Controls.JsInclude JsInclude9;
-
-		/// <summary>
-		/// JsInclude10 control.
-		/// </summary>
-		/// <remarks>
-		/// Auto-generated field.
-		/// To modify move field declaration from designer file to code-behind file.
-		/// </remarks>
-		protected global::ClientDependency.Core.Controls.JsInclude JsInclude10;
-
-		/// <summary>
-		/// JsInclude11 control.
-		/// </summary>
-		/// <remarks>
-		/// Auto-generated field.
-		/// To modify move field declaration from designer file to code-behind file.
-		/// </remarks>
-		protected global::ClientDependency.Core.Controls.JsInclude JsInclude11;
-
-		/// <summary>
-		/// JsInclude4 control.
-		/// </summary>
-		/// <remarks>
-		/// Auto-generated field.
-		/// To modify move field declaration from designer file to code-behind file.
-		/// </remarks>
-		protected global::ClientDependency.Core.Controls.JsInclude JsInclude4;
-
-		/// <summary>
-		/// JsInclude17 control.
-		/// </summary>
-		/// <remarks>
-		/// Auto-generated field.
-		/// To modify move field declaration from designer file to code-behind file.
-		/// </remarks>
-		protected global::ClientDependency.Core.Controls.JsInclude JsInclude17;
-
-		/// <summary>
-		/// JsInclude12 control.
-		/// </summary>
-		/// <remarks>
-		/// Auto-generated field.
-		/// To modify move field declaration from designer file to code-behind file.
-		/// </remarks>
-		protected global::ClientDependency.Core.Controls.JsInclude JsInclude12;
-
-		/// <summary>
-		/// JsInclude15 control.
-		/// </summary>
-		/// <remarks>
-		/// Auto-generated field.
-		/// To modify move field declaration from designer file to code-behind file.
-		/// </remarks>
-		protected global::ClientDependency.Core.Controls.JsInclude JsInclude15;
-
-		/// <summary>
-		/// JsInclude16 control.
-		/// </summary>
-		/// <remarks>
-		/// Auto-generated field.
-		/// To modify move field declaration from designer file to code-behind file.
-		/// </remarks>
-		protected global::ClientDependency.Core.Controls.JsInclude JsInclude16;
-
-		/// <summary>
-		/// Form1 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.HtmlForm Form1;
-
-		/// <summary>
-		/// umbracoScriptManager control.
-		/// </summary>
-		/// <remarks>
-		/// Auto-generated field.
-		/// To modify move field declaration from designer file to code-behind file.
-		/// </remarks>
-		protected global::System.Web.UI.ScriptManager umbracoScriptManager;
-
-		/// <summary>
-		/// FindDocuments 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.Panel FindDocuments;
-
-		/// <summary>
-		/// Search control.
-		/// </summary>
-		/// <remarks>
-		/// Auto-generated field.
-		/// To modify move field declaration from designer file to code-behind file.
-		/// </remarks>
-		protected global::umbraco.presentation.Search.QuickSearch Search;
-
-		/// <summary>
-		/// treeWindow control.
-		/// </summary>
-		/// <remarks>
-		/// Auto-generated field.
-		/// To modify move field declaration from designer file to code-behind file.
-		/// </remarks>
-		protected global::umbraco.uicontrols.UmbracoPanel treeWindow;
-
-		/// <summary>
-		/// JTree control.
-		/// </summary>
-		/// <remarks>
-		/// Auto-generated field.
-		/// To modify move field declaration from designer file to code-behind file.
-		/// </remarks>
-		protected global::umbraco.controls.Tree.TreeControl JTree;
-
-		/// <summary>
-		/// PlaceHolderAppIcons control.
-		/// </summary>
-		/// <remarks>
-		/// Auto-generated field.
-		/// To modify move field declaration from designer file to code-behind file.
-		/// </remarks>
-		protected global::umbraco.uicontrols.UmbracoPanel PlaceHolderAppIcons;
-
-		/// <summary>
-		/// plcIcons 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.Literal plcIcons;
-
-    }
-}

src/Umbraco.Web/umbraco.presentation/umbraco/users/EditUser.aspx.cs

@@ -69,8 +69,7 @@ namespace umbraco.cms.presentation.user
             {
                 throw new UserAuthorizationException("Access denied");
             }
-
-            int UID = int.Parse(Request.QueryString["id"]);
+           int UID = int.Parse(Request.QueryString["id"]);
             u = BusinessLogic.User.GetUser(UID);
 
             //the true admin can only edit the true admin