Merge pull request #1857 from umbraco/temp-U4-9696

fixes: U4-9696 Update hover of Umbraco Forms install button

build/NuSpecs/UmbracoCms.nuspec

@@ -17,7 +17,7 @@
     <dependencies>
       <dependency id="UmbracoCms.Core" version="[$version$]" />
       <dependency id="Newtonsoft.Json" version="[9.0.1, 10.0.0)" />
-      <dependency id="Umbraco.ModelsBuilder" version="[3.0.5, 4.0.0)" />
+      <dependency id="Umbraco.ModelsBuilder" version="[3.0.6, 4.0.0)" />
       <dependency id="Microsoft.AspNet.SignalR.Core" version="[2.2.1, 3.0.0)" />
 	  <dependency id="ImageProcessor.Web.Config" version="[2.3.0, 3.0.0)" />
     </dependencies>

build/UmbracoVersion.txt

@@ -1,3 +1,3 @@
 # Usage: on line 2 put the release version, on line 3 put the version comment (example: beta)
 7.6.0
-beta06
+RC

src/SolutionInfo.cs

@@ -12,4 +12,4 @@ using System.Resources;
 [assembly: AssemblyVersion("1.0.*")]
 
 [assembly: AssemblyFileVersion("7.6.0")]
-[assembly: AssemblyInformationalVersion("7.6.0-beta06")]
+[assembly: AssemblyInformationalVersion("7.6.0-RC")]

src/Umbraco.Core/Configuration/UmbracoSettings/ContentElement.cs

@@ -183,6 +183,12 @@ namespace Umbraco.Core.Configuration.UmbracoSettings
             get { return GetOptionalTextElement("EnablePropertyValueConverters", false); }
         }
 
+        [ConfigurationProperty("loginBackgroundImage")]
+        internal InnerTextConfigurationElement<string> LoginBackgroundImage
+        {
+            get { return GetOptionalTextElement("loginBackgroundImage", string.Empty); }
+        }
+
         string IContentSection.NotificationEmailAddress
         {
             get { return Notifications.NotificationEmailAddress; }
@@ -336,5 +342,10 @@ namespace Umbraco.Core.Configuration.UmbracoSettings
         {
             get { return EnablePropertyValueConverters; }
         }
+
+        string IContentSection.LoginBackgroundImage
+        {
+            get { return LoginBackgroundImage; }
+        }
     }
 }

src/Umbraco.Core/Configuration/UmbracoSettings/IContentSection.cs

@@ -72,5 +72,6 @@ namespace Umbraco.Core.Configuration.UmbracoSettings
 
         bool EnablePropertyValueConverters { get; }
 
+        string LoginBackgroundImage { get; }
     }
 }

src/Umbraco.Core/Configuration/UmbracoVersion.cs

@@ -24,7 +24,7 @@ namespace Umbraco.Core.Configuration
         /// Gets the version comment (like beta or RC).
         /// </summary>
         /// <value>The version comment.</value>
-        public static string CurrentComment { get { return "beta06"; } }
+        public static string CurrentComment { get { return "RC"; } }
 
         // Get the version of the umbraco.dll by looking at a class in that dll
         // Had to do it like this due to medium trust issues, see: http://haacked.com/archive/2010/11/04/assembly-location-and-medium-trust.aspx

src/Umbraco.Core/Deploy/IServiceConnector.cs

@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
+using umbraco.interfaces;
 using Umbraco.Core;
 
 namespace Umbraco.Core.Deploy
@@ -8,7 +9,7 @@ namespace Umbraco.Core.Deploy
     /// <summary>
     /// Connects to an Umbraco service.
     /// </summary>
-    public interface IServiceConnector
+    public interface IServiceConnector : IDiscoverable
     {
         /// <summary>
         /// Gets an artifact.

src/Umbraco.Core/IO/MediaFileSystem.cs

@@ -31,6 +31,7 @@ namespace Umbraco.Core.IO
         private long _folderCounter;
         private bool _folderCounterInitialized;
 
+        [Obsolete("This should no longer be used, image manipulation should be done via ImageProcessor, Umbraco no longer generates '_thumb' files for media")]
         private static readonly Dictionary<int, string> DefaultSizes = new Dictionary<int, string>
         {
             { 100, "thumb" },
@@ -263,7 +264,7 @@ namespace Umbraco.Core.IO
             var filename = Path.GetFileName(sourcepath);
             var filepath = GetMediaPath(filename, content.Key, propertyType.Key);
             this.CopyFile(sourcepath, filepath);
-            CopyThumbnails(sourcepath, filepath);
+            
             return filepath;
         }
 
@@ -312,29 +313,17 @@ namespace Umbraco.Core.IO
             }
         }
 
-        // sets a file for the FileUpload property editor
-        // ie generates thumbnails and populates autofill properties
+        /// <summary>
+        /// Sets a file for the FileUpload property editor and populates autofill properties
+        /// </summary>
+        /// <param name="content"></param>
+        /// <param name="property"></param>
+        /// <param name="filepath"></param>
+        /// <param name="filestream"></param>
         private void SetUploadFile(IContentBase content, Property property, string filepath, Stream filestream)
-        {
-            // check if file is an image (and supports resizing and thumbnails etc)
-            var extension = Path.GetExtension(filepath);
-            var isImage = IsImageFile(extension);
-
-            // specific stuff for images (thumbnails etc)
-            if (isImage)
-            {
-                using (var image = Image.FromStream(filestream))
-                {
-                    // use one image for all
-                    GenerateThumbnails(image, filepath, property.PropertyType);
-                    _uploadAutoFillProperties.Populate(content, property.Alias, filepath, filestream, image);
-                }
-            }
-            else
-            {
-                // will use filepath for extension, and filestream for length
-                _uploadAutoFillProperties.Populate(content, property.Alias, filepath, filestream);
-            }
+        {            
+            // will use filepath for extension, and filestream for length
+            _uploadAutoFillProperties.Populate(content, property.Alias, filepath, filestream);
         }
 
         #endregion
@@ -401,6 +390,7 @@ namespace Umbraco.Core.IO
 
         // note: this does not find 'custom' thumbnails?
         // will find _thumb and _big-thumb but NOT _custom?
+        [Obsolete("This should no longer be used, image manipulation should be done via ImageProcessor, Umbraco no longer generates '_thumb' files for media")]
         public IEnumerable<string> GetThumbnails(string path)
         {
             var parentDirectory = Path.GetDirectoryName(path);
@@ -421,12 +411,14 @@ namespace Umbraco.Core.IO
             DeleteThumbnails(path);
         }
 
+        [Obsolete("This should no longer be used, image manipulation should be done via ImageProcessor, Umbraco no longer generates '_thumb' files for media")]
         public void DeleteThumbnails(string path)
         {
             GetThumbnails(path)
                 .ForEach(x => base.DeleteFile(x));
         }
 
+        [Obsolete("This should no longer be used, image manipulation should be done via ImageProcessor, Umbraco no longer generates '_thumb' files for media")]
         public void CopyThumbnails(string sourcePath, string targetPath)
         {
             var targetPathBase = Path.GetDirectoryName(targetPath) ?? "";
@@ -479,6 +471,7 @@ namespace Umbraco.Core.IO
 
         #region GenerateThumbnails
 
+        [Obsolete("This should no longer be used, image manipulation should be done via ImageProcessor, Umbraco no longer generates '_thumb' files for media")]
         public IEnumerable<ResizedImage> GenerateThumbnails(
             Image image,
             string filepath,
@@ -500,6 +493,7 @@ namespace Umbraco.Core.IO
             return GenerateThumbnails(image, filepath, additionalSizes);
         }
 
+        [Obsolete("This should no longer be used, image manipulation should be done via ImageProcessor, Umbraco no longer generates '_thumb' files for media")]
         public IEnumerable<ResizedImage> GenerateThumbnails(
             Image image,
             string filepath,
@@ -522,6 +516,7 @@ namespace Umbraco.Core.IO
                 .ToList(); // now
         }
 
+        [Obsolete("This should no longer be used, image manipulation should be done via ImageProcessor, Umbraco no longer generates '_thumb' files for media")]
         public IEnumerable<ResizedImage> GenerateThumbnails(
             Stream filestream,
             string filepath,
@@ -535,6 +530,7 @@ namespace Umbraco.Core.IO
             }
         }
 
+        [Obsolete("This should no longer be used, image manipulation should be done via ImageProcessor, Umbraco no longer generates '_thumb' files for media")]
         public IEnumerable<ResizedImage> GenerateThumbnails(
             Image image,
             string filepath,
@@ -556,16 +552,19 @@ namespace Umbraco.Core.IO
 
         #region GenerateResized - Generate at resized filepath derived from origin filepath
 
+        [Obsolete("This should no longer be used, image manipulation should be done via ImageProcessor, Umbraco no longer generates '_thumb' files for media")]
         public ResizedImage GenerateResized(Image originImage, string originFilepath, string sizeName, int maxWidthHeight)
         {
             return GenerateResized(originImage, originFilepath, sizeName, maxWidthHeight, -1, -1);
         }
 
+        [Obsolete("This should no longer be used, image manipulation should be done via ImageProcessor, Umbraco no longer generates '_thumb' files for media")]
         public ResizedImage GenerateResized(Image originImage, string originFilepath, string sizeName, int fixedWidth, int fixedHeight)
         {
             return GenerateResized(originImage, originFilepath, sizeName, -1, fixedWidth, fixedHeight);
         }
 
+        [Obsolete("This should no longer be used, image manipulation should be done via ImageProcessor, Umbraco no longer generates '_thumb' files for media")]
         public ResizedImage GenerateResized(Image originImage, string originFilepath, string sizeName, int maxWidthHeight, int fixedWidth, int fixedHeight)
         {
             if (string.IsNullOrWhiteSpace(sizeName))
@@ -581,16 +580,19 @@ namespace Umbraco.Core.IO
 
         #region GenerateResizedAt - Generate at specified resized filepath
 
+        [Obsolete("This should no longer be used, image manipulation should be done via ImageProcessor, Umbraco no longer generates '_thumb' files for media")]
         public ResizedImage GenerateResizedAt(Image originImage, string resizedFilepath, int maxWidthHeight)
         {
             return GenerateResizedAt(originImage, resizedFilepath, maxWidthHeight, -1, -1);
         }
 
+        [Obsolete("This should no longer be used, image manipulation should be done via ImageProcessor, Umbraco no longer generates '_thumb' files for media")]
         public ResizedImage GenerateResizedAt(Image originImage, int fixedWidth, int fixedHeight, string resizedFilepath)
         {
             return GenerateResizedAt(originImage, resizedFilepath, -1, fixedWidth, fixedHeight);
         }
 
+        [Obsolete("This should no longer be used, image manipulation should be done via ImageProcessor, Umbraco no longer generates '_thumb' files for media")]
         public ResizedImage GenerateResizedAt(Image originImage, string resizedFilepath, int maxWidthHeight, int fixedWidth, int fixedHeight)
         {
             // target dimensions
@@ -699,6 +701,7 @@ namespace Umbraco.Core.IO
 
         #region Inner classes
 
+        [Obsolete("This should no longer be used, image manipulation should be done via ImageProcessor, Umbraco no longer generates '_thumb' files for media")]
         public class ResizedImage
         {
             public ResizedImage()

src/Umbraco.Core/Media/IImageUrlProvider.cs

@@ -1,8 +1,14 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 
 namespace Umbraco.Core.Media
 {
-    public interface IImageUrlProvider
+    // note: because this interface is obsolete is is *not* IDiscoverable, and in case the
+    // PluginManager is asked to find types implementing this interface it will fall back
+    // to a complete scan.
+
+    [Obsolete("IImageUrlProvider is no longer used and will be removed in future versions")]
+    public interface IImageUrlProvider // IDiscoverable
     {
         string Name { get; }
         string GetImageUrlFromMedia(int mediaId, IDictionary<string, string> parameters);

src/Umbraco.Core/Media/IThumbnailProvider.cs

@@ -1,6 +1,13 @@
-namespace Umbraco.Core.Media
+using System;
+
+namespace Umbraco.Core.Media
 {
-	public interface IThumbnailProvider
+    // note: because this interface is obsolete is is *not* IDiscoverable, and in case the
+    // PluginManager is asked to find types implementing this interface it will fall back
+    // to a complete scan.
+
+    [Obsolete("Thumbnails are generated by ImageProcessor, use that instead")]
+	public interface IThumbnailProvider  // : IDiscoverable
     {
         bool CanProvideThumbnail(string fileUrl);
         string GetThumbnailUrl(string fileUrl);

src/Umbraco.Core/Media/UploadAutoFillProperties.cs

@@ -96,8 +96,7 @@ namespace Umbraco.Core.Media
         /// <param name="propertyTypeAlias">The property type alias.</param>
         /// <param name="filepath">The filesystem-relative filepath, or null to clear properties.</param>
         /// <param name="filestream">The stream containing the file data.</param>
-        /// <param name="image">The file data as an image object.</param>
-        public void Populate(IContentBase content, string propertyTypeAlias, string filepath, Stream filestream, Image image = null)
+        public void Populate(IContentBase content, string propertyTypeAlias, string filepath, Stream filestream)
         {
             if (content == null) throw new ArgumentNullException("content");
             if (propertyTypeAlias == null) throw new ArgumentNullException("propertyTypeAlias");
@@ -110,7 +109,7 @@ namespace Umbraco.Core.Media
             if (autoFillConfig == null) return; // nothing
 
             // populate
-            Populate(content, autoFillConfig, filepath, filestream, image);
+            Populate(content, autoFillConfig, filepath, filestream);
         }
 
         /// <summary>
@@ -158,8 +157,7 @@ namespace Umbraco.Core.Media
         /// <param name="autoFillConfig"></param>
         /// <param name="filepath">The filesystem-relative filepath, or null to clear properties.</param>
         /// <param name="filestream">The stream containing the file data.</param>
-        /// <param name="image">The file data as an image object.</param>
-        public void Populate(IContentBase content, IImagingAutoFillUploadField autoFillConfig, string filepath, Stream filestream, Image image = null)
+        public void Populate(IContentBase content, IImagingAutoFillUploadField autoFillConfig, string filepath, Stream filestream)
         {
             if (content == null) throw new ArgumentNullException("content");
             if (autoFillConfig == null) throw new ArgumentNullException("autoFillConfig");
@@ -172,11 +170,7 @@ namespace Umbraco.Core.Media
             else
             {
                 var extension = (Path.GetExtension(filepath) ?? "").TrimStart('.');
-                Size? size;
-                if (image == null)
-                    size = _mediaFileSystem.IsImageFile(extension) ? (Size?) _mediaFileSystem.GetDimensions(filestream) : null;
-                else 
-                    size = new Size(image.Width, image.Height);
+                var size = _mediaFileSystem.IsImageFile(extension) ? (Size?)_mediaFileSystem.GetDimensions(filestream) : null;
                 SetProperties(content, autoFillConfig, size, filestream.Length, extension);
             }
         }

src/Umbraco.Core/ObjectResolution/Resolution.cs

@@ -63,49 +63,6 @@ namespace Umbraco.Core.ObjectResolution
 			}
 		}
 
-        // NOTE - the ugly code below exists only because of umbraco.BusinessLogic.Actions.Action.ReRegisterActionsAndHandlers
-        // which wants to re-register actions and handlers instead of properly restarting the application. Don't even think
-        // about using it for anything else. Also, while the backdoor is open, the resolution system is locked so nothing
-        // can work properly => deadlocks. Therefore, open the backdoor, do resolution changes EXCLUSIVELY, and close the door!
-
-        /// <summary>
-        /// Returns a disposable object that reprents dirty access to temporarily unfrozen resolution configuration.
-        /// </summary>
-        /// <remarks>
-        /// <para>Should not be used.</para>
-        /// <para>Should be used in a <c>using(Resolution.DirtyBackdoorToConfiguration) { ... }</c> mode.</para>
-        /// <para>Because we just lift the frozen state, and we don't actually re-freeze, the <c>Frozen</c> event does not trigger.</para>
-        /// </remarks>
-        internal static IDisposable DirtyBackdoorToConfiguration
-        {
-            get { return new DirtyBackdoor(); }
-        }
-
-        // keep the class here because it needs write-access to Resolution.IsFrozen
-        private class DirtyBackdoor : IDisposable
-        {
-
-            private readonly IDisposable _lock;
-            private readonly bool _frozen;
-
-            public DirtyBackdoor()
-            {
-                LogHelper.Debug(typeof(DirtyBackdoor), "Creating back door for resolution");
-
-                _lock = new WriteLock(ConfigurationLock);
-                _frozen = _isFrozen;
-                _isFrozen = false;
-            }
-
-            public void Dispose()
-            {
-                LogHelper.Debug(typeof(DirtyBackdoor), "Disposing back door for resolution");
-
-                _isFrozen = _frozen;
-                _lock.Dispose();
-            }
-        }
-
 		/// <summary>
 		/// Freezes resolution.
 		/// </summary>

src/Umbraco.Core/Persistence/Mappers/BaseMapper.cs

@@ -2,11 +2,12 @@
 using System.Collections.Concurrent;
 using System.Linq.Expressions;
 using System.Reflection;
+using umbraco.interfaces;
 using Umbraco.Core.Persistence.SqlSyntax;
 
 namespace Umbraco.Core.Persistence.Mappers
 {
-    public abstract class BaseMapper
+    public abstract class BaseMapper : IDiscoverable
     {
         private readonly ISqlSyntaxProvider _sqlSyntax;
 

src/Umbraco.Core/Persistence/Migrations/IMigration.cs

@@ -1,9 +1,11 @@
-namespace Umbraco.Core.Persistence.Migrations
+using umbraco.interfaces;
+
+namespace Umbraco.Core.Persistence.Migrations
 {
     /// <summary>
     /// Marker interface for database migrations
     /// </summary>
-    public interface IMigration
+    public interface IMigration : IDiscoverable
     {
         void Up();
         void Down();

src/Umbraco.Core/PropertyEditors/IParameterEditor.cs

@@ -1,8 +1,9 @@
 using System.Collections.Generic;
+using umbraco.interfaces;
 
 namespace Umbraco.Core.PropertyEditors
 {
-    public interface IParameterEditor
+    public interface IParameterEditor : IDiscoverable
     {
         /// <summary>
         /// The id  of the property editor

src/Umbraco.Core/PropertyEditors/IPropertyEditorValueConverter.cs

@@ -1,4 +1,5 @@
 using System;
+using umbraco.interfaces;
 
 namespace Umbraco.Core.PropertyEditors
 {
@@ -7,8 +8,8 @@ namespace Umbraco.Core.PropertyEditors
     /// </summary>
     // todo: drop IPropertyEditorValueConverter support (when?).
     [Obsolete("Use IPropertyValueConverter.")]
-    public interface IPropertyEditorValueConverter
-	{
+    public interface IPropertyEditorValueConverter : IDiscoverable
+    {
 		/// <summary>
 		/// Returns a value indicating whether this provider applies to the specified property.
 		/// </summary>

src/Umbraco.Core/PropertyEditors/IPropertyValueConverter.cs

@@ -1,11 +1,12 @@
-using Umbraco.Core.Models.PublishedContent;
+using umbraco.interfaces;
+using Umbraco.Core.Models.PublishedContent;
 
 namespace Umbraco.Core.PropertyEditors
 {
     /// <summary>
     /// Provides published content properties conversion service.
     /// </summary>
-    public interface IPropertyValueConverter
+    public interface IPropertyValueConverter : IDiscoverable
     {
         /// <summary>
         /// Gets a value indicating whether the converter supports a property type.

src/Umbraco.Core/Services/ContentTypeService.cs

@@ -19,14 +19,15 @@ namespace Umbraco.Core.Services
     /// </summary>
     public class ContentTypeService : ContentTypeServiceBase, IContentTypeService
     {
-	    private readonly IContentService _contentService;
+        private readonly IContentService _contentService;
         private readonly IMediaService _mediaService;
 
         //Support recursive locks because some of the methods that require locking call other methods that require locking.
         //for example, the Move method needs to be locked but this calls the Save method which also needs to be locked.
         private static readonly ReaderWriterLockSlim Locker = new ReaderWriterLockSlim(LockRecursionPolicy.SupportsRecursion);
 
-        public ContentTypeService(IDatabaseUnitOfWorkProvider provider, RepositoryFactory repositoryFactory, ILogger logger, IEventMessagesFactory eventMessagesFactory, IContentService contentService, IMediaService mediaService)
+        public ContentTypeService(IDatabaseUnitOfWorkProvider provider, RepositoryFactory repositoryFactory, ILogger logger, IEventMessagesFactory eventMessagesFactory, IContentService contentService,
+            IMediaService mediaService)
             : base(provider, repositoryFactory, logger, eventMessagesFactory)
         {
             if (contentService == null) throw new ArgumentNullException("contentService");
@@ -210,7 +211,7 @@ namespace Umbraco.Core.Services
 
         public IEnumerable<EntityContainer> GetMediaTypeContainers(IMediaType mediaType)
         {
-            var ancestorIds = mediaType.Path.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries)
+            var ancestorIds = mediaType.Path.Split(new[] {','}, StringSplitOptions.RemoveEmptyEntries)
                 .Select(x =>
                 {
                     var asInt = x.TryConvertTo<int>();
@@ -297,7 +298,7 @@ namespace Umbraco.Core.Services
                 repo.Delete(container);
                 uow.Commit();
 
-                uow.Events.Dispatch(DeletedContentTypeContainer, this, new DeleteEventArgs<EntityContainer>(container, evtMsgs));
+                uow.Events.Dispatch(DeletedContentTypeContainer, this, new DeleteEventArgs<EntityContainer>(container, evtMsgs), "DeletedContentTypeContainer");
 
                 return OperationStatus.Success(evtMsgs);
                 //TODO: Audit trail ?
@@ -425,7 +426,7 @@ namespace Umbraco.Core.Services
 
             clone.Name = name;
 
-            var compositionAliases = clone.CompositionAliases().Except(new[] { alias }).ToList();
+            var compositionAliases = clone.CompositionAliases().Except(new[] {alias}).ToList();
             //remove all composition that is not it's current alias
             foreach (var a in compositionAliases)
             {
@@ -712,7 +713,7 @@ namespace Umbraco.Core.Services
             var comparer = new DelegateEqualityComparer<IContentTypeComposition>((x, y) => x.Id == y.Id, x => x.Id);
             var dependencies = new HashSet<IContentTypeComposition>(compositions, comparer);
             var stack = new Stack<IContentTypeComposition>();
-            indirectReferences.ForEach(stack.Push);//Push indirect references to a stack, so we can add recursively
+            indirectReferences.ForEach(stack.Push); //Push indirect references to a stack, so we can add recursively
             while (stack.Count > 0)
             {
                 var indirectReference = stack.Pop();
@@ -770,6 +771,8 @@ namespace Umbraco.Core.Services
 
                     ValidateLocked(contentType); // throws if invalid
                     contentType.CreatorId = userId;
+                    if (contentType.Description == string.Empty)
+                        contentType.Description = null;
                     repository.AddOrUpdate(contentType);
 
                     uow.Commit();
@@ -812,6 +815,8 @@ namespace Umbraco.Core.Services
                     foreach (var contentType in asArray)
                     {
                         contentType.CreatorId = userId;
+                        if (contentType.Description == string.Empty)
+                            contentType.Description = null;
                         repository.AddOrUpdate(contentType);
                     }
 
@@ -1233,6 +1238,8 @@ namespace Umbraco.Core.Services
 
                     ValidateLocked(mediaType); // throws if invalid
                     mediaType.CreatorId = userId;
+                    if (mediaType.Description == string.Empty)
+                        mediaType.Description = null;
                     repository.AddOrUpdate(mediaType);
                     uow.Commit();
 
@@ -1274,6 +1281,8 @@ namespace Umbraco.Core.Services
                     foreach (var mediaType in asArray)
                     {
                         mediaType.CreatorId = userId;
+                        if (mediaType.Description == string.Empty)
+                            mediaType.Description = null;
                         repository.AddOrUpdate(mediaType);
                     }
 
@@ -1452,40 +1461,40 @@ namespace Umbraco.Core.Services
         /// </summary>
         public static event TypedEventHandler<IContentTypeService, DeleteEventArgs<IContentType>> DeletingContentType;
 
-		/// <summary>
-		/// Occurs after Delete
-		/// </summary>
-		public static event TypedEventHandler<IContentTypeService, DeleteEventArgs<IContentType>> DeletedContentType;
+        /// <summary>
+        /// Occurs after Delete
+        /// </summary>
+        public static event TypedEventHandler<IContentTypeService, DeleteEventArgs<IContentType>> DeletedContentType;
 
-		/// <summary>
-		/// Occurs before Delete
-		/// </summary>
-		public static event TypedEventHandler<IContentTypeService, DeleteEventArgs<IMediaType>> DeletingMediaType;
+        /// <summary>
+        /// Occurs before Delete
+        /// </summary>
+        public static event TypedEventHandler<IContentTypeService, DeleteEventArgs<IMediaType>> DeletingMediaType;
 
-		/// <summary>
-		/// Occurs after Delete
-		/// </summary>
-		public static event TypedEventHandler<IContentTypeService, DeleteEventArgs<IMediaType>> DeletedMediaType;
+        /// <summary>
+        /// Occurs after Delete
+        /// </summary>
+        public static event TypedEventHandler<IContentTypeService, DeleteEventArgs<IMediaType>> DeletedMediaType;
 
         /// <summary>
         /// Occurs before Save
         /// </summary>
-		public static event TypedEventHandler<IContentTypeService, SaveEventArgs<IContentType>> SavingContentType;
+        public static event TypedEventHandler<IContentTypeService, SaveEventArgs<IContentType>> SavingContentType;
 
         /// <summary>
         /// Occurs after Save
         /// </summary>
-		public static event TypedEventHandler<IContentTypeService, SaveEventArgs<IContentType>> SavedContentType;
+        public static event TypedEventHandler<IContentTypeService, SaveEventArgs<IContentType>> SavedContentType;
 
-		/// <summary>
-		/// Occurs before Save
-		/// </summary>
-		public static event TypedEventHandler<IContentTypeService, SaveEventArgs<IMediaType>> SavingMediaType;
+        /// <summary>
+        /// Occurs before Save
+        /// </summary>
+        public static event TypedEventHandler<IContentTypeService, SaveEventArgs<IMediaType>> SavingMediaType;
 
-		/// <summary>
-		/// Occurs after Save
-		/// </summary>
-		public static event TypedEventHandler<IContentTypeService, SaveEventArgs<IMediaType>> SavedMediaType;
+        /// <summary>
+        /// Occurs after Save
+        /// </summary>
+        public static event TypedEventHandler<IContentTypeService, SaveEventArgs<IMediaType>> SavedMediaType;
 
         /// <summary>
         /// Occurs before Move

src/Umbraco.Core/Services/IMediaService.cs

@@ -468,12 +468,7 @@ namespace Umbraco.Core.Services
         /// <param name="filepath">The filesystem path to the media.</param>
         void DeleteMediaFile(string filepath);
 
-        /// <summary>
-        /// Generates thumbnails.
-        /// </summary>
-        /// <param name="filepath">The filesystem-relative path to the original image.</param>
-        /// <param name="propertyType">The property type.</param>
-        /// <remarks>This should be obsoleted, we should not generate thumbnails.</remarks>
+        [Obsolete("This should no longer be used, thumbnail generation should be done via ImageProcessor, Umbraco no longer generates '_thumb' files for media")]
         void GenerateThumbnails(string filepath, PropertyType propertyType);
     }
 }

src/Umbraco.Core/Services/MediaService.cs

@@ -1431,6 +1431,7 @@ namespace Umbraco.Core.Services
             _mediaFileSystem.DeleteFile(filepath, true);
         }
 
+        [Obsolete("This should no longer be used, thumbnail generation should be done via ImageProcessor, Umbraco no longer generates '_thumb' files for media")]
         public void GenerateThumbnails(string filepath, PropertyType propertyType)
         {
             using (var filestream = _mediaFileSystem.OpenFile(filepath))

src/Umbraco.Core/Services/MemberTypeService.cs

@@ -93,6 +93,8 @@ namespace Umbraco.Core.Services
 
                     var repository = RepositoryFactory.CreateMemberTypeRepository(uow);
                     memberType.CreatorId = userId;
+                    if (memberType.Description == string.Empty)
+                        memberType.Description = null;
                     repository.AddOrUpdate(memberType);
                     uow.Commit(); // flush, so that the db contains the saved value
 
@@ -121,6 +123,8 @@ namespace Umbraco.Core.Services
                     foreach (var memberType in asArray)
                     {
                         memberType.CreatorId = userId;
+                        if (memberType.Description == string.Empty)
+                            memberType.Description = null;
                         repository.AddOrUpdate(memberType);
                     }
                     uow.Commit(); // flush, so that the db contains the saved values

src/Umbraco.Core/TypeFinder.cs

@@ -1,32 +1,24 @@
 using System;
-using System.Collections.Concurrent;
 using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Diagnostics;
 using System.IO;
 using System.Linq;
-using System.Linq.Expressions;
 using System.Reflection;
 using System.Security;
 using System.Text;
-using System.Threading;
 using System.Web;
 using System.Web.Compilation;
-using System.Web.Hosting;
-using Umbraco.Core.Configuration;
 using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
 
 namespace Umbraco.Core
 {
-
     /// <summary>
     /// A utility class to find all classes of a certain type by reflection in the current bin folder
     /// of the web application.
     /// </summary>
     public static class TypeFinder
     {
-        private static volatile HashSet<Assembly> _localFilteredAssemblyCache = null;
+        private static volatile HashSet<Assembly> _localFilteredAssemblyCache;
         private static readonly object LocalFilteredAssemblyCacheLocker = new object();
 
         /// <summary>
@@ -63,7 +55,7 @@ namespace Umbraco.Core
                 }
                 catch (InvalidOperationException e)
                 {
-                    if (!(e.InnerException is SecurityException))
+                    if ((e.InnerException is SecurityException) == false)
                         throw;
                 }
 
@@ -99,7 +91,7 @@ namespace Umbraco.Core
                 }
 
                 //if for some reason they are still no assemblies, then use the AppDomain to load in already loaded assemblies.
-                if (!assemblies.Any())
+                if (assemblies.Any() == false)
                 {
                     foreach (var a in AppDomain.CurrentDomain.GetAssemblies())
                     {
@@ -111,12 +103,12 @@ namespace Umbraco.Core
                 var fileExtensions = new[] { ".cs", ".vb" }; //only vb and cs files are supported
                 var appCodeFolder = new DirectoryInfo(IOHelper.MapPath(IOHelper.ResolveUrl("~/App_code")));
                 //check if the folder exists and if there are any files in it with the supported file extensions
-                if (appCodeFolder.Exists && (fileExtensions.Any(x => appCodeFolder.GetFiles("*" + x).Any())))
+                if (appCodeFolder.Exists && fileExtensions.Any(x => appCodeFolder.GetFiles("*" + x).Any()))
                 {
                     try
                     {
                         var appCodeAssembly = Assembly.Load("App_Code");
-                        if (!assemblies.Contains(appCodeAssembly)) // BuildManager will find App_Code already
+                        if (assemblies.Contains(appCodeAssembly) == false) // BuildManager will find App_Code already
                             assemblies.Add(appCodeAssembly);
                     }
                     catch (FileNotFoundException ex)
@@ -128,7 +120,7 @@ namespace Umbraco.Core
             }
             catch (InvalidOperationException e)
             {
-                if (!(e.InnerException is SecurityException))
+                if (e.InnerException is SecurityException == false)
                     throw;
             }
 
@@ -145,23 +137,15 @@ namespace Umbraco.Core
         internal static HashSet<Assembly> GetAssembliesWithKnownExclusions(
             IEnumerable<Assembly> excludeFromResults = null)
         {
-            if (_localFilteredAssemblyCache == null)
+            lock (LocalFilteredAssemblyCacheLocker)
             {
-                lock (LocalFilteredAssemblyCacheLocker)
-                {
-                    //double check
-                    if (_localFilteredAssemblyCache == null)
-                    {
-                        _localFilteredAssemblyCache = new HashSet<Assembly>();
-                        var assemblies = GetFilteredAssemblies(excludeFromResults, KnownAssemblyExclusionFilter);
-                        foreach (var a in assemblies)
-                        {
-                            _localFilteredAssemblyCache.Add(a);
-                        }
-                    }
-                }
+                if (_localFilteredAssemblyCache != null)
+                    return _localFilteredAssemblyCache;
+
+                var assemblies = GetFilteredAssemblies(excludeFromResults, KnownAssemblyExclusionFilter);
+                _localFilteredAssemblyCache = new HashSet<Assembly>(assemblies);
+                return _localFilteredAssemblyCache;
             }
-            return _localFilteredAssemblyCache;
         }
 
         /// <summary>
@@ -180,9 +164,9 @@ namespace Umbraco.Core
                 exclusionFilter = new string[] { };
 
             return GetAllAssemblies()
-                .Where(x => !excludeFromResults.Contains(x)
-                            && !x.GlobalAssemblyCache
-                            && !exclusionFilter.Any(f => x.FullName.StartsWith(f)));
+                .Where(x => excludeFromResults.Contains(x) == false
+                            && x.GlobalAssemblyCache == false
+                            && exclusionFilter.Any(f => x.FullName.StartsWith(f)) == false);
         }
 
         /// <summary>
@@ -298,7 +282,7 @@ namespace Umbraco.Core
         {
             if (assemblies == null) throw new ArgumentNullException("assemblies");
 
-            return GetClasses(assignTypeFrom, assemblies, onlyConcreteClasses,
+            return GetClassesWithBaseType(assignTypeFrom, assemblies, onlyConcreteClasses,
                 //the additional filter will ensure that any found types also have the attribute applied.
                 t => t.GetCustomAttributes<TAttribute>(false).Any());
         }
@@ -324,7 +308,7 @@ namespace Umbraco.Core
         {
             if (assemblies == null) throw new ArgumentNullException("assemblies");
 
-            return GetClasses(typeof(T), assemblies, onlyConcreteClasses);
+            return GetClassesWithBaseType(typeof(T), assemblies, onlyConcreteClasses);
         }
 
         /// <summary>
@@ -363,105 +347,9 @@ namespace Umbraco.Core
             IEnumerable<Assembly> assemblies,
             bool onlyConcreteClasses)
         {
-            if (assemblies == null) throw new ArgumentNullException("assemblies");
-
-            if (TypeHelper.IsTypeAssignableFrom<Attribute>(attributeType) == false)
-                throw new ArgumentException("The type specified: " + attributeType + " is not an Attribute type");
-
-            var foundAttributedTypes = new HashSet<Type>();
-
-            var assemblyList = assemblies.ToArray();
-
-            //find all assembly references that are referencing the attribute type's assembly since we
-            //should only be scanning those assemblies because any other assembly will definitely not
-            //contain a class that has this attribute.
-            var referencedAssemblies = TypeHelper.GetReferencedAssemblies(attributeType, assemblyList);
-
-            //get a list of non-referenced assemblies (we'll use this when we recurse below)
-            var otherAssemblies = assemblyList.Where(x => referencedAssemblies.Contains(x) == false).ToArray();
-
-            //loop through the referenced assemblies
-            foreach (var a in referencedAssemblies)
-            {
-                //get all types in this assembly
-                var allTypes = GetTypesWithFormattedException(a)
-                    .ToArray();
-
-                var attributedTypes = new Type[] { };
-                try
-                {
-                    //now filter the types based on the onlyConcreteClasses flag, not interfaces, not static classes but have
-                    //the specified attribute
-                    attributedTypes = allTypes
-                        .Where(t => (TypeHelper.IsNonStaticClass(t)
-                                     && (onlyConcreteClasses == false || t.IsAbstract == false))
-                            //the type must have this attribute
-                                     && t.GetCustomAttributes(attributeType, false).Any())
-                        .ToArray();
-                }
-                catch (TypeLoadException ex)
-                {
-                    LogHelper.Error(typeof(TypeFinder), string.Format("Could not query types on {0} assembly, this is most likely due to this assembly not being compatible with the current Umbraco version", a), ex);
-                    continue;
-                }
-
-                //add the types to our list to return
-                foreach (var t in attributedTypes)
-                {
-                    foundAttributedTypes.Add(t);
-                }
-
-                //get all attributes of the type being searched for
-                var allAttributeTypes = allTypes.Where(attributeType.IsAssignableFrom);
-
-                //now we need to include types that may be inheriting from sub classes of the attribute type being searched for
-                //so we will search in assemblies that reference those types too.
-                foreach (var subTypesInAssembly in allAttributeTypes.GroupBy(x => x.Assembly))
-                {
-
-                    //So that we are not scanning too much, we need to group the sub types:
-                    // * if there is more than 1 sub type in the same assembly then we should only search on the 'lowest base' type.
-                    // * We should also not search for sub types if the type is sealed since you cannot inherit from a sealed class
-                    // * We should not search for sub types if the type is static since you cannot inherit from them.
-                    var subTypeList = subTypesInAssembly
-                        .Where(t => t.IsSealed == false && TypeHelper.IsStaticClass(t) == false)
-                        .ToArray();
-
-                    var baseClassAttempt = TypeHelper.GetLowestBaseType(subTypeList);
-
-                    //if there's a base class amongst the types then we'll only search for that type.
-                    //otherwise we'll have to search for all of them.
-                    var subTypesToSearch = new HashSet<Type>();
-                    if (baseClassAttempt.Success)
-                    {
-                        subTypesToSearch.Add(baseClassAttempt.Result);
-                    }
-                    else
-                    {
-                        foreach (var t in subTypeList)
-                        {
-                            subTypesToSearch.Add(t);
-                        }
-                    }
-
-                    foreach (var typeToSearch in subTypesToSearch)
-                    {
-                        //recursively find the types inheriting from this sub type in the other non-scanned assemblies.
-                        var foundTypes = FindClassesWithAttribute(typeToSearch, otherAssemblies, onlyConcreteClasses);
-
-                        foreach (var f in foundTypes)
-                        {
-                            foundAttributedTypes.Add(f);
-                        }
-                    }
-
-                }
-            }
-
-            return foundAttributedTypes;
+            return GetClassesWithAttribute(attributeType, assemblies, onlyConcreteClasses);
         }
 
-
         /// <summary>
         /// Finds the classes with attribute.
         /// </summary>
@@ -485,122 +373,129 @@ namespace Umbraco.Core
             return FindClassesWithAttribute<T>(GetAssembliesWithKnownExclusions());
         }
 
-
         #region Private methods
 
+        private static IEnumerable<Type> GetClassesWithAttribute(
+            Type attributeType,
+            IEnumerable<Assembly> assemblies,
+            bool onlyConcreteClasses)
+        {
+            if (typeof(Attribute).IsAssignableFrom(attributeType) == false)
+                throw new ArgumentException("Type " + attributeType + " is not an Attribute type.");
+
+            var candidateAssemblies = new HashSet<Assembly>(assemblies);
+            var attributeAssemblyIsCandidate = candidateAssemblies.Contains(attributeType.Assembly);
+            candidateAssemblies.Remove(attributeType.Assembly);
+            var types = new List<Type>();
+
+            var stack = new Stack<Assembly>();
+            stack.Push(attributeType.Assembly);
+
+            while (stack.Count > 0)
+            {
+                var assembly = stack.Pop();
+
+                Type[] assemblyTypes = null;
+                if (assembly != attributeType.Assembly || attributeAssemblyIsCandidate)
+                {
+                    // get all assembly types that can be assigned to baseType
+                    try
+                    {
+                        assemblyTypes = GetTypesWithFormattedException(assembly)
+                            .ToArray(); // in try block
+                    }
+                    catch (TypeLoadException ex)
+                    {
+                        LogHelper.Error(typeof(TypeFinder), string.Format("Could not query types on {0} assembly, this is most likely due to this assembly not being compatible with the current Umbraco version", assembly), ex);
+                        continue;
+                    }
+
+                    types.AddRange(assemblyTypes.Where(x =>
+                        x.IsClass // only classes
+                        && (x.IsAbstract == false || x.IsSealed == false) // ie non-static, static is abstract and sealed
+                        && x.IsNestedPrivate == false // exclude nested private
+                        && (onlyConcreteClasses == false || x.IsAbstract == false) // exclude abstract
+                        && x.GetCustomAttribute<HideFromTypeFinderAttribute>() == null // exclude hidden
+                        && x.GetCustomAttributes(attributeType, false).Any())); // marked with the attribute
+                }
+
+                if (assembly != attributeType.Assembly && assemblyTypes.Where(attributeType.IsAssignableFrom).Any() == false)
+                    continue;
+
+                foreach (var referencing in TypeHelper.GetReferencingAssemblies(assembly, candidateAssemblies))
+                {
+                    candidateAssemblies.Remove(referencing);
+                    stack.Push(referencing);
+                }
+            }
+
+            return types;
+        }
+
         /// <summary>
         /// Finds types that are assignable from the assignTypeFrom parameter and will scan for these types in the assembly
         /// list passed in, however we will only scan assemblies that have a reference to the assignTypeFrom Type or any type
         /// deriving from the base type.
         /// </summary>
-        /// <param name="assignTypeFrom"></param>
+        /// <param name="baseType"></param>
         /// <param name="assemblies"></param>
         /// <param name="onlyConcreteClasses"></param>
         /// <param name="additionalFilter">An additional filter to apply for what types will actually be included in the return value</param>
         /// <returns></returns>
-        private static IEnumerable<Type> GetClasses(
-            Type assignTypeFrom,
+        private static IEnumerable<Type> GetClassesWithBaseType(
+            Type baseType,
             IEnumerable<Assembly> assemblies,
             bool onlyConcreteClasses,
             Func<Type, bool> additionalFilter = null)
         {
-            //the default filter will always return true.
-            if (additionalFilter == null)
+            var candidateAssemblies = new HashSet<Assembly>(assemblies);
+            var baseTypeAssemblyIsCandidate = candidateAssemblies.Contains(baseType.Assembly);
+            candidateAssemblies.Remove(baseType.Assembly);
+            var types = new List<Type>();
+
+            var stack = new Stack<Assembly>();
+            stack.Push(baseType.Assembly);
+
+            while (stack.Count > 0)
             {
-                additionalFilter = type => true;
-            }
+                var assembly = stack.Pop();
 
-            var foundAssignableTypes = new HashSet<Type>();
-
-            var assemblyList = assemblies.ToArray();
-
-            //find all assembly references that are referencing the current type's assembly since we
-            //should only be scanning those assemblies because any other assembly will definitely not
-            //contain sub type's of the one we're currently looking for
-            var referencedAssemblies = TypeHelper.GetReferencedAssemblies(assignTypeFrom, assemblyList);
-
-            //get a list of non-referenced assemblies (we'll use this when we recurse below)
-            var otherAssemblies = assemblyList.Where(x => referencedAssemblies.Contains(x) == false).ToArray();
-
-            //loop through the referenced assemblies
-            foreach (var a in referencedAssemblies)
-            {
-                //get all types in the assembly that are sub types of the current type
-                var allSubTypes = GetTypesWithFormattedException(a)
-                    .Where(assignTypeFrom.IsAssignableFrom)
-                    .ToArray();
-
-                var filteredTypes = new Type[] { };
-                try
+                // get all assembly types that can be assigned to baseType
+                Type[] assemblyTypes = null;
+                if (assembly != baseType.Assembly || baseTypeAssemblyIsCandidate)
                 {
-                    //now filter the types based on the onlyConcreteClasses flag, not interfaces, not static classes
-                    filteredTypes = allSubTypes
-                        .Where(t => (TypeHelper.IsNonStaticClass(t)
-                            //Do not include nested private classes - since we are in full trust now this will find those too!
-                                     && t.IsNestedPrivate == false
-                                     && (onlyConcreteClasses == false || t.IsAbstract == false)
-                            //Do not include classes that are flagged to hide from the type finder
-                                     && t.GetCustomAttribute<HideFromTypeFinderAttribute>() == null
-                                     && additionalFilter(t)))
-                        .ToArray();
+                    try
+                    {
+                        assemblyTypes = GetTypesWithFormattedException(assembly)
+                            .Where(baseType.IsAssignableFrom)
+                            .ToArray(); // in try block
+                    }
+                    catch (TypeLoadException ex)
+                    {
+                        LogHelper.Error(typeof(TypeFinder), string.Format("Could not query types on {0} assembly, this is most likely due to this assembly not being compatible with the current Umbraco version", assembly), ex);
+                        continue;
+                    }
+
+                    types.AddRange(assemblyTypes.Where(x =>
+                        x.IsClass // only classes
+                        && (x.IsAbstract == false || x.IsSealed == false) // ie non-static, static is abstract and sealed
+                        && x.IsNestedPrivate == false // exclude nested private
+                        && (onlyConcreteClasses == false || x.IsAbstract == false) // exclude abstract
+                        && x.GetCustomAttribute<HideFromTypeFinderAttribute>() == null // exclude hidden
+                        && (additionalFilter == null || additionalFilter(x)))); // filter
                 }
-                catch (TypeLoadException ex)
-                {
-                    LogHelper.Error(typeof(TypeFinder), string.Format("Could not query types on {0} assembly, this is most likely due to this assembly not being compatible with the current Umbraco version", a), ex);
+
+                if (assembly != baseType.Assembly && assemblyTypes.All(x => x.IsSealed))
                     continue;
-                }
 
-                //add the types to our list to return
-                foreach (var t in filteredTypes)
+                foreach (var referencing in TypeHelper.GetReferencingAssemblies(assembly, candidateAssemblies))
                 {
-                    foundAssignableTypes.Add(t);
+                    candidateAssemblies.Remove(referencing);
+                    stack.Push(referencing);
                 }
-
-                //now we need to include types that may be inheriting from sub classes of the type being searched for
-                //so we will search in assemblies that reference those types too.
-                foreach (var subTypesInAssembly in allSubTypes.GroupBy(x => x.Assembly))
-                {
-
-                    //So that we are not scanning too much, we need to group the sub types:
-                    // * if there is more than 1 sub type in the same assembly then we should only search on the 'lowest base' type.
-                    // * We should also not search for sub types if the type is sealed since you cannot inherit from a sealed class
-                    // * We should not search for sub types if the type is static since you cannot inherit from them.
-                    var subTypeList = subTypesInAssembly
-                        .Where(t => t.IsSealed == false && TypeHelper.IsStaticClass(t) == false)
-                        .ToArray();
-
-                    var baseClassAttempt = TypeHelper.GetLowestBaseType(subTypeList);
-
-                    //if there's a base class amongst the types then we'll only search for that type.
-                    //otherwise we'll have to search for all of them.
-                    var subTypesToSearch = new HashSet<Type>();
-                    if (baseClassAttempt.Success)
-                    {
-                        subTypesToSearch.Add(baseClassAttempt.Result);
-                    }
-                    else
-                    {
-                        foreach (var t in subTypeList)
-                        {
-                            subTypesToSearch.Add(t);
-                        }
-                    }
-
-                    foreach (var typeToSearch in subTypesToSearch)
-                    {
-                        //recursively find the types inheriting from this sub type in the other non-scanned assemblies.
-                        var foundTypes = GetClasses(typeToSearch, otherAssemblies, onlyConcreteClasses, additionalFilter);
-
-                        foreach (var f in foundTypes)
-                        {
-                            foundAssignableTypes.Add(f);
-                        }
-                    }
-
-                }
-
             }
-            return foundAssignableTypes;
+
+            return types;
         }
 
         internal static IEnumerable<Type> GetTypesWithFormattedException(Assembly a)
@@ -666,7 +561,6 @@ namespace Umbraco.Core
 
         #endregion
 
-
         public static Type GetTypeByName(string typeName)
         {
             var type = BuildManager.GetType(typeName, false);
@@ -684,6 +578,5 @@ namespace Umbraco.Core
                 .Select(x => x.GetType(typeName))
                 .FirstOrDefault(x => x != null);
         }
-
     }
 }

src/Umbraco.Core/TypeHelper.cs

@@ -13,9 +13,12 @@ namespace Umbraco.Core
 	/// </summary>
 	internal static class TypeHelper
 	{
-		
-		private static readonly ConcurrentDictionary<Type, FieldInfo[]> GetFieldsCache = new ConcurrentDictionary<Type, FieldInfo[]>();
-		private static readonly ConcurrentDictionary<Tuple<Type, bool, bool, bool>, PropertyInfo[]> GetPropertiesCache = new ConcurrentDictionary<Tuple<Type, bool, bool, bool>, PropertyInfo[]>();
+	    private static readonly ConcurrentDictionary<Tuple<Type, bool, bool, bool>, PropertyInfo[]> GetPropertiesCache
+            = new ConcurrentDictionary<Tuple<Type, bool, bool, bool>, PropertyInfo[]>();
+		private static readonly ConcurrentDictionary<Type, FieldInfo[]> GetFieldsCache 
+            = new ConcurrentDictionary<Type, FieldInfo[]>();
+
+        private static readonly Assembly[] EmptyAssemblies  = new Assembly[0];
         
         /// <summary>
         /// Checks if the method is actually overriding a base method
@@ -30,44 +33,40 @@ namespace Umbraco.Core
         /// <summary>
         /// Find all assembly references that are referencing the assignTypeFrom Type's assembly found in the assemblyList
         /// </summary>
-        /// <param name="assignTypeFrom"></param>
-        /// <param name="assemblies"></param>
+        /// <param name="assembly">The referenced assembly.</param>
+        /// <param name="assemblies">A list of assemblies.</param>
         /// <returns></returns>
         /// <remarks>
         /// If the assembly of the assignTypeFrom Type is in the App_Code assembly, then we return nothing since things cannot
         /// reference that assembly, same with the global.asax assembly.
         /// </remarks>
-        public static Assembly[] GetReferencedAssemblies(Type assignTypeFrom, IEnumerable<Assembly> assemblies)
+        public static Assembly[] GetReferencingAssemblies(Assembly assembly, IEnumerable<Assembly> assemblies)
         {
-            //check if it is the app_code assembly.
-            //check if it is App_global.asax assembly
-            if (assignTypeFrom.Assembly.IsAppCodeAssembly() || assignTypeFrom.Assembly.IsGlobalAsaxAssembly())
-            {
-                return Enumerable.Empty<Assembly>().ToArray();
-            }
+            if (assembly.IsAppCodeAssembly() || assembly.IsGlobalAsaxAssembly())
+                return EmptyAssemblies;
+
             
-            //find all assembly references that are referencing the current type's assembly since we 
-            //should only be scanning those assemblies because any other assembly will definitely not
-            //contain sub type's of the one we're currently looking for
-            return assemblies
-                .Where(assembly =>
-                       assembly == assignTypeFrom.Assembly 
-                        || HasReferenceToAssemblyWithName(assembly, assignTypeFrom.Assembly.GetName().Name))
-                .ToArray();
+            // find all assembly references that are referencing the current type's assembly since we 
+            // should only be scanning those assemblies because any other assembly will definitely not
+            // contain sub type's of the one we're currently looking for
+            var name = assembly.GetName().Name;
+            return assemblies.Where(x => x == assembly || HasReference(x, name)).ToArray();
         }
 
 	    /// <summary>
-	    /// checks if the assembly has a reference with the same name as the expected assembly name.
+	    /// Determines if an assembly references another assembly.
 	    /// </summary>
 	    /// <param name="assembly"></param>
-	    /// <param name="expectedAssemblyName"></param>
+	    /// <param name="name"></param>
 	    /// <returns></returns>
-        private static bool HasReferenceToAssemblyWithName(Assembly assembly, string expectedAssemblyName)
-        {           
-            return assembly
-                .GetReferencedAssemblies()                
-                .Select(a => a.Name)
-                .Contains(expectedAssemblyName, StringComparer.Ordinal);
+        public static bool HasReference(Assembly assembly, string name)
+        {
+            // ReSharper disable once LoopCanBeConvertedToQuery - no!
+            foreach (var a in assembly.GetReferencedAssemblies())
+            {
+                if (string.Equals(a.Name, name, StringComparison.Ordinal)) return true;
+            }
+            return false;
         }
 
         /// <summary>
@@ -106,13 +105,10 @@ namespace Umbraco.Core
         public static Attempt<Type> GetLowestBaseType(params Type[] types)
 	    {
 	        if (types.Length == 0)
-	        {
 	            return Attempt<Type>.Fail();
-	        }
-	        if (types.Length == 1)
-	        {
+
+            if (types.Length == 1)
                 return Attempt.Succeed(types[0]);
-	        }
 
 	        foreach (var curr in types)
 	        {
@@ -196,20 +192,15 @@ namespace Umbraco.Core
 		/// <param name="includeIndexed"></param>
 		/// <param name="caseSensitive"> </param>
 		/// <returns></returns>
-		public static PropertyInfo GetProperty(Type type, string name, 
-			bool mustRead = true, 
-			bool mustWrite = true, 
+		public static PropertyInfo GetProperty(Type type, string name,
+			bool mustRead = true,
+			bool mustWrite = true,
 			bool includeIndexed = false,
 			bool caseSensitive = true)
 		{
-			return CachedDiscoverableProperties(type, mustRead, mustWrite, includeIndexed)
-				.FirstOrDefault(x =>
-					{
-						if (caseSensitive)
-							return x.Name == name;
-						return x.Name.InvariantEquals(name);
-					});
-		}        
+            return CachedDiscoverableProperties(type, mustRead, mustWrite, includeIndexed)
+		        .FirstOrDefault(x => caseSensitive ? (x.Name == name) : x.Name.InvariantEquals(name));
+        }
 
 		/// <summary>
 		/// Gets (and caches) <see cref="FieldInfo"/> discoverable in the current <see cref="AppDomain"/> for a given <paramref name="type"/>.
@@ -222,7 +213,7 @@ namespace Umbraco.Core
 				type,
 				x => type
 				     	.GetFields(BindingFlags.Public | BindingFlags.Instance)
-				     	.Where(y => !y.IsInitOnly)
+				     	.Where(y => y.IsInitOnly == false)
 				     	.ToArray());
 		}
 
@@ -240,13 +231,12 @@ namespace Umbraco.Core
 				new Tuple<Type, bool, bool, bool>(type, mustRead, mustWrite, includeIndexed),
 				x => type
 				     	.GetProperties(BindingFlags.Public | BindingFlags.Instance)
-				     	.Where(y => (!mustRead || y.CanRead)
-				     	            && (!mustWrite || y.CanWrite)
-				     	            && (includeIndexed || !y.GetIndexParameters().Any()))
+				     	.Where(y => (mustRead == false || y.CanRead)
+				     	            && (mustWrite == false || y.CanWrite)
+				     	            && (includeIndexed || y.GetIndexParameters().Any() == false))
 				     	.ToArray());
 		}
 
-
         #region Match Type
 
         //TODO: Need to determine if these methods should replace/combine/merge etc with IsTypeAssignableFrom, IsAssignableFromGeneric
@@ -337,9 +327,9 @@ namespace Umbraco.Core
 
             // not a generic type, not a generic parameter
             // so normal class or interface
-            // fixme structs? enums? array types?
             // about primitive types, value types, etc:
             // http://stackoverflow.com/questions/1827425/how-to-check-programatically-if-a-type-is-a-struct-or-a-class
+            // if it's a primitive type... it needs to be ==
 
             if (implementation == contract) return true;
             if (contract.IsClass && implementation.IsClass && implementation.IsSubclassOf(contract)) return true;

src/Umbraco.Tests/CodeFirst/TypeInheritanceTest.cs

@@ -35,7 +35,7 @@ namespace Umbraco.Tests.CodeFirst
 		        }
             };
 
-          
+
         }
 
         [Test]
@@ -84,10 +84,7 @@ namespace Umbraco.Tests.CodeFirst
             var foundTypes = _pluginManager.ResolveContentTypeBaseTypes();
 
             Assert.That(foundTypes.Count(), Is.EqualTo(15));
-            Assert.AreEqual(1,
-                            _pluginManager.GetTypeLists()
-                                .Count(x => x.IsTypeList<ContentTypeBase>(PluginManager.TypeResolutionKind.FindAllTypes)));
+            Assert.AreEqual(1, _pluginManager.TypeLists.Count(x => x.BaseType == typeof (ContentTypeBase) && x.AttributeType == null));
         }
-
     }
 }

src/Umbraco.Tests/Plugins/PluginManagerTests.cs

@@ -18,6 +18,7 @@ using Umbraco.Core.Profiling;
 using Umbraco.Core.PropertyEditors;
 using umbraco.DataLayer;
 using umbraco.editorControls;
+using umbraco.interfaces;
 using umbraco.MacroEngines;
 using umbraco.uicontrols;
 using Umbraco.Web;
@@ -34,14 +35,14 @@ namespace Umbraco.Tests.Plugins
         public void Initialize()
         {
             //this ensures its reset
-            _manager = new PluginManager(new ActivatorServiceProvider(), new NullCacheProvider(), 
+            _manager = new PluginManager(new ActivatorServiceProvider(), new NullCacheProvider(),
                 new ProfilingLogger(Mock.Of<ILogger>(), Mock.Of<IProfiler>()));
 
             //for testing, we'll specify which assemblies are scanned for the PluginTypeResolver
             //TODO: Should probably update this so it only searches this assembly and add custom types to be found
             _manager.AssembliesToScan = new[]
 			    {
-			        this.GetType().Assembly, 
+			        this.GetType().Assembly,
 			        typeof(ApplicationStartupHandler).Assembly,
 			        typeof(SqlCEHelper).Assembly,
 			        typeof(CMSNode).Assembly,
@@ -160,7 +161,7 @@ namespace Umbraco.Tests.Plugins
         public void Detect_Legacy_Plugin_File_List()
         {
             var tempFolder = IOHelper.MapPath("~/App_Data/TEMP/PluginCache");
-            
+
             var filePath= Path.Combine(tempFolder, string.Format("umbraco-plugins.{0}.list", NetworkHelper.FileSafeMachineName));
 
             File.WriteAllText(filePath, @"<?xml version=""1.0"" encoding=""utf-8""?>
@@ -169,12 +170,11 @@ namespace Umbraco.Tests.Plugins
 <add type=""umbraco.macroCacheRefresh, umbraco, Version=6.0.0.0, Culture=neutral, PublicKeyToken=null"" />
 </baseType>
 </plugins>");
-            
-            Assert.IsTrue(_manager.DetectLegacyPluginListFile());
+
+            Assert.IsEmpty(_manager.ReadCache()); // uber-legacy cannot be read
 
             File.Delete(filePath);
 
-            //now create a valid one
             File.WriteAllText(filePath, @"<?xml version=""1.0"" encoding=""utf-8""?>
 <plugins>
 <baseType type=""umbraco.interfaces.ICacheRefresher"" resolutionType=""FindAllTypes"">
@@ -182,19 +182,32 @@ namespace Umbraco.Tests.Plugins
 </baseType>
 </plugins>");
 
-            Assert.IsFalse(_manager.DetectLegacyPluginListFile());
+            Assert.IsEmpty(_manager.ReadCache()); // legacy cannot be read
+
+            File.Delete(filePath);
+
+            File.WriteAllText(filePath, @"IContentFinder
+
+MyContentFinder
+AnotherContentFinder
+
+");
+
+            Assert.IsNotNull(_manager.ReadCache()); // works
         }
 
         [Test]
         public void Create_Cached_Plugin_File()
         {
-            var types = new[] { typeof(PluginManager), typeof(PluginManagerTests), typeof(UmbracoContext) };
+            var types = new[] { typeof (PluginManager), typeof (PluginManagerTests), typeof (UmbracoContext) };
 
-            //yes this is silly, none of these types inherit from string, but this is just to test the xml file format
-            _manager.UpdateCachedPluginsFile<string>(types, PluginManager.TypeResolutionKind.FindAllTypes);
+            var typeList1 = new PluginManager.TypeList(typeof (object), null);
+            foreach (var type in types) typeList1.Add(type);
+            _manager.AddTypeList(typeList1);
+            _manager.WriteCache();
 
-            var plugins = _manager.TryGetCachedPluginsFromFile<string>(PluginManager.TypeResolutionKind.FindAllTypes);
-            var diffType = _manager.TryGetCachedPluginsFromFile<string>(PluginManager.TypeResolutionKind.FindAttributedTypes);
+            var plugins = _manager.TryGetCached(typeof (object), null);
+            var diffType = _manager.TryGetCached(typeof (object), typeof (ObsoleteAttribute));
 
             Assert.IsTrue(plugins.Success);
             //this will be false since there is no cache of that type resolution kind
@@ -210,7 +223,7 @@ namespace Umbraco.Tests.Plugins
         public void PluginHash_From_String()
         {
             var s = "hello my name is someone".GetHashCode().ToString("x", CultureInfo.InvariantCulture);
-            var output = PluginManager.ConvertPluginsHashFromHex(s);
+            var output = PluginManager.ConvertHashToInt64(s);
             Assert.AreNotEqual(0, output);
         }
 
@@ -240,7 +253,7 @@ namespace Umbraco.Tests.Plugins
             var list1 = new[] { f1, f2, f3, f4, f5, f6 };
             var list2 = new[] { f1, f3, f5 };
             var list3 = new[] { f1, f3, f5, f7 };
-            
+
             //Act
             var hash1 = PluginManager.GetFileHash(list1, new ProfilingLogger(Mock.Of<ILogger>(), Mock.Of<IProfiler>()));
             var hash2 = PluginManager.GetFileHash(list2, new ProfilingLogger(Mock.Of<ILogger>(), Mock.Of<IProfiler>()));
@@ -259,9 +272,7 @@ namespace Umbraco.Tests.Plugins
         {
             var foundTypes1 = _manager.ResolveFindMeTypes();
             var foundTypes2 = _manager.ResolveFindMeTypes();
-            Assert.AreEqual(1,
-                            _manager.GetTypeLists()
-                                .Count(x => x.IsTypeList<IFindMe>(PluginManager.TypeResolutionKind.FindAllTypes)));
+            Assert.AreEqual(1, _manager.TypeLists.Count(x => x.BaseType == typeof(IFindMe) && x.AttributeType == null));
         }
 
         [Test]
@@ -344,20 +355,20 @@ namespace Umbraco.Tests.Plugins
         {
             var types = new HashSet<PluginManager.TypeList>();
 
-            var propEditors = new PluginManager.TypeList<PropertyEditor>(PluginManager.TypeResolutionKind.FindAllTypes);
-            propEditors.AddType(typeof(LabelPropertyEditor));
+            var propEditors = new PluginManager.TypeList(typeof (PropertyEditor), null);
+            propEditors.Add(typeof(LabelPropertyEditor));
             types.Add(propEditors);
 
-            var found = types.SingleOrDefault(x => x.IsTypeList<PropertyEditor>(PluginManager.TypeResolutionKind.FindAllTypes));
+            var found = types.SingleOrDefault(x => x.BaseType == typeof (PropertyEditor) && x.AttributeType == null);
 
             Assert.IsNotNull(found);
 
             //This should not find a type list of this type
-            var shouldNotFind = types.SingleOrDefault(x => x.IsTypeList<IParameterEditor>(PluginManager.TypeResolutionKind.FindAllTypes));
+            var shouldNotFind = types.SingleOrDefault(x => x.BaseType == typeof (IParameterEditor) && x.AttributeType == null);
 
             Assert.IsNull(shouldNotFind);
         }
-     
+
         [XsltExtension("Blah.Blah")]
         public class MyXsltExtension
         {
@@ -371,7 +382,7 @@ namespace Umbraco.Tests.Plugins
 
         }
 
-        public interface IFindMe
+        public interface IFindMe : IDiscoverable
         {
 
         }

src/Umbraco.Tests/Plugins/TypeFinderTests.cs

@@ -26,11 +26,11 @@ using Umbraco.Web.BaseRest;
 
 namespace Umbraco.Tests.Plugins
 {
-    
+
     /// <summary>
 	/// Tests for typefinder
 	/// </summary>
-	[TestFixture]	
+	[TestFixture]
 	public class TypeFinderTests
 	{
 		/// <summary>
@@ -43,7 +43,7 @@ namespace Umbraco.Tests.Plugins
 		{
 		    _assemblies = new[]
 			    {
-			        this.GetType().Assembly, 
+			        this.GetType().Assembly,
 			        typeof(ApplicationStartupHandler).Assembly,
 			        typeof(SqlCEHelper).Assembly,
 			        typeof(CMSNode).Assembly,
@@ -75,7 +75,7 @@ namespace Umbraco.Tests.Plugins
         [Test]
         public void Find_Classes_Of_Type()
         {
-            var typesFound = TypeFinder.FindClassesOfType<IApplicationStartupHandler>(_assemblies);            
+            var typesFound = TypeFinder.FindClassesOfType<IApplicationStartupHandler>(_assemblies);
             var originalTypesFound = TypeFinderOriginal.FindClassesOfType<IApplicationStartupHandler>(_assemblies);
 
             Assert.AreEqual(originalTypesFound.Count(), typesFound.Count());
@@ -118,7 +118,7 @@ namespace Umbraco.Tests.Plugins
                     }
                 }
             }
-            
+
         }
 
         [Ignore]
@@ -149,7 +149,7 @@ namespace Umbraco.Tests.Plugins
                     }
                 }
             }
-            
+
         }
 
         public class MyTag : ITag
@@ -161,7 +161,7 @@ namespace Umbraco.Tests.Plugins
 
         public class MySuperTag : MyTag
         {
-            
+
         }
 
         [AttributeUsage(AttributeTargets.Class, AllowMultiple = false)]
@@ -203,7 +203,7 @@ namespace Umbraco.Tests.Plugins
             /// This is a modified version of: http://www.dominicpettifer.co.uk/Blog/44/how-to-get-a-reference-to-all-assemblies-in-the--bin-folder
             /// </summary>
             /// <remarks>
-            /// We do this because we cannot use AppDomain.Current.GetAssemblies() as this will return only assemblies that have been 
+            /// We do this because we cannot use AppDomain.Current.GetAssemblies() as this will return only assemblies that have been
             /// loaded in the CLR, not all assemblies.
             /// See these threads:
             /// http://issues.umbraco.org/issue/U5-198
@@ -329,8 +329,8 @@ namespace Umbraco.Tests.Plugins
                             }
                             catch (SecurityException)
                             {
-                                //we will just ignore this because this will fail 
-                                //in medium trust for system assemblies, we get an exception but we just want to continue until we get to 
+                                //we will just ignore this because this will fail
+                                //in medium trust for system assemblies, we get an exception but we just want to continue until we get to
                                 //an assembly that is ok.
                             }
                         }
@@ -347,9 +347,9 @@ namespace Umbraco.Tests.Plugins
                             }
                             catch (SecurityException)
                             {
-                                //we will just ignore this because if we are trying to do a call to: 
+                                //we will just ignore this because if we are trying to do a call to:
                                 // AssemblyName.ReferenceMatchesDefinition(a.GetName(), assemblyName)))
-                                //in medium trust for system assemblies, we get an exception but we just want to continue until we get to 
+                                //in medium trust for system assemblies, we get an exception but we just want to continue until we get to
                                 //an assembly that is ok.
                             }
                         }
@@ -361,7 +361,7 @@ namespace Umbraco.Tests.Plugins
             }
 
             /// <summary>
-            /// Return a list of found local Assemblies excluding the known assemblies we don't want to scan 
+            /// Return a list of found local Assemblies excluding the known assemblies we don't want to scan
             /// and exluding the ones passed in and excluding the exclusion list filter, the results of this are
             /// cached for perforance reasons.
             /// </summary>
@@ -429,7 +429,7 @@ namespace Umbraco.Tests.Plugins
                     "RouteDebugger,",
                     "SqlCE4Umbraco,",
                     "umbraco.datalayer,",
-                    "umbraco.interfaces,",										
+                    "umbraco.interfaces,",
 					"umbraco.providers,",
 					"Umbraco.Web.UI,",
                     "umbraco.webservices",
@@ -631,5 +631,5 @@ namespace Umbraco.Tests.Plugins
         }
 	}
 
-    
+
 }

src/Umbraco.Tests/Services/ContentTypeServiceTests.cs

@@ -1,4 +1,3 @@
-using System.Runtime.Remoting;
 using NUnit.Framework;
 using System;
 using System.Collections.Generic;
@@ -9,7 +8,6 @@ using Umbraco.Core.Exceptions;
 using Umbraco.Core.Models;
 using Umbraco.Core.Models.Rdbms;
 using Umbraco.Core.Services;
-using Umbraco.Tests.CodeFirst.TestModels.Composition;
 using Umbraco.Tests.TestHelpers;
 using Umbraco.Tests.TestHelpers.Entities;
 
@@ -1644,6 +1642,38 @@ namespace Umbraco.Tests.Services
             Assert.That(descriptionPropertyTypeReloaded.PropertyGroupId.IsValueCreated, Is.False);
         }
 
+        [Test]
+        public void Empty_Description_Is_Always_Null_After_Saving_Content_Type()
+        {
+            var service = ServiceContext.ContentTypeService;
+            var contentType = MockedContentTypes.CreateBasicContentType();
+            contentType.Description = null;
+            service.Save(contentType);
+
+            var contentType2 = MockedContentTypes.CreateBasicContentType("basePage2", "Base Page 2");
+            contentType2.Description = string.Empty;
+            service.Save(contentType2);
+
+            Assert.IsNull(contentType.Description);
+            Assert.IsNull(contentType2.Description);
+        }
+
+        [Test]
+        public void Empty_Description_Is_Always_Null_After_Saving_Media_Type()
+        {
+            var service = ServiceContext.ContentTypeService;
+            var mediaType = MockedContentTypes.CreateSimpleMediaType("mediaType", "Media Type");
+            mediaType.Description = null;
+            service.Save(mediaType);
+
+            var mediaType2 = MockedContentTypes.CreateSimpleMediaType("mediaType2", "Media Type 2");
+            mediaType2.Description = string.Empty;
+            service.Save(mediaType2);
+
+            Assert.IsNull(mediaType.Description);
+            Assert.IsNull(mediaType2.Description);
+        }
+
         private ContentType CreateComponent()
         {
             var component = new ContentType(-1)

src/Umbraco.Tests/Services/MemberTypeServiceTests.cs

@@ -1,8 +1,6 @@
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using NUnit.Framework;
-using umbraco.cms.presentation.create.controls;
 using Umbraco.Core;
 using Umbraco.Core.Models;
 using Umbraco.Core.Models.Rdbms;
@@ -183,6 +181,22 @@ namespace Umbraco.Tests.Services
             Assert.Throws<ArgumentException>(() => ServiceContext.MemberTypeService.Save(memberType));
         }
 
+        [Test]
+        public void Empty_Description_Is_Always_Null_After_Saving_Member_Type()
+        {
+            var service = ServiceContext.MemberTypeService;
+            var memberType = MockedContentTypes.CreateSimpleMemberType();
+            memberType.Description = null;
+            service.Save(memberType);
+
+            var memberType2 = MockedContentTypes.CreateSimpleMemberType("memberType2", "Member Type 2");
+            memberType2.Description = string.Empty;
+            service.Save(memberType2);
+
+            Assert.IsNull(memberType.Description);
+            Assert.IsNull(memberType2.Description);
+        }
+
         //[Test]
         //public void Can_Save_MemberType_Structure_And_Create_A_Member_Based_On_It()
         //{

src/Umbraco.Tests/TestHelpers/BaseUmbracoApplicationTest.cs

@@ -62,7 +62,7 @@ namespace Umbraco.Tests.TestHelpers
         public override void TearDown()
         {
             base.TearDown();
-            
+
             // reset settings
             SettingsForTests.Reset();
             UmbracoContext.Current = null;
@@ -119,7 +119,7 @@ namespace Umbraco.Tests.TestHelpers
         }
 
         /// <summary>
-        /// By default this returns false which means the plugin manager will not be reset so it doesn't need to re-scan 
+        /// By default this returns false which means the plugin manager will not be reset so it doesn't need to re-scan
         /// all of the assemblies. Inheritors can override this if plugin manager resetting is required, generally needs
         /// to be set to true if the SetupPluginManager has been overridden.
         /// </summary>

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

@@ -1,5 +1,4 @@
 using System;
-using System.Linq;
 using Umbraco.Core;
 using Umbraco.Core.Models;
 

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

@@ -62,14 +62,14 @@ function macroResource($q, $http, umbRequestHelper) {
          * @param {} filename
          * @returns {}
          */
-        createPartialViewMacroWithFile: function(parent, filename) {
+        createPartialViewMacroWithFile: function(virtualPath, filename) {
 
             return umbRequestHelper.resourcePromise(
                 $http.post(
                     umbRequestHelper.getApiUrl(
                         "macroApiBaseUrl",
                         "CreatePartialViewMacroWithFile"), {
-                            parent: parent,
+                            virtualPath: virtualPath,
                             filename: filename
                         }
                 ),

src/Umbraco.Web.UI.Client/src/less/buttons.less

@@ -65,12 +65,6 @@
     -webkit-box-shadow:none;
 }
 
-.btn-group > .btn:first-child,
-.btn-group > .btn:last-child,
-.btn-group > .dropdown-toggle {
-    border-radius: 0;
-}
-
 
 
 // Button Sizes

src/Umbraco.Web.UI.Client/src/less/components/umb-lightbox.less

@@ -47,8 +47,8 @@
     border-radius: 3px;
     padding: 10px;
     img {
-        max-width: 50vw;
-        max-height: 70vh;
+        max-width: 80vw;
+        max-height: 80vh;
     }
 }
 

src/Umbraco.Web.UI.Client/src/less/dashboards.less

@@ -99,6 +99,12 @@
 		}
 	}
 
+	.forms-install-button {
+		.btn {
+			padding: 14px 40px;
+		}
+	}
+
     .installer-top {
 		overflow: hidden;
 		margin: 0 auto 30px;

src/Umbraco.Web.UI.Client/src/less/pages/login.less

@@ -4,9 +4,6 @@
 .login-overlay {
     width: 100%;
     height: 100%;
-    background: @gray-1 url(../img/application/logo.png) no-repeat 25px 30px fixed !important;
-    background-size: 30px 30px !important;
-    color: @white;
     position: absolute;
     z-index: 10000;
     top: 0;
@@ -16,34 +13,24 @@
     border: none;
     border-radius: 0;
     overflow-y: auto;
+    background-color: @purple-d2;
 }
 
-
-@media only screen and (-webkit-min-device-pixel-ratio: 1.5),
-       only screen and (min-resolution: 144dpi)
-{
-    .login-overlay {
-        background-image: url(../img/application/logo@2x.png) !important;
-    }
+.login-overlay__background-image {
+    background-position: center center;
+    background-repeat: no-repeat;
+    background-size: cover;
+    width: 100%;
+    height: 100%;
+    position: absolute;
+    opacity: 0.05;
 }
 
-
-@media only screen and (-webkit-min-device-pixel-ratio: 2),
-       only screen and (min-resolution: 192dpi)
-{
-    .login-overlay {
-        background-image: url(../img/application/logo@2x.png) !important;
-    }
-}
-
-
-@media only screen and (-webkit-min-device-pixel-ratio: 3),
-       only screen and (min-resolution: 3dppx),
-       only screen and (min-resolution: 350dpi)
-{
-    .login-overlay {
-        background-image: url(../img/application/logo@3x.png) !important;
-    }
+.login-overlay__logo {
+    position: absolute;
+    top: 22px;
+    left: 25px;
+    z-index: 1;
 }
 
 .login-overlay .umb-modalcolumn {
@@ -51,21 +38,56 @@
     border: none;
 }
 
+.login-overlay .umb-login-container {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    width: 100%;
+    height: 100%;
+    position: relative;
+    z-index: 3;
+    box-sizing: border-box;
+}
+
+@media (max-width: 565px) {
+    // making sure we don't crash into the logo
+    .login-overlay .umb-login-container {
+        padding-top: 80px;
+    }
+}
+
 .login-overlay .form {
-    position:relative;
-    display: block;
-    top: 100px;
-    left: 165px;
-    width: 370px;
-    text-align: right;
+    background: @white;
+    padding: 25px;
+    width: 500px;
+    margin-left: 25px;
+    margin-right: 25px;
+    margin-top: auto;
+    margin-bottom: auto;
+}
+
+.login-overlay .form input[type="text"], 
+.login-overlay .form input[type="password"] {
+    height: 36px;
+    padding-left: 10px;
+    padding-right: 10px;
+}
+
+.login-overlay .btn-success {
+    padding: 12px 24px;
+}
+
+.login-overlay .form label {
+    font-weight: bold;
 }
 
 .login-overlay h1 {
     display: block;
-    text-align: right;
-    color: @white;
-    font-size: 18px;
+    text-align: center;
+    color: @black;
+    font-size: 24px;
     font-weight: bold;
+    margin-bottom: 20px;
 }
 
 .login-overlay .alert {
@@ -76,62 +98,19 @@
     text-align: center;
 }
 
-.login-overlay .switch-view {
-    margin-top: 10px;    
+.login-overlay .external-logins form {
+    margin-bottom: 20px;
 }
 
-@media (max-width: 767px) and (max-height: 420px) and (orientation: landscape) {
-  // Move form closer to top on narrow screen sizes
-  .login-overlay .form {
-    top: 50px;
-  }
-}
-
-@media (max-width: 565px) {
-  // Remove padding on login-form on smaller devices
-  .login-overlay .form {
-    top: 60px;
-    right: 25px;
-    left: inherit;
-    padding-left: 25px;
-    padding-right:25px;
-    width: auto;
-  }
-}
-
-@media (max-width: 339px) {
-  .login-overlay .form {
-    input[type="text"], input[type="password"] {
-      width: 250px;
-    }
-  }
-}
-
-#hrOr {
-    height: 30px;
-    text-align: center;
-    position: relative;
-    padding-top: 20px;
-}
-
-#hrOr hr {
+.login-overlay .btn-social {
+    padding-top: 8px;
+    padding-bottom: 8px;
     margin: 0;
-    border: none;
-    background-color: @gray-3;
-    height: 1px;
+    margin-bottom: 5px;
 }
 
-#hrOr div {
-    background-color: @black;
-    position: relative;
-    top: -16px;
-    border: 1px solid @gray-3;
-    padding: 4px;
-    border-radius: 50%;
-    width: 20px;
-    height: 20px;
-    margin: auto;
-    color: @gray-8;
+.login-overlay .btn-social>:first-child {
+    line-height: 36px;
 }
 
 .login-overlay .text-error, 

src/Umbraco.Web.UI.Client/src/less/variables.less

@@ -42,6 +42,7 @@
 @turquoise-l3:			#C0F0ED;
 @turquoise-washed:		#F3FDFC; 
 
+@purple-d2:			    #1D1333;
 @purple-d1:			    #2E2246;
 @purple:                #413659;
 @purple-l1:			    #675E7A;
@@ -141,9 +142,9 @@
 
 
 // Disabled this to keep consistency throughout the backoffice UI. Untill a better solution is thought up, this will do.
-@baseBorderRadius:      0px; // 2px;
-@borderRadiusLarge:     0px; // 6px;
-@borderRadiusSmall:     0px; // 3px;
+@baseBorderRadius:      3px; // 2px;
+@borderRadiusLarge:     3px; // 6px;
+@borderRadiusSmall:     3px; // 3px;
 
 
 // Tables
@@ -185,7 +186,7 @@
 // -------------------------
 @inputBackground:               @white;
 @inputBorder:                   @gray-7;
-@inputBorderRadius:             @baseBorderRadius;
+@inputBorderRadius:             0;
 @inputDisabledBackground:       @gray-10;
 @formActionsBackground:         @gray-9;
 @inputHeight:                   @baseLineHeight + 10px; // base line-height + 8px vertical padding + 2px top/bottom border
@@ -195,7 +196,7 @@
 // Tabs
 // -------------------------
 
-@tabsBorderRadius:				0px;
+@tabsBorderRadius:				@baseBorderRadius;
 
 // Dropdowns
 // -------------------------

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

@@ -81,6 +81,7 @@
         $scope.externalLoginProviders = externalLoginInfo.providers;
         $scope.externalLoginInfo = externalLoginInfo;
         $scope.resetPasswordCodeInfo = resetPasswordCodeInfo;
+        $scope.backgroundImage = Umbraco.Sys.ServerVariables.umbracoSettings.loginBackgroundImage;
 
         $scope.activateKonamiMode = function () {
             if ($cookies.konamiLogin == "1") {

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

@@ -1,133 +1,146 @@
 <div ng-controller="Umbraco.Dialogs.LoginController">
+    
     <div id="login" class="umb-modalcolumn umb-dialog" ng-class="{'show-validation': loginForm.$invalid}" ng-cloak konami-code="activateKonamiMode()">
-        <div class="form">
-            <h1>{{greeting}}</h1>
+        
+        <div class="login-overlay__background-image" ng-if="backgroundImage" ng-style="{'background-image':'url(' + backgroundImage + ')'}"></div>
 
-            <div ng-show="view == 'login'">
+        <div class="login-overlay__logo">
+            <img ng-src="assets/img/application/logo.png" ng-srcset="assets/img/application/logo@2x.png 2x, assets/img/application/logo@3x.png 3x">
+        </div>
 
-                <p>
-                    <span ng-show="dialogData.isTimedOut"><localize key="login_timeout">Log in below</localize>.</span>
-                    <localize key="login_instruction">Log in below</localize>
-                </p>
+        <div class="umb-login-container">
 
-                <div class="external-logins" ng-if="externalLoginProviders.length > 0">
+            <div class="form">
+                <h1>{{greeting}}</h1>
 
-                    <div class="text-error" ng-repeat="error in externalLoginInfo.errors">
+                <div ng-show="view == 'login'">
+                    
+                    <p>
+                        <span ng-show="dialogData.isTimedOut"><localize key="login_timeout">Log in below</localize>.</span>
+                    </p>
+
+                    <div class="external-logins" ng-if="externalLoginProviders.length > 0">
+
+                        <div class="text-error" ng-repeat="error in externalLoginInfo.errors">
+                            <span>{{error}}</span>
+                        </div>
+
+                        <form method="POST" name="externalLoginForm" action="{{externalLoginFormAction}}">
+
+                            <div ng-repeat="login in externalLoginProviders">
+
+                                <button type="submit" class="btn btn-block btn-social"
+                                        ng-class="login.properties.SocialStyle"
+                                        id="{{login.authType}}" name="provider" value="{{login.authType}}"
+                                        title="Log in using your {{login.caption}} account">
+                                    <i class="fa" ng-class="login.properties.SocialIcon"></i>
+                                    <localize key="login_signInWith">Sign in with</localize> {{login.caption}}
+                                </button>
+
+                            </div>
+                        </form>
+
+                    </div>
+
+                    <form method="POST" name="loginForm" ng-submit="loginSubmit(login, password)">
+
+                        <div class="control-group" ng-show="loginForm.$invalid">
+                            <div class="text-error">{{errorMsg}}</div>
+                        </div>
+
+                        <div class="control-group" ng-class="{error: loginForm.username.$invalid}">
+                            <label><localize key="general_username">Username</localize></label>
+                            <input type="text" ng-model="login" name="username" class="-full-width-input" localize="placeholder" placeholder="@placeholders_username" />
+                        </div>
+
+                        <div class="control-group" ng-class="{error: loginForm.password.$invalid}">
+                            <label><localize key="general_password">Password</localize></label>
+                            <input type="password" ng-model="password" name="password" class="-full-width-input" localize="placeholder" placeholder="@placeholders_password" autocomplete="off" />
+                        </div>
+
+                        <div class="flex justify-between items-center">
+                            <button type="submit" class="btn btn-success" val-trigger-change="#login .form input"><localize key="general_login">Login</localize></button>
+                            <div ng-show="allowPasswordReset">
+                                <a class="muted" style="text-decoration: underline;" href="#" prevent-default ng-click="showRequestPasswordReset()"><localize key="login_forgottenPassword">Forgotten password?</localize></a>
+                            </div>
+                        </div>
+
+                    </form>
+                </div>
+
+                <div ng-show="view == 'request-password-reset'">
+                    <p>
+                        <localize key="login_forgottenPasswordInstruction">An email will be sent to the address specified with a link to reset your password</localize>
+                    </p>
+
+                    <form method="POST" name="requestPasswordResetForm" ng-submit="requestPasswordResetSubmit(email)">
+                        <div class="control-group" ng-class="{error: requestPasswordResetForm.email.$invalid}">
+                            <label><localize key="general_email">Email</localize></label>
+                            <input type="text" ng-model="email" name="email" class="-full-width-input" localize="placeholder" placeholder="@placeholders_email" />
+                        </div>
+                        
+                        <div class="control-group" ng-show="requestPasswordResetForm.$invalid">
+                            <div class="text-error">{{errorMsg}}</div>
+                        </div>
+                        
+                        <div class="control-group" ng-show="showEmailResetConfirmation">
+                            <div class="text-info">
+                                <localize key="login_requestPasswordResetConfirmation">An email with password reset instructions will be sent to the specified address if it matched our records</localize>
+                            </div>
+                        </div>
+
+                        <div class="flex justify-between items-center">
+                            <button type="submit" class="btn btn-success" val-trigger-change="#login .form input"><localize key="general_submit">Submit</localize></button>
+                            <a class="muted" href="#" prevent-default ng-click="showLogin()" style="text-decoration: underline;"><localize key="login_returnToLogin">Return to login form</localize></a>
+                        </div>
+
+                    </form>
+                </div>
+
+                <div ng-show="view == 'set-password'">
+                    
+                    <p ng-hide="resetComplete">
+                        <localize key="login_setPasswordInstruction">Please provide a new password.</localize>
+                    </p>
+
+                    <form method="POST" name="setPasswordForm" ng-submit="setPasswordSubmit(password, confirmPassword)">
+
+                        <div ng-hide="resetComplete" class="control-group" ng-class="{error: setPasswordForm.password.$invalid}">
+                            <label><localize key="user_newPassword">New password</localize></label>
+                            <input type="password" ng-model="password" name="password" class="-full-width-input" localize="placeholder" placeholder="@placeholders_password" />
+                        </div>
+
+                        <div ng-hide="resetComplete" class="control-group" ng-class="{error: setPasswordForm.confirmPassword.$invalid}">
+                            <label><localize key="user_confirmNewPassword">Confirm new password</localize></label>
+                            <input type="password" ng-model="confirmPassword" name="confirmPassword" class="-full-width-input" localize="placeholder" placeholder="@placeholders_confirmPassword" />
+                        </div>
+                        
+                        <div ng-hide="resetComplete" class="control-group" ng-show="setPasswordForm.$invalid">
+                            <div class="text-error">{{errorMsg}}</div>
+                        </div>
+
+                        <div class="control-group" ng-show="showSetPasswordConfirmation">
+                            <div class="text-info">
+                                <localize key="login_setPasswordConfirmation">Your new password has been set and you may now use it to log in.</localize>
+                            </div>                        
+                        </div>
+
+                        <div class="flex justify-between items-center">
+                            <button ng-hide="resetComplete" type="submit" class="btn btn-success" val-trigger-change="#login .form input"><localize key="general_submit">Submit</localize></button>
+                            <a class="muted" href="#" prevent-default ng-click="showLogin()"><localize key="login_returnToLogin">Return to login form</localize></a>
+                        </div>
+
+                    </form>
+                </div>
+
+                <div ng-show="view == 'password-reset-code-expired'">
+                    <div class="text-error" ng-repeat="error in resetPasswordCodeInfo.errors">
                         <span>{{error}}</span>
                     </div>
-
-                    <form method="POST" name="externalLoginForm" action="{{externalLoginFormAction}}">
-
-                        <div ng-repeat="login in externalLoginProviders">
-
-                            <button type="submit" class="btn btn-block btn-social"
-                                    ng-class="login.properties.SocialStyle"
-                                    id="{{login.authType}}" name="provider" value="{{login.authType}}"
-                                    title="Log in using your {{login.caption}} account">
-                                <i class="fa" ng-class="login.properties.SocialIcon"></i>
-                                <localize key="login_signInWith">Sign in with</localize> {{login.caption}}
-                            </button>
-
-                        </div>
-                    </form>
-
-                    <div id="hrOr">
-                        <hr />
-                        <div><localize key="general_or">or</localize></div>
-                    </div>
-
-                </div>
-
-                <form method="POST" name="loginForm" ng-submit="loginSubmit(login, password)">
-                    <div class="control-group" ng-class="{error: loginForm.username.$invalid}">
-                        <input type="text" ng-model="login" name="username" class="input-xlarge input--no-border" localize="placeholder" placeholder="@placeholders_username" />
-                    </div>
-
-                    <div class="control-group" ng-class="{error: loginForm.password.$invalid}">
-                        <input type="password" ng-model="password" name="password" class="input-xlarge input--no-border" localize="placeholder" placeholder="@placeholders_password" autocomplete="off" />
-                    </div>
                     
-                    <div class="control-group" ng-show="loginForm.$invalid">
-                        <div class="text-error">{{errorMsg}}</div>
-                    </div>
-
-                    <button type="submit" class="btn" val-trigger-change="#login .form input"><localize key="general_login">Login</localize></button>
-
-                    <div class="switch-view" ng-show="allowPasswordReset">
-                        <a class="muted" href="#" prevent-default ng-click="showRequestPasswordReset()"><localize key="login_forgottenPassword">Forgotten password?</localize></a>
-                    </div>
-                </form>
-            </div>
-
-            <div ng-show="view == 'request-password-reset'">
-                <p>
-                    <localize key="login_forgottenPasswordInstruction">An email will be sent to the address specified with a link to reset your password</localize>
-                </p>
-
-                <form method="POST" name="requestPasswordResetForm" ng-submit="requestPasswordResetSubmit(email)">
-                    <div class="control-group" ng-class="{error: requestPasswordResetForm.email.$invalid}">
-                        <input type="text" ng-model="email" name="email" class="input-xlarge input--no-border" localize="placeholder" placeholder="@placeholders_email" />
-                    </div>
-                    
-                    <div class="control-group" ng-show="requestPasswordResetForm.$invalid">
-                        <div class="text-error">{{errorMsg}}</div>
-                    </div>
-                    
-                    <div class="control-group" ng-show="showEmailResetConfirmation">
-                        <div class="text-info">
-                            <localize key="login_requestPasswordResetConfirmation">An email with password reset instructions will be sent to the specified address if it matched our records</localize>
-                        </div>
-                    </div>
-
-                    <button type="submit" class="btn" val-trigger-change="#login .form input"><localize key="general_submit">Submit</localize></button>
-
                     <div class="switch-view">
                         <a class="muted" href="#" prevent-default ng-click="showLogin()"><localize key="login_returnToLogin">Return to login form</localize></a>
                     </div>
-                </form>
-            </div>
-
-            <div ng-show="view == 'set-password'">
-                
-                <p ng-hide="resetComplete">
-                    <localize key="login_setPasswordInstruction">Please provide a new password.</localize>
-                </p>
-
-                <form method="POST" name="setPasswordForm" ng-submit="setPasswordSubmit(password, confirmPassword)">
-
-                    <div ng-hide="resetComplete" class="control-group" ng-class="{error: setPasswordForm.password.$invalid}">
-                        <input type="password" ng-model="password" name="password" class="input-xlarge" localize="placeholder" placeholder="@placeholders_password" />
-                    </div>
-
-                    <div ng-hide="resetComplete" class="control-group" ng-class="{error: setPasswordForm.confirmPassword.$invalid}">
-                        <input type="password" ng-model="confirmPassword" name="confirmPassword" class="input-xlarge" localize="placeholder" placeholder="@placeholders_confirmPassword" />
-                    </div>
-                    
-                    <div ng-hide="resetComplete" class="control-group" ng-show="setPasswordForm.$invalid">
-                        <div class="text-error">{{errorMsg}}</div>
-                    </div>
-
-                    <div class="control-group" ng-show="showSetPasswordConfirmation">
-                        <div class="text-info">
-                            <localize key="login_setPasswordConfirmation">Your new password has been set and you may now use it to log in.</localize>
-                        </div>                        
-                    </div>
-
-                    <button ng-hide="resetComplete" type="submit" class="btn" val-trigger-change="#login .form input"><localize key="general_submit">Submit</localize></button>
-
-                    <div class="switch-view">
-                        <a class="muted" href="#" prevent-default ng-click="showLogin()"><localize key="login_returnToLogin">Return to login form</localize></a>
-                    </div>
-                </form>
-            </div>
-
-            <div ng-show="view == 'password-reset-code-expired'">
-                <div class="text-error" ng-repeat="error in resetPasswordCodeInfo.errors">
-                    <span>{{error}}</span>
-                </div>
-                
-                <div class="switch-view">
-                    <a class="muted" href="#" prevent-default ng-click="showLogin()"><localize key="login_returnToLogin">Return to login form</localize></a>
                 </div>
             </div>
         </div>

src/Umbraco.Web.UI.Client/src/views/dashboard/developer/examinemanagement.html

@@ -3,232 +3,285 @@
     <h3 class="bold">Examine Management</h3>
 
     <div ng-show="loading">
-        Loading...
+        <div class="umb-healthcheck-group__details-status-overlay"></div>
+        <umb-load-indicator></umb-load-indicator>
     </div>
 
-    <h4>Indexers</h4>
+    <div ng-hide="loading" class="umb-healthcheck-group__details">
 
-    <ul ng-hide="loading">
-        <li class="provider" ng-repeat="indexer in indexerDetails">
+        <div class="umb-healthcheck-group__details-group-title">
+            <div class="umb-healthcheck-group__details-group-name">Indexers</div>
+        </div>
 
-            <a class="btn-link -underline" href="" ng-click="toggle(indexer, 'showProperties')">
-                {{indexer.name}}
-            </a>
+        <div class="umb-healthcheck-group__details-checks">
+            <div class="umb-healthcheck-group__details-check">
+                <div class="umb-healthcheck-group__details-check-title">
+                    <div class="umb-healthcheck-group__details-check-name">Manage Examine's indexes</div>
+                    <div class="umb-healthcheck-group__details-check-description">Allows you to view the details of each index and provides some tools for managing the indexes</div>
+                </div>
 
-            <ul ng-show="indexer.showProperties">
+                <div class="umb-healthcheck-group__details-status" ng-repeat="indexer in indexerDetails">
 
-                <li>
+                    <div class="umb-healthcheck-group__details-status-icon-container">
+                        <i class="umb-healthcheck-status-icon" ng-class="{'icon-check color-green' : indexer.isHealthy, 'icon-delete color-red' : !indexer.isHealthy}"></i>
+                    </div>
 
-                    <a href="" ng-click="toggle(indexer, 'showTools')">Index info & tools</a>
-
-                    <div ng-show="indexer.showTools && indexer.isLuceneIndex">
-                        <div>
-                            <br />
-                            <div ng-show="!indexer.isProcessing && (!indexer.processingAttempts || indexer.processingAttempts < 100)">
-
-                                <button type="button" class="btn btn-warning" ng-click="rebuildIndex(indexer)">Rebuild index</button>
-                                <button type="button" class="btn btn-warning" ng-click="optimizeIndex(indexer)" ng-show="indexer.documentCount > 0">Optimize index</button>
+                    <div class="umb-healthcheck-group__details-status-content">
+                        <div class="umb-healthcheck-group__details-status-text">
+                            <div ng-show="!indexer.isHealthy">
+                                {{indexer.name}}
                             </div>
-
-                            <div ng-show="indexer.isProcessing" class="umb-loader-wrapper" ng-show="actionInProgress">
-                                <div class="umb-loader"></div>
-                            </div>
-
-                            <div class="error" ng-show="indexer.processingAttempts >= 100">
-                                The process is taking longer than expected, check the umbraco log to see if there have been any errors during this operation
+                            <a class="btn-link -underline" href="" ng-click="toggle(indexer, 'showProperties')" ng-show="indexer.isHealthy">
+                                {{indexer.name}}
+                            </a>
+                            <div ng-if="!indexer.isHealthy" class="text-error">
+                                The index cannot be read and will need to be rebuilt
                             </div>
                         </div>
-                        <table class="table table-bordered table-condensed">
-                            <caption>&nbsp;</caption>
-                            <tr>
-                                <th>Documents in index</th>
-                                <td>{{indexer.documentCount}}</td>
-                            </tr>
-                            <tr>
-                                <th>Fields in index</th>
-                                <td>{{indexer.fieldCount}}</td>
-                            </tr>
-                            <tr>
-                                <th>Has deletions?</th>
-                                <td>
-                                    <span>{{indexer.deletionCount > 0}}</span>
-                                    (<span>{{indexer.deletionCount}}</span>)
-                                </td>
-                            </tr>
-                            <tr>
-                                <th>Optimized?</th>
-                                <td>
-                                    <span>{{indexer.isOptimized}}</span>
-                                </td>
-                            </tr>
 
-                        </table>
-                    </div>
-                </li>
-
-                <li ng-show="indexer.indexCriteria.IncludeNodeTypes.length > 0 || indexer.indexCriteria.ExcludeNodeTypes.length > 0 || indexer.indexCriteria.ParentNodeId">
-                    <a href="" ng-click="toggle(indexer, 'showNodeTypes')">Node types</a>
-                    <table ng-show="indexer.showNodeTypes" class="table table-bordered table-condensed">
-                        <tr ng-show="indexer.indexCriteria.IncludeNodeTypes.length > 0">
-                            <th>Include node types</th>
-                            <td>{{indexer.indexCriteria.IncludeNodeTypes | json}}</td>
-                        </tr>
-                        <tr ng-show="indexer.indexCriteria.ExcludeNodeTypes.length > 0">
-                            <th>Exclude node types</th>
-                            <td>{{indexer.indexCriteria.ExcludeNodeTypes | json}}</td>
-                        </tr>
-                        <tr ng-show="indexer.indexCriteria.ParentNodeId">
-                            <th>Parent node id</th>
-                            <td>{{indexer.indexCriteria.ParentNodeId}}</td>
-                        </tr>
-                    </table>
-                </li>
-
-                <li ng-show="indexer.indexCriteria.StandardFields.length > 0">
-                    <a href="" ng-click="toggle(indexer, 'showSystemFields')">System fields</a>
-                    <table ng-show="indexer.showSystemFields" class="table table-bordered table-condensed">
-                        <caption>&nbsp;</caption>
-                        <thead>
-                            <tr>
-                                <th>Name</th>
-                                <th>Enable sorting</th>
-                                <th>Type</th>
-                            </tr>
-                        </thead>
-                        <tbody>
-                            <tr ng-repeat="field in indexer.indexCriteria.StandardFields">
-                                <th>{{field.Name}}</th>
-                                <td>{{field.EnableSorting}}</td>
-                                <td>{{field.Type}}</td>
-                            </tr>
-                        </tbody>
-                    </table>
-                </li>
-
-                <li ng-show="indexer.indexCriteria.UserFields.length > 0">
-                    <a href="" ng-click="toggle(indexer, 'showUserFields')">User fields</a>
-                    <table ng-show="indexer.showUserFields" class="table table-bordered table-condensed">
-                        <caption>&nbsp;</caption>
-                        <thead>
-                            <tr>
-                                <th>Name</th>
-                                <th>Enable sorting</th>
-                                <th>Type</th>
-                            </tr>
-                        </thead>
-                        <tbody>
-                            <tr ng-repeat="field in indexer.indexCriteria.UserFields">
-                                <th>{{field.Name}}</th>
-                                <td>{{field.EnableSorting}}</td>
-                                <td>{{field.Type}}</td>
-                            </tr>
-                        </tbody>
-                    </table>
-                </li>
-
-                <li>
-                    <a href="" ng-click="toggle(indexer, 'showProviderProperties')">Provider properties</a>
-                    <table ng-show="indexer.showProviderProperties" class="table table-bordered table-condensed">
-                        <caption>&nbsp;</caption>
-                        <tr ng-repeat="(key, val) in indexer.providerProperties track by $index">
-                            <th>{{key}}</th>
-                            <td>{{val}}</td>
-                        </tr>
-                    </table>
-                </li>
-            </ul>
-        </li>
-
-
-
-    </ul>
-
-    <h4>Searchers</h4>
-
-    <ul ng-hide="loading">
-        <li class="provider" ng-repeat="searcher in searcherDetails">
-            <a class="btn-link -underline" href="" ng-click="toggle(searcher, 'showProperties')">
-                {{searcher.name}}
-            </a>
-
-            <ul ng-show="searcher.showProperties">
-
-                <li class="search-tools">
-
-                    <a href="" ng-click="toggle(searcher, 'showTools')">Search tools</a>
-
-                    <div ng-show="searcher.showTools">
-                        <a class="hide" href="" ng-click="closeSearch(searcher)" ng-show="searcher.isSearching">Hide search results</a>
-
-                        <br />
-
-                        <form>
-
-                            <div class="row form-search">
-                                <div class="span8 input-append">
-                                    <input type="text" class="search-query" ng-model="searcher.searchText" no-dirty-check />
-                                    <button type="button" class="btn btn-info" ng-click="search(searcher)" ng-disabled="searcher.isProcessing">Search</button>
-                                </div>
-                            </div>
-                            <div class="row">
-                                <label for="{{searcher.name}}-textSearch" class="radio inline">
-                                    <input type="radio" name="searchType" id="{{searcher.name}}-textSearch" value="text" ng-model="searcher.searchType" no-dirty-check />
-                                    Text Search
-                                </label>
-                                <label for="{{searcher.name}}-luceneSearch" class="radio inline">
-                                    <input type="radio" name="searchType" id="{{searcher.name}}-luceneSearch" value="lucene" ng-model="searcher.searchType" no-dirty-check />
-                                    Lucene Search
-                                </label>
+                        <div class="umb-healthcheck-group__details-status-actions" ng-if="!indexer.isHealthy">
+                            <div class="umb-healthcheck-group__details-status-action">
+                                <button type="button" class="umb-era-button -blue"
+                                        ng-show="!indexer.isProcessing && (!indexer.processingAttempts || indexer.processingAttempts < 100)"
+                                        ng-click="rebuildIndex(indexer)">
+                                    Rebuild index
+                                </button>
                             </div>
+                        </div>
 
+                        <div class="umb-healthcheck-group__details-status-actions" ng-show="indexer.isHealthy && indexer.showProperties">
+                            <ul>
+                                <li>
+                                    <a href="" ng-click="toggle(indexer, 'showTools')">Index info & tools</a>
 
-                        </form>
+                                    <div ng-show="indexer.showTools && indexer.isLuceneIndex">
+                                        <div>
+                                            <br />
 
-                        <div class="search-results" ng-show="searcher.isSearching">
+                                            <div ng-show="!indexer.isProcessing && (!indexer.processingAttempts || indexer.processingAttempts < 100)"
+                                                 class="umb-healthcheck-group__details-status-action">
+                                                <button type="button" class="umb-era-button -blue" ng-click="rebuildIndex(indexer)">Rebuild index</button>
+                                            </div>
 
-                            <div ng-show="indexer.isProcessing" class="umb-loader-wrapper" ng-show="indexer.isProcessing">
-                                <div class="umb-loader"></div>
-                            </div>
+                                            <div ng-show="indexer.processingAttempts >= 100">
+                                                The process is taking longer than expected, check the umbraco log to see if there have been any errors during this operation
+                                            </div>
+                                        </div>
+                                        <table class="table table-bordered table-condensed">
+                                            <caption>&nbsp;</caption>
+                                            <tr>
+                                                <th>Documents in index</th>
+                                                <td>{{indexer.documentCount}}</td>
+                                            </tr>
+                                            <tr>
+                                                <th>Fields in index</th>
+                                                <td>{{indexer.fieldCount}}</td>
+                                            </tr>
+                                            <tr>
+                                                <th>Has deletions?</th>
+                                                <td>
+                                                    <span>{{indexer.deletionCount > 0}}</span>
+                                                    (<span>{{indexer.deletionCount}}</span>)
+                                                </td>
+                                            </tr>
+                                            <tr>
+                                                <th>Optimized?</th>
+                                                <td>
+                                                    <span>{{indexer.isOptimized}}</span>
+                                                </td>
+                                            </tr>
 
-                            <table ng-hide="searcher.isProcessing" class="table table-bordered table-condensed">
-                                <thead>
-                                    <tr>
-                                        <th class="score">Score</th>
-                                        <th class="id">Id</th>
-                                        <th>Values</th>
-                                    </tr>
-                                </thead>
-                                <tbody>
-                                    <tr ng-repeat="result in searcher.searchResults">
-                                        <td>{{result.Score}}</td>
-                                        <td>{{result.Id}}</td>
-                                        <td>
-                                            <span ng-repeat="(key,val) in result.Fields track by $index">
-                                                <span class=""><em>{{key}}</em>:</span>
-                                                <span class="text-info">{{val}}</span>
-                                            </span>
-                                        </td>
-                                    </tr>
-                                </tbody>
-                            </table>
+                                        </table>
+                                    </div>
+                                </li>
+                                <li ng-show="indexer.indexCriteria.IncludeNodeTypes.length > 0 || indexer.indexCriteria.ExcludeNodeTypes.length > 0 || indexer.indexCriteria.ParentNodeId">
+                                    <a href="" ng-click="toggle(indexer, 'showNodeTypes')">Node types</a>
+                                    <table ng-show="indexer.showNodeTypes" class="table table-bordered table-condensed">
+                                        <tr ng-show="indexer.indexCriteria.IncludeNodeTypes.length > 0">
+                                            <th>Include node types</th>
+                                            <td>{{indexer.indexCriteria.IncludeNodeTypes | json}}</td>
+                                        </tr>
+                                        <tr ng-show="indexer.indexCriteria.ExcludeNodeTypes.length > 0">
+                                            <th>Exclude node types</th>
+                                            <td>{{indexer.indexCriteria.ExcludeNodeTypes | json}}</td>
+                                        </tr>
+                                        <tr ng-show="indexer.indexCriteria.ParentNodeId">
+                                            <th>Parent node id</th>
+                                            <td>{{indexer.indexCriteria.ParentNodeId}}</td>
+                                        </tr>
+                                    </table>
+                                </li>
+                                <li ng-show="indexer.indexCriteria.StandardFields.length > 0">
+                                    <a href="" ng-click="toggle(indexer, 'showSystemFields')">System fields</a>
+                                    <table ng-show="indexer.showSystemFields" class="table table-bordered table-condensed">
+                                        <caption>&nbsp;</caption>
+                                        <thead>
+                                            <tr>
+                                                <th>Name</th>
+                                                <th>Enable sorting</th>
+                                                <th>Type</th>
+                                            </tr>
+                                        </thead>
+                                        <tbody>
+                                            <tr ng-repeat="field in indexer.indexCriteria.StandardFields">
+                                                <th>{{field.Name}}</th>
+                                                <td>{{field.EnableSorting}}</td>
+                                                <td>{{field.Type}}</td>
+                                            </tr>
+                                        </tbody>
+                                    </table>
+                                </li>
+                                <li ng-show="indexer.indexCriteria.UserFields.length > 0">
+                                    <a href="" ng-click="toggle(indexer, 'showUserFields')">User fields</a>
+                                    <table ng-show="indexer.showUserFields" class="table table-bordered table-condensed">
+                                        <caption>&nbsp;</caption>
+                                        <thead>
+                                            <tr>
+                                                <th>Name</th>
+                                                <th>Enable sorting</th>
+                                                <th>Type</th>
+                                            </tr>
+                                        </thead>
+                                        <tbody>
+                                            <tr ng-repeat="field in indexer.indexCriteria.UserFields">
+                                                <th>{{field.Name}}</th>
+                                                <td>{{field.EnableSorting}}</td>
+                                                <td>{{field.Type}}</td>
+                                            </tr>
+                                        </tbody>
+                                    </table>
+                                </li>
+                                <li>
+                                    <a href="" ng-click="toggle(indexer, 'showProviderProperties')">Provider properties</a>
+                                    <table ng-show="indexer.showProviderProperties" class="table table-bordered table-condensed">
+                                        <caption>&nbsp;</caption>
+                                        <tr ng-repeat="(key, val) in indexer.providerProperties track by $index">
+                                            <th>{{key}}</th>
+                                            <td>{{val}}</td>
+                                        </tr>
+                                    </table>
+                                </li>
+                            </ul>
                         </div>
                     </div>
-                </li>
 
-                <li>
-                    <a href="" ng-click="toggle(searcher, 'showProviderProperties')">Provider properties</a>
-                    <table ng-show="searcher.showProviderProperties" class="table table-bordered table-condensed">
-                        <caption>&nbsp;</caption>
-                        <tr ng-repeat="(key, val) in searcher.providerProperties track by $index">
-                            <th>{{key}}</th>
-                            <td>{{val}}</td>
-                        </tr>
-                    </table>
-                </li>
+                    <div ng-show="indexer.isProcessing">
+                        <div class="umb-healthcheck-group__details-status-overlay"></div>
+                        <umb-load-indicator></umb-load-indicator>
+                    </div>
+                </div>
+            </div>
+        </div>
+
+        <br />
+
+        <div class="umb-healthcheck-group__details-group-title">
+            <div class="umb-healthcheck-group__details-group-name">Searchers</div>
+        </div>
+
+        <div class="umb-healthcheck-group__details-checks">
+            <div class="umb-healthcheck-group__details-check">
+                <div class="umb-healthcheck-group__details-check-title">
+                    <div class="umb-healthcheck-group__details-check-name">Search indexes</div>
+                    <div class="umb-healthcheck-group__details-check-description">Allows you to search the indexes and view the searcher properties</div>
+                </div>
+
+                <div class="umb-healthcheck-group__details-status" ng-repeat="searcher in searcherDetails">
+
+                    <div class="umb-healthcheck-group__details-status-icon-container">
+                        <i class="umb-healthcheck-status-icon icon-info"></i>
+                    </div>
+                    
+                    <div class="umb-healthcheck-group__details-status-content">
+                        <div class="umb-healthcheck-group__details-status-text">
+                            <a class="btn-link -underline" href="" ng-click="toggle(searcher, 'showProperties')">
+                                {{searcher.name}}
+                            </a>
+                        </div>
+                        
+                        <div class="umb-healthcheck-group__details-status-actions" ng-show="searcher.showProperties">
+                            <ul>
+                                <li class="search-tools">
+
+                                    <a href="" ng-click="toggle(searcher, 'showTools')">Search tools</a>
+
+                                    <div ng-show="searcher.showTools">
+                                        <a class="hide" href="" ng-click="closeSearch(searcher)" ng-show="searcher.isSearching">Hide search results</a>
+
+                                        <br />
+
+                                        <form>
+
+                                            <div class="row form-search">
+                                                <div class="span8 input-append">
+                                                    <input type="text" class="search-query" ng-model="searcher.searchText" no-dirty-check />
+                                                    <button type="button" class="btn btn-info" ng-click="search(searcher)" ng-disabled="searcher.isProcessing">Search</button>
+                                                </div>
+                                            </div>
+                                            <div class="row">
+                                                <label for="{{searcher.name}}-textSearch" class="radio inline">
+                                                    <input type="radio" name="searchType" id="{{searcher.name}}-textSearch" value="text" ng-model="searcher.searchType" no-dirty-check />
+                                                    Text Search
+                                                </label>
+                                                <label for="{{searcher.name}}-luceneSearch" class="radio inline">
+                                                    <input type="radio" name="searchType" id="{{searcher.name}}-luceneSearch" value="lucene" ng-model="searcher.searchType" no-dirty-check />
+                                                    Lucene Search
+                                                </label>
+                                            </div>
+
+
+                                        </form>
+
+                                        <div class="search-results" ng-show="searcher.isSearching">
+
+                                            <div ng-show="indexer.isProcessing" class="umb-loader-wrapper" ng-show="indexer.isProcessing">
+                                                <div class="umb-loader"></div>
+                                            </div>
+
+                                            <table ng-hide="searcher.isProcessing" class="table table-bordered table-condensed">
+                                                <thead>
+                                                    <tr>
+                                                        <th class="score">Score</th>
+                                                        <th class="id">Id</th>
+                                                        <th>Values</th>
+                                                    </tr>
+                                                </thead>
+                                                <tbody>
+                                                    <tr ng-repeat="result in searcher.searchResults">
+                                                        <td>{{result.Score}}</td>
+                                                        <td>{{result.Id}}</td>
+                                                        <td>
+                                                            <span ng-repeat="(key,val) in result.Fields track by $index">
+                                                                <span class=""><em>{{key}}</em>:</span>
+                                                                <span class="text-info">{{val}}</span>
+                                                            </span>
+                                                        </td>
+                                                    </tr>
+                                                </tbody>
+                                            </table>
+                                        </div>
+                                    </div>
+                                </li>
+                                <li>
+                                    <a href="" ng-click="toggle(searcher, 'showProviderProperties')">Provider properties</a>
+                                    <table ng-show="searcher.showProviderProperties" class="table table-bordered table-condensed">
+                                        <caption>&nbsp;</caption>
+                                        <tr ng-repeat="(key, val) in searcher.providerProperties track by $index">
+                                            <th>{{key}}</th>
+                                            <td>{{val}}</td>
+                                        </tr>
+                                    </table>
+                                </li>
+                            </ul>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+
+
+    </div>
 
-            </ul>
 
-        </li>
-    </ul>
 
 </div>

src/Umbraco.Web.UI.Client/src/views/dashboard/forms/formsdashboardintro.html

@@ -16,9 +16,16 @@
 				</video>
 			</div>
 
-			<p style="font-size: 16px; line-height: 1.5; color: #4c4c4c;">Create forms using an intuitive drag and drop interface. From simple contact forms that sends e-mails to advanced questionaires that integrate with CRM systems. Your clients will love it!</p>
+			<p style="font-size: 16px; line-height: 1.5; color: #4c4c4c; margin-bottom: 20px;">Create forms using an intuitive drag and drop interface. From simple contact forms that sends e-mails to advanced questionaires that integrate with CRM systems. Your clients will love it!</p>
+
+			<umb-button
+				class="forms-install-button"
+				type="button"
+				button-style="success"
+				label="Install"
+				action="installForms()">
+			</umb-button>
 
-			<button class="btn publish btn-install" ng-click="installForms()">Install</button>
 		</div>
 
 		<div class="step-two" ng-if="state"> <!-- STEP two -->

src/Umbraco.Web.UI.Client/src/views/partialviewmacros/create.controller.js

@@ -8,19 +8,18 @@
         var localizeCreateFolder = localizationService.localize("defaultdialog_createFolder");
 
         vm.snippets = [];
-        vm.snippet = "Empty";
-        vm.createMacro = false;
         vm.createFolderError = "";
         vm.folderName = "";
         vm.fileName = "";
-
+        vm.showSnippets = false;
         vm.creatingFolder = false;
-        vm.creatingFile = false;
 
         vm.showCreateFolder = showCreateFolder;
-        vm.showCreateFile = showCreateFile;
         vm.createFolder = createFolder;
         vm.createFile = createFile;
+        vm.createFileWithoutMacro = createFileWithoutMacro;
+        vm.showCreateFromSnippet = showCreateFromSnippet;
+        vm.createFileFromSnippet = createFileFromSnippet;
 
         function onInit() {
             codefileResource.getSnippets('partialViewMacros')
@@ -33,12 +32,8 @@
             vm.creatingFolder = true;
         }
 
-        function showCreateFile() {
-            vm.creatingFile = true;
-        }
-
         function createFolder(form) {
-            if (formHelper.submitForm({scope: $scope, formCtrl: form, statusMessage: localizeCreateFolder})) {
+            if (formHelper.submitForm({ scope: $scope, formCtrl: form, statusMessage: localizeCreateFolder })) {
 
                 codefileResource.createContainer("partialViewMacros", node.id, vm.folderName).then(function (saved) {
 
@@ -57,7 +52,7 @@
 
                     var section = appState.getSectionState("currentSection");
 
-                }, function(err) {
+                }, function (err) {
 
                     vm.createFolderError = err;
 
@@ -71,29 +66,23 @@
             }
         }
 
-        function createFile(form) {
-            if (formHelper.submitForm({ scope: $scope, formCtrl: form, statusMessage: 'create file' })) {
+        function createFile() {
+            $location.path("/developer/partialviewmacros/edit/" + node.id).search("create", "true");
+            navigationService.hideMenu();
+        }
 
-                if (vm.createMacro) {
-                    var path = decodeURIComponent(node.id);
-                    macroResource.createPartialViewMacroWithFile(path, vm.fileName).then(function(created) {
-                        $location.path("/developer/partialviewmacros/edit/" + node.id).search("create", "true").search("name", vm.fileName).search("snippet", vm.snippet);
-                        navigationService.hideMenu();
-                    }, function(err) {
-                        vm.createFileError = err;
+        function createFileWithoutMacro() {
+            $location.path("/developer/partialviewmacros/edit/" + node.id).search("create", "true").search("nomacro", "true");
+            navigationService.hideMenu();
+        }
 
-                        //show any notifications
-                        if (angular.isArray(err.data.notifications)) {
-                            for (var i = 0; i < err.data.notifications.length; i++) {
-                                notificationsService.showNotification(err.data.notifications[i]);
-                            }
-                        }
-                    });
-                } else {
-                    $location.path("/developer/partialviewmacros/edit/" + node.id).search("create", "true").search("name", vm.fileName).search("snippet", vm.snippet);
-                    navigationService.hideMenu();
-                }
-            }
+        function createFileFromSnippet(snippet) {
+            $location.path("/developer/partialviewmacros/edit/" + node.id).search("create", "true").search("snippet", snippet.fileName);
+            navigationService.hideMenu();
+        }
+
+        function showCreateFromSnippet() {
+            vm.showSnippets = true;
         }
 
         onInit();

src/Umbraco.Web.UI.Client/src/views/partialviewmacros/create.html

@@ -2,61 +2,56 @@
 
     <div class="umbracoDialog umb-dialog-body with-footer">
 
-        <div class="umb-pane" ng-if="!vm.creatingFolder && !vm.creatingFile">
-
-            <h5><localize key="create_createUnder">Create an item under</localize> {{currentNode.name}}</h5>
+        <div class="umb-pane" ng-if="!vm.creatingFolder">
 
             <!-- Main options -->
-            <ul class="umb-actions umb-actions-child">
-                <li>
-                    <a href="" ng-click="vm.showCreateFile()" umb-auto-focus>
-                        <i class="large icon-article"></i>
-                        <span class="menu-label"><localize key="create_newPartialViewMacro">New partial view macro</localize></span>
-                    </a>
-                </li>
-                <li>
-                    <a href="" ng-click="vm.showCreateFolder()">
-                        <i class="large icon-folder"></i>
-                        <span class="menu-label"><localize key="general_folder"></localize></span>
-                    </a>
-                </li>
-            </ul>
+            <div ng-if="!vm.showSnippets">
 
-        </div>
+                <h5><localize key="create_createUnder">Create an item under</localize> {{currentNode.name}}</h5>
 
-        <!-- Create file -->
-        <div class="umb-pane" ng-if="vm.creatingFile">
-            <form novalidate name="createFileForm"
-                    ng-submit="vm.createFile(createFileForm)"
-                    val-form-manager>
+                <ul class="umb-actions umb-actions-child">
+                    <li>
+                        <a href="" ng-click="vm.createFile()" umb-auto-focus>
+                            <i class="large icon-article"></i>
+                            <span class="menu-label"><localize key="create_newPartialViewMacro">New partial view macro</localize></span>
+                        </a>
+                    </li>
+                    <li>
+                        <a href="" ng-click="vm.createFileWithoutMacro()">
+                            <i class="large icon-article"></i>
+                            <span class="menu-label"><localize key="create_newPartialViewMacroNoMacro">New partial view macro (without macro)</localize></span>
+                        </a>
+                    </li>
+                    <li>
+                        <a href="" ng-click="vm.showCreateFromSnippet()">
+                            <i class="large icon-article"></i>
+                            <span class="menu-label"><localize key="create_newPartialViewMacroFromSnippet">>New partial view macro from snippet</localize></span>
+                        </a>
+                    </li>
+                    <li>
+                        <a href="" ng-click="vm.showCreateFolder()">
+                            <i class="large icon-folder"></i>
+                            <span class="menu-label"><localize key="general_folder"></localize></span>
+                        </a>
+                    </li>
+                </ul>
+            </div>
 
-                <div ng-show="vm.createFileError">
-                    <h5 class="text-error">{{vm.createFileError.errorMsg}}</h5>
-                    <p class="text-error">{{vm.createFileError.data.message}}</p>
-                </div>
+            <!-- Snippets list -->
+            <div ng-if="vm.showSnippets">
 
-                <umb-control-group label="Enter a file name" hide-label="false">
-                    <input type="text" name="fileName" ng-model="vm.fileName" class="umb-textstring textstring input-block-level" umb-auto-focus required no-dirty-check />
+                <h5>Select snippet</h5>
 
-                    <div>
-                        <label class="checkbox">
-                            <input type="checkbox" name="createMacro" ng-model="vm.createMacro" ng-true-value="true" ng-false-value="false" no-dirty-check/>
-                            Create corresponding macro
-                        </label>
-                    </div>
-                </umb-control-group>
+                <ul class="umb-actions umb-actions-child">
+                    <li ng-repeat="snippet in vm.snippets">
+                        <a href="" ng-click="vm.createFileFromSnippet(snippet)" style="padding-top: 6px; padding-bottom: 6px;">
+                            <i class="icon-article" style="font-size: 20px;"></i>
+                            <span class="menu-label" style="margin-left: 0; padding-left: 5px;">{{ snippet.name }}</span>
+                        </a>
+                    </li>
+                </ul>
+            </div>
 
-                <umb-control-group label="Select a snippet (or create an empty file)" hide-label="false">
-
-                    <select name="snippet"
-                            class="umb-editor umb-dropdown"
-                            ng-model="vm.snippet"
-                            ng-options="snippet.fileName as snippet.name for snippet in vm.snippets"></select>
-
-                </umb-control-group>
-
-                <button type="submit" class="btn btn-primary"><localize key="general_create">Create</localize></button>
-            </form>
         </div>
 
         <!-- Create folder -->

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

@@ -1,7 +1,7 @@
 (function () {
     "use strict";
 
-    function partialViewMacrosEditController($scope, $routeParams, codefileResource, assetsService, notificationsService, editorState, navigationService, appState, macroService, angularHelper, $timeout, contentEditingHelper, localizationService, templateHelper) {
+    function partialViewMacrosEditController($scope, $routeParams, codefileResource, assetsService, notificationsService, editorState, navigationService, appState, macroService, angularHelper, $timeout, contentEditingHelper, localizationService, templateHelper, macroResource) {
 
         var vm = this;
         var localizeSaving = localizationService.localize("general_saving");
@@ -41,32 +41,22 @@
                 redirectOnFailure: false,
                 rebindCallback: function (orignal, saved) {}
             }).then(function (saved) {
-
-                localizationService.localize("speechBubbles_partialViewSavedHeader").then(function (headerValue) {
-                    localizationService.localize("speechBubbles_partialViewSavedText").then(function(msgValue) {
-                        notificationsService.success(headerValue, msgValue);
+                // create macro if needed
+                if($routeParams.create && $routeParams.nomacro !== "true") {
+                    macroResource.createPartialViewMacroWithFile(saved.virtualPath, saved.name).then(function(created) {
+                        completeSave(saved);
+                    }, function(err) {
+                        //show any notifications
+                        if (angular.isArray(err.data.notifications)) {
+                            for (var i = 0; i < err.data.notifications.length; i++) {
+                                notificationsService.showNotification(err.data.notifications[i]);
+                            }
+                        }
                     });
-                });
-
-                //check if the name changed, if so we need to redirect
-                if (vm.partialViewMacro.id !== saved.id) {
-                    contentEditingHelper.redirectToRenamedContent(saved.id);
+                } else {
+                    completeSave(saved);
                 }
-                else {
-                    vm.page.saveButtonState = "success";
-                    vm.partialViewMacro = saved;
 
-                    //sync state
-                    editorState.set(vm.partialViewMacro);
-
-                    // normal tree sync
-                    navigationService.syncTree({ tree: "partialViewMacros", path: vm.partialViewMacro.path, forceReload: true }).then(function (syncArgs) {
-                        vm.page.menu.currentNode = syncArgs.node;
-                    });
-
-                    // clear $dirty state on form
-                    setFormState("pristine");
-                }
             }, function (err) {
 
                 vm.page.saveButtonState = "error";
@@ -81,6 +71,36 @@
 
         }
 
+        function completeSave(saved) {
+
+            localizationService.localize("speechBubbles_partialViewSavedHeader").then(function (headerValue) {
+                localizationService.localize("speechBubbles_partialViewSavedText").then(function (msgValue) {
+                    notificationsService.success(headerValue, msgValue);
+                });
+            });
+
+            //check if the name changed, if so we need to redirect
+            if (vm.partialViewMacro.id !== saved.id) {
+                contentEditingHelper.redirectToRenamedContent(saved.id);
+            }
+            else {
+                vm.page.saveButtonState = "success";
+                vm.partialViewMacro = saved;
+
+                //sync state
+                editorState.set(vm.partialViewMacro);
+
+                // normal tree sync
+                navigationService.syncTree({ tree: "partialViewMacros", path: vm.partialViewMacro.path, forceReload: true }).then(function (syncArgs) {
+                    vm.page.menu.currentNode = syncArgs.node;
+                });
+
+                // clear $dirty state on form
+                setFormState("pristine");
+            }
+
+        }
+
         function openInsertOverlay() {
 
             vm.insertOverlay = {

src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html

@@ -17,7 +17,7 @@
                            <span class="caret"></span>
                        </a>
                        <ul class="dropdown-menu">
-                           <li ng-repeat="contentType in listViewAllowedTypes">
+                           <li ng-repeat="contentType in listViewAllowedTypes | orderBy:'name':false">
                                <a href="#/{{entityType}}/{{entityType}}/edit/{{contentId}}?doctype={{contentType.alias}}&create=true">
                                    <i class="icon-{{contentType.cssClass}}"></i>
                                    {{contentType.name}}

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

@@ -348,8 +348,8 @@
       <Name>umbraco.providers</Name>
     </ProjectReference>
     <Reference Include="System.Xml.Linq" />
-    <Reference Include="Umbraco.ModelsBuilder, Version=3.0.5.96, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Umbraco.ModelsBuilder.3.0.5\lib\Umbraco.ModelsBuilder.dll</HintPath>
+    <Reference Include="Umbraco.ModelsBuilder, Version=3.0.6.97, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Umbraco.ModelsBuilder.3.0.6\lib\Umbraco.ModelsBuilder.dll</HintPath>
       <Private>True</Private>
     </Reference>
   </ItemGroup>

src/Umbraco.Web.UI/config/umbracoSettings.Release.config

@@ -58,6 +58,9 @@
 
     <!-- Enables value converters for all built in property editors so that they return strongly typed object, recommended for use with Models Builder -->
     <EnablePropertyValueConverters>true</EnablePropertyValueConverters>
+	
+    <!-- You can specify your own background image for the login screen here. The image will automatically get an overlay to match back office colors - this path is relative to the ~/umbraco path. The default location is: /umbraco/assets/img/installer.jpg -->
+    <loginBackgroundImage>assets/img/installer.jpg</loginBackgroundImage>
   </content>
 
   <security>

src/Umbraco.Web.UI/config/umbracoSettings.config

@@ -108,7 +108,11 @@
     <showDeprecatedPropertyEditors>true</showDeprecatedPropertyEditors>
     
     <!-- Enables value converters for all built in property editors so that they return strongly typed object, recommended for use with Models Builder -->
-    <EnablePropertyValueConverters>true</EnablePropertyValueConverters>
+    <EnablePropertyValueConverters>true</EnablePropertyValueConverters>	
+    
+    <!-- You can specify your own background image for the login screen here. The image will automatically get an overlay to match back office colors - this path is relative to the ~/umbraco path. The default location is: /umbraco/assets/img/installer.jpg -->
+    <loginBackgroundImage>assets/img/installer.jpg</loginBackgroundImage>
+	
   </content>
 
   <security>
@@ -119,8 +123,8 @@
     <hideDisabledUsersInBackoffice>false</hideDisabledUsersInBackoffice>
     
     <!-- set to true to enable the UI and API to allow back-office users to reset their passwords -->
-    <allowPasswordReset>true</allowPasswordReset>  
-    
+    <allowPasswordReset>true</allowPasswordReset>
+
   </security>
 
   <requestHandler>

src/Umbraco.Web.UI/packages.config

@@ -37,5 +37,5 @@
   <package id="SqlServerCE" version="4.0.0.1" targetFramework="net45" />
   <package id="System.Collections.Immutable" version="1.1.36" targetFramework="net45" />
   <package id="System.Reflection.Metadata" version="1.0.21" targetFramework="net45" />
-  <package id="Umbraco.ModelsBuilder" version="3.0.5" targetFramework="net45" />
+  <package id="Umbraco.ModelsBuilder" version="3.0.6" targetFramework="net45" />
 </packages>

src/Umbraco.Web.UI/umbraco/config/lang/en.xml

@@ -205,6 +205,7 @@
     <key alias="newPartialViewFromSnippet">New partial view from snippet</key>
     <key alias="newEmptyPartialViewMacro">New empty partial view macro</key>
     <key alias="newPartialViewMacroFromSnippet">New partial view macro from snippet</key>
+    <key alias="newPartialViewMacroNoMacro">New partial view macro (without macro)</key>
   </area>
   <area alias="dashboard">
     <key alias="browser">Browse your website</key>

src/Umbraco.Web.UI/umbraco/controls/Images/ImageViewer.ascx.cs

@@ -2,6 +2,7 @@
 
 namespace Umbraco.Web.UI.Umbraco.Controls.Images
 {
+    [Obsolete("This is no longer used and will be removed in future versions")]
     public partial class ImageViewer : global::umbraco.controls.Images.ImageViewer
     {
     }

src/Umbraco.Web/Editors/BackOfficeController.cs

@@ -395,6 +395,7 @@ namespace Umbraco.Web.Editors
                             {"keepUserLoggedIn", UmbracoConfig.For.UmbracoSettings().Security.KeepUserLoggedIn},
                             {"cssPath", IOHelper.ResolveUrl(SystemDirectories.Css).TrimEnd('/')},
                             {"allowPasswordReset", UmbracoConfig.For.UmbracoSettings().Security.AllowPasswordReset},
+                            {"loginBackgroundImage",  UmbracoConfig.For.UmbracoSettings().Content.LoginBackgroundImage},
                         }
                     },
                     {
@@ -441,7 +442,7 @@ namespace Umbraco.Web.Editors
 
             return JavaScript(result);
         }
-        
+
         [HttpPost]
         public ActionResult ExternalLogin(string provider, string redirectUrl = null)
         {
@@ -474,7 +475,7 @@ namespace Umbraco.Web.Editors
                 if (result)
                 {
                     //Add a flag and redirect for it to be displayed
-                    TempData[TokenPasswordResetCode] = new ValidatePasswordResetCodeModel {UserId = userId, ResetCode = resetCode};
+                    TempData[TokenPasswordResetCode] = new ValidatePasswordResetCodeModel { UserId = userId, ResetCode = resetCode };
                     return RedirectToLocal(Url.Action("Default", "BackOffice"));
                 }
             }
@@ -515,7 +516,7 @@ namespace Umbraco.Web.Editors
         /// </summary>
         /// <returns></returns>       
         private async Task<ActionResult> RenderDefaultOrProcessExternalLoginAsync(
-            Func<ActionResult> defaultResponse, 
+            Func<ActionResult> defaultResponse,
             Func<ActionResult> externalSignInResponse)
         {
             if (defaultResponse == null) throw new ArgumentNullException("defaultResponse");
@@ -525,7 +526,7 @@ namespace Umbraco.Web.Editors
 
             //check if there is the TempData with the any token name specified, if so, assign to view bag and render the view
             foreach (var tempDataTokenName in TempDataTokenNames)
-            {                
+            {
                 if (TempData[tempDataTokenName] != null)
                 {
                     ViewData[tempDataTokenName] = TempData[tempDataTokenName];
@@ -708,7 +709,7 @@ namespace Umbraco.Web.Editors
 
             return app;
         }
-        
+
 
         private IEnumerable<Dictionary<string, string>> GetTreePluginsMetaData()
         {

src/Umbraco.Web/Editors/IEditorValidator.cs

@@ -1,10 +1,11 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
+using umbraco.interfaces;
 
 namespace Umbraco.Web.Editors
 {
-    internal interface IEditorValidator
+    internal interface IEditorValidator : IDiscoverable
     {
         Type ModelType { get; }
         IEnumerable<ValidationResult> Validate(object model);

src/Umbraco.Web/Editors/MacroController.cs

@@ -1,3 +1,4 @@
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Net;
@@ -134,12 +135,17 @@ namespace Umbraco.Web.Editors
         [HttpPost]
         public HttpResponseMessage CreatePartialViewMacroWithFile(CreatePartialViewMacroWithFileModel model)
         {
+            if (model == null) throw new ArgumentNullException("model");
+            if (string.IsNullOrWhiteSpace(model.Filename)) throw new ArgumentException("Filename cannot be null or whitespace", "model.Filename");
+            if (string.IsNullOrWhiteSpace(model.VirtualPath)) throw new ArgumentException("VirtualPath cannot be null or whitespace", "model.VirtualPath");
+
+            var macroName = model.Filename.TrimEnd(".cshtml");
+
             var macro = new Macro
             {
-
-                Alias = model.Filename,
-                Name = model.Filename, // will be "aliased"
-                ScriptPath = "~/Views/MacroPartials/" + model.Parent + "/" + model.Filename + ".cshtml"
+                Alias = macroName.ToSafeAlias(),
+                Name = macroName,
+                ScriptPath = model.VirtualPath.EnsureStartsWith("~")
             };
 
             Services.MacroService.Save(macro); // may throw
@@ -148,8 +154,8 @@ namespace Umbraco.Web.Editors
 
         public class CreatePartialViewMacroWithFileModel
         {
-            public string Parent { get; set; }
             public string Filename { get; set; }
+            public string VirtualPath { get; set; }
         }
     }
 }

src/Umbraco.Web/HealthCheck/HealthCheck.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Runtime.Serialization;
+using umbraco.interfaces;
 using Umbraco.Core;
 
 namespace Umbraco.Web.HealthCheck
@@ -9,7 +10,7 @@ namespace Umbraco.Web.HealthCheck
     /// The abstract health check class
     /// </summary>
     [DataContract(Name = "healtCheck", Namespace = "")]
-    public abstract class HealthCheck
+    public abstract class HealthCheck : IDiscoverable
     {
         protected HealthCheck(HealthCheckContext healthCheckContext)
         {

src/Umbraco.Web/HtmlHelperBackOfficeExtensions.cs

@@ -47,7 +47,8 @@ namespace Umbraco.Web
                         ""externalLoginsUrl"": """ + externalLoginsUrl + @"""
                     },
                     ""umbracoSettings"": {
-                        ""allowPasswordReset"": " + (UmbracoConfig.For.UmbracoSettings().Security.AllowPasswordReset ? "true" : "false") + @"
+                        ""allowPasswordReset"": " + (UmbracoConfig.For.UmbracoSettings().Security.AllowPasswordReset ? "true" : "false") + @",
+                        ""loginBackgroundImage"": """ + UmbracoConfig.For.UmbracoSettings().Content.LoginBackgroundImage + @"""
                     },
                     ""application"": {
                         ""applicationPath"": """ + html.ViewContext.HttpContext.Request.ApplicationPath + @""",

src/Umbraco.Web/Media/ImageUrl.cs

@@ -11,6 +11,7 @@ using umbraco;
 
 namespace Umbraco.Web.Media
 {
+    [Obsolete("This is no longer used and will be removed in future versions")]
     public class ImageUrl
     {
         [Obsolete("Use TryGetImageUrl() instead")]

src/Umbraco.Web/Media/ImageUrlProviderResolver.cs

@@ -8,9 +8,10 @@ using Umbraco.Web.Media.ImageUrlProviders;
 
 namespace Umbraco.Web.Media
 {
-    internal sealed class ImageUrlProviderResolver : ManyObjectsResolverBase<ImageUrlProviderResolver, IImageUrlProvider>
+    [Obsolete("IImageUrlProvider is no longer used and will be removed in future versions")]
+    internal sealed class ImageUrlProviderResolver : LazyManyObjectsResolverBase<ImageUrlProviderResolver, IImageUrlProvider>
     {
-        internal ImageUrlProviderResolver(IServiceProvider serviceProvider, ILogger logger, IEnumerable<Type> value)
+        internal ImageUrlProviderResolver(IServiceProvider serviceProvider, ILogger logger, Func<IEnumerable<Type>> value)
             : base(serviceProvider, logger, value)
         {
         }

src/Umbraco.Web/Media/ImageUrlProviders/ImageUrlProvider.cs

@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.Xml.XPath;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.Media;
@@ -7,6 +8,7 @@ using Umbraco.Core;
 
 namespace Umbraco.Web.Media.ImageUrlProviders
 {
+    [Obsolete("IImageUrlProvider is no longer used and will be removed in future versions")]
     public class ImageUrlProvider : IImageUrlProvider
     {
         public const string DefaultName = "umbracoUpload";

src/Umbraco.Web/Media/ThumbnailProviders/ThumbnailProvidersResolver.cs

@@ -12,7 +12,8 @@ using umbraco.BusinessLogic.Utils;
 
 namespace Umbraco.Web.Media.ThumbnailProviders
 {
-    public sealed class ThumbnailProvidersResolver : ManyObjectsResolverBase<ThumbnailProvidersResolver, IThumbnailProvider>
+    [Obsolete("Thumbnails are generated by ImageProcessor, use that instead")]
+    public sealed class ThumbnailProvidersResolver : LazyManyObjectsResolverBase<ThumbnailProvidersResolver, IThumbnailProvider>
     {
 	    /// <summary>
 	    /// Constructor
@@ -20,7 +21,7 @@ namespace Umbraco.Web.Media.ThumbnailProviders
 	    /// <param name="serviceProvider"></param>
 	    /// <param name="logger"></param>
 	    /// <param name="providers"></param>		
-	    internal ThumbnailProvidersResolver(IServiceProvider serviceProvider, ILogger logger, IEnumerable<Type> providers)
+	    internal ThumbnailProvidersResolver(IServiceProvider serviceProvider, ILogger logger, Func<IEnumerable<Type>> providers)
             : base(serviceProvider, logger, providers)
 		{
 

src/Umbraco.Web/Mvc/PluginController.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Concurrent;
 using System.Web.Mvc;
+using umbraco.interfaces;
 using Umbraco.Core;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Services;
@@ -12,7 +13,7 @@ namespace Umbraco.Web.Mvc
     /// <summary>
     /// A base class for all plugin controllers to inherit from
     /// </summary>
-    public abstract class PluginController : Controller
+    public abstract class PluginController : Controller, IDiscoverable
     {
         /// <summary>
         /// stores the metadata about plugin controllers

src/Umbraco.Web/PropertyEditors/FileUploadPropertyEditor.cs

@@ -30,16 +30,7 @@ namespace Umbraco.Web.PropertyEditors
             baseEditor.Validators.Add(new UploadFileTypeValidator());
             return new FileUploadPropertyValueEditor(baseEditor, MediaFileSystem);
         }
-
-        /// <summary>
-        /// Creates the corresponding preValue editor.
-        /// </summary>
-        /// <returns>The corresponding preValue editor.</returns>
-        protected override PreValueEditor CreatePreValueEditor()
-        {
-            return new FileUploadPreValueEditor();
-        }
-
+        
         /// <summary>
         /// Gets a value indicating whether a property is an upload field.
         /// </summary>
@@ -143,100 +134,7 @@ namespace Umbraco.Web.PropertyEditors
                 else
                     MediaFileSystem.UploadAutoFillProperties.Populate(content, autoFillConfig, MediaFileSystem.GetRelativePath(svalue));
             }
-        }
-
-        /// <summary>
-        /// A custom pre-val editor to ensure that the data is stored how the legacy data was stored in
-        /// </summary>
-        internal class FileUploadPreValueEditor : ValueListPreValueEditor
-        {
-            public FileUploadPreValueEditor()
-            {
-                var field = Fields.First();
-                field.Description = "Enter a max width/height for each thumbnail";
-                field.Name = "Add thumbnail size";
-                //need to have some custom validation happening here
-                field.Validators.Add(new ThumbnailListValidator());
-            }
-
-            /// <summary>
-            /// Format the persisted value to work with our multi-val editor.
-            /// </summary>
-            /// <param name="defaultPreVals"></param>
-            /// <param name="persistedPreVals"></param>
-            /// <returns></returns>
-            public override IDictionary<string, object> ConvertDbToEditor(IDictionary<string, object> defaultPreVals, PreValueCollection persistedPreVals)
-            {
-                var result = new List<PreValue>();
-
-                //the pre-values just take up one field with a semi-colon delimiter so we'll just parse
-                var dictionary = persistedPreVals.FormatAsDictionary();
-                if (dictionary.Any())
-                {
-                    //there should only be one val
-                    var delimited = dictionary.First().Value.Value.Split(new[] { ';' }, StringSplitOptions.RemoveEmptyEntries);
-                    var i = 0;
-                    result.AddRange(delimited.Select(x => new PreValue(i++, x)));
-                }
-
-                //the items list will be a dictionary of it's id -> value we need to use the id for persistence for backwards compatibility
-                return new Dictionary<string, object> { { "items", result.ToDictionary(x => x.Id, PreValueAsDictionary) } };
-            }
-
-            private IDictionary<string, object> PreValueAsDictionary(PreValue preValue)
-            {
-                return new Dictionary<string, object> { { "value", preValue.Value }, { "sortOrder", preValue.SortOrder } };
-            }
-            /// <summary>
-            /// Take the posted values and convert them to a semi-colon separated list so that its backwards compatible
-            /// </summary>
-            /// <param name="editorValue"></param>
-            /// <param name="currentValue"></param>
-            /// <returns></returns>
-            public override IDictionary<string, PreValue> ConvertEditorToDb(IDictionary<string, object> editorValue, PreValueCollection currentValue)
-            {
-                var result = base.ConvertEditorToDb(editorValue, currentValue);
-
-                //this should just be a dictionary of values, we want to re-format this so that it is just one value in the dictionary that is
-                // semi-colon delimited
-                var values = result.Select(item => item.Value.Value).ToList();
-
-                result.Clear();
-                result.Add("thumbs", new PreValue(string.Join(";", values)));
-                return result;
-            }
-
-            internal class ThumbnailListValidator : IPropertyValidator
-            {
-                public IEnumerable<ValidationResult> Validate(object value, PreValueCollection preValues, PropertyEditor editor)
-                {
-                    var json = value as JArray;
-                    if (json == null) yield break;
-
-                    //validate each item which is a json object
-                    for (var index = 0; index < json.Count; index++)
-                    {
-                        var i = json[index];
-                        var jItem = i as JObject;
-                        if (jItem == null || jItem["value"] == null) continue;
-
-                        //NOTE: we will be removing empty values when persisting so no need to validate
-                        var asString = jItem["value"].ToString();
-                        if (asString.IsNullOrWhiteSpace()) continue;
-
-                        int parsed;
-                        if (int.TryParse(asString, out parsed) == false)
-                        {
-                            yield return new ValidationResult("The value " + asString + " is not a valid number", new[]
-                            {
-                                //we'll make the server field the index number of the value so it can be wired up to the view
-                                "item_" + index.ToInvariantString()
-                            });
-                        }
-                    }
-                }
-            }
-        }
+        }        
 
         #region Application event handler, used to bind to events on startup
 

src/Umbraco.Web/Search/ExamineIndexerModel.cs

@@ -8,6 +8,7 @@ namespace Umbraco.Web.Search
     [DataContract(Name = "indexer", Namespace = "")]
     public class ExamineIndexerModel : ExamineSearcherModel
     {
+        
         [DataMember(Name = "indexCriteria")]
         public IIndexCriteria IndexCriteria { get; set; }
         

src/Umbraco.Web/Search/ExamineSearcherModel.cs

@@ -14,6 +14,18 @@ namespace Umbraco.Web.Search
             ProviderProperties = new Dictionary<string, string>();
         }
 
+        /// <summary>
+        /// If the index is not healthy this represents the index error state
+        /// </summary>
+        [DataMember(Name = "error")]
+        public string Error { get; set; }
+
+        /// <summary>
+        /// If the index can be open/read
+        /// </summary>
+        [DataMember(Name = "isHealthy")]
+        public bool IsHealthy { get; set; }
+
         [DataMember(Name = "name")]
         public string Name { get; set; }
 

src/Umbraco.Web/Search/LuceneIndexerExtensions.cs

@@ -15,6 +15,28 @@ namespace Umbraco.Web.Search
     /// </summary>
     internal static class ExamineExtensions
     {
+        /// <summary>
+        /// Checks if the index can be read/opened
+        /// </summary>
+        /// <param name="indexer"></param>
+        /// <param name="ex">The exception returned if there was an error</param>
+        /// <returns></returns>
+        public static bool IsHealthy(this LuceneIndexer indexer, out Exception ex)
+        {
+            try
+            {
+                using (indexer.GetIndexWriter().GetReader())
+                {
+                    ex = null;
+                    return true;
+                }
+            }
+            catch (Exception e)
+            {
+                ex = e;
+                return false;
+            }
+        }
 
         /// <summary>
         /// Return the number of indexed documents in Lucene

src/Umbraco.Web/WebApi/UmbracoApiController.cs

@@ -2,6 +2,7 @@
 using System.Linq;
 using System.Web.Http;
 using System.Web.Http.ModelBinding;
+using umbraco.interfaces;
 using Umbraco.Core.Models;
 using Umbraco.Core.Models.Validation;
 using Umbraco.Web.Models.ContentEditing;
@@ -11,7 +12,7 @@ namespace Umbraco.Web.WebApi
     /// <summary>
     /// The base class for auto-routed API controllers for Umbraco
     /// </summary>
-    public abstract class UmbracoApiController : UmbracoApiControllerBase
+    public abstract class UmbracoApiController : UmbracoApiControllerBase, IDiscoverable
     {        
         protected UmbracoApiController()
         {

src/Umbraco.Web/WebBootManager.cs

@@ -533,11 +533,11 @@ namespace Umbraco.Web
 
             ThumbnailProvidersResolver.Current = new ThumbnailProvidersResolver(
                 ServiceProvider, LoggerResolver.Current.Logger,
-                PluginManager.ResolveThumbnailProviders());
+                () => PluginManager.ResolveThumbnailProviders());
 
             ImageUrlProviderResolver.Current = new ImageUrlProviderResolver(
                 ServiceProvider, LoggerResolver.Current.Logger,
-                PluginManager.ResolveImageUrlProviders());
+                () => PluginManager.ResolveImageUrlProviders());
 
             CultureDictionaryFactoryResolver.Current = new CultureDictionaryFactoryResolver(
                 new DefaultCultureDictionaryFactory());

src/Umbraco.Web/WebServices/ExamineManagementApiController.cs

@@ -86,7 +86,7 @@ namespace Umbraco.Web.WebServices
             var model = new List<ExamineSearcherModel>(
                 ExamineManager.Instance.SearchProviderCollection.Cast<BaseSearchProvider>().Select(searcher =>
                 {
-                    var indexerModel = new ExamineIndexerModel()
+                    var indexerModel = new ExamineSearcherModel()
                     {
                         Name = searcher.Name
                     };
@@ -260,6 +260,7 @@ namespace Umbraco.Web.WebServices
                 IndexCriteria = indexer.IndexerData,
                 Name = indexer.Name
             };
+            
             var props = TypeHelper.CachedDiscoverableProperties(indexer.GetType(), mustWrite: false)
                 //ignore these properties
                                   .Where(x => new[] {"IndexerData", "Description", "WorkingFolder"}.InvariantContains(x.Name) == false)
@@ -281,11 +282,21 @@ namespace Umbraco.Web.WebServices
 
             var luceneIndexer = indexer as LuceneIndexer;
             if (luceneIndexer != null)
-            {                
+            {
                 indexerModel.IsLuceneIndex = true;
 
                 if (luceneIndexer.IndexExists())
                 {
+                    Exception indexError;
+                    indexerModel.IsHealthy = luceneIndexer.IsHealthy(out indexError);
+
+                    if (indexerModel.IsHealthy == false)
+                    {
+                        //we cannot continue at this point
+                        indexerModel.Error = indexError.ToString();
+                        return indexerModel;
+                    }
+
                     indexerModel.DocumentCount = luceneIndexer.GetIndexDocumentCount();
                     indexerModel.FieldCount = luceneIndexer.GetIndexFieldCount();
                     indexerModel.IsOptimized = luceneIndexer.IsIndexOptimized();

src/Umbraco.Web/WebServices/FolderBrowserService.cs

@@ -15,7 +15,7 @@ using Tag = umbraco.cms.businesslogic.Tags.Tag;
 namespace Umbraco.Web.WebServices
 {
     //TODO: Can we convert this to MVC please instead of /base?
-
+    [Obsolete("Thumbnails are generated by ImageProcessor, use that instead")]
     [RestExtension("FolderBrowserService")]
     public class FolderBrowserService
     {

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

@@ -823,8 +823,15 @@ namespace umbraco
             catch (Exception e)
             {
                 // if something goes wrong remove the file
-                DeleteXmlFile();
-
+                try
+                {
+                    DeleteXmlFile();
+                }
+                catch
+                {
+                    // don't make it worse: could be that we failed to write because we cannot
+                    // access the file, in which case we won't be able to delete it either
+                }
                 LogHelper.Error<content>("Failed to save Xml to file.", e);
             }
         }
@@ -886,7 +893,15 @@ namespace umbraco
             catch (Exception e)
             {
                 LogHelper.Error<content>("Failed to load Xml from file.", e);
-                DeleteXmlFile();
+                try
+                {
+                    DeleteXmlFile();
+                }
+                catch
+                {
+                    // don't make it worse: could be that we failed to read because we cannot
+                    // access the file, in which case we won't be able to delete it either
+                }
                 return null;
             }
         }

src/Umbraco.Web/umbraco.presentation/umbraco/controls/Images/ImageViewer.ascx.cs

@@ -7,7 +7,8 @@ using Umbraco.Core;
 
 namespace umbraco.controls.Images
 {
-	public partial class ImageViewer : UserControl
+    [Obsolete("This is no longer used and will be removed in future versions")]
+    public partial class ImageViewer : UserControl
 	{
 
 		public ImageViewer()

src/Umbraco.Web/umbraco.presentation/umbraco/controls/Images/ImageViewerUpdater.asmx.cs

@@ -21,7 +21,8 @@ namespace umbraco.controls.Images
 	[WebServiceBinding(ConformsTo = WsiProfiles.BasicProfile1_1)]
 	[ToolboxItem(false)]
 	[ScriptService]
-	public class ImageViewerUpdater : System.Web.Services.WebService
+    [Obsolete("This is no longer used and will be removed in future versions")]
+    public class ImageViewerUpdater : System.Web.Services.WebService
 	{
 
 		/// <summary>

src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/mediaPicker.aspx.designer.cs

@@ -6,10 +6,11 @@
 //     the code is regenerated. 
 // </auto-generated>
 //------------------------------------------------------------------------------
+using System;
 
 namespace umbraco.presentation.umbraco.dialogs {
-    
-    
+
+    [Obsolete("This is no longer used and will be removed in future versions")]
     public partial class mediaPicker {
         
         /// <summary>

src/Umbraco.Web/umbraco.presentation/umbraco/templateControls/Image.cs

@@ -1,10 +1,12 @@
-using System.Web.UI;
+using System;
+using System.Web.UI;
 using System.Web.UI.HtmlControls;
 using Umbraco.Core.Media;
 using Umbraco.Web.Media;
 
 namespace umbraco.presentation.templateControls
 {
+    [Obsolete("This is no longer used and will be removed in future versions")]
     public class Image : HtmlImage
     {
         public string NodeId { get; set; }

src/Umbraco.Web/umbraco.presentation/umbraco/uQuery/MediaExtensions.cs

@@ -7,10 +7,11 @@ using Umbraco.Core;
 
 namespace umbraco
 {
-	/// <summary>
-	/// Extension methods for umbraco.cms.businesslogic.media.Media
-	/// </summary>
-	public static class MediaExtensions
+    /// <summary>
+    /// Extension methods for umbraco.cms.businesslogic.media.Media
+    /// </summary>
+    [Obsolete("Obsolete, Use Umbraco.Core.Models.Media", false)]
+    public static class MediaExtensions
 	{
 		/// <summary>
 		/// Functionally similar to the XPath axis 'ancestor'
@@ -203,12 +204,13 @@ namespace umbraco
 			return string.Empty;
 		}
 
-		/// <summary>
-		/// Gets the image thumbnail URL.
-		/// </summary>
-		/// <param name="media">an umbraco.cms.businesslogic.media.Media object</param>
-		/// <returns></returns>
-		public static string GetImageThumbnailUrl(this Media media)
+        /// <summary>
+        /// Gets the image thumbnail URL.
+        /// </summary>
+        /// <param name="media">an umbraco.cms.businesslogic.media.Media object</param>
+        /// <returns></returns>
+        [Obsolete("This should no longer be used, thumbnail generation should be done via ImageProcessor, Umbraco no longer generates '_thumb' files for media")]
+        public static string GetImageThumbnailUrl(this Media media)
 		{
 			if (media.ContentType.Alias.Equals(Constants.Conventions.MediaTypes.Image))
 			{

src/umbraco.businesslogic/PluginManagerExtensions.cs

@@ -16,9 +16,8 @@ namespace umbraco.businesslogic
 		/// <param name="resolver"></param>
 		/// <returns></returns>
 		internal static IEnumerable<Type> ResolveApplications(this PluginManager resolver)
-		{
-			//don't cache the result of this because it is only used once during app startup, caching will just add a bit more mem overhead for no reason
-			return resolver.ResolveTypesWithAttribute<IApplication, ApplicationAttribute>(cacheResult:false);
+		{			
+			return resolver.ResolveTypesWithAttribute<IApplication, ApplicationAttribute>();
 		}
 
 		/// <summary>
@@ -28,8 +27,7 @@ namespace umbraco.businesslogic
 		/// <returns></returns>
 		internal static IEnumerable<Type> ResolveAttributedTrees(this PluginManager resolver)
 		{
-			//don't cache the result of this because it is only used once during app startup, caching will just add a bit more mem overhead for no reason
-			return resolver.ResolveTypesWithAttribute<ITree, TreeAttribute>(cacheResult:false);
+			return resolver.ResolveTypesWithAttribute<ITree, TreeAttribute>();
 		}
 		
 	}

src/umbraco.cms/Actions/Action.cs

@@ -35,40 +35,10 @@ namespace umbraco.BusinessLogic.Actions
     public class Action
     {
         private static readonly Dictionary<string, string> ActionJs = new Dictionary<string, string>();
-
-        private static readonly object Lock = new object();
-
-        static Action()
-        {
-            ReRegisterActionsAndHandlers();
-        }
-
-        /// <summary>
-        /// This is used when an IAction or IActionHandler is installed into the system
-        /// and needs to be loaded into memory.
-        /// </summary>
-        /// <remarks>
-        /// TODO: this shouldn't be needed... we should restart the app pool when a package is installed!
-        /// </remarks>
+        
+        [Obsolete("This no longer performs any action there is never a reason to rescan because the app domain will be restarted if new IActions are added because they are included in assemblies")]
         public static void ReRegisterActionsAndHandlers()
-        {
-            lock (Lock)
-            {
-                // NOTE use the DirtyBackdoor to change the resolution configuration EXCLUSIVELY
-                // ie do NOT do ANYTHING else while holding the backdoor, because while it is open
-                // the whole resolution system is locked => nothing can work properly => deadlocks
-
-                var newResolver = new ActionsResolver(
-                    new ActivatorServiceProvider(), LoggerResolver.Current.Logger,
-                        () => TypeFinder.FindClassesOfType<IAction>(PluginManager.Current.AssembliesToScan));
-
-                using (Umbraco.Core.ObjectResolution.Resolution.DirtyBackdoorToConfiguration)
-                {
-                    ActionsResolver.Reset(false); // and do NOT reset the whole resolution!
-                    ActionsResolver.Current = newResolver;
-                }
-
-            }
+        {            
         }
 
         /// <summary>

src/umbraco.cms/businesslogic/Files/UmbracoFile.cs

@@ -35,35 +35,38 @@ namespace umbraco.cms.businesslogic.Files
         #endregion
 
         #region Static Methods
-
-        //MB: Do we really need all these overloads? looking through the code, only one of them is actually used
-
+        
+        [Obsolete("This is no longer used and will be removed in future versions")]
         public static UmbracoFile Save(HttpPostedFile file, string path)
         {
             return new UmbracoFile(UmbracoMediaFile.Save(file.InputStream, path));
         }
 
+        [Obsolete("This is no longer used and will be removed in future versions")]
         public static UmbracoFile Save(HttpPostedFileBase file, string path)
         {
             return new UmbracoFile(UmbracoMediaFile.Save(file.InputStream, path));
         }
 
+        [Obsolete("This is no longer used and will be removed in future versions")]
         public static UmbracoFile Save(Stream inputStream, string path)
         {
             return new UmbracoFile(UmbracoMediaFile.Save(inputStream, path));
         }
 
+        [Obsolete("This is no longer used and will be removed in future versions")]
         public static UmbracoFile Save(byte[] file, string relativePath)
         {
             return new UmbracoFile(UmbracoMediaFile.Save(new MemoryStream(file), relativePath));
         }
 
+        [Obsolete("This is no longer used and will be removed in future versions")]
         public static UmbracoFile Save(HttpPostedFile file)
         {
             return new UmbracoFile(UmbracoMediaFile.Save(file));
         }
 
-        //filebase overload...
+        [Obsolete("This is no longer used and will be removed in future versions")]
         public static UmbracoFile Save(HttpPostedFileBase file)
         {
             return new UmbracoFile(UmbracoMediaFile.Save(file));
@@ -118,11 +121,13 @@ namespace umbraco.cms.businesslogic.Files
             return new System.Tuple<int, int>(size.Width, size.Height);
         }
 
+        [Obsolete("This is no longer used and will be removed in future versions")]
         public string Resize(int width, int height)
         {
             return _mediaFile.Resize(width, height);
         }
 
+        [Obsolete("This is no longer used and will be removed in future versions")]
         public string Resize(int maxWidthHeight, string fileNameAddition)
         {
             return _mediaFile.Resize(maxWidthHeight, fileNameAddition);

src/umbraco.cms/businesslogic/macro/IMacroEngine.cs

@@ -6,7 +6,8 @@ using umbraco.interfaces;
 
 namespace umbraco.cms.businesslogic.macro
 {
-    public interface IMacroEngine {
+    public interface IMacroEngine : IDiscoverable
+    {
         string Name { get; }
         IEnumerable<string> SupportedExtensions { get; }
         IEnumerable<string> SupportedUIExtensions { get; }

src/umbraco.cms/businesslogic/media/IMediaFactory.cs

@@ -3,11 +3,12 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using umbraco.BusinessLogic;
+using umbraco.interfaces;
 
 namespace umbraco.cms.businesslogic.media
 {
     [Obsolete("This interface is no longer used and will be removed from the codebase in future versions")]
-    public interface IMediaFactory
+    public interface IMediaFactory : IDiscoverable
     {
         List<string> Extensions { get; }
         int Priority { get; }

src/umbraco.interfaces/IAction.cs

@@ -5,8 +5,8 @@ namespace umbraco.interfaces
 	/// <summary>
 	/// Summary description for ActionI.
 	/// </summary>
-	public interface IAction
-	{
+	public interface IAction : IDiscoverable
+    {
 		char Letter {get;}
 		bool ShowInNotifier {get;}
 		bool CanBePermissionAssigned {get;}

src/umbraco.interfaces/IApplication.cs

@@ -7,6 +7,6 @@ namespace umbraco.interfaces
     /// <summary>
     /// Interface for created applications in the umbraco backoffice
     /// </summary>
-    public interface IApplication 
-    {}
+    public interface IApplication : IDiscoverable
+    { }
 }

src/umbraco.interfaces/IApplicationStartupHandler.cs

@@ -14,6 +14,6 @@ namespace umbraco.interfaces
 	/// and bind to any custom events in the OnApplicationInitialized method.
 	/// </remarks>
 	[Obsolete("This interface is obsolete, use IApplicationEventHandler or ApplicationEventHandler instead")]
-	public interface IApplicationStartupHandler
+	public interface IApplicationStartupHandler : IDiscoverable
     { }
 }

src/umbraco.interfaces/ICacheRefresher.cs

@@ -7,7 +7,7 @@ namespace umbraco.interfaces
     /// The IcacheRefresher Interface is used for loadbalancing.
     /// 
     /// </summary>
-    public interface ICacheRefresher
+    public interface ICacheRefresher : IDiscoverable
     {
         Guid UniqueIdentifier { get; }
         string Name { get; }

src/umbraco.interfaces/IDataType.cs

@@ -8,8 +8,8 @@ namespace umbraco.interfaces
     /// And finally it contains IData which manages the actual data in the Data Type
 	/// </summary>
 	[Obsolete("IDataType is obsolete and is no longer used, it will be removed from the codebase in future versions")]
-	public interface IDataType 
-	{
+	public interface IDataType : IDiscoverable
+    {
         /// <summary>
         /// Gets the id.
         /// </summary>

src/umbraco.interfaces/IDiscoverable.cs

@@ -0,0 +1,8 @@
+namespace umbraco.interfaces
+{
+    /// <summary>
+    /// Marks a class or an interface as discoverable by PluginManager.
+    /// </summary>
+    public interface IDiscoverable
+    { }
+}

src/umbraco.interfaces/IMacroGuiRendering.cs

@@ -6,8 +6,8 @@ namespace umbraco.interfaces
 	/// Summary description for IMacroGuiRendering.
 	/// </summary>
 	[Obsolete("This interface is no longer used and will be removed from the codebase in future versions")]
-	public interface IMacroGuiRendering
-	{
+	public interface IMacroGuiRendering : IDiscoverable
+    {
         /// <summary>
         /// Gets or sets the value.
         /// </summary>

src/umbraco.interfaces/IPackageAction.cs

@@ -4,7 +4,8 @@ using System.Text;
 using System.Xml;
 
 namespace umbraco.interfaces {
-    public interface IPackageAction {
+    public interface IPackageAction : IDiscoverable
+    {
         bool Execute(string packageName, XmlNode xmlData);
         string Alias();
         bool Undo(string packageName, XmlNode xmlData);

src/umbraco.interfaces/ITree.cs

@@ -6,8 +6,8 @@ namespace umbraco.interfaces
 	/// <summary>
 	/// Interface for created application trees in the umbraco backoffice
 	/// </summary>
-	public interface ITree
-	{
+	public interface ITree : IDiscoverable
+    {
         /// <summary>
         /// Sets the tree id.
         /// </summary>

src/umbraco.interfaces/umbraco.interfaces.csproj

@@ -127,6 +127,7 @@
     <Compile Include="IApplication.cs" />
     <Compile Include="IApplicationStartupHandler.cs" />
     <Compile Include="IDataFieldWithButtons.cs" />
+    <Compile Include="IDiscoverable.cs" />
     <Compile Include="IProperty.cs" />
     <Compile Include="ITag.cs" />
     <Compile Include="ITaskReturnUrl.cs" />