Merge pull request #436 from kgiszewski/feature/slow-the-updates-roll

Feature/slow the updates roll

.gitignore

@@ -62,4 +62,5 @@ VersionInfo.cs
 .builds
 .svn
 .hg
-.hgignore
+.hgignore
+app/Umbraco/.vs/config/applicationhost.config

Gruntfile.js

@@ -85,6 +85,7 @@ module.exports = function(grunt) {
           'app/controllers/controller_versioned.js',
           'app/controllers/config.controller.js',
           'app/controllers/config.dialog.controller.js',
+          'app/controllers/config.global.controller.js',
           'app/directives/archetypeproperty.js',
           'app/directives/archetypesubmitwatcher.js',
           'app/directives/archetypecustomview.js',
@@ -95,7 +96,8 @@ module.exports = function(grunt) {
           'app/resources/archetypePropertyEditorResource.js',
           'app/services/archetypeService.js',
           'app/services/archetypeLabelService.js',
-          'app/services/archetypeCacheService.js'
+          'app/services/archetypeCacheService.js',
+          'app/services/archetypeGlobalConfigService.js'
         ],
         dest: '<%= basePath %>/js/archetype.js'
       }
@@ -269,7 +271,8 @@ module.exports = function(grunt) {
         'app/controllers/*.js',
         '!app/controllers/controller.js',
         '!app/controllers/config.controller.js',
-        '!app/controllers/config.dialog.controller.js'
+        '!app/controllers/config.dialog.controller.js',
+        '!app/controllers/config.global.controller.js'
       ],
       less: [
         'app/less/*.less',
@@ -319,4 +322,5 @@ module.exports = function(grunt) {
   grunt.registerTask('nuget',   ['copy:nuget', 'template:nuspec', 'template:nuspec_binaries', 'template:nuspec_courier', 'nugetpack']);
   grunt.registerTask('umbraco', ['copy:umbraco', 'umbracoPackage']);
   grunt.registerTask('package', ['clean:tmp', 'default', 'nuget', 'copy:umbraco', 'umbracoPackage', 'clean:tmp']);
+  grunt.registerTask('assets',  ['clean', 'string-replace', 'less', 'concat', 'assemblyinfo', 'copy:assets', 'copy:html', 'copy:config', 'clean:html', 'clean:js', 'clean:less']);
 };

Information Collection Disclosure.md

@@ -0,0 +1,13 @@
+# Information Collection Disclosure
+
+As of version v1.16.0, we are checking your installed version of Archetype against the current version. In this process we collect the current version of Archetype along with the current version of Umbraco that you are running. We use these values to help determine a response message to you. You may opt-out of this process by 'un-checking' the option in any of the Archetypes you have configured in the `Developer->Data Types` section of Umbraco. 
+
+![opt out](assets/optout3.png)
+
+This is a global setting that will set an `AppSetting` and update a file located at `~/config/archetype.config.js`. If you manually change the setting it will require an app reload to refresh to runtime values. If somehow this file becomes corrupt, a new file will be generated and you will again have to opt out.
+
+We identify your install only by a randomly generated GUID. We WILL NOT store your IP address or hostname during the update check. 
+
+Part of the reason we collect this information is to also ascertain how many active installs exist. If this number is sufficiently high, we can plan accordingly and attempt to keep this project going.
+
+We would ask that you reach out to the Archetype team via creating an issue on this site if you have any questions or concerns. We truly want Archetype to be a win-win for all involved. 

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2014 Imulus
+Copyright (c) 2016 Kevin Giszewski LLC
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in

README.md

@@ -1,18 +1,37 @@
 Archetype
 =========
-![alt tag](http://imulus.github.io/Archetype/images/logo.png)
+![alt tag](http://kgiszewski.github.io/Archetype/images/logo.png)
 
-![alt tag](http://imulus.github.io/Archetype/images/example1.png)
+![alt tag](http://kgiszewski.github.io/Archetype/images/example1.png)
 
 ## Installation
-Install the selected <a href='https://github.com/imulus/Archetype/releases'>release</a> through the Umbraco package installer or via <a href='http://www.nuget.org/packages/Archetype/'>NuGet</a>.
-
+Install the selected <a href='https://github.com/kgiszewski/Archetype/releases'>release</a> through the Umbraco package installer or via <a href='http://www.nuget.org/packages/Archetype/'>NuGet</a>.
 
 ## Official Docs ##
 https://github.com/kgiszewski/ArchetypeManual
 
+Get up and running in 15 minutes! https://www.youtube.com/watch?v=79LksNwGjLk
+
+## News and Updates ##
 Follow us on Twitter https://twitter.com/ArchetypeKit
 
+## Core Team ##
+* Kevin Giszewski (founder/project lead) - Tonic - https://kevin.giszewski.com/
+* Tom Fulton (founder) - Tonic - http://hellotonic.com/
+* Lee Kelleher - Umbrella - http://www.umbrellainc.co.uk/
+* Matt Brailsford - The Outfield - http://www.theoutfield.co.uk/
+* Kenn Jacobsen - Vertica - http://kennjacobsen.dk/
+
+## Sponsor us\Donate!
+[![Donate](https://img.shields.io/badge/Donate-PayPal-green.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=KBKWLURGLGU6L)
+
+This project is funded by the core team members' time only. We don't charge for Archetype but it does take quite a bit of effort to keep it up-to-date with Umbraco core changes. If you're making a few bucks off of Archetype, we wouldn't refuse a donation :)
+
+[Learn more](Sponsors.md) about sponsorship!
+
+## Information Collection Disclosure
+Please read the information disclosure [here](Information%20Collection%20Disclosure.md).
+
 ## Contribute ##
 
 Want to contribute to Archetype?  You'll want to use Grunt (our task runner) to help you integrate with a local copy of Umbraco.

Sponsors.md

@@ -0,0 +1,13 @@
+# Sponsorship
+
+Are you a company that depends on Archetype? We would love for you to sponsor us! Here's some suggested ways below!
+
+## Sponsor a Sprint
+
+We have a [backlog](https://github.com/kgiszewski/Archetype/issues), it gets worked on when either we have a personal need, we get bored or when we get a sponsorship. If you want to sponsor a sprint, we can give you thanks on social media and if you're really generous, we can put your logo and link on a well placed spot in a version release. [Contact us](https://twitter.com/ArchetypeKit) to get started.
+
+## Donations
+
+If you want to quietly support us, you can also send us a donation:
+
+[![Donate](https://img.shields.io/badge/Donate-PayPal-green.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=KBKWLURGLGU6L)

app/Umbraco/Archetype.Tests/Archetype.Tests.csproj

@@ -263,6 +263,7 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="PropertyValueConverter\PropertyValueConverterTests.cs" />
     <Compile Include="PublishedContent\ArchetypePublishedContentTests.cs" />
+    <Compile Include="PublishedContent\TypeConverterTests.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="app.config" />

app/Umbraco/Archetype.Tests/PublishedContent/TypeConverterTests.cs

@@ -0,0 +1,68 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Archetype.Models;
+using Archetype.PropertyConverters;
+using NUnit.Framework;
+using Umbraco.Core;
+using Umbraco.Core.Models;
+
+namespace Archetype.Tests.PublishedContent
+{
+    [TestFixture]
+    public class TypeConverterTests
+    {
+        private ArchetypeModel _archetype;
+
+        [TestFixtureSetUp]
+        public void Init()
+        {
+            var archetypeJson = System.IO.File.ReadAllText("..\\..\\Data\\sample-1.json");
+            var converter = new ArchetypeValueConverter();
+
+            _archetype = (ArchetypeModel)converter.ConvertDataToSource(null, archetypeJson, false);
+        }
+
+        [TestCase(typeof(ArchetypeModel), true)]
+        [TestCase(typeof(ArchetypePublishedContentSet), true)]
+        [TestCase(typeof(IEnumerable<IPublishedContent>), true)]
+        [TestCase(typeof(string), true)]
+        [TestCase(typeof(int), false)]
+        [TestCase(typeof(ArchetypeFieldsetModel), false)]
+        public void ArchetypeModel_ConvertsTo_EnumerablePublishedContent(Type destinationType, bool expected)
+        {
+            Assert.IsNotNull(_archetype);
+
+            var attempt = _archetype.TryConvertTo(destinationType);
+
+            Assert.That(attempt.Success, Is.EqualTo(expected));
+
+            if (attempt.Success)
+            {
+                Assert.IsNotNull(attempt.Result);
+                Assert.That(attempt.Result, Is.InstanceOf(destinationType));
+            }
+        }
+
+        [TestCase(typeof(ArchetypeFieldsetModel), true)]
+        [TestCase(typeof(ArchetypePublishedContent), true)]
+        [TestCase(typeof(IPublishedContent), true)]
+        [TestCase(typeof(string), true)]
+        [TestCase(typeof(int), false)]
+        [TestCase(typeof(ArchetypeModel), false)]
+        public void ArchetypeFieldsetModel_ConvertsTo_PublishedContent(Type destinationType, bool expected)
+        {
+            CollectionAssert.IsNotEmpty(_archetype.Fieldsets);
+
+            var attempt = _archetype.First().TryConvertTo(destinationType);
+
+            Assert.That(attempt.Success, Is.EqualTo(expected));
+
+            if (attempt.Success)
+            {
+                Assert.IsNotNull(attempt.Result);
+                Assert.That(attempt.Result, Is.InstanceOf(destinationType));
+            }
+        }
+    }
+}

app/Umbraco/Umbraco.Archetype/Api/ArchetypeDataTypeController.cs

@@ -1,9 +1,7 @@
 using System.Collections.Generic;
 using System;
-using System.Diagnostics;
 using System.Linq;
 using System.Net;
-using System.Reflection;
 using System.Web.Http;
 using AutoMapper;
 using Umbraco.Core.Models;
@@ -11,32 +9,57 @@ using Umbraco.Web.Models.ContentEditing;
 using Umbraco.Web.Mvc;
 using Umbraco.Web.Editors;
 using Archetype.Extensions;
+using Archetype.Models;
 
 namespace Archetype.Api
 {
     /// <summary>
     /// Controller that handles datatype related interactions.
     /// </summary>
+    /// <seealso cref="Umbraco.Web.Editors.UmbracoAuthorizedJsonController" />
     [PluginController("ArchetypeApi")]
     public class ArchetypeDataTypeController : UmbracoAuthorizedJsonController
     {
+        private static DateTime _lastVersionCheck;
+        private const int IntervalInDaysBetweenVersionChecks = 7;
+
         public IEnumerable<object> GetAllPropertyEditors()
         {
             return
                 global::Umbraco.Core.PropertyEditors.PropertyEditorResolver.Current.PropertyEditors
-                    .Select(x => new {defaultPreValues = x.DefaultPreValuesForArchetype(), alias = x.Alias, view = x.ValueEditor.View});
+                    .Select(x => new { defaultPreValues = x.DefaultPreValuesForArchetype(), alias = x.Alias, view = x.ValueEditor.View });
         }
 
         /// <summary>
         /// Gets all datatypes.
         /// </summary>
-        /// <returns></returns>
-        public object GetAll() 
+        /// <returns>System.Object.</returns>
+        public object GetAll()
         {
             var dataTypes = Services.DataTypeService.GetAllDataTypeDefinitions();
             return dataTypes.Select(t => new { guid = t.Key, name = t.Name });
         }
 
+        /// <summary>
+        /// Gets all details.
+        /// </summary>
+        /// <returns>System.Object.</returns>
+        public object GetAllDetails()
+        {
+            var dataTypes = Services.DataTypeService.GetAllDataTypeDefinitions();
+
+            var list = new List<object>();
+
+            foreach (var dataType in dataTypes)
+            {
+                var dataTypeDisplay = Mapper.Map<IDataTypeDefinition, DataTypeDisplay>(dataType);
+
+                list.Add(new { selectedEditor = dataTypeDisplay.SelectedEditor, preValues = dataTypeDisplay.PreValues, dataTypeGuid = dataType.Key });
+            }
+
+            return list;
+        }
+
         /// <summary>
         /// Gets the datatype by GUID.
         /// </summary>
@@ -68,11 +91,14 @@ namespace Archetype.Api
         public object GetByGuid(Guid guid, string contentTypeAlias, string propertyTypeAlias, string archetypeAlias, int nodeId)
         {
             var dataType = Services.DataTypeService.GetDataTypeDefinitionById(guid);
+
             if (dataType == null)
             {
                 throw new HttpResponseException(HttpStatusCode.NotFound);
             }
+
             var dataTypeDisplay = Mapper.Map<IDataTypeDefinition, DataTypeDisplay>(dataType);
+
             return new { selectedEditor = dataTypeDisplay.SelectedEditor, preValues = dataTypeDisplay.PreValues, contentTypeAlias = contentTypeAlias, propertyTypeAlias = propertyTypeAlias, archetypeAlias = archetypeAlias, nodeId = nodeId };
         }
 
@@ -82,19 +108,64 @@ namespace Archetype.Api
         /// <returns></returns>
         public object GetDllVersion()
         {
-            return new {dllVersion = _version()};
+            return new { dllVersion = ArchetypeHelper.Instance.DllVersion() };
         }
 
         /// <summary>
-        /// Gets the DLL version from the file.
+        /// Globals the settings.
         /// </summary>
-        /// <returns></returns>
-        private string _version()
+        /// <returns>System.Object.</returns>
+        [HttpGet]
+        public object GlobalSettings()
         {
-            var asm = Assembly.GetExecutingAssembly();
-            var fvi = FileVersionInfo.GetVersionInfo(asm.Location);
+            return new
+            {
+                isCheckingForUpdates = ArchetypeGlobalSettings.Instance.CheckForUpdates
+            };
+        }
 
-            return fvi.FileVersion;
+        /// <summary>
+        /// Sets the check for updates.
+        /// </summary>
+        /// <param name="isChecking">if set to <c>true</c> [is checking].</param>
+        [HttpPost]
+        public void SetCheckForUpdates([FromBody] bool isChecking)
+        {
+            ArchetypeGlobalSettings.Instance.CheckForUpdates = isChecking;
+            ArchetypeGlobalSettings.Instance.Save();
+        }
+
+        /// <summary>
+        /// Checks for updates.
+        /// </summary>
+        /// <returns>System.Object.</returns>
+        [HttpPost]
+        public object CheckForUpdates()
+        {
+            if (!ArchetypeGlobalSettings.Instance.CheckForUpdates || !IsItTimeToCheck())
+            {
+                return new
+                {
+                    isUpdateAvailable = false
+                };
+            }
+
+            var updateNotificationModel = ArchetypeHelper.Instance.CheckForUpdates();
+            _lastVersionCheck = DateTime.UtcNow;
+
+            return new
+            {
+                isUpdateAvailable = updateNotificationModel.IsUpdateAvailable,
+                headline = updateNotificationModel.Headline,
+                type = updateNotificationModel.Type,
+                message = updateNotificationModel.Message,
+                url = updateNotificationModel.Url
+            };
+        }
+
+        internal bool IsItTimeToCheck()
+        {
+            return _lastVersionCheck.AddDays(IntervalInDaysBetweenVersionChecks) < DateTime.UtcNow;
         }
     }
 }

app/Umbraco/Umbraco.Archetype/Archetype.Umbraco.csproj

@@ -129,6 +129,7 @@
       <Private>False</Private>
     </Reference>
     <Reference Include="System" />
+    <Reference Include="System.Configuration" />
     <Reference Include="System.Core" />
     <Reference Include="System.Data.SqlServerCe, Version=4.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
       <Private>False</Private>
@@ -238,6 +239,8 @@
     <Compile Include="Extensions\ArchetypePropertyModelExtensions.cs" />
     <Compile Include="Extensions\PropertyEditorExtensions.cs" />
     <Compile Include="Extensions\StringExtensions.cs" />
+    <Compile Include="Models\ArchetypeConfigFileModel.cs" />
+    <Compile Include="Models\ArchetypeGlobalSettings.cs" />
     <Compile Include="Models\ArchetypeModel.cs" />
     <Compile Include="Models\ArchetypePreValue.cs" />
     <Compile Include="Models\ArchetypePreValueFieldset.cs" />
@@ -248,10 +251,13 @@
     <Compile Include="Models\ArchetypePublishedContent.cs" />
     <Compile Include="Models\ArchetypePublishedContentSet.cs" />
     <Compile Include="Models\ArchetypePublishedProperty.cs" />
+    <Compile Include="Models\ArchetypeUpdateNotification.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Properties\VersionInfo.cs" />
     <Compile Include="PropertyConverters\ArchetypeValueConverter.cs" />
     <Compile Include="PropertyEditors\ArchetypePropertyEditor.cs" />
+    <Compile Include="TypeConverters\ArchetypeFieldsetModelConverter.cs" />
+    <Compile Include="TypeConverters\ArchetypeModelConverter.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="app.config" />

app/Umbraco/Umbraco.Archetype/Constants.cs

@@ -12,5 +12,8 @@
         public const string CacheKey_DataTypeByGuid = "";
 
         public const string CacheKey_PreValueFromDataTypeId = "Archetype_GetArchetypePreValueFromDataTypeId_";
+
+        public const string UmbracoVersionAlias = "umbracoConfigurationStatus";
+        public const string NotificationUrl = "https://api.gizmo42.com/v1/archetype/check-for-updates";
     }
 }

app/Umbraco/Umbraco.Archetype/Extensions/ArchetypeHelper.cs

@@ -1,12 +1,21 @@
 using System;
+using System.Configuration;
 using System.Linq;
+using System.Net.Http;
+using System.Text;
 using Archetype.Models;
 using Newtonsoft.Json;
 using Umbraco.Core;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
 using Umbraco.Core.Models.PublishedContent;
+using System.Reflection;
+using System.Diagnostics;
+using System.Net;
 
+/// <summary>
+/// The Extensions namespace.
+/// </summary>
 namespace Archetype.Extensions
 {
     /// <summary>
@@ -14,20 +23,52 @@ namespace Archetype.Extensions
     /// </summary>
     public class ArchetypeHelper
     {
+        /// <summary>
+        /// The json settings
+        /// </summary>
         protected JsonSerializerSettings _jsonSettings;
+        /// <summary>
+        /// The application
+        /// </summary>
         protected ApplicationContext _app;
-
-        private static readonly ArchetypeHelper _instance = new ArchetypeHelper();
-
-        internal static ArchetypeHelper Instance { get { return _instance; } }
+        /// <summary>
+        /// The pad lock
+        /// </summary>
+        private static readonly object _padLock = new object();
+        /// <summary>
+        /// The instance
+        /// </summary>
+        private static ArchetypeHelper _instance = new ArchetypeHelper();
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="ArchetypeHelper"/> class.
+        /// Gets the instance.
         /// </summary>
-        internal ArchetypeHelper()
+        /// <value>The instance.</value>
+        internal static ArchetypeHelper Instance {
+            get
+            {
+                if (_instance == null)
+                {
+                    lock (_padLock)
+                    {
+                        if (_instance == null)
+                        {
+                            _instance = new ArchetypeHelper();
+                        }
+                    }
+                }
+
+                return _instance;
+            }
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ArchetypeHelper" /> class.
+        /// </summary>
+        private ArchetypeHelper()
         {
             var dcr = new Newtonsoft.Json.Serialization.DefaultContractResolver();
-            dcr.DefaultMembersSearchFlags |= System.Reflection.BindingFlags.NonPublic;
+            dcr.DefaultMembersSearchFlags |= BindingFlags.NonPublic;
 
             _jsonSettings = new JsonSerializerSettings { ContractResolver = dcr };
             _app = ApplicationContext.Current;
@@ -36,9 +77,7 @@ namespace Archetype.Extensions
         /// <summary>
         /// Gets the json serializer settings.
         /// </summary>
-        /// <value>
-        /// The json serializer settings.
-        /// </value>
+        /// <value>The json serializer settings.</value>
         internal JsonSerializerSettings JsonSerializerSettings { get { return _jsonSettings; } }
 
         /// <summary>
@@ -46,7 +85,7 @@ namespace Archetype.Extensions
         /// </summary>
         /// <param name="sourceJson">The source JSON.</param>
         /// <param name="dataTypePreValues">The data type pre values.</param>
-        /// <returns></returns>
+        /// <returns>ArchetypeModel.</returns>
         internal ArchetypeModel DeserializeJsonToArchetype(string sourceJson, PreValueCollection dataTypePreValues)
         {
             try
@@ -78,7 +117,7 @@ namespace Archetype.Extensions
         /// <param name="sourceJson">The source JSON.</param>
         /// <param name="dataTypeId">The data type identifier.</param>
         /// <param name="hostContentType">Type of the host content.</param>
-        /// <returns></returns>
+        /// <returns>ArchetypeModel.</returns>
         internal ArchetypeModel DeserializeJsonToArchetype(string sourceJson, int dataTypeId, PublishedContentType hostContentType = null)
         {
             try
@@ -98,7 +137,7 @@ namespace Archetype.Extensions
 
                 return archetype;
             }
-            catch
+            catch (Exception ex)
             {
                 return new ArchetypeModel();
             }
@@ -108,21 +147,66 @@ namespace Archetype.Extensions
         /// Determines whether datatypeId has had it's PVC overridden.
         /// </summary>
         /// <param name="dataTypeId">The data type identifier.</param>
-        /// <returns></returns>
+        /// <returns><c>true</c> if [is property value converter overridden] [the specified data type identifier]; otherwise, <c>false</c>.</returns>
         internal bool IsPropertyValueConverterOverridden(int dataTypeId)
         {
             var prevalues = GetArchetypePreValueFromDataTypeId(dataTypeId);
+
             if (prevalues == null)
                 return false;
 
             return prevalues.OverrideDefaultPropertyValueConverter;
         }
 
+        /// <summary>
+        /// Checks for updates.
+        /// </summary>
+        /// <returns>ArchetypeUpdateNotification.</returns>
+        internal ArchetypeUpdateNotification CheckForUpdates()
+        {
+            try
+            {
+                using (var client = new HttpClient())
+                {
+                    var content = new StringContent(JsonConvert.SerializeObject(new
+                    {
+                        umbracoVersion = ConfigurationManager.AppSettings[Constants.UmbracoVersionAlias],
+                        archetypeVersion = DllVersion(),
+                        id = ArchetypeGlobalSettings.Instance.Id
+                    }), Encoding.UTF8, "application/json");
+
+                    client.DefaultRequestHeaders.Add("x-api-key-id", ArchetypeGlobalSettings.Instance.ApiKey.ToString());
+
+                    var response = client.PostAsync(new Uri(Constants.NotificationUrl), content).Result;
+
+                    if (response.StatusCode == HttpStatusCode.OK)
+                    {
+                        var responseString = response.Content.ReadAsStringAsync().Result;
+
+                        return JsonConvert.DeserializeObject<ArchetypeUpdateNotification>(responseString);
+                    }
+
+                    return new ArchetypeUpdateNotification
+                    {
+                        IsUpdateAvailable = false
+                    };
+                }
+            }
+            catch (Exception ex)
+            {
+                //if anything goes wrong let's make sure we don't break their site
+                return new ArchetypeUpdateNotification
+                {
+                    IsUpdateAvailable = false
+                };
+            }
+        }
+
         /// <summary>
         /// Gets the archetype pre value from data type identifier.
         /// </summary>
         /// <param name="dataTypeId">The data type identifier.</param>
-        /// <returns></returns>
+        /// <returns>ArchetypePreValue.</returns>
         private ArchetypePreValue GetArchetypePreValueFromDataTypeId(int dataTypeId)
         {
             return _app.ApplicationCache.RuntimeCache.GetCacheItem(
@@ -147,7 +231,7 @@ namespace Archetype.Extensions
         /// Gets the archetype pre value from pre values collection.
         /// </summary>
         /// <param name="dataTypePreValues">The data type pre values.</param>
-        /// <returns></returns>
+        /// <returns>ArchetypePreValue.</returns>
         private ArchetypePreValue GetArchetypePreValueFromPreValuesCollection(PreValueCollection dataTypePreValues)
         {
             var preValueAsString = dataTypePreValues.PreValuesAsDictionary.First().Value.Value;
@@ -159,7 +243,7 @@ namespace Archetype.Extensions
         /// Gets the data type by unique identifier.
         /// </summary>
         /// <param name="guid">The unique identifier.</param>
-        /// <returns></returns>
+        /// <returns>IDataTypeDefinition.</returns>
         internal IDataTypeDefinition GetDataTypeByGuid(Guid guid)
         {
             return (IDataTypeDefinition)ApplicationContext.Current.ApplicationCache.RuntimeCache.GetCacheItem(
@@ -172,6 +256,7 @@ namespace Archetype.Extensions
         /// </summary>
         /// <param name="archetype">The Archetype to add the additional metadata to</param>
         /// <param name="preValue">The configuration of the Archetype</param>
+        /// <param name="hostContentType">Type of the host content.</param>
         private void RetrieveAdditionalProperties(ref ArchetypeModel archetype, ArchetypePreValue preValue, PublishedContentType hostContentType = null)
         {
             foreach (var fieldset in preValue.Fieldsets)
@@ -197,7 +282,6 @@ namespace Archetype.Extensions
         /// <summary>
         /// Retrieves additional metadata that isn't available on the stored model of an ArchetypePreValue
         /// </summary>
-        /// <param name="archetype">The Archetype to add the additional metadata to</param>
         /// <param name="preValue">The configuration of the Archetype</param>
         private void RetrieveAdditionalProperties(ref ArchetypePreValue preValue)
         {
@@ -209,5 +293,18 @@ namespace Archetype.Extensions
                 }
             }
         }
+
+
+        /// <summary>
+        /// Gets the DLL version from the file.
+        /// </summary>
+        /// <returns>System.String.</returns>
+        internal string DllVersion()
+        {
+            var asm = Assembly.GetExecutingAssembly();
+            var fvi = FileVersionInfo.GetVersionInfo(asm.Location);
+
+            return fvi.FileVersion;
+        }
     }
 }

app/Umbraco/Umbraco.Archetype/Models/ArchetypeConfigFileModel.cs

@@ -0,0 +1,10 @@
+using System;
+
+namespace Archetype.Models
+{
+    public class ArchetypeConfigFileModel
+    {
+        public Guid Id { get; set; }
+        public bool CheckForUpdates { get; set; }
+    }
+}

app/Umbraco/Umbraco.Archetype/Models/ArchetypeFieldsetModel.cs

@@ -1,14 +1,18 @@
+using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Linq;
+using System.Web.Security;
+using Archetype.TypeConverters;
 using Newtonsoft.Json;
 using Umbraco.Core;
-using System;
 
 namespace Archetype.Models
 {
     /// <summary>
     /// Model that represents a fieldset stored as content JSON.
     /// </summary>
+    [TypeConverter(typeof(ArchetypeFieldsetModelConverter))]
     public class ArchetypeFieldsetModel
     {
         [JsonProperty("alias")]
@@ -23,6 +27,15 @@ namespace Archetype.Models
         [JsonProperty("id")]
         public Guid Id { get; set; }
 
+        [JsonProperty("releaseDate")]
+        public DateTime? ReleaseDate { get; set; }
+
+        [JsonProperty("expireDate")]
+        public DateTime? ExpireDate { get; set; }
+
+        [JsonProperty("allowedMemberGroups")]
+        public string AllowedMemberGroups { get; set; }
+
         /// <summary>
         /// Initializes a new instance of the <see cref="ArchetypeFieldsetModel"/> class.
         /// </summary>
@@ -53,7 +66,7 @@ namespace Archetype.Models
         {
             var property = GetProperty(propertyAlias);
 
-            if (IsEmptyProperty(property)) 
+            if (IsEmptyProperty(property))
             {
                 return default(T);
             }
@@ -77,7 +90,7 @@ namespace Archetype.Models
         {
             var property = GetProperty(propertyAlias);
 
-            if (IsEmptyProperty(property)) 
+            if (IsEmptyProperty(property))
             {
                 return defaultValue;
             }
@@ -90,7 +103,7 @@ namespace Archetype.Models
         /// </summary>
         /// <param name="property">The property.</param>
         /// <returns></returns>
-        private bool IsEmptyProperty(ArchetypePropertyModel property) 
+        private bool IsEmptyProperty(ArchetypePropertyModel property)
         {
             return (property == null || property.Value == null || string.IsNullOrEmpty(property.Value.ToString()));
         }
@@ -129,6 +142,32 @@ namespace Archetype.Models
             return Properties.FirstOrDefault(p => p.Alias.InvariantEquals(propertyAlias));
         }
 
+        /// <summary>
+        /// Is this fieldset disabled, either explicitly or by other means?
+        /// </summary>
+        /// <returns>true if this fieldset is disabled, false otherwise</returns>
+        internal bool IsAvailable()
+        {
+            // explicitly disabled or implicitly disabled through publishing?
+            var disabled = Disabled
+                   || (ReleaseDate.HasValue && ReleaseDate > DateTime.UtcNow)
+                   || (ExpireDate.HasValue && DateTime.UtcNow > ExpireDate);
+            if (disabled)
+            {
+                // yes - the fieldset is not available
+                return false;
+            }
+            // limitation on member group access?
+            if (string.IsNullOrEmpty(AllowedMemberGroups))
+            {
+                // no - the fieldset is available
+                return true;
+            }
+            // maybe - the fieldset is available if the current member is a member of the configured member groups
+            var currentUserGroups = Roles.GetRolesForUser() ?? new string[0];
+            return currentUserGroups.ContainsAny(AllowedMemberGroups.Split(','));
+        }
+
         #endregion
     }
 }

app/Umbraco/Umbraco.Archetype/Models/ArchetypeGlobalSettings.cs

@@ -0,0 +1,134 @@
+using System;
+using System.IO;
+using System.Text;
+using Newtonsoft.Json;
+using Umbraco.Core.IO;
+using Umbraco.Core.Logging;
+
+namespace Archetype.Models
+{
+    public class ArchetypeGlobalSettings
+    {
+        public bool CheckForUpdates { get; set; }
+        public Guid Id { get; set; }
+
+        public Guid ApiKey = _getApiKey();
+
+        private static ArchetypeGlobalSettings _instance;
+
+        private static string _pathToConfig = @"~/Config/Archetype.config.js";
+
+        private static readonly string _mappedPathToConfig = IOHelper.MapPath(_pathToConfig);
+
+        private static object _padLock = new object();
+
+        private ArchetypeGlobalSettings()
+        {
+            
+        }
+
+        public static ArchetypeGlobalSettings Instance
+        {
+            get
+            {
+                if (_instance == null)
+                {
+                    lock (_padLock)
+                    {
+                        if (_instance == null)
+                        {
+                            _instance = new ArchetypeGlobalSettings();
+
+                            _loadSettingsFromConfigFile();
+                        }
+                    }
+                }
+
+                return _instance;
+            }
+        }
+
+        public void Save()
+        {
+            lock (_padLock)
+            {
+                //write to JSON
+                var configFileModel = new ArchetypeConfigFileModel
+                {
+                    Id = _instance.Id,
+                    CheckForUpdates = _instance.CheckForUpdates
+                };
+
+                var serializedJson = JsonConvert.SerializeObject(configFileModel, Formatting.Indented);
+
+                File.WriteAllText(_mappedPathToConfig, serializedJson);
+            }
+        }
+
+        private static void _loadSettingsFromConfigFile()
+        {
+            try
+            {
+                if (File.Exists(_mappedPathToConfig))
+                {
+                    //load
+                    var deserializedConfigFile = JsonConvert.DeserializeObject<ArchetypeConfigFileModel>(File.ReadAllText(_mappedPathToConfig));
+
+                    if (deserializedConfigFile != null)
+                    {
+                        _instance.Id = deserializedConfigFile.Id;
+                        _instance.CheckForUpdates = deserializedConfigFile.CheckForUpdates;
+                    }
+                    else
+                    {
+                        _createNewConfigFile("Config file model was null!");
+                    }
+                }
+                else
+                {
+                    _createNewConfigFile("Config file was missing!");
+                }
+            }
+            catch (Exception ex)
+            {
+                LogHelper.Error<ArchetypeGlobalSettings>(ex.Message, ex);
+
+                _createNewConfigFile("Exception!");
+            }
+        }
+
+        private static void _createNewConfigFile(string reason)
+        {
+            //write a new file with defaults
+            LogHelper.Info<ArchetypeGlobalSettings>(string.Format("Generating a new config file reason: {0}", reason));
+
+            _instance.Id = Guid.NewGuid();
+            _instance.CheckForUpdates = true;
+            _instance.Save();
+        }
+
+        private static Guid _getApiKey()
+        {
+            //this is just obfuscation and an attempt to keep out most but not the determined hacker
+            var array = new []
+            {
+                "RTA4MUZDRjA=",
+                "NzkzQS1BRDIw",
+                "OTI3QjFDNjkwQTYy",
+                "MjI0OQ=="
+            };
+
+            return new Guid(string.Format("{0}-{1}-{3}-{2}",
+                _decodeBase64(array[0]),
+                _decodeBase64(array[1]),
+                _decodeBase64(array[2]),
+                _decodeBase64(array[3])
+            ));
+        }
+
+        private static string _decodeBase64(string input)
+        {
+            return Encoding.UTF8.GetString(Convert.FromBase64String(input));
+        }
+    }
+}

app/Umbraco/Umbraco.Archetype/Models/ArchetypeModel.cs

@@ -1,7 +1,9 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Linq;
+using Archetype.TypeConverters;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 
@@ -11,6 +13,7 @@ namespace Archetype.Models
     /// Model that represents an entire Archetype.
     /// </summary>
     [JsonObject]
+    [TypeConverter(typeof(ArchetypeModelConverter))]
     public class ArchetypeModel : IEnumerable<ArchetypeFieldsetModel>
     {
         [JsonProperty("fieldsets")]
@@ -32,7 +35,7 @@ namespace Archetype.Models
         /// </returns>
         public IEnumerator<ArchetypeFieldsetModel> GetEnumerator()
         {
-            return this.Fieldsets.Where(f => f.Disabled == false).GetEnumerator();
+            return this.Fieldsets.Where(f => f.IsAvailable()).GetEnumerator();
         }
 
         //possibly obsolete?

app/Umbraco/Umbraco.Archetype/Models/ArchetypePreValue.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using Newtonsoft.Json;
 
@@ -25,18 +25,33 @@ namespace Archetype.Models
         [JsonProperty("enableCollapsing")]
         public bool EnableCollapsing { get; set; }
 
+        [JsonProperty("enableMultipleOpen")]
+        public bool EnableMultipleOpen { get; set; }
+
         [JsonProperty("enableCloning")]
         public bool EnableCloning { get; set; }
 
         [JsonProperty("enableDisabling")]
         public bool EnableDisabling { get; set; }
 
+        [JsonProperty("enablePublishing")]
+        public bool EnablePublishing { get; set; }
+
+        [JsonProperty("enableCrossDragging")]
+        public bool EnableCrossDragging { get; set; }
+        
+        [JsonProperty("enableMemberGroups")]
+        public bool EnableMemberGroups { get; set; }
+
         [JsonProperty("hideFieldsetControls")]
         public bool HideFieldsetControls { get; set; }
 
         [JsonProperty("hidePropertyLabel")]
         public bool HidePropertyLabel { get; set; }
 
+        [JsonProperty("minFieldsets", NullValueHandling = NullValueHandling.Ignore)]
+        public int MinFieldsets { get; set; }
+
         [JsonProperty("maxFieldsets", NullValueHandling = NullValueHandling.Ignore)]
         public int MaxFieldsets { get; set; }
 

app/Umbraco/Umbraco.Archetype/Models/ArchetypePreValueFieldset.cs

@@ -26,6 +26,9 @@ namespace Archetype.Models
         [JsonProperty("label")]
         public string Label { get; set; }
 
+        [JsonProperty("previewImage")]
+        public string PreviewImage { get; set; }
+
         [JsonProperty("properties")]
         public IEnumerable<ArchetypePreValueProperty> Properties { get; set; }
 

app/Umbraco/Umbraco.Archetype/Models/ArchetypePublishedContent.cs

@@ -98,7 +98,7 @@ namespace Archetype.Models
 
         public bool IsDraft
         {
-            get { return _fieldset.Disabled; }
+            get { return _fieldset.IsAvailable() == false; }
         }
 
         public PublishedItemType ItemType

app/Umbraco/Umbraco.Archetype/Models/ArchetypePublishedContentSet.cs

@@ -19,7 +19,7 @@ namespace Archetype.Models
             var count = archetype.Fieldsets.Count();
 
             _items = archetype.Fieldsets
-                .Where(x => x.Disabled == false)
+                .Where(x => x.IsAvailable())
                 .Select(x => new ArchetypePublishedContent(x, this))
                 .ToArray();
         }

app/Umbraco/Umbraco.Archetype/Models/ArchetypePublishedProperty.cs

@@ -1,5 +1,6 @@
 using System;
 using Archetype.Extensions;
+using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
 using Umbraco.Core.Models.PublishedContent;
 
@@ -24,14 +25,22 @@ namespace Archetype.Models
             _property = property;
             _rawValue = property.Value;
 
-            _propertyType = property.CreateDummyPropertyType();
+			// #418 - need to wrap this in a try/catch to prevent orphaned properties from breaking everything
+	        try
+	        {
+				_propertyType = property.CreateDummyPropertyType();
 
-            if (_propertyType != null)
-            {
-                _sourceValue = new Lazy<object>(() => _propertyType.ConvertDataToSource(_rawValue, preview));
-                _objectValue = new Lazy<object>(() => _propertyType.ConvertSourceToObject(_sourceValue.Value, preview));
-                _xpathValue = new Lazy<object>(() => _propertyType.ConvertSourceToXPath(_sourceValue.Value, preview));
-            }
+				if (_propertyType != null)
+				{
+					_sourceValue = new Lazy<object>(() => _propertyType.ConvertDataToSource(_rawValue, preview));
+					_objectValue = new Lazy<object>(() => _propertyType.ConvertSourceToObject(_sourceValue.Value, preview));
+					_xpathValue = new Lazy<object>(() => _propertyType.ConvertSourceToXPath(_sourceValue.Value, preview));
+				}
+	        }
+	        catch(Exception ex)
+	        {
+		        LogHelper.Warn<ArchetypePublishedProperty>(string.Format("Could not create an IPublishedProperty for property: {0} - the error was: {1}", property.Alias, ex.Message));
+	        }
         }
 
         internal ArchetypePropertyModel ArchetypeProperty

app/Umbraco/Umbraco.Archetype/Models/ArchetypeUpdateNotification.cs

@@ -0,0 +1,11 @@
+namespace Archetype.Models
+{
+    public class ArchetypeUpdateNotification
+    {
+        public bool IsUpdateAvailable { get; set; }
+        public string Headline { get; set; }
+        public string Type { get; set; }
+        public string Message { get; set; }
+        public string Url { get; set; }
+    }
+}

app/Umbraco/Umbraco.Archetype/Properties/AssemblyInfo.cs

@@ -5,7 +5,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyTitle("Archetype")]
 [assembly: AssemblyDescription("Archetype's supporting code library for Umbraco")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Imulus")]
+[assembly: AssemblyCompany("Kevin Giszewski LLC")]
 [assembly: AssemblyProduct("Archetype")]
 [assembly: AssemblyCopyright("MIT Licensed")]
 [assembly: AssemblyTrademark("")]

app/Umbraco/Umbraco.Archetype/Properties/VersionInfo.cs

@@ -1,4 +1,4 @@
 using System.Reflection;
 
-[assembly: AssemblyVersion("1.12.3")]
-[assembly: AssemblyFileVersion("1.12.3")]
+[assembly: AssemblyVersion("1.17.1")]
+[assembly: AssemblyFileVersion("1.17.1")]

app/Umbraco/Umbraco.Archetype/PropertyEditors/ArcheTypePropertyEditor.cs

@@ -2,6 +2,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using Archetype.Extensions;
+using Archetype.Models;
 using ClientDependency.Core;
 using Newtonsoft.Json;
 using Umbraco.Core;
@@ -175,6 +176,10 @@ namespace Archetype.PropertyEditors
 				var uploadedFiles = editorValue.AdditionalData.ContainsKey("files") ? editorValue.AdditionalData["files"] as IEnumerable<ContentItemFile> : null;
 				foreach (var fieldset in archetype.Fieldsets)
 				{
+					// make sure the publishing dates are in UTC
+					fieldset.ReleaseDate = EnsureUtcDate(fieldset.ReleaseDate);
+					fieldset.ExpireDate = EnsureUtcDate(fieldset.ExpireDate);
+
 					// assign an id to the fieldset if it has none (e.g. newly created fieldset)
 					fieldset.Id = fieldset.Id == Guid.Empty ? Guid.NewGuid() : fieldset.Id;
 					// find the corresponding fieldset in the current Archetype value (if any)
@@ -201,13 +206,28 @@ namespace Archetype.PropertyEditors
 								else if (propDef.EditorState != null && propDef.EditorState.FileNames != null && propDef.EditorState.FileNames.Any())
 								{
 									// pass the uploaded files that belongs to this property (if any) to the value editor
-									var propertyFiles = propDef.EditorState.FileNames.Select(f => uploadedFiles.FirstOrDefault(u => u.FileName == f)).Where(f => f != null).ToList();
+									var propertyFiles = propDef.EditorState.FileNames.Select(fileName =>
+											uploadedFiles.FirstOrDefault(u => u.FileName != null &&
+												// #384, #389 and #394 - look for "safe" file names (using the ToSafeFileName() extension)
+												// - for backwards compatibility we'll look for the raw filename as well as the "safe" file name
+												(u.FileName.Equals(fileName, StringComparison.OrdinalIgnoreCase) || u.FileName.Equals(fileName.ToSafeFileName(), StringComparison.OrdinalIgnoreCase))
+											)
+                                        ).Where(f => f != null).ToList();
 									if(propertyFiles.Any())
 									{
 										additionalData["files"] = propertyFiles;
 									}
 								}
 							}
+							// #397 - pass along "cuid" and "puid" (part of the Umbraco 7.6 scheme)
+							if(editorValue.AdditionalData.ContainsKey("cuid"))
+							{
+								additionalData["cuid"] = editorValue.AdditionalData["cuid"];
+							}
+							if(editorValue.AdditionalData.ContainsKey("puid"))
+							{
+								additionalData["puid"] = editorValue.AdditionalData["puid"];
+							}
 							var propData = new ContentPropertyData(propDef.Value, preValues, additionalData);
 							var propEditor = PropertyEditorResolver.Current.GetByAlias(dtd.PropertyEditorAlias);
 							// make sure to send the current property value (if any) to the PE ValueEditor
@@ -237,6 +257,20 @@ namespace Archetype.PropertyEditors
 					? new ArchetypePropertyEditor()
 					: (PropertyEditor) new TextboxPropertyEditor();
 			}
+
+			/// <summary>
+			/// Ensures that a datetime is in UTC
+			/// </summary>
+			/// <param name="dateTime">The datetime</param>
+			/// <returns>The datetime in UTC (or null if it's not set)</returns>
+			private DateTime? EnsureUtcDate(DateTime? dateTime)
+			{
+				if(dateTime.HasValue == false || dateTime.Value.Kind == DateTimeKind.Utc)
+				{
+					return dateTime;
+				}
+				return new DateTime(dateTime.Value.Ticks, DateTimeKind.Utc);
+			}
 		}
 
 		#endregion

app/Umbraco/Umbraco.Archetype/TypeConverters/ArchetypeFieldsetModelConverter.cs

@@ -0,0 +1,39 @@
+using System;
+using System.ComponentModel;
+using System.Globalization;
+using Archetype.Extensions;
+using Archetype.Models;
+using Umbraco.Core.Models;
+
+namespace Archetype.TypeConverters
+{
+    public class ArchetypeFieldsetModelConverter : TypeConverter
+    {
+        public override bool CanConvertTo(ITypeDescriptorContext context, Type destinationType)
+        {
+            if (destinationType == typeof(IPublishedContent) ||
+                destinationType == typeof(ArchetypePublishedContent))
+            {
+                return true;
+            }
+
+            if (destinationType == typeof(string))
+            {
+                // NOTE: The converter needs to return false here, otherwise `ArchetypeHelper.DeserializeJsonToArchetype` fails.
+                return false;
+            }
+
+            return base.CanConvertTo(context, destinationType);
+        }
+
+        public override object ConvertTo(ITypeDescriptorContext context, CultureInfo culture, object value, Type destinationType)
+        {
+            if (value is ArchetypeFieldsetModel && (destinationType == typeof(IPublishedContent) || destinationType == typeof(ArchetypePublishedContent)))
+            {
+                return ((ArchetypeFieldsetModel)value).ToPublishedContent();
+            }
+
+            return base.ConvertTo(context, culture, value, destinationType);
+        }
+    }
+}

app/Umbraco/Umbraco.Archetype/TypeConverters/ArchetypeModelConverter.cs

@@ -0,0 +1,34 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Globalization;
+using Archetype.Extensions;
+using Archetype.Models;
+using Umbraco.Core.Models;
+
+namespace Archetype.TypeConverters
+{
+    public class ArchetypeModelConverter : TypeConverter
+    {
+        public override bool CanConvertTo(ITypeDescriptorContext context, Type destinationType)
+        {
+            if (destinationType == typeof(ArchetypePublishedContentSet) ||
+                destinationType == typeof(IEnumerable<IPublishedContent>))
+            {
+                return true;
+            }
+
+            return base.CanConvertTo(context, destinationType);
+        }
+
+        public override object ConvertTo(ITypeDescriptorContext context, CultureInfo culture, object value, Type destinationType)
+        {
+            if (value is ArchetypeModel && (destinationType == typeof(ArchetypePublishedContentSet) || destinationType == typeof(IEnumerable<IPublishedContent>)))
+            {
+                return ((ArchetypeModel)value).ToPublishedContentSet();
+            }
+
+            return base.ConvertTo(context, culture, value, destinationType);
+        }
+    }
+}

app/controllers/config.controller.js

@@ -1,4 +1,4 @@
-angular.module("umbraco").controller("Imulus.ArchetypeConfigController", function ($scope, $http, assetsService, dialogService, archetypePropertyEditorResource) {
+angular.module("umbraco").controller("Imulus.ArchetypeConfigController", function ($scope, $http, assetsService, dialogService, archetypePropertyEditorResource, archetypeGlobalConfigService, notificationsService) {
 
     //$scope.model.value = "";
     //console.log($scope.model.value);
@@ -6,7 +6,7 @@ angular.module("umbraco").controller("Imulus.ArchetypeConfigController", functio
     //define empty items
     var newPropertyModel = '{"alias": "", "remove": false, "collapse": false, "label": "", "helpText": "", "dataTypeGuid": "0cc0eba1-9960-42c9-bf9b-60e150b429ae", "value": ""}';
     var newFieldsetModel = '{"alias": "", "remove": false, "collapse": false, "labelTemplate": "", "icon": "", "label": "", "properties": [' + newPropertyModel + '], "group": null}';
-    var defaultFieldsetConfigModel = JSON.parse('{"showAdvancedOptions": false, "startWithAddButton": false, "hideFieldsetToolbar": false, "enableMultipleFieldsets": false, "hideFieldsetControls": false, "hidePropertyLabel": false, "maxFieldsets": null, "enableCollapsing": true, "enableCloning": false, "enableDisabling": true, "enableDeepDatatypeRequests": false, "fieldsets": [' + newFieldsetModel + '], "fieldsetGroups": []}');
+    var defaultFieldsetConfigModel = JSON.parse('{"showAdvancedOptions": false, "startWithAddButton": false, "hideFieldsetToolbar": false, "enableMultipleFieldsets": false, "hideFieldsetControls": false, "hidePropertyLabel": false, "maxFieldsets": null, "enableCollapsing": true, "enableMultipleOpen": true, "enableCloning": false, "enableDisabling": true, "enableDeepDatatypeRequests": false, "enablePublishing": false, "enableMemberGroups": false, "enableCrossDragging": false, "fieldsets": [' + newFieldsetModel + '], "fieldsetGroups": []}');
 
     //ini the model
     $scope.model.value = $scope.model.value || defaultFieldsetConfigModel;
@@ -16,6 +16,17 @@ angular.module("umbraco").controller("Imulus.ArchetypeConfigController", functio
     archetypePropertyEditorResource.getDllVersion().then(function(data){
         $scope.dllVersion = data.dllVersion;
     });
+       
+    archetypeGlobalConfigService.checkForUpdates().then(function(data) {
+        if(data.isUpdateAvailable) {
+            notificationsService.add({
+                headline: data.headline,
+                type: data.type,
+                message: data.message,
+                url: data.url
+            });
+        }
+    });
 
     //ini the render model
     initConfigRenderModel();
@@ -47,6 +58,12 @@ angular.module("umbraco").controller("Imulus.ArchetypeConfigController", functio
         }
     };
 
+    // added to track loaded fieldsets 
+    $scope.loadedFieldsets = [];
+    $scope.isLoaded = function (fieldset) {
+        return $scope.loadedFieldsets.indexOf(fieldset) >= 0;
+    }
+
     //function that determines how to manage expanding/collapsing fieldsets
     $scope.focusFieldset = function(fieldset){
         var iniState;
@@ -60,6 +77,7 @@ angular.module("umbraco").controller("Imulus.ArchetypeConfigController", functio
             if($scope.archetypeConfigRenderModel.fieldsets.length == 1 && fieldset.remove == false)
             {
                 fieldset.collapse = false;
+                $scope.loadedFieldsets.push(fieldset);
                 return;
             }
 
@@ -70,12 +88,14 @@ angular.module("umbraco").controller("Imulus.ArchetypeConfigController", functio
             else
             {
                 fieldset.collapse = false;
+                $scope.loadedFieldsets.push(fieldset);
             }
         });
 
         if(iniState)
         {
             fieldset.collapse = !iniState;
+            $scope.loadedFieldsets.push(fieldset);
         }
     }
 
@@ -123,27 +143,20 @@ angular.module("umbraco").controller("Imulus.ArchetypeConfigController", functio
 
     //watch for changes
     $scope.$watch('archetypeConfigRenderModel', function (v) {
-        //console.log(v);
         if (typeof v === 'string') {
             $scope.archetypeConfigRenderModel = JSON.parse(v);
             $scope.archetypeConfigRenderModel.toString = stringify;
         }
     });
 
-    $scope.autoPopulateAlias = function(s) {
-        var modelType = s.hasOwnProperty('fieldset') ? 'fieldset' : 'property';
-        var modelProperty = s[modelType];
-
-        if (!modelProperty.aliasIsDirty) {
+    $scope.autoPopulateAlias = function (modelProperty) {
+        if (modelProperty && !modelProperty.aliasIsDirty) {
             modelProperty.alias = modelProperty.label.toUmbracoAlias();
         }
     }
 
-    $scope.markAliasDirty = function(s) {
-        var modelType = s.hasOwnProperty('fieldset') ? 'fieldset' : 'property';
-        var modelProperty = s[modelType];
-
-        if (!modelProperty.aliasIsDirty) {
+    $scope.markAliasDirty = function (modelProperty) {
+        if (modelProperty && !modelProperty.aliasIsDirty) {
             modelProperty.aliasIsDirty = true;;
         }
     }
@@ -313,9 +326,13 @@ angular.module("umbraco").controller("Imulus.ArchetypeConfigController", functio
         dialogService.open({
             template: template,
             show: true,
-            callback: function(data) {
+            callback: function (data) {
+                // replace the entire render model if it was changed (in developer options)
+                if (data.model && data.modelChanged) {
+                    $scope.archetypeConfigRenderModel = data.model;
+                }
             },
-            dialogData: $scope.archetypeConfigRenderModel
+            dialogData: { model: $scope.archetypeConfigRenderModel }
         });
     }
 

app/controllers/config.dialog.controller.js

@@ -1,17 +1,16 @@
 angular.module('umbraco').controller('ArchetypeConfigOptionsController', function ($scope) {
-    $scope.model = $scope.dialogData;
-
+    
     //handles a fieldset group add
     $scope.addFieldsetGroup = function () {
-        $scope.model.fieldsetGroups.push({ name: "" });
+        $scope.dialogData.model.fieldsetGroups.push({ name: "" });
     }
 
     //handles a fieldset group removal
     $scope.removeFieldsetGroup = function ($index) {
-        $scope.model.fieldsetGroups.splice($index, 1);
+        $scope.dialogData.model.fieldsetGroups.splice($index, 1);
     }
 
     $scope.apply = function(index) {
-        $scope.submit($scope.model);
+        $scope.submit($scope.dialogData);
     }
 });

app/controllers/config.global.controller.js

@@ -0,0 +1,21 @@
+angular.module('umbraco').controller('ArchetypeConfigGlobalOptionsController', function ($scope, archetypeGlobalConfigService) {
+    $scope.globalSettings = {};
+  
+    $scope.confirmCheckNewVersionChange = function() {      
+        archetypeGlobalConfigService.setCheckForUpdates($scope.globalSettings.checkForNewVersion);
+    }
+    
+    function getGlobalSettings()
+    {
+        archetypeGlobalConfigService.globalSettings().then(function(data) {          
+            $scope.globalSettings.checkForNewVersion = data.isCheckingForUpdates;
+        });
+    }    
+    
+    init();
+       
+    function init()
+    {      
+        getGlobalSettings();
+    }
+});

app/controllers/controller.js

@@ -1,5 +1,10 @@
 {{VERSION}}
-angular.module("umbraco").controller("Imulus.ArchetypeController", function ($scope, $http, $filter, assetsService, angularHelper, notificationsService, $timeout, fileManager, entityResource, archetypeService, archetypeLabelService, archetypeCacheService, archetypePropertyEditorResource) {
+angular.module("umbraco").controller("Imulus.ArchetypeController", function ($scope, $http, $filter, $interpolate, assetsService, angularHelper, notificationsService, $timeout, fileManager, entityResource, archetypeService, archetypeLabelService, archetypeCacheService, archetypePropertyEditorResource, archetypeLocalizationService) {
+
+    // Variables.
+    var draggedParent;
+    
+    var isCacheInitialized = false;
 
     //$scope.model.value = "";
     $scope.model.hideLabel = $scope.model.config.hideLabel == 1;
@@ -24,55 +29,262 @@ angular.module("umbraco").controller("Imulus.ArchetypeController", function ($sc
     };
 
     init();
-
-    //hold references to helper resources 
-    $scope.resources = {
-        entityResource: entityResource,
-        archetypePropertyEditorResource: archetypePropertyEditorResource
-    }
-
-    //hold references to helper services 
-    $scope.services = {
-        archetypeService: archetypeService,
-        archetypeLabelService: archetypeLabelService,
-        archetypeCacheService: archetypeCacheService
-    }
-
+    
     //helper to get $eval the labelTemplate
+    $scope.fieldsetTitles = [];
     $scope.getFieldsetTitle = function (fieldsetConfigModel, fieldsetIndex) {
-        return archetypeLabelService.getFieldsetTitle($scope, fieldsetConfigModel, fieldsetIndex);
-    }
+       
+        if(!isCacheInitialized) {         
+            return "";
+        }
+    
+        // Ensure the collection of titles is large enough.
+        ensureEnoughTitles(fieldsetIndex + 1);
+        var title = $scope.fieldsetTitles[fieldsetIndex];
 
-    var draggedRteSettings;
-    var rteClass = ".umb-rte textarea";
+        // Return the title if it's already been loaded.
+        if (title.loaded) {
+            return title.value;
+        }
+
+        // Return early if the title is still loading.
+        if (title.loading) {
+            return;
+        }
+
+        // Start loading the title.
+        title.loading = true;
+        title.loaded = false;
+        title.value = null;
+
+        archetypeLabelService.getFieldsetTitle($scope, fieldsetConfigModel, fieldsetIndex).then(function(value) {
+            // Finished loading the title.
+            title.loaded = true;
+            title.loading = false;
+            title.value = value;
+        });
+    };
+
+    /**
+     * Ensure the collection of fieldset titles is large enough to accommodate the number of fieldsets.
+     * @param count The number of fieldsets.
+     */
+    function ensureEnoughTitles(count) {
+        while ($scope.fieldsetTitles.length < count) {
+            $scope.fieldsetTitles.push({
+                loading: false,
+                loaded: false,
+                value: null
+            });
+        }
+    }
 
     //sort config
     $scope.sortableOptions = {
         axis: 'y',
         cursor: "move",
         handle: ".handle",
+        tolerance: "pointer",
+        activate: function(ev, ui) {
+
+            // Variables.
+            var parentItem = ui.item.parent();
+            var thisElement = parentItem[0];
+            var targetElement = ev.target;
+            var targetItem = angular.element(targetElement);
+
+            // The source of the drag can always be dropped back onto.
+            if (targetElement === thisElement) {
+                return;
+            }
+
+            // Variables.
+            var sourceScope = ui.item.scope();
+            var targetScope = targetItem.scope();
+            var valid = canMove(sourceScope, targetScope);
+
+            // If the sortable can't be moved to the target Archetype, disable
+            // the target Archetype's sortable temporarily.
+            if (!valid) {
+                var targetSortable = getSortableWidgetInstance(targetItem);
+                targetSortable.disable();
+                parentItem.sortable("refresh");
+                archetypeService.rememberDisabledSortable(targetSortable);
+            }
+
+        },
         start: function(ev, ui) {
-            draggedRteSettings = {};
-            $(rteClass, ui.item.parent()).each(function () {
-                var id = $(this).attr("id");
-                draggedRteSettings[id] = _.findWhere(tinyMCE.editors, { id: id }).settings;
-                tinymce.execCommand('mceRemoveEditor', false, id);
-                $(this).css("visibility", "hidden");
+            archetypeService.getEditors().addClass('archetypeDragging');
+            archetypeService.storeEditors(ui.item.parent());
+            $scope.$apply(function() {
+                draggedParent = ui.item.parent();
+                draggedParent.scope().doingSort = true;
             });
         },
         update: function (ev, ui) {
+
+            // Variables.
+            var targetScope = ui.item.sortable.droptarget.scope();
+            var sourceScope = ui.item.scope();
+            var sameScope = sourceScope === targetScope;
+            var sourceIndex = ui.item.sortable.index;
+
+            // Special constraints for when moving between Archetypes.
+            // If sourceScope is populated, we are in the first of the two updates (when
+            // moving between lists, ui-sortable calls the update function twice).
+            if (sourceScope && !sameScope) {
+
+                // Variables.
+                var valid = canMove(sourceScope, targetScope);
+
+                // If update isn't allowed, cancel the drag operation.
+                if (!valid) {
+                    ui.item.sortable.cancel();
+                    return;
+                }
+
+                // Clear the validations for this item.
+                clearValidations(ui.item.parent());
+                clearValidations(ui.item.sortable.droptarget);
+
+                // Reset "isValid" on the properties and fieldsets.
+                var fieldsetGroups = [
+                    $scope.model.value.fieldsets,
+                    targetScope.model.value.fieldsets
+                ];
+                _.each(fieldsetGroups, function(fieldsets) {
+                    recurseProperties(function(property, fieldset) {
+                        property.isValid = true;
+                        fieldset.isValid = true;
+                    }, fieldsets);
+                });
+
+                // Move the activated fieldset to the target Archetype.
+                var movedFieldset = $scope.model.value.fieldsets[sourceIndex];
+                var loadedIndex = $scope.loadedFieldsets.indexOf(movedFieldset);
+                if (loadedIndex >= 0) {
+                    $scope.loadedFieldsets.splice(loadedIndex, 1);
+                    if (targetScope.loadedFieldsets.indexOf(movedFieldset) < 0) {
+                        targetScope.loadedFieldsets.push(movedFieldset);
+                    }
+                }
+
+            }
+
+            // Set scope dirty.
             $scope.setDirty();
+
         },
         stop: function (ev, ui) {
-            $(rteClass, ui.item.parent()).each(function () {
-                var id = $(this).attr("id");
-                draggedRteSettings[id] = draggedRteSettings[id] || _.findWhere(tinyMCE.editors, { id: id }).settings;
-                tinyMCE.execCommand("mceRemoveEditor", false, id);
-                tinyMCE.init(draggedRteSettings[id]);
-            });
+            // Done sorting.
+            draggedParent.scope().doingSort = false;
+
+            // Enable disabled sortables.
+            archetypeService.enableSortables();
+
+            // Restore rich text editors.
+            var parent = null;
+            var target = ui.item.sortable.droptarget;
+            if (target) {
+                parent = target.parent();
+            }
+            archetypeService.restoreEditors(parent);
+
+            archetypeService.getEditors().removeClass('archetypeDragging');
         }
     };
 
+    // Clears the Angular validations in an Archetype.
+    function clearValidations(el) {
+        var combined = $(".archetypeSortable", el).add(el);
+        combined.each(function(index, item) {
+            var $item = angular.element(item);
+            var cont = $item.controller("ngModel");
+            var err = cont.$error;
+            var keys = Object.keys(err);
+            for (var i = 0; i < keys.length; i++) {
+                cont.$setValidity(keys[i], true);
+            }
+        });
+    }
+
+    // Enable cross-archetype dragging?
+    if ($scope.model.config.enableCrossDragging) {
+        $scope.sortableOptions.connectWith = ".archetypeSortable:not(.invalid)";
+    }
+
+    // Checks if the specified model's properties match all of the properties in any of
+    // the specified fieldsets, while also checking if the fieldset aliases match.
+    // This is an indicator of the compatibility of a fieldset model with a collection
+    // of fieldset configurations.
+    function modelMatchesAnyFieldset(model, fieldsets) {
+
+        // Loop through fieldsets to find a match.
+        for (var i = 0; i < fieldsets.length; i++) {
+            var fieldset = fieldsets[i];
+
+            // Confirm that this configured fielset contains exactly
+            // the same properties as those that were supplied.
+            var valid =
+                // Does the alias match?
+                model.alias === fieldset.alias &&
+                // Does this fieldset have all the properties?
+                arePropertiesSubset(model.properties, fieldset.properties) &&
+                // Does the property array have all the fieldset properties?
+                arePropertiesSubset(fieldset.properties, model.properties);
+
+            // Match found?
+            if (valid) {
+                return true;
+            }
+
+        }
+
+        // No match found.
+        return false;
+
+    }
+
+    // Checks if the specified array of fieldsets contains the specified fieldset.
+    function arrayContainsFieldset(fieldset, fieldsets) {
+        for (var i = 0; i < fieldsets.length; i++) {
+            if (fieldsets[i] === fieldset) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    // Confirms that an array of properties is a subset of another array of properties.
+    function arePropertiesSubset(subset, superset) {
+
+        // Loop through the subset of properties.
+        for (var j = 0; j < subset.length; j++) {
+            var subProperty = subset[j];
+            var matchedProp = false;
+
+            // Loop through the superset to find a matching property from the subset.
+            for (var k = 0; k < superset.length; k++) {
+                var superProperty = superset[k];
+                if (superProperty.alias === subProperty.alias &&
+                    superProperty.dataTypeGuid === subProperty.dataTypeGuid) {
+                    matchedProp = true;
+                    break;
+                }
+            }
+
+            // If no matching property could be found, the array is not a subset.
+            if (!matchedProp) {
+                return false;
+            }
+
+        }
+
+        // The array is a subset.
+        return true;
+
+    }
+
     //handles a fieldset add
     $scope.openFieldsetPicker = function ($index, event) {
         if ($scope.canAdd() == false) {
@@ -86,7 +298,8 @@ angular.module("umbraco").controller("Imulus.ArchetypeController", function ($sc
                 alias: fieldset.alias,
                 label: fieldset.label,
                 icon: (fieldset.icon || "icon-document-dashed-line"), // default icon if none is chosen
-                group: fieldset.group ? fieldset.group.name : null
+                group: fieldset.group ? fieldset.group.name : null,
+                previewImage: fieldset.previewImage
             });
         });
         // sanity check
@@ -126,13 +339,22 @@ angular.module("umbraco").controller("Imulus.ArchetypeController", function ($sc
 
     $scope.closeFieldsetPicker = function () {
         $scope.overlayMenu.show = false;
+        $scope.overlayMenu.fieldsetPreview = null;
     };
     
     $scope.pickFieldset = function (fieldsetAlias, $index) {
         $scope.closeFieldsetPicker();
         $scope.addRow(fieldsetAlias, $index);
     };    
-    
+
+    $scope.openFieldsetPreview = function (fieldset) {
+        $scope.overlayMenu.fieldsetPreview = fieldset;
+    }
+
+    $scope.closeFieldsetPreview = function () {
+        $scope.overlayMenu.fieldsetPreview = null;
+    }
+
     $scope.addRow = function (fieldsetAlias, $index) {
         if ($scope.canAdd()) {
             if ($scope.model.config.fieldsets) {
@@ -148,13 +370,21 @@ angular.module("umbraco").controller("Imulus.ArchetypeController", function ($sc
                 }
             }
 
+            addCustomPropertiesToFieldset(newFieldset);
+
             $scope.setDirty();
 
             $scope.$broadcast("archetypeAddFieldset", {index: $index, visible: countVisible()});
 
             newFieldset.collapse = $scope.model.config.enableCollapsing ? true : false;
+
+            // If the fieldset is not collapsed, it should be instantly loaded.
+            if (!newFieldset.collapse) {
+                $scope.loadedFieldsets.push(newFieldset);
+            }
             
             $scope.focusFieldset(newFieldset);
+            $scope.handleMandatoryValidation();
         }
     }
 
@@ -164,6 +394,7 @@ angular.module("umbraco").controller("Imulus.ArchetypeController", function ($sc
                 $scope.setDirty();
                 $scope.model.value.fieldsets.splice($index, 1);
                 $scope.$broadcast("archetypeRemoveFieldset", {index: $index});
+                $scope.handleMandatoryValidation();
             }
         }
     }
@@ -174,11 +405,24 @@ angular.module("umbraco").controller("Imulus.ArchetypeController", function ($sc
 
             if(newFieldset) {
 
+                // Regenerate the temporary ID on each nested fieldset.
+                // This is done because no two fieldsets should have the same
+                // temporary ID.
+                recurseProperties(function(property) {
+                    archetypeService.ensureTemporaryId(property, true);
+                }, [newFieldset]);
+
                 $scope.model.value.fieldsets.splice($index + 1, 0, newFieldset);
 
                 $scope.setDirty();
 
                 newFieldset.collapse = $scope.model.config.enableCollapsing ? true : false;
+
+                // If the fieldset is not collapsed, it should be instantly loaded.
+                if (!newFieldset.collapse) {
+                    $scope.loadedFieldsets.push(newFieldset);
+                }
+
                 $scope.focusFieldset(newFieldset);
             }
         }
@@ -188,24 +432,27 @@ angular.module("umbraco").controller("Imulus.ArchetypeController", function ($sc
         fieldset.disabled = !fieldset.disabled;
         // explicitly set the form as dirty when manipulating the enabled/disabled state of a fieldset
         $scope.setDirty();
+        $scope.handleMandatoryValidation();
     }
 
     //helpers for determining if a user can do something
     $scope.canAdd = function () {
         if ($scope.model.config.maxFieldsets)
         {
-            return countVisible() < $scope.model.config.maxFieldsets;
+            var visibleCount = countVisible();
+            var maxFieldsets = $scope.model.config.maxFieldsets;
+            return visibleCount < maxFieldsets;
         }
 
         return true;
-    }
+    };
 
     //helper that returns if an item can be removed
     $scope.canRemove = function () {
         return countVisible() > 1 
             || ($scope.model.config.maxFieldsets == 1 && $scope.model.config.fieldsets.length > 1)
             || $scope.model.config.startWithAddButton;
-    }
+    };
 
     $scope.canClone = function () {
 
@@ -224,8 +471,16 @@ angular.module("umbraco").controller("Imulus.ArchetypeController", function ($sc
     //helper that returns if an item can be sorted
     $scope.canSort = function ()
     {
-        return countVisible() > 1;
-    }
+        // Sorting can occur if there are multiple fieldsets, or if there is only one
+        // fieldset that can be removed (in which case it can be sorted into an entirely
+        // different Archetype).
+        return countVisible() > 1 || $scope.canRemove();
+    };
+
+    //helper that returns if an item is the last and it's being sorted.
+    $scope.sortingLastItem = function() {
+        return $scope.doingSort && $scope.model.value.fieldsets.length <= 1;
+    };
 
     //helper that returns if an item can be disabled
     $scope.canDisable = function () {
@@ -234,15 +489,110 @@ angular.module("umbraco").controller("Imulus.ArchetypeController", function ($sc
 
     //helpers for determining if the add button should be shown
     $scope.showAddButton = function () {
+        var visible = countVisible();
+        return (visible === 0 && $scope.model.config.startWithAddButton) 
+            || (visible > 0 && $scope.canAdd());
+    }
+
+    //helper for determining if no content is available yet
+    $scope.showEmptyContentHint = function () {
         return $scope.model.config.startWithAddButton
             && countVisible() === 0;
             ///&& $scope.model.config.fieldsets.length == 1;
     }
 
+    //helper that returns if an item can use publishing
+    $scope.canPublish = function () {
+        return $scope.model.config.enablePublishing;
+    }
+
+    $scope.canUseMemberGroups = function() {
+        return $scope.model.config.enableMemberGroups;
+    }
+
+    //helper that returns if the "misc fieldset configuration" section should be visible
+    $scope.canConfigure = function () {
+        // currently the "misc fieldset configuration" section contains the publishing and the member groups setup
+        return $scope.canPublish() || $scope.canUseMemberGroups();
+    }
+
+    $scope.showDisableIcon = function (fieldset) {
+        if ($scope.canDisable() == false) {
+            return false;
+        }
+        // disabled state takes precedence over publishing
+        if (fieldset.disabled) {
+            return true;
+        }
+        return $scope.isDisabledByPublishing(fieldset) == false;
+    }
+
+    $scope.showPublishingIcon = function (fieldset) {
+        if ($scope.canPublish() == false) {
+            return false;
+        }
+        if ($scope.canDisable()) {
+            // disabled state takes precedence over publishing
+            if (fieldset.disabled) {
+                return false;
+            }
+            return $scope.isDisabledByPublishing(fieldset);
+        }
+        return true;
+    }
+
+    $scope.isDisabledByPublishing = function(fieldset) {
+        if ($scope.canPublish() === false) {
+            return false;
+        }
+        // NOTE: all comparison is done in local datetime
+        //       - that's fine because the selected local datetimes will be converted to UTC datetimes when submitted
+        if (fieldset.expireDateModel && fieldset.expireDateModel.value && (moment() > moment(fieldset.expireDateModel.value))) {
+            // an expired release affects the fieldset
+            return true;
+        }
+        if (fieldset.releaseDateModel && fieldset.releaseDateModel.value && (moment(fieldset.releaseDateModel.value) > moment())) {
+            // a pending release affects the fieldset
+            return true;
+        }
+        return false;
+    }
+
+    $scope.isDisabled = function(fieldset) {
+        if (fieldset.disabled) {
+            return true;
+        }
+        return $scope.isDisabledByPublishing(fieldset);
+    }
+
+    $scope.numberOfEnabledFieldsets = function () {
+        if (!$scope.model.value.fieldsets) {
+            return 0;
+        }
+        return _.filter($scope.model.value.fieldsets, function (f) {
+            return $scope.isDisabled(f) == false;
+        }).length;
+    }
+
     //helper, ini the render model from the server (model.value)
     function init() {
         $scope.model.value = removeNulls($scope.model.value);
         addDefaultProperties($scope.model.value.fieldsets);
+        
+        archetypeCacheService.initialize().then(function() {
+            isCacheInitialized = true;
+        });
+
+        $timeout(function () {
+            $scope.handleMandatoryValidation();
+        }, 50);
+
+        // localize the message for minimum fieldsets validation errors
+        archetypeLocalizationService.localize("minFieldsetsMessage").then(function (value) {
+            value = value || "You must add minimum {{minFieldsets}} items";
+            var exp = $interpolate(value);
+            $scope.minFieldsetsMessage = exp({ minFieldsets: $scope.model.config.minFieldsets });
+        });
     }
 
     function addDefaultProperties(fieldsets)
@@ -254,6 +604,36 @@ angular.module("umbraco").controller("Imulus.ArchetypeController", function ($sc
         });
     }
 
+    function addCustomProperties(fieldsets) {
+        // make sure we have loaded moment.js before using it
+        assetsService.loadJs("lib/moment/moment-with-locales.js").then(function() {
+            _.each(fieldsets, function(fieldset) {
+                addCustomPropertiesToFieldset(fieldset);
+            });
+        });
+    }
+
+    function addCustomPropertiesToFieldset(fieldset) {
+        // create models for publish configuration (utilizing the built-in datepicker data type)
+        // NOTE: all datetimes must be converted from UTC to local
+        fieldset.releaseDateModel = {
+            alias: _.uniqueId("archetypeReleaseDate_"),
+            view: "datepicker",
+            value: fromUtc(fieldset.releaseDate)
+        };
+        fieldset.expireDateModel = {
+            alias: _.uniqueId("archetypeExpireDate_"),
+            view: "datepicker",
+            value: fromUtc(fieldset.expireDate)
+        };
+        // create model for allowed member groups
+        fieldset.allowedMemberGroupsModel = {
+            alias: _.uniqueId("archetypeAllowedMemberGroups_"),
+            view: "membergrouppicker",
+            value: fieldset.allowedMemberGroups
+        };
+    }
+
     //helper to get the correct fieldset from config
     $scope.getConfigFieldsetByAlias = function(alias) {
         return _.find($scope.model.config.fieldsets, function(fieldset){
@@ -273,9 +653,15 @@ angular.module("umbraco").controller("Imulus.ArchetypeController", function ($sc
     {
         if(typeof fieldset.collapse === "undefined")
         {
-            fieldset.collapse = true;
+            fieldset.collapse = $scope.model.config.enableCollapsing ? true : false;
         }
         return fieldset.collapse;
+    };
+
+    // added to track loaded fieldsets 
+    $scope.loadedFieldsets = [];
+    $scope.isLoaded = function (fieldset) {
+        return $scope.loadedFieldsets.indexOf(fieldset) >= 0;
     }
 
     //helper for expanding/collapsing fieldsets
@@ -286,32 +672,43 @@ angular.module("umbraco").controller("Imulus.ArchetypeController", function ($sc
             return;
         }
 
-        var iniState;
-
-        if(fieldset)
+        // collapse all other fieldsets if "multiple open fieldsets" is not enabled
+        if(!$scope.model.config.enableMultipleOpen) 
         {
-            iniState = fieldset.collapse;
+            _.each($scope.model.value.fieldsets, function (f) {
+                if(f != fieldset)
+                {
+                    f.collapse = true;
+                }
+            });
         }
 
-        _.each($scope.model.value.fieldsets, function(fieldset){
-            fieldset.collapse = true;
-        });
-
         if(!fieldset && $scope.model.value.fieldsets.length == 1)
         {
             $scope.model.value.fieldsets[0].collapse = false;
+            $scope.loadedFieldsets.push($scope.model.value.fieldsets[0]);
             return;
         }
 
-        if(iniState && fieldset)
+        if(fieldset)
         {
-            fieldset.collapse = !iniState;
+            fieldset.collapse = !fieldset.collapse;
+            if($scope.loadedFieldsets.indexOf(fieldset) < 0)
+            {
+                $scope.loadedFieldsets.push(fieldset);
+            }
         }
     }
 
     //ini the fieldset expand/collapse
     $scope.focusFieldset();
 
+    // Fieldsets which cannot be collapsed should start expanded.
+    _.each($scope.model.value.fieldsets, function(fieldset) {
+        fieldset.collapse = $scope.model.config.enableCollapsing;
+    });
+    $scope.loadedFieldsets = _.where($scope.model.value.fieldsets, { collapse: false });
+
     //developerMode helpers
     $scope.model.value.toString = stringify;
 
@@ -345,6 +742,14 @@ angular.module("umbraco").controller("Imulus.ArchetypeController", function ($sc
         fileManager.setFiles($scope.model.alias, archetypeFiles);
     }
 
+    // Deep watch for changes.
+    $scope.$watch('model.value', function () {
+
+        // Empty titles. If the value has changed, the titles may have changed.
+        $scope.fieldsetTitles = [];
+
+    }, true);
+
     //watch for changes
     $scope.$watch('model.value', function (v) {
         if ($scope.model.config.developerMode) {
@@ -361,6 +766,15 @@ angular.module("umbraco").controller("Imulus.ArchetypeController", function ($sc
 
         // reset submit watcher counter on save
         $scope.activeSubmitWatcher = 0;
+
+        // init loaded fieldsets tracking
+        _.each($scope.model.value.fieldsets, function (fieldset) {
+            fieldset.collapse = $scope.model.config.enableCollapsing ? true : false;
+        });
+        $scope.loadedFieldsets = _.where($scope.model.value.fieldsets, { collapse: false });
+
+        // create properties needed for the backoffice to work (data that is not serialized to DB)
+        addCustomProperties($scope.model.value.fieldsets);
     });
 
     //helper to count what is visible
@@ -421,24 +835,21 @@ angular.module("umbraco").controller("Imulus.ArchetypeController", function ($sc
 
     //helper to lookup validity when given a fieldset
     $scope.getFieldsetValidity = function (fieldset) {
-        if (fieldset.isValid == false) {
-            return false;
-        }
 
-        // recursive validation of nested fieldsets
-        var nestedFieldsetsValid = true;
-        _.each(fieldset.properties, function (property) {
-            if (property != null && property.value != null && property.propertyEditorAlias == "Imulus.Archetype") {
-                _.each(property.value.fieldsets, function (inner) {
-                    if ($scope.getFieldsetValidity(inner) == false) {
-                        nestedFieldsetsValid = false;
-                    }
-                });
+        // Variables.
+        var valid = true;
+
+        // Recursive validation of nested fieldsets.
+        recurseFieldsets(function(item) {
+            if (item.isValid === false) {
+                valid = false;
             }
-        });
+        }, [fieldset]);
 
-        return nestedFieldsetsValid;
-    }
+        // Were all the nested fieldsets valid?
+        return valid;
+
+    };
 
     // helper to force the current form into the dirty state
     $scope.setDirty = function () {
@@ -447,6 +858,13 @@ angular.module("umbraco").controller("Imulus.ArchetypeController", function ($sc
         }
     }
 
+    $scope.minFieldsetsFulfilled = function () {
+        if (!$scope.model.config.minFieldsets) {
+            return true;
+        }
+        return $scope.numberOfEnabledFieldsets() >= $scope.model.config.minFieldsets;
+    }
+
     //custom js
     if ($scope.model.config.customJsPath) {
         assetsService.loadJs($scope.model.config.customJsPath);
@@ -470,7 +888,114 @@ angular.module("umbraco").controller("Imulus.ArchetypeController", function ($sc
         $scope.activeSubmitWatcher++;
         return $scope.activeSubmitWatcher;
     }
-    $scope.submitWatcherOnSubmit = function () {
-        $scope.$broadcast("archetypeFormSubmitting");
+    $scope.submitWatcherOnSubmit = function (args) {
+        $scope.$broadcast("archetypeFormSubmitting", args);
+    }
+
+    // we'll use our own "archetypeFormSubmitting" event to save custom properties, as at least some 
+    // of the editors store their values back to the model on the core "formSubmitting" event
+    $scope.$on("archetypeFormSubmitting", function (ev, args) {
+        _.each($scope.model.value.fieldsets, function (fieldset) {
+            // extract the publish configuration from the fieldsets (and convert local datetimes to UTC)
+            fieldset.releaseDate = toUtc(fieldset.releaseDateModel.value);
+            fieldset.expireDate = toUtc(fieldset.expireDateModel.value);
+            // extract the allowed member groups 
+            fieldset.allowedMemberGroups = fieldset.allowedMemberGroupsModel.value;
+        });
+    });
+
+    // handle mandatory validation of the entire Archetype
+    // - no fieldsets = not valid
+    $scope.handleMandatoryValidation = function() {
+        var valid = true;
+        if ($scope.model.validation && $scope.model.validation.mandatory) {
+            valid = $scope.numberOfEnabledFieldsets() > 0;
+        }
+        $scope.model.mandatoryValidation = valid ? "valid" : null;
+    }
+
+    function toUtc(date) {
+        if (!date) {
+            return null;
+        }
+        return moment(date, "YYYY-MM-DD HH:mm:ss").utc().toDate();
+    }
+
+    function fromUtc(date) {
+        if (!date) {
+            return null;
+        }
+        return moment(moment.utc(date).toDate()).format("YYYY-MM-DD HH:mm:ss")
+    }
+
+    // Serializes and deserializes an item to return a snapshot of that item (e.g., so it is not
+    // changed before being inspected). Useful when troubleshooting.
+    // Modified from: http://stackoverflow.com/a/11616993/2052963
+    function jsonSnapshot(item) {
+        var cache = [];
+        var stringItem = JSON.stringify(item, function(key, value) {
+            if (typeof value === "object" && value !== null) {
+                if (cache.indexOf(value) !== -1) {
+                    return "[Removed Circular Reference Item]";
+                }
+                cache.push(value);
+            }
+            return value;
+        });
+        return JSON.parse(stringItem);
+    }
+
+    // Recursively processes each Archetype fieldset.
+    function recurseFieldsets(fn, fieldsets) {
+        if (!fieldsets || !fieldsets.length) {
+            return;
+        }
+        _.each(fieldsets, function(fieldset) {
+            fn(fieldset);
+            _.each(fieldset.properties, function (property) {
+                if (property != null && property.value != null && property.propertyEditorAlias === "Imulus.Archetype") {
+                    recurseFieldsets(fn, property.value.fieldsets);
+                }
+            });
+        });
+    }
+
+    // Recursively processes each Archetype fieldset property.
+    function recurseProperties(fn, fieldsets) {
+        recurseFieldsets(function(fieldset) {
+            _.each(fieldset.properties, function (property) {
+                fn(property, fieldset);
+            });
+        }, fieldsets);
+    }
+
+    // Indicates whether or not the fieldset can be moved between the source and target scope.
+    // The source scope is the scope of the fieldset being dragged.
+    // The target scope is the scope of the Archetype to drop into.
+    function canMove(sourceScope, targetScope) {
+        var targetFieldsetConfigs = targetScope.model.config.fieldsets;
+        var targetFieldsets = targetScope.model.value.fieldsets;
+        var sourceFieldset = sourceScope.fieldset;
+        var sameArchetype = arrayContainsFieldset(sourceFieldset, targetFieldsets);
+        var model = sourceScope.fieldsetConfigModel;
+        var canRemove = sourceScope.canRemove();
+        var canAdd = targetScope.canAdd();
+        var valid = sameArchetype || (canRemove && canAdd);
+        valid = valid && modelMatchesAnyFieldset(model, targetFieldsetConfigs);
+        return valid;
+    }
+
+    // This is an alternative to: element.sortable("instance")
+    // Workaround for this issue: https://github.com/imulus/Archetype/pull/356#issuecomment-218527910
+    // Snagged from this pull request: https://github.com/angular-ui/ui-sortable/pull/319
+    // More technical details here: https://github.com/angular-ui/ui-sortable/issues/316
+    function getSortableWidgetInstance(element) {
+        // this is a fix to support jquery-ui prior to v1.11.x
+        // otherwise we should be using `element.sortable('instance')`
+        var data = element.data('ui-sortable');
+        if (data && typeof data === 'object' && data.widgetFullName === 'ui-sortable') {
+            return data;
+        }
+        return null;
     }
 });

app/directives/archetypeproperty.js

@@ -1,4 +1,4 @@
-angular.module("umbraco.directives").directive('archetypeProperty', function ($compile, $http, archetypePropertyEditorResource, umbPropEditorHelper, $timeout, $rootScope, $q, fileManager, editorState, archetypeService, archetypeCacheService) {
+angular.module("umbraco.directives").directive('archetypeProperty', function ($compile, $http, archetypePropertyEditorResource, umbPropEditorHelper, $timeout, $rootScope, $q, fileManager, editorState, archetypeService) {
 
     var linker = function (scope, element, attrs, ngModelCtrl) {
         var configFieldsetModel = archetypeService.getFieldsetByAlias(scope.archetypeConfig.fieldsets, scope.fieldset.alias);
@@ -25,9 +25,6 @@ angular.module("umbraco.directives").directive('archetypeProperty', function ($c
             
             config = configObj;
 
-            //caching for use by label templates later
-            archetypeCacheService.addDatatypeToCache(data, dataTypeGuid);
-
             //determine the view to use [...] and load it
             archetypePropertyEditorResource.getPropertyEditorMapping(data.selectedEditor).then(function(propertyEditor) {
                 var pathToView = umbPropEditorHelper.getViewPath(propertyEditor.view);
@@ -65,15 +62,22 @@ angular.module("umbraco.directives").directive('archetypeProperty', function ($c
 
                     if (!scope.renderModelPropertyIndex)
                     {
-                        archetypeService.getFieldset(scope).properties.push(JSON.parse('{"alias": "' + alias + '", "value": "' + defaultValue + '"}'));
+                        var propertyValue = { alias: alias, value: defaultValue };
+                        archetypeService.getFieldset(scope).properties.push(propertyValue);
                         scope.renderModelPropertyIndex = archetypeService.getPropertyIndexByAlias(archetypeService.getFieldset(scope).properties, alias);
                     }
 
                     scope.renderModel = {};
                     scope.model.value = archetypeService.getFieldsetProperty(scope).value;
 
-                    //init the property editor state
-                    archetypeService.getFieldsetProperty(scope).editorState = {};
+                    // init the property editor state (while ensuring the temporary ID is retained
+                    // from any prior initializations).
+                    var fieldsetProperty = archetypeService.getFieldsetProperty(scope);
+                    var oldState = fieldsetProperty.editorState;
+                    archetypeService.ensureTemporaryId(fieldsetProperty);
+                    if (oldState) {
+                        fieldsetProperty.editorState.temporaryId = oldState.temporaryId;
+                    }
 
                     //set the config from the prevalues
                     scope.model.config = config;
@@ -93,9 +97,11 @@ angular.module("umbraco.directives").directive('archetypeProperty', function ($c
                         }
                     }
 
-                    //upload, colorpicker datatype hack
-                    if(view.indexOf('fileupload.html') != -1 || view.indexOf('colorpicker.html') != -1) {
+                    //hacks for various built-in datatyps including upload, colorpicker and tags
+                    if (!scope.propertyForm) {
                         scope.propertyForm = scope.form;
+                    }
+                    if (!scope.model.validation) {
                         scope.model.validation = {};
                         scope.model.validation.mandatory = 0;
                     }
@@ -115,6 +121,8 @@ angular.module("umbraco.directives").directive('archetypeProperty', function ($c
                     });
 
                     scope.$on('archetypeFormSubmitting', function (ev, args) {
+                        // #385 - revert the changes made in #311 to avoid publishing invalid fieldsets (leaving the code from #311 here, in case we figure out how to re-introduce "save as draft")
+                        // if(args.action !== 'save') {
                         // validate all fieldset properties
                         _.each(scope.fieldset.properties, function (property) {
                             archetypeService.validateProperty(scope.fieldset, property, configFieldsetModel);
@@ -123,6 +131,7 @@ angular.module("umbraco.directives").directive('archetypeProperty', function ($c
                         var validationKey = "validation-f" + scope.fieldsetIndex;
 
                         ngModelCtrl.$setValidity(validationKey, scope.fieldset.isValid);
+                        // }
 
                         // did the value change (if it did, it most likely did so during the "formSubmitting" event)
                         var property = archetypeService.getFieldsetProperty(scope);

app/directives/archetypesubmitwatcher.js

@@ -1,11 +1,12 @@
 angular.module("umbraco.directives").directive('archetypeSubmitWatcher', function ($rootScope) {
     var linker = function (scope, element, attrs, ngModelCtrl) {
         // call the load callback on scope to obtain the ID of this submit watcher
-        var id = scope.loadCallback();
+        var id = scope.loadCallback ? scope.loadCallback() : 0;
+
         scope.$on("formSubmitting", function (ev, args) {
             // on the "formSubmitting" event, call the submit callback on scope to notify the Archetype controller to do it's magic
             if (id == scope.activeSubmitWatcher) {
-                scope.submitCallback();
+                scope.submitCallback(args);
             }
         });
     }
@@ -21,4 +22,4 @@ angular.module("umbraco.directives").directive('archetypeSubmitWatcher', functio
             activeSubmitWatcher: '='
         }
     }
-});
+});

app/helpers/sampleLabelHelpers.js

@@ -1,70 +1,51 @@
-var ArchetypeSampleLabelTemplates = (function() {
+//create a namespace (optional)
+var ArchetypeSampleLabelHelpers = {};
 
-    //public functions
-    return {
-        Entity: function (value, scope, args) {
-
-           if(!args.entityType) {
-                args = {entityType: "Document", propertyName: "name"}
-            }
-
-            if (value) {
-                //if handed a csv list, take the first only
-                var id = value.split(",")[0];
-
-                if (id) {
-                    var entity = scope.services.archetypeLabelService.getEntityById(scope, id, args.entityType);
-
-                    if(entity) {
-                        return entity[args.propertyName];
-                    }
-                }
-            }
-
-            return "";
-        },
-        UrlPicker: function(value, scope, args) {
-
-            if(!args.propertyName) {
-                args = {propertyName: "name"}
-            }
-
-            var entity;
-
-            switch (value.type) {
-                case "content":
-                    if(value.typeData.contentId) {
-                        entity = scope.services.archetypeLabelService.getEntityById(scope, value.typeData.contentId, "Document");
-                    }
-                    break;
-
-                case "media":
-                    if(value.typeData.mediaId) {
-                        entity = scope.services.archetypeLabelService.getEntityById(scope, value.typeData.mediaId, "Media");
-                    }
-                    break;
-
-                case "url":
-                    return value.typeData.url;
-                    
-                default:
-                    break;
-
-            }
-
-            if(entity) {
-                return entity[args.propertyName];
-            }
-
-            return "";
-        },
-        Rte: function (value, scope, args) {
-
-            if(!args.contentLength) {
-                args = {contentLength: 50}
-            }
-
-            return $(value).text().substring(0, args.contentLength);
-        }
+//create a function
+//you will add it to your label template field as `{{ArchetypeSampleLabelHelpers.testPromise(someArchetypePropertyAlias)}}`
+ArchetypeSampleLabelHelpers.testPromise = function(value) {   
+    //you can inject services
+    return function ($timeout, archetypeCacheService) {        
+        //best to return a promise
+        //NOTE: $timeout returns a promise
+        return $timeout(function () {
+            return "As Promised: " + value;
+        }, 1000);
     }
-})();
+}
+
+ArchetypeSampleLabelHelpers.testEntityPromise = function(value, scope, args) {
+    //hey look, args!
+    //{{ArchetypeSampleLabelHelpers.testEntityPromise(someArchetypePropertyAlias, {foo: 1})}}
+    console.log(args);
+    
+    return function ($q, entityResource) {    
+        var deferred = $q.defer();
+    
+        entityResource.getById(args.foo, 'document').then(function(entity) {
+            console.log("Hello from testEntityPromise");
+            console.log(entity);
+            deferred.resolve(entity.name);
+        });
+    
+        return deferred.promise;
+    }
+}
+
+ArchetypeSampleLabelHelpers.testEntityPromise2 = function(value, scope, args) {  
+    //hey look, args but we're also using the built-in archetypeCacheService
+    //{{ArchetypeSampleLabelHelpers.testEntityPromise(someArchetypePropertyAlias, {foo: 1234})}}
+    console.log(args);        
+    
+    return function ($q, archetypeCacheService) {    
+        var deferred = $q.defer();
+    
+        archetypeCacheService.getEntityById(args.foo, 'document').then(function(entity) {
+            console.log("Hello from testEntityPromise2");
+            console.log(entity);
+            deferred.resolve(entity.name);
+        });
+    
+        return deferred.promise;
+    }
+}

app/langs/da-dk.js

@@ -44,5 +44,19 @@
   "fieldsetGroups":"Fieldset-grupper",
   "fieldsetGroupsDescription":"Hvis du har mange fieldsets, skal du måske overveje at gruppere dem i fieldset-vælgeren. Når du først har defineret dine grupper her, vil en gruppe-vælger dukke op i fieldset-editoren, og du kan derefter vælge grupper for alle dine fieldsets.",
   "fieldsetGroupName":"Navn",
-  "addFieldsetGroup":"Tilføj gruppe"
+  "addFieldsetGroup":"Tilføj gruppe",
+  "enablePublishing": "Aktivér fieldset-publicering?",
+  "enablePublishingDescription": "Tillad automatisk udgivelse og udløb for fieldsets",
+  "publish": "Publicering",
+  "publishHelpText": "Konfigurér udgivelses- og udløbsdato for dette element",
+  "publishReleaseDate": "Udgivelsesdato",
+  "publishExpireDate": "Udløbsdato",
+  "settings": "Indstillinger",
+  "enableMemberGroups": "Aktivér medlems-grupper",
+  "enableMemerGroupsDescription": "Tillad at fieldsets kun vises for specifikke medlems-grupper",
+  "allowedMemberGroups": "Tilladte medlems-grupper",
+  "allowedMemberGroupsHelpText": "Vælg de medlems-grupper, der skal kunne se dette element. Hvis der ikke er valgt nogen, kan alle se elementet.",
+  "previewFieldsetOpen": "(se eksempel)",
+  "previewFieldsetHeader": "Eksempel: ",
+  "previewFieldsetClose": "(luk eksempel)"
 }

app/langs/da.js

@@ -44,5 +44,19 @@
   "fieldsetGroups":"Fieldset-grupper",
   "fieldsetGroupsDescription":"Hvis du har mange fieldsets, skal du måske overveje at gruppere dem i fieldset-vælgeren. Når du først har defineret dine grupper her, vil en gruppe-vælger dukke op i fieldset-editoren, og du kan derefter vælge grupper for alle dine fieldsets.",
   "fieldsetGroupName":"Navn",
-  "addFieldsetGroup":"Tilføj gruppe"    
+  "addFieldsetGroup":"Tilføj gruppe",
+  "enablePublishing": "Aktivér fieldset-publicering?",
+  "enablePublishingDescription": "Tillad automatisk udgivelse og udløb for fieldsets",
+  "publish": "Publicering",
+  "publishHelpText": "Konfigurér udgivelses- og udløbsdato for dette element",
+  "publishReleaseDate": "Udgivelsesdato",
+  "publishExpireDate": "Udløbsdato",
+  "settings": "Indstillinger",
+  "enableMemberGroups": "Aktivér medlems-grupper",
+  "enableMemerGroupsDescription": "Tillad at fieldsets kun vises for specifikke medlems-grupper",
+  "allowedMemberGroups": "Tilladte medlems-grupper",
+  "allowedMemberGroupsHelpText": "Vælg de medlems-grupper, der skal kunne se dette element. Hvis der ikke er valgt nogen, kan alle se elementet.",
+  "previewFieldsetOpen": "(se eksempel)",
+  "previewFieldsetHeader": "Eksempel: ",
+  "previewFieldsetClose": "(luk eksempel)"
 }

app/langs/en-gb.js

@@ -11,7 +11,7 @@
 	"maxFieldsets": "Max Fieldsets",
 	"maxFieldsetsDescription": "How many Fieldsets are allowed? Entering '1' will disable the controls. Default is unlimited.",
 	"enableMultipleFieldsets": "Enable Multiple Fieldsets?",
-	"enableMultipleFieldsetsDescription": "Allows multiple types of fieldsets within this archetype.",
+	"enableMultipleFieldsetsDescription": "Allows multiple types of fieldsets within this Archetype.",
 	"hideFieldsetToolbar": "Hide Fieldset Toolbar?",
 	"hideFieldsetToolbarDescription": "Hides the fieldset toolbar that appears when more than one fieldset model appears.",
 	"customWrapperClass": "Custom Wrapper Class",
@@ -23,7 +23,7 @@
 	"toggleDeveloperMode": "Toggle Developer Mode",
 	"toggleDeveloperModeDescription": "Turn on for developer options.",
 	"configModel": "Config Model",
-	"configModelDescription": "Be careful editing the text below, it controls the schema for this archetype.",
+	"configModelDescription": "Be careful editing the text below, it controls the schema for this Archetype.",
 	"helpText": "Help Text",
 	"defaultValue": "Default Value",
 	"dataType": "DataType",
@@ -41,6 +41,8 @@
     "overrideDefaultConverter":"Override Default Property Value Converter?",
     "enableCloning":"Enable Cloning?",
  	"enableCloningDescription":"Enable Fieldset Cloning.",
+	"enableCrossDragging":"Enable Cross-Archetype Dragging?",
+	"enableCrossDraggingDescription":"Allows fieldsets to be dragged into other Archetypes.",
   "fieldsetGroups":"Fieldset groups",
   "fieldsetGroupsDescription":"If you have a lot of fieldsets to choose from, you may want to consider grouping them in the fieldset picker. Once you have created your groups here, a group picker will be displayed in the fieldset editor and you can assign your fieldsets to their respective groups.",
   "fieldsetGroupName":"Name",

app/langs/en-us.js

@@ -11,7 +11,7 @@
 	"maxFieldsets": "Max Fieldsets",
 	"maxFieldsetsDescription": "How many Fieldsets are allowed? Entering '1' will disable the controls. Default is unlimited.",
 	"enableMultipleFieldsets": "Enable Multiple Fieldsets?",
-	"enableMultipleFieldsetsDescription": "Allows multiple types of fieldsets within this archetype.",
+	"enableMultipleFieldsetsDescription": "Allows multiple types of fieldsets within this Archetype.",
 	"hideFieldsetToolbar": "Hide Fieldset Toolbar?",
 	"hideFieldsetToolbarDescription": "Hides the fieldset toolbar that appears when more than one fieldset model appears.",
 	"customWrapperClass": "Custom Wrapper Class",
@@ -23,7 +23,7 @@
 	"toggleDeveloperMode": "Toggle Developer Mode",
 	"toggleDeveloperModeDescription": "Turn on for developer options.",
 	"configModel": "Config Model",
-	"configModelDescription": "Be careful editing the text below, it controls the schema for this archetype.",
+	"configModelDescription": "Be careful editing the text below, it controls the schema for this Archetype.",
 	"helpText": "Help Text",
 	"defaultValue": "Default Value",
 	"dataType": "DataType",
@@ -41,6 +41,8 @@
     "overrideDefaultConverter":"Override Default Property Value Converter?",
     "enableCloning":"Enable Cloning?",
  	"enableCloningDescription":"Enable Fieldset Cloning.",
+	"enableCrossDragging":"Enable Cross-Archetype Dragging?",
+	"enableCrossDraggingDescription":"Allows fieldsets to be dragged into other Archetypes.",
   "fieldsetGroups":"Fieldset groups",
   "fieldsetGroupsDescription":"If you have a lot of fieldsets to choose from, you may want to consider grouping them in the fieldset picker. Once you have created your groups here, a group picker will be displayed in the fieldset editor and you can assign your fieldsets to their respective groups.",
   "fieldsetGroupName":"Name",

app/langs/en.js

@@ -11,7 +11,7 @@
 	"maxFieldsets": "Max Fieldsets",
 	"maxFieldsetsDescription": "How many Fieldsets are allowed? Entering '1' will disable the controls. Default is unlimited.",
 	"enableMultipleFieldsets": "Enable Multiple Fieldsets?",
-	"enableMultipleFieldsetsDescription": "Allows multiple types of fieldsets within this archetype.",
+	"enableMultipleFieldsetsDescription": "Allows multiple types of fieldsets within this Archetype.",
 	"hideFieldsetToolbar": "Hide Fieldset Toolbar?",
 	"hideFieldsetToolbarDescription": "Hides the fieldset toolbar that appears when more than one fieldset model appears.",
 	"customWrapperClass": "Custom Wrapper Class",
@@ -23,7 +23,7 @@
 	"toggleDeveloperMode": "Toggle Developer Mode",
 	"toggleDeveloperModeDescription": "Turn on for developer options.",
 	"configModel": "Config Model",
-	"configModelDescription": "Be careful editing the text below, it controls the schema for this archetype.",
+	"configModelDescription": "Be careful editing the text below, it controls the schema for this Archetype.",
 	"helpText": "Help Text",
 	"defaultValue": "Default Value",
 	"dataType": "DataType",
@@ -41,6 +41,8 @@
     "overrideDefaultConverter":"Override Default Property Value Converter?",
     "enableCloning":"Enable Cloning?",
  	"enableCloningDescription":"Enable Fieldset Cloning.",
+	"enableCrossDragging":"Enable Cross-Archetype Dragging?",
+	"enableCrossDraggingDescription":"Allows fieldsets to be dragged into other Archetypes.",
   "fieldsetGroups":"Fieldset groups",
   "fieldsetGroupsDescription":"If you have a lot of fieldsets to choose from, you may want to consider grouping them in the fieldset picker. Once you have created your groups here, a group picker will be displayed in the fieldset editor and you can assign your fieldsets to their respective groups.",
   "fieldsetGroupName":"Name",

app/less/archetype.less

@@ -33,29 +33,26 @@
         margin-left: 0;
     }
 
-    .icon {
-        color: #ddd;
-        padding: 2px;
-        font-size: 16px;
-        &:hover {
-            color: #333;
-        }
-        &.icon-delete:hover {
-            color: #b94a48;
-        }
-    }
-
     .fieldsetIcon {
         float: left;
-        padding: 0 4px 0 0;
-        color: #333;
+        padding: 0 10px 0 0;
         vertical-align: text-bottom;
     }
 
+    .caret {
+        margin: 8px 1px 0 2px;
+        &.caret-right {
+            border-bottom: 4px solid transparent;
+            border-top: 4px solid transparent;
+            border-left: 4px solid #ddd;
+            content: "";
+            margin-top: 6px;
+        }
+    }
+
     fieldset {
         border-bottom: 1px dashed #dddddd;
         padding: 0;
-        margin-bottom: 5px;
         clear: both;
         display: inline-block;
         width: 100%;
@@ -76,15 +73,28 @@
                 }
 
             }
+            
+            .publishOptions {
+                .publishDate {
+                    display: inline-block;
+                    vertical-align: top;
+                    margin-right: 20px;
+                    
+                    label {
+                        padding: 0 !important;
+                        margin: 0 !important;
+                    }
+                }
+            }
         }
 
         .archetypeFieldsetLabel {
             position: relative;
             width: 100%;
-            min-height: 42px;
+            background: white;
 
             .label-sub {
-                padding: 8px 0 8px 0;
+                padding: 18px 0;
                 display: inline-block;
                 min-height: 20px; /* this makes the header clickable when there's no icon and no text */
                 &.module-label {
@@ -94,9 +104,9 @@
                     cursor: pointer;
     
                     label  {
-                        span {
-                            text-decoration: underline;
-                        }
+                        // span {
+                        //     text-decoration: underline;
+                        // }
                         &:hover {
                             cursor: pointer;
                         }
@@ -117,7 +127,7 @@
             }
 
             span {
-                font-weight: bold;
+                // font-weight: bold;
 
                 &.menu-label { font-weight: normal; }
             }
@@ -127,48 +137,105 @@
             }
 
             .caret {
-                margin: 8px 1px 0 2px;
                 position: absolute;
-
-                &.caret-right {
-                    border-bottom: 4px solid transparent;
-                    border-top: 4px solid transparent;
-                    border-left: 4px solid #ddd;
-                    content: "";
-                    margin-top: 6px;
-                }
             }
 
             label {
                 margin-bottom: 0;
                 margin-left: 18px;
-                white-space: nowrap;
                 padding: 0;
-                width: ~"calc(100% - 144px)";
-                position: absolute;
+                display: block;
                 span {
                     display: block;
                     overflow: hidden;
                     text-overflow: ellipsis;
+                    max-height: 40px;
+                    -webkit-line-clamp: 2;
+                    -webkit-box-orient: vertical;
+                    display: -webkit-box;
                 }
-                &.dimmed {
-                    i, span {
-                        color: #d9d9d9 !important;
-                    }
+            }
+
+            &.dimmed {
+                label {
+                    color: #d9d9d9 !important;
                 }
             }
 
             .archetypeEditorControls {
                 float: none;
                 position: absolute;
-                right: 15px;
+                right: 0;
                 top: 0;
+                height: 100%; 
+                padding: 0;
+                display: flex;
+                align-items: center;
+                opacity: 0;
+                transition: opacity .15s ease-in-out;
+                -moz-transition: opacity .15s ease-in-out;
+                -webkit-transition: opacity .15s ease-in-out;
+                background: white;
+
+                &:before {
+                    content: ' ';
+                    position: absolute;
+                    display: block; 
+                    left: -40px;
+                    width: 40px;
+                    top: 0;
+                    bottom: 0;
+                    background: -webkit-linear-gradient(90deg, rgba(255,255,255,0), white);
+                    background: -moz-linear-gradient(90deg, rgba(255,255,255,0), white);
+                    background: linear-gradient(90deg, rgba(255,255,255,0), white);
+                }
+
+                .icon {
+                    display: inline-block;
+                    height: 28px;
+                    width: 28px;
+                    line-height: 28px;
+                    border-radius: 14px;
+                    border: 1px solid #d6d6d6;
+                    color: #5f5f5f;
+                    background: white;
+                    font-size: 16px;
+                    text-align: center;
+                    margin-left: 8px;
+
+                    &:hover {
+                        background: #f3f3f5;
+                    }
+                    &.icon-trash:hover {
+                        background: #fe5b57;
+                        border-color: #fe5b57;
+                        color: white;
+                    }
+                    &.icon-disabled {
+                        cursor: default;
+                        &:hover {
+                            color: #ddd;
+                            background: white;
+                        }
+                    }
+                    &.icon-active {
+                        color: #bbb;
+                        &:hover {
+                            color: white;
+                        }
+                    }
+                }
             }
-            
-            &:hover {
+
+            &:hover .archetypeEditorControls {
+                opacity: 1;
             }
         }
 
+        &.is-open > .archetypeFieldsetLabel .archetypeEditorControls {
+            opacity: 1;
+        }
+
         .archetypePropertyError {
             margin-bottom: 5px;
             padding-top: 3px;
@@ -186,9 +253,24 @@
         .archetypeCollapser {
             clear: both;
             height: 100%;
-            padding: 12px 0 0 20px;
-            background-color: #fff;
-            border-radius: 0 0 0 5px;
+            padding: 24px 20px 0 20px;
+            background-color: #fafafa;
+            border-top: 1px dashed #e0e0e0;
+            line-height: 20px;
+
+            .archetypeFieldsetLabel {
+                background: #fafafa;
+            }
+
+            .archetypeEditorControls {
+                background: #fafafa;
+
+                &:before {
+                    background: -webkit-linear-gradient(90deg, rgba(250,250,250,0), #fafafa);
+                    background: -moz-linear-gradient(90deg, rgba(250,250,250,0), #fafafa);
+                    background: linear-gradient(90deg, rgba(250,250,250,0), #fafafa);
+                }
+            }
 
             form {
                 margin-left:20px;
@@ -219,25 +301,69 @@
         border: 1px solid #b94a48;
     }
 
+    .archetypeFooter {
+        text-align: center;
+        margin-top: 20px;
+    }
+
     .archetypeAddButton {
-        color: #ddd;
-        .icon {
-            vertical-align: text-top;
-        }
+        display: inline-block;
+        height: 28px;
+        width: 28px;
+        line-height: 28px;
+        border-radius: 14px;
+        border: 1px solid #b6b6b6;
+        color: #5f5f5f;
+        background: white;
+        font-size: 16px;
+        text-align: center;
+        text-decoration: none;
+        cursor: pointer;
+
         &:hover {
-            color: #333;
-            text-decoration: none;
-            cursor: pointer;
-
-            .archetypeAddButtonText {
-                text-decoration: underline;
-            }
-
-            .icon {
-                color: #333;
-            }
+            background: #00aea2;
+            border-color: #00aea2;
+            color: white;
         }
+    }
 
+    .archetypeEmptyContent {
+        text-align: center;
+        margin-bottom: 20px;
+
+        span {
+            display: inline-block;
+            padding: 10px 20px;
+            clear: both;
+            font-size: 14px;
+            color: #555;
+            background: #f8f8f8;
+            border-radius: 15px;
+        }
+    }
+
+    .archetypeCrossDraggable + .archetypeEmptyContent {
+        margin-top: -42px;
+    }
+
+    &.archetypeDragging .archetypeCrossDraggable + .archetypeEmptyContent {
+        display: none;
+    }
+
+    // Necessary to ensure empty lists can be dropped onto when sorting nested fieldsets.
+    .archetypeSortable.archetypeEmpty.archetypeCrossDraggable {
+        min-height: 40px;
+        border: 1px dashed transparent;
+    }
+
+    &.archetypeDragging .archetypeSortable.archetypeEmpty.archetypeCrossDraggable {
+        min-height: 56px;
+        border-color: #dddddd;
+    }
+
+
+    .archetypeCollapser .archetypeEmptyContent span {
+        background: #f2f2f2;
     }
 
     .multiPropertyTextbox {
@@ -248,6 +374,9 @@
         list-style: none;
         margin-left: 0;
     }
+    li {
+        line-height: 20px;
+    }
 
     .show-validation.ng-invalid .control-group.error .control-label {
         span {
@@ -263,6 +392,12 @@
             overflow: visible;
             vertical-align: top;  
             height: 90px;        
+            .fieldsetPreviewOpen {
+                font-style: italic;
+                a:hover {
+                    text-decoration: underline;
+                }
+            }
         }
         ul.groups {
             display: block;
@@ -283,6 +418,66 @@
                 }
             }
         }
+
+        .fieldsetPreview {
+            .fieldsetPreviewClose {
+                font-style: italic;
+                font-size: 12px;
+                text-align: center;
+            }
+            .fieldsetPreviewImage {
+                padding: 6px 0px;
+                img {
+                    height: auto;
+                    max-width: 100%;
+                    vertical-align: middle;
+                    border: 0;
+                    cursor: zoom-in;
+                }
+            }
+        }
+    }
+
+    .settingsWrapper {
+        &:hover {
+            caret {
+                background-color: #333;
+            }
+        }
+        .settingsHeader {
+            label {
+                display: inline-block;
+            }
+            &:hover {
+                cursor: pointer;
+                label {
+                    text-decoration: underline;
+                }
+
+                .caret-right {
+                    border-left-color: #333;
+                }
+            }
+        }
+        
+        .settings {
+            padding: 14px;
+            background-color: #f8f8f8;
+            overflow: hidden;
+
+            .allowedGroups {
+                .umb-membergrouppicker a {
+                    i {
+                        padding-right: 0;
+                        font-size: inherit;
+                    }
+
+                    &:hover i {
+                        color: #333;
+                    }
+                }
+            }
+        }
     }
 }
 
@@ -290,6 +485,7 @@
     .archetypeEditorControls {
         float: right;
     }
+    
     .archetypeEditorControls, .archetypeFieldsetGroups {
         i {
             cursor: pointer;
@@ -315,10 +511,10 @@
         small {
             margin-left: 5px;
         }
-        
+
         a {
             float: right;
-            
+
             img {
                 width: 35px;
             }
@@ -328,6 +524,26 @@
     .manual-link {
         color: blue;
     }
+    
+    .donate-link {
+        font-weight: 700;
+    }
+    
+    .sponsors {
+        padding-bottom: 10px;
+        margin-bottom: 5px;
+        margin-left: 5px;
+        display: inline-table;
+        float: right;
+        
+        a {
+            float: none;
+        }
+        
+        h4 {
+            border-bottom: 1px solid #ccc;
+        }
+    }
 
     ul {
         list-style: none;
@@ -339,6 +555,7 @@
 
     label {
         width: 120px;
+        padding-left: 0;
     }
 
     .archetypeEditorControls {
@@ -347,6 +564,8 @@
 
     .archetypeFieldsets {
         margin-left: 0;
+        border-top: 5px solid;
+        padding-top: 5px;
     }
 
     .archetypeFieldsetWrapper {
@@ -362,8 +581,11 @@
 
     .archetypeFieldsetOption {
         margin-bottom: 15px;
-        input[type=text]{
-            max-width: 300px;
+        margin-right: 15px;
+
+        input[type=text] {
+            max-width: 100%;
+            width: 100%;
         }
     }
 
@@ -374,15 +596,20 @@
         height: 130px;
     }
 
-    .archetypeOptions label{
-        width: 400px;
+    .archetypeOptions {
+        .btn {
+            margin-bottom: 5px;
+        }
+
+        label {
+            width: 400px;
+        }
     }
 
     .archetypePropertiesWrapper {
         border: 1px solid #ddd;
         padding: 8px;
         margin: -40px 10px 10px 140px;
-        max-width: 475px;
 
         ul {
             padding: 0;
@@ -395,12 +622,13 @@
             background-color: #eee;
 
             input[type=text] {
-                max-width: 190px;
-                width: auto;
+                max-width: 100%;
+                width: 100%;
             }
 
             select {
-                max-width: 160px;
+                max-width: 100%;
+                width: 100%;
             }
         }
 
@@ -414,6 +642,10 @@
             width: 100%;
         }
 
+        input[type=text] {
+            width: 100%;
+        }
+
         input[type=checkbox] {
             margin-top: 0;
             margin-right: 2px;
@@ -444,10 +676,10 @@
                     }
                 }
             }
-        }        
+        }
     }
 
-    .archetypeMaxFieldsets{
+    .archetypeMaxFieldsets {
         border: 1px solid #ddd;
         width: 40px;
         text-align: right;
@@ -460,8 +692,10 @@
 
     .archetypePropertyCollapser {
         margin-top: 10px;
+
         div {
             margin-bottom: 10px;
+            margin-right: 15px;
         }
     }
 
@@ -472,6 +706,10 @@
     .fieldsetIcon {
         margin-right: 10px;
     }
+
+    small {
+        color: #817f85;
+    }
 }
 
 .ui-sortable-placeholder {

app/resources/archetypePropertyEditorResource.js

@@ -6,6 +6,11 @@ angular.module('umbraco.resources').factory('archetypePropertyEditorResource', f
                 $http.get("backoffice/ArchetypeApi/ArchetypeDataType/GetAll"), 'Failed to retrieve datatypes from tree service'
             );
         },
+        getAllDataTypesForCache: function() {
+            return umbRequestHelper.resourcePromise(
+                $http.get("backoffice/ArchetypeApi/ArchetypeDataType/GetAllDetails"), 'Failed to retrieve datatypes from tree service'
+            );
+        },
         getDataType: function (guid, useDeepDatatypeLookup, contentTypeAlias, propertyTypeAlias, archetypeAlias, nodeId) {
             if(useDeepDatatypeLookup) {
             	return umbRequestHelper.resourcePromise(

app/services/archetypeCacheService.js

@@ -1,78 +1,87 @@
-angular.module('umbraco.services').factory('archetypeCacheService', function (archetypePropertyEditorResource) {
+angular.module('umbraco.services').factory('archetypeCacheService', function (archetypePropertyEditorResource, $q, entityResource) {
     //private
-
-    var isEntityLookupLoading = false;
     var entityCache = [];
-
-    var isDatatypeLookupLoading = false;
     var datatypeCache = [];
-
+    
     return {
-    	getDataTypeFromCache: function(guid) {
-        	return _.find(datatypeCache, function (dt){
-	            return dt.dataTypeGuid == guid;
-	        });
-    	},
-
-    	addDatatypeToCache: function(datatype, dataTypeGuid) {
-            var cachedDatatype = this.getDataTypeFromCache(dataTypeGuid);
-
-            if(!cachedDatatype) {
-            	datatype.dataTypeGuid = dataTypeGuid;
-            	datatypeCache.push(datatype);
-            }
-    	},
+        initialize: function() {
+            return archetypePropertyEditorResource.getAllDataTypesForCache().then(function(data) {
+                _.each(data, function(datatype) {
+                    datatypeCache[datatype.dataTypeGuid] = datatype;
+                });
+            });
+        },
+        
+        getDataTypeFromCache: function(guid) {
+            return datatypeCache[guid];
+        },
  
-		getDatatypeByGuid: function(guid) {
-			var cachedDatatype = this.getDataTypeFromCache(guid);
+        getDatatypeByGuid: function(guid) {
+            var cachedDatatype = this.getDataTypeFromCache(guid);
+            
+            if(cachedDatatype) {
+                return cachedDatatype;
+            }
 
-	        if(cachedDatatype) {
-	            return cachedDatatype;
-	        }
-
-	        //go get it from server, but this should already be pre-populated from the directive, but I suppose I'll leave this in in case used ad-hoc
-	        if (!isDatatypeLookupLoading) {
-	            isDatatypeLookupLoading = true;
-
-	            archetypePropertyEditorResource.getDataType(guid).then(function(datatype) {
-
-	            	datatype.dataTypeGuid = guid;
-
-	                datatypeCache.push(datatype);
-
-	                isDatatypeLookupLoading = false;
-
-	                return datatype;
-	            });
-	        }
-
-	        return null;
+            return null;
         },
 
-     	getEntityById: function(scope, id, type) {
-	        var cachedEntity = _.find(entityCache, function (e){
-	            return e.id == id;
-	        });
+        getEntityById: function(id, type) {
+            var deferred = $q.defer();
+            
+            //console.log(entityCache);
+                
+            var cachedEntity = entityCache[id];
 
-	        if(cachedEntity) {
-	            return cachedEntity;
-	        }
+            if(cachedEntity) {
+                //console.log("Found ID " + id);
+                
+                deferred.resolve(cachedEntity);
+                
+                return deferred.promise;
+            }
 
-	        //go get it from server
-	        if (!isEntityLookupLoading) {
-	            isEntityLookupLoading = true;
+            //go get it from server
+            entityResource.getById(id, type).then(function(entity) {
+                entityCache[id] = entity;
+                
+                //console.log("entity ID is now resolved into cache...");
+                //console.log(entityCache);
+                
+                deferred.resolve(entity);
+            });
 
-	            scope.resources.entityResource.getById(id, type).then(function(entity) {
+            return deferred.promise;
+        },
 
-	                entityCache.push(entity);
+        //perhaps this should return a promise?
+        getEntityByUmbracoId: function(udi, type) {
+            var deferred = $q.defer();
+            
+            var cachedEntity = entityCache[udi];
 
-	                isEntityLookupLoading = false;
+            if(cachedEntity) {
+                //console.log("Found UDI " + udi);
+                
+                deferred.resolve(cachedEntity);
+                
+                return deferred.promise;
+            }
 
-	                return entity;
-	            });
-	        }
+            //go get it from server
+            entityResource.getByIds([udi], type).then(function (entities) {
+                // prevent infinite lookups with a default entity
+                var entity = entities.length > 0 ? entities[0] : { udi: udi, name: "" };
 
-	        return null;
-	    }
+                entityCache[udi] = entity;
+                
+                //console.log("entity UDI is now resolved into cache...");
+                //console.log(entityCache);
+
+                deferred.resolve(entity);
+            });
+
+            return deferred.promise;
+        }
     }
 });

app/services/archetypeGlobalConfigService.js

@@ -0,0 +1,19 @@
+angular.module('umbraco.services').factory('archetypeGlobalConfigService', function ($q, $http, umbRequestHelper) {
+    return {
+        globalSettings: function () {
+            return umbRequestHelper.resourcePromise(
+                $http.get("backoffice/ArchetypeApi/ArchetypeDataType/globalSettings"), 'Failed to get whether or not we are checking for updates!'
+            );
+        },
+        setCheckForUpdates: function (isChecking) {
+            return umbRequestHelper.resourcePromise(
+                $http.post("backoffice/ArchetypeApi/ArchetypeDataType/SetCheckForUpdates", isChecking), 'Failed to update check status!'
+            );
+        },
+        checkForUpdates: function () {
+            return umbRequestHelper.resourcePromise(
+                $http.post("backoffice/ArchetypeApi/ArchetypeDataType/checkForUpdates", { }), 'Failed to check for updates!'
+            );
+        }
+    }
+});

app/services/archetypeLabelService.js

@@ -1,6 +1,172 @@
-angular.module('umbraco.services').factory('archetypeLabelService', function (archetypeCacheService) {
+angular.module('umbraco.services').factory('archetypeLabelService', function (archetypeCacheService, $q, $injector, $timeout) {
     //private
 
+    /**
+     * This will repeatedly wait for all promises in an array of promises to resolve, and it allows
+     * for promises to be added to the array (i.e., if you add more promises, those added promises
+     * will also be resolved too).
+     * @param promises The array of promises.
+     * @returns {*} The promise that will resolve once all promises in the array resolve.
+     */
+    function repeatedlyWaitForPromises(promises) {
+
+        // Remember the original number of promises being resolved.
+        var originalLength = promises.length;
+        
+        return $q.all(promises).then(function () {
+
+            // If there are new promises, resolve those too.
+            if (promises.length > originalLength) {
+                promises = promises.slice(originalLength);
+                return repeatedlyWaitForPromises(promises);
+            }
+        });
+    }
+
+    /**
+     * Processes a value to be used in a fieldset label. Since it might be a promise or a function, the
+     * value is repeatedly processed until it becomes a string.
+     * @param labelValue The value to be used in the fieldset label.
+     * @param promises The collection of promises to add any promises to.
+     * @param match The current matched substring object in a label template.
+     */
+    function processLabelValue(labelValue, promises, match) {
+
+        // Normalize null/undefined values to an empty string.
+        if(!labelValue) {
+            labelValue = "";
+        }
+
+        // Check the type of value (may be a string, promise, function, or other).
+        if (isString(labelValue)) {
+
+            // handle collapsing dollar signs in labels (#387)
+            if (labelValue.indexOf("$$") >= 0) {
+                labelValue = labelValue.replace(/\$\$/g, "$$$$$$$$");
+            }
+
+            // Set a new value now that it has been processed.
+            //console.log("Processing string..." + labelValue);
+            match.value = labelValue;
+        } else if (isPromise(labelValue)) {
+            // Remember the promise so we can wait for it to be completed before constructing the
+            // fieldset label.
+            promises.push(labelValue);
+            labelValue.then(function (value) {
+                //console.log("Processing final value..." + value);
+                // The value will probably be a string, but recursively process it in case it's
+                // something else.
+                processLabelValue(value, promises, match);
+            });
+        } else if (_.isFunction(labelValue)) {
+
+            // Allow for the function to accept injected parameters, and invoke it.
+            labelValue = $injector.invoke(labelValue);
+
+            // Recursively check result (may be a string, promise, or another function (another
+            // function would be pretty strange, though I see no reason to disallow it).
+            processLabelValue(labelValue, promises, match);
+        } else {
+            // Some other data type (e.g., number, date, object).
+            match.value = labelValue;
+        }
+    }
+
+    /**
+     * Checks if the specified value is of type string.
+     * @param value The value to check the type of.
+     * @returns {boolean} True, if the value is a string; otherwise, false.
+     */
+    function isString(value) {
+        if (value === null) {
+            return false;
+        } else if (typeof value === 'string') {
+            return true;
+        } else if (value instanceof String) {
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    /**
+     * Checks if the specified value is a JavaScript promise.
+     * @param value The value that may be a promise.
+     * @returns {*} True, if the value appears to be a promise; otherwise, false.
+     */
+    function isPromise(value) {
+        return value && _.isFunction(value.then);
+    }
+
+    /**
+     * Splits a string value into a collection based on a regular expression.
+     * @param rgx The regular expression to use to find matches in the string value.
+     * @param value The string value to split.
+     * @returns {Array} A collection of objects, each representing a portion of the supplied
+     *      string. Each object will contain the substring value, as well as a property
+     *      indicating whether or not that substring was matched the regular expression.
+     */
+    function splitByRegex(rgx, value) {
+        // Validate input.
+        if (!rgx || !value) {
+            return [];
+        }
+
+        // Variables.
+        var substring,
+            splitParts = [],
+            nextIndex = 0,
+            index;
+
+        // Reset regex so we get all the matches.
+        rgx.lastIndex = 0;
+
+        // Loop through each match until there are no more matches.
+        var match = rgx.exec(value);
+        while (match) {
+
+            // Extract match index.
+            index = match.index;
+
+            // Is there text between the prior match and this one?
+            if (nextIndex < index) {
+                substring = value.substring(nextIndex, index);
+                splitParts.push({
+                    isMatch: false,
+                    value: substring
+                });
+            }
+
+            // Remember the end of this match for the next loop iteration.
+            nextIndex = rgx.lastIndex;
+
+            // Store info about this match.
+            substring = value.substring(index, nextIndex);
+            splitParts.push({
+                isMatch: true,
+                value: substring
+            });
+
+            // Get next match.
+            match = rgx.exec(value);
+        }
+
+        // The text after the last match.
+        if (nextIndex < value.length) {
+            substring = value.substring(nextIndex);
+            splitParts.push({
+                isMatch: false,
+                value: substring
+            });
+        }
+
+        // Reset regex in case somebody else wants to use it.
+        rgx.lastIndex = 0;
+
+        // Return information about the matches.
+        return splitParts;
+    }
+
     function executeFunctionByName(functionName, context) {
         var args = Array.prototype.slice.call(arguments).splice(2);
 
@@ -19,21 +185,31 @@ angular.module('umbraco.services').factory('archetypeLabelService', function (ar
     }
 
     function getNativeLabel(datatype, value, scope) {
-
-    	switch (datatype.selectedEditor) {
-    		case "Imulus.UrlPicker":
-    			return imulusUrlPicker(value, scope, {});
-    		case "Umbraco.TinyMCEv3":
-    			return coreTinyMce(value, scope, {});
-            case "Umbraco.MultiNodeTreePicker":
-                return coreMntp(value, scope, datatype);
-            case "Umbraco.MediaPicker":
-                return coreMediaPicker(value, scope, datatype);
-            case "Umbraco.DropDown":
-                return coreDropdown(value, scope, datatype);
-    		default:
-    			return "";
-    	}
+        switch (datatype.selectedEditor) {
+                case "Imulus.UrlPicker":
+                    return imulusUrlPicker(value, scope, {});
+                case "Umbraco.TinyMCEv3":
+                    return coreTinyMce(value, scope, {});
+                case "Umbraco.MultiNodeTreePicker":
+                    return coreMntp(value, scope, datatype);
+                case "Umbraco.MultiNodeTreePicker2":
+                    return coreMntpV2(value, scope, datatype);
+                case "Umbraco.MultipleMediaPicker":
+                case "Umbraco.MediaPicker":
+                    return coreMediaPicker(value, scope, datatype);
+                case "Umbraco.MediaPicker2":
+                    return coreMediaPickerV2(value, scope, datatype);
+                case "Umbraco.DropDown":
+                    return coreDropdown(value, scope, datatype);
+                case "RJP.MultiUrlPicker":
+                    return rjpMultiUrlPicker(value, scope, {});
+                case "Umbraco.ContentPickerAlias":
+                    return coreContentPicker(value, scope, datatype);
+                case "Umbraco.ContentPicker2":
+                    return coreContentPickerV2(value, scope, datatype);
+                default:
+                    return null;
+        }
     }
 
     function coreDropdown(value, scope, args) {
@@ -53,6 +229,7 @@ angular.module('umbraco.services').factory('archetypeLabelService', function (ar
     function coreMntp(value, scope, args) {
         var ids = value.split(',');
         var type = "Document";
+        var deferred = $q.defer();
 
         switch(args.preValues[0].value.type) {
             case 'content':
@@ -64,129 +241,264 @@ angular.module('umbraco.services').factory('archetypeLabelService', function (ar
             case 'member':
                 type = 'member';
                 break;
-
             default:
                 break;
         }
 
         var entityArray = [];
+        var promises = [];
 
         _.each(ids, function(id){
             if(id) {
-
-                var entity = archetypeCacheService.getEntityById(scope, id, type);
-                
-                if(entity) {
-                    entityArray.push(entity.name);
-                }
+               promises.push(archetypeCacheService.getEntityById(id, type).then(function(entity){                
+                    if(entity) {
+                        entityArray.push(entity.name);
+                    }
+               }).promise);
             }
         });
 
-        return entityArray.join(', ');
+        $q.all(promises).then(function() {
+            deferred.resolve(entityArray.join(', '));
+        });
+                
+        return deferred.promise;
+    }
+
+    function coreMntpV2(value, scope, args) {
+        var deferred = $q.defer();
+        
+        var ids = value.split(',');
+        
+        if (ids.length == 0) {
+          return "";
+        }
+        
+        var type = "document";
+
+        switch(args.preValues[0].value.type) {
+            case 'content':
+                type = 'document';
+                break;
+            case 'media':
+                type = 'media';
+                break;
+            case 'member':
+                type = 'member';
+                break;
+
+            default:
+                break;
+        }
+        
+        var entityArray = [];
+        var promises = [];
+
+        _.each(ids, function (id) {            
+            if(id) {
+                promises.push(archetypeCacheService.getEntityByUmbracoId(id, type).then(function(entity) {
+                    if(entity) {
+                        entityArray.push(entity.name);
+                    }
+                }).promise);
+            }
+        });
+        
+        $q.all(promises).then(function() {           
+            if(entityArray.length == 0) {
+                deferred.resolve("");
+            }
+            
+            var firstEntityName = entityArray[0];
+            
+            var value = firstEntityName + (ids.length > 1 ? ", ..." : "");
+            
+            deferred.resolve(value);
+        });
+                
+        return deferred.promise;
     }
 
     function coreMediaPicker(value, scope, args) {
+        var deferred = $q.defer();
+        
         if(value) {
-             var entity = archetypeCacheService.getEntityById(scope, value, "media");     
-             
-            if(entity) {
-                return entity.name; 
-            }
+            archetypeCacheService.getEntityById(value, "media").then(function(entity) {
+                deferred.resolve(entity.name);
+            });
+        }
+        else
+        {
+            deferred.resolve("");
         }
 
-        return "";
+        return deferred.promise;
+    }
+
+    function coreMediaPickerV2(value, scope, args) {
+        var deferred = $q.defer();
+       
+        //console.log("value=");
+        //console.log(value);       
+       
+        if(value) {
+            archetypeCacheService.getEntityByUmbracoId(value, "media").then(function(entity) {
+                deferred.resolve(entity.name);
+            });
+        }
+        else
+        {
+            deferred.resolve("");
+        }
+
+        return deferred.promise;
+    }
+
+    function coreContentPicker(value, scope, args) {
+        var deferred = $q.defer();
+        
+        if(value) {
+            archetypeCacheService.getEntityById(value, "document").then(function(entity) {
+                deferred.resolve(entity.name);
+            });
+        }
+        else 
+        {
+            deferred.resolve("");
+        }
+        
+        return deferred.promise;
+    }
+
+    function coreContentPickerV2(value, scope, args) {
+        var deferred = $q.defer();
+      
+        if (value) {
+            archetypeCacheService.getEntityByUmbracoId(value, "document").then(function(entity) {
+                deferred.resolve(entity.name);
+            });
+        }
+        else 
+        {
+            deferred.resolve("");
+        }
+
+        return deferred.promise;
     }
 
     function imulusUrlPicker(value, scope, args) {
-
+        var deferred = $q.defer();        
+        
+        if(!value) {
+            deferred.resolve("");
+            
+            return deferred.promise;
+        }
+        
         if(!args.propertyName) {
             args = {propertyName: "name"}
         }
+        
+        if(typeof(value) != "object") {
+            value = JSON.parse(value);
+        }
 
-        var entity;
-
+        //console.log("urlpicker value...");
+        //console.log(value);
+        
+        if(value.length) {
+            value = value[0];
+        }       
+               
         switch (value.type) {
             case "content":
                 if(value.typeData.contentId) {
-                    entity = archetypeCacheService.getEntityById(scope, value.typeData.contentId, "Document");
+                    archetypeCacheService.getEntityById(value.typeData.contentId, "Document").then(function(entity) {
+                        //console.log("Retrived entity from cache!");
+                        //console.log("Resolving the entity name with " + entity[args.propertyName]);
+                        deferred.resolve(entity[args.propertyName]);
+                    });
                 }
                 break;
 
             case "media":
                 if(value.typeData.mediaId) {
-                    entity = archetypeCacheService.getEntityById(scope, value.typeData.mediaId, "Media");
+                    archetypeCacheService.getEntityById(value.typeData.mediaId, "Media").then(function(entity) {
+                        deferred.resolve(entity[args.propertyName]);
+                    });
                 }
                 break;
 
             case "url":
-                return value.typeData.url;
+                deferred.resolve(value.typeData.url);
+                
+                return deferred.promise;
                 
             default:
                 break;
-
         }
-
-        if(entity) {
-            return entity[args.propertyName];
-        }
-
-        return "";
+        
+        return deferred.promise;
     }
 
     function coreTinyMce(value, scope, args) {
-
         if(!args.contentLength) {
-            args = {contentLength: 50}
+            args = {contentLength: 160}
         }
 
         var suffix = "";
         var strippedText = $("<div/>").html(value).text();
 
         if(strippedText.length > args.contentLength) {
-        	suffix = "…";
+            suffix = "…";
         }
 
         return strippedText.substring(0, args.contentLength) + suffix;
     }
 
-	return {
-		getFieldsetTitle: function(scope, fieldsetConfigModel, fieldsetIndex) {
+    function rjpMultiUrlPicker(values, scope, args) {
+        var names = [];
 
-            //console.log(scope.model.config);
+        _.each(values, function (value) {
+            if (value.name) {
+                names.push(value.name);
+            }
+        });
+
+        return names.join(", ");
+    }
+    
+    return {
+        getFieldsetTitle: function(scope, fieldsetConfigModel, fieldsetIndex) {
 
             if(!fieldsetConfigModel)
-                return "";
+                return $q.when("");
 
             var fieldset = scope.model.value.fieldsets[fieldsetIndex];
             var fieldsetConfig = scope.getConfigFieldsetByAlias(fieldset.alias);
             var template = fieldsetConfigModel.labelTemplate;
+            var promises = [];
 
             if (template.length < 1)
-                return fieldsetConfig.label;
+                return $q.when(fieldsetConfig.label);
 
-            var rgx = /({{(.*?)}})*/g;
-            var results;
-            var parsedTemplate = template;
-
-            var rawMatches = template.match(rgx);
-            
-            var matches = [];
-
-            _.each(rawMatches, function(match){
-                if(match) {
-                    matches.push(match);
-                }
-            });
+            var rgx = /{{.*?}}/g;
+            var matches = splitByRegex(rgx, template);
 
             _.each(matches, function (match) {
 
+                // Skip over substrings that didn't match the regex (they do not require a transformation).
+                if (!match.isMatch) {
+                    return;
+                }
+
                 // split the template in case it consists of multiple property aliases and/or functions
-                var templates = match.replace("{{", '').replace("}}", '').split("|");
+                var templates = match.value.replace("{{", '').replace("}}", '').split("|");
                 var templateLabelValue = "";
 
                 for(var i = 0; i < templates.length; i++) {
                     // stop looking for a template label value if a previous template part already yielded a value
-                    if(templateLabelValue != "") {
+                    if(templateLabelValue !== "") {
                         break;
                     }
                     
@@ -197,7 +509,7 @@ angular.module('umbraco.services').factory('archetypeLabelService', function (ar
                     var endParamsIndexOf = template.indexOf(")");
 
                     //if passed a function
-                    if(beginParamsIndexOf != -1 && endParamsIndexOf != -1)
+                    if(beginParamsIndexOf !== -1 && endParamsIndexOf !== -1)
                     {
                         var functionName = template.substring(0, beginParamsIndexOf);
                         var propertyAlias = template.substring(beginParamsIndexOf + 1, endParamsIndexOf).split(',')[0];
@@ -206,7 +518,7 @@ angular.module('umbraco.services').factory('archetypeLabelService', function (ar
 
                         var beginArgsIndexOf = template.indexOf(',');
 
-                        if(beginArgsIndexOf != -1) {
+                        if(beginArgsIndexOf !== -1) {
 
                             var argsString = template.substring(beginArgsIndexOf + 1, endParamsIndexOf).trim();
 
@@ -214,52 +526,57 @@ angular.module('umbraco.services').factory('archetypeLabelService', function (ar
 
                             args = JSON.parse(normalizedJsonString);
                         }
-
+                       
                         templateLabelValue = executeFunctionByName(functionName, window, scope.getPropertyValueByAlias(fieldset, propertyAlias), scope, args);
                     }
                     //normal {{foo}} syntax
                     else {
                         propertyAlias = template;
+                        
                         var rawValue = scope.getPropertyValueByAlias(fieldset, propertyAlias);
 
                         templateLabelValue = rawValue;
 
                         //determine the type of editor
                         var propertyConfig = _.find(fieldsetConfigModel.properties, function(property){
-                            return property.alias == propertyAlias;
+                            return property.alias === propertyAlias;
                         });
 
                         if(propertyConfig) {
-                        	var datatype = archetypeCacheService.getDatatypeByGuid(propertyConfig.dataTypeGuid);
+                            var datatype = archetypeCacheService.getDatatypeByGuid(propertyConfig.dataTypeGuid);
 
-                        	if(datatype) {
-
-                            	//try to get built-in label
-                            	var label = getNativeLabel(datatype, templateLabelValue, scope);
-
-                            	if(label) {
-                        			templateLabelValue = label;
-                        		}
-                        		else {
-                        			templateLabelValue = templateLabelValue;
-                        		}
-                        	}
+                            if(datatype) {
+                                //try to get built-in label
+                                var label = getNativeLabel(datatype, rawValue, scope);
+                                
+                                if (label) {
+                                    templateLabelValue = label;
+                                }
+                            }
                         }
-                        else {
-                        	return templateLabelValue;
-                        }
-
-                    }                
+                    }
                 }
 
-                if(!templateLabelValue) {
-                    templateLabelValue = "";
-                }
-                
-                parsedTemplate = parsedTemplate.replace(match, templateLabelValue);
+                // Process the value (i.e., reduce any functions or promises down to strings).
+                processLabelValue(templateLabelValue, promises, match);
             });
 
-            return parsedTemplate;
+            // Wait for all of the promises to resolve before constructing the full fieldset label.
+            return repeatedlyWaitForPromises(promises).then(function () {
+
+                //console.log("done waiting...")
+                // Extract string values and combine them into a single string.
+                var substrings = _.map(matches, function (value) {
+                    return value.value;
+                });
+                
+                var combinedSubstrings = substrings.join('');
+
+                //console.log(combinedSubstrings);
+                
+                // Return the title.
+                return combinedSubstrings;
+            });
         }
-	}
+    }
 });

app/services/archetypeService.js

@@ -1,4 +1,12 @@
 angular.module('umbraco.services').factory('archetypeService', function () {
+
+    // Variables.
+    var draggedRteArchetype;
+    var archetypeEditors;
+    var rteClass = ".archetypeEditor .umb-rte textarea";
+    var editorSettings = {};
+    var disabledSortables = [];
+
     //public
     return {
         //helper that returns a JS ojbect from 'value' string or the original string
@@ -44,7 +52,7 @@ angular.module('umbraco.services').factory('archetypeService', function () {
                 return property.alias == alias; 
             });
         },
-        getUniquePropertyAlias: function (currentScope, propertyAliasParts) {
+        getUniquePropertyAlias: function (currentScope, propertyAliasParts, excludeUniqueId) {
             if (currentScope.hasOwnProperty('fieldsetIndex') && currentScope.hasOwnProperty('property') && currentScope.hasOwnProperty('propertyConfigIndex'))
             {
                 var currentPropertyAlias = "f" + currentScope.fieldsetIndex + "-" + currentScope.property.alias + "-p" + currentScope.propertyConfigIndex;
@@ -57,15 +65,23 @@ angular.module('umbraco.services').factory('archetypeService', function () {
             }
 
             if (currentScope.$parent)
-                this.getUniquePropertyAlias(currentScope.$parent, propertyAliasParts);
+                this.getUniquePropertyAlias(currentScope.$parent, propertyAliasParts, true);
 
-            return _.unique(propertyAliasParts).reverse().join("-");
+            var reversed = _.unique(propertyAliasParts).reverse();
+
+            if (!excludeUniqueId) {
+                reversed.push(_.uniqueId("u-"));
+            }
+
+            return reversed.join("-");
         },
         getFieldset: function(scope) {
-            return scope.archetypeRenderModel.fieldsets[scope.fieldsetIndex];
+            var renderModel = scope.archetypeRenderModel;
+            return renderModel ? renderModel.fieldsets[scope.fieldsetIndex] : null;
         },
         getFieldsetProperty: function (scope) {
-            return this.getFieldset(scope).properties[scope.renderModelPropertyIndex];
+            var fieldset = this.getFieldset(scope);
+            return fieldset ? fieldset.properties[scope.renderModelPropertyIndex] : null;
         },
         setFieldsetValidity: function (fieldset) {
             // mark the entire fieldset as invalid if there are any invalid properties in the fieldset, otherwise mark it as valid
@@ -99,6 +115,114 @@ angular.module('umbraco.services').factory('archetypeService', function () {
             // it's the Umbraco way to hide the invalid state when altering an invalid property, even if the new value isn't valid either
             property.isValid = true;
             this.setFieldsetValidity(fieldset);
+        },
+        // This stores the rich text editors in all Archetypes (e.g., during a drag operation).
+        // Typically, the editors will be restored after the drag completes.
+        storeEditors: function (element) {
+
+            // If there are not tinyMCE editors, this may be undefined.
+            if (typeof tinyMCE === "undefined") {
+                return;
+            }
+
+            // Variables.
+            var self = this;
+            draggedRteArchetype = element;
+
+            // Empty the stored settings.
+            editorSettings = {};
+
+            // For fast lookups, store each editor by the element ID.
+            var editorsById = {};
+            for (var i = 0; i < tinyMCE.editors.length; i++) {
+                var tempEditor = tinyMCE.editors[i];
+                editorsById[tempEditor.id] = tempEditor;
+            }
+
+            // Process each rich text editor.
+            $(rteClass).each(function() {
+
+                // Variables.
+                var id = $(this).attr("id");
+                var editor = editorsById[id];
+
+                // Get the property's temporary ID.
+                var scope = angular.element(this).scope().$parent;
+                var property = self.getFieldsetProperty(scope);
+                var tempId = property ? property.editorState.temporaryId : null;
+
+                // Store the editor settings by the temporary ID?
+                if (editor && editor.settings && tempId) {
+                    editorSettings[tempId] = editor.settings;
+                }
+
+            });
+
+        },
+        // This restores the rich text editors in the specified Archetype
+        // (e.g., after a drop drop operation).
+        restoreEditors: function(element) {
+
+            // If there are not tinyMCE editors, this may be undefined.
+            if (typeof tinyMCE === "undefined") {
+                return;
+            }
+
+            // Variables.
+            var bothElements = element
+                ? element.add(draggedRteArchetype)
+                : draggedRteArchetype;
+            var self = this;
+
+            // Process each RTE in both Archetypes.
+            $(rteClass, bothElements).each(function () {
+
+                // Variables.
+                var id = $(this).attr("id");
+
+                // Get the stored editor settings.
+                var scope = angular.element(this).scope().$parent;
+                var property = self.getFieldsetProperty(scope);
+                var tempId = property ? property.editorState.temporaryId : null;
+                var settings = editorSettings[tempId];
+
+                // Remove and reinitialize the editor.
+                if (settings) {
+                    tinyMCE.execCommand("mceRemoveEditor", false, id);
+                    tinyMCE.init(settings);
+                }
+
+            });
+
+        },
+        // Ensures the specified property has a temporary ID in its editor state,
+        // optionally forcing one to be regenerated (if specified).
+        ensureTemporaryId: function(property, regenerateId) {
+            if (!property.editorState) {
+                property.editorState = {};
+            }
+            var editorState = property.editorState;
+            if (!editorState.temporaryId || regenerateId) {
+                editorState.temporaryId = _.uniqueId("property-temp-id-");
+            }
+        },
+        // Remembers a sortable that has been disabled (so it can be enabled later).
+        rememberDisabledSortable: function(sortable) {
+            disabledSortables.push(sortable);
+        },
+        // Enables all of the sortables that were disabled.
+        enableSortables: function() {
+            _.each(disabledSortables, function(sortable) {
+                sortable.enable();
+            });
+            disabledSortables = [];
+        },
+        // Get all active archetype editors on the current page
+        getEditors: function() {
+            if (archetypeEditors == null) {
+                archetypeEditors = $('.archetypeEditor');
+            }
+            return archetypeEditors;
         }
     }
 });

app/views/archetype.config.developer.dialog.html

@@ -3,18 +3,20 @@
     <div class="umb-panel-body no-header with-footer umb-scrollable archetypeAdvancedOptions">
         <h3><archetype-localize key="developer_options">Developer Options</archetype-localize></h3>
         <div>
-            <label for="archetypeAdvancedOptionsDeepDatatypeRequest"><input type="checkbox" id="archetypeAdvancedOptionsDeepDatatypeRequest" ng-model="model.enableDeepDatatypeRequests"/><archetype-localize key="deepDatatypeRequest">Enable Deep Datatype Requests?</archetype-localize><small><archetype-localize key="deepDatatypeRequestDescription">Allows for easier datatype interception at the cost of caching performance.</archetype-localize></small></label>
+            <label for="archetypeAdvancedOptionsDeepDatatypeRequest"><input type="checkbox" id="archetypeAdvancedOptionsDeepDatatypeRequest" ng-model="dialogData.model.enableDeepDatatypeRequests" /><archetype-localize key="deepDatatypeRequest">Enable Deep Datatype Requests?</archetype-localize><small><archetype-localize key="deepDatatypeRequestDescription">Allows for easier datatype interception at the cost of caching performance.</archetype-localize></small></label>
         </div>
         <div>
-            <label for="archetypeAdvancedOptionsDeveloperMode"><input type="checkbox" id="archetypeAdvancedOptionsDeveloperMode" ng-model="model.developerMode"/><archetype-localize key="toggleDeveloperMode">Enable Developer Mode?</archetype-localize><small><archetype-localize key="toggleDeveloperModeDescription">Toggle Developer Mode</archetype-localize></small></label>
+            <label for="archetypeAdvancedOptionsDeveloperMode"><input type="checkbox" id="archetypeAdvancedOptionsDeveloperMode" ng-model="dialogData.model.developerMode" /><archetype-localize key="toggleDeveloperMode">Enable Developer Mode?</archetype-localize><small><archetype-localize key="toggleDeveloperModeDescription">Toggle Developer Mode</archetype-localize></small></label>
         </div>
         <div>
-            <label for="archetypeOverrideDefaultConverter"><input type="checkbox" id="archetypeOverrideDefaultConverter" ng-model="model.overrideDefaultPropertyValueConverter" /><archetype-localize key="overrideDefaultConverter">Override Default Property Value Converter?</archetype-localize><small><archetype-localize key="overrideDefaultConverterDescription">Check this if you wish to use your own custom property value converter.</archetype-localize></small></label>
+            <label for="archetypeOverrideDefaultConverter"><input type="checkbox" id="archetypeOverrideDefaultConverter" ng-model="dialogData.model.overrideDefaultPropertyValueConverter" /><archetype-localize key="overrideDefaultConverter">Override Default Property Value Converter?</archetype-localize><small><archetype-localize key="overrideDefaultConverterDescription">Check this if you wish to use your own custom property value converter.</archetype-localize></small></label>
+        </div>
+        <div ng-controller="ArchetypeConfigGlobalOptionsController">
+            <label for="archetypeCheckForNewVersion"><input type="checkbox" id="archetypeCheckForNewVersion" ng-model="globalSettings.checkForNewVersion" ng-click="confirmCheckNewVersionChange();" /><archetype-localize key="checkForNewVersion">Automatically check for newer versions?</archetype-localize><small><archetype-localize key="checkForNewVersionDescription">Check this if you wish to be notified when a newer version of Archetype is available. This is a application level setting.</archetype-localize> <a class="manual-link" href="https://github.com/kgiszewski/Archetype/blob/master/Information%20Collection%20Disclosure.md" target="_blank">Information Collection Disclosure</a></small></label>
         </div>
-
         <div>
-            <label for="archetypeAdvancedOptionsConfigModel"><archetype-localize key="configModel">Config Model</archetype-localize><small><archetype-localize key="configModelDescription">Be careful editing the text below, it controls the schema for this archetype.</archetype-localize></small></label>
-            <textarea class="archetypeDeveloperModel" id="archetypeAdvancedOptionsConfigModel" ng-model="model"></textarea>
+            <label for="archetypeAdvancedOptionsConfigModel"><archetype-localize key="configModel">Config Model</archetype-localize><small><archetype-localize key="configModelDescription">Be careful editing the text below, it controls the schema for this Archetype.</archetype-localize></small></label>
+            <textarea class="archetypeDeveloperModel" id="archetypeAdvancedOptionsConfigModel" ng-model="dialogData.model" ng-change="dialogData.modelChanged = true"></textarea>
         </div>
     </div>
     <div class="umb-panel-footer">

app/views/archetype.config.fieldset.dialog.html

@@ -3,46 +3,62 @@
     <div class="umb-panel-body no-header with-footer umb-scrollable archetypeAdvancedOptions">
         <h3><archetype-localize key="global_fieldset_options">Global Fieldset Options</archetype-localize></h3>
         <div>
-            <label for="archetypeAdvancedOptionsStartWithAddButton"><input type="checkbox" id="archetypeAdvancedOptionsStartWithAddButton" ng-model="model.startWithAddButton"/><archetype-localize key="startWithAddButton">Start With Add Button?</archetype-localize><small><archetype-localize key="startWithAddButtonDescription">Empty property shows an add button instead of providing a default fieldset.</archetype-localize></small></label>
+            <label for="archetypeAdvancedOptionsStartWithAddButton"><input type="checkbox" id="archetypeAdvancedOptionsStartWithAddButton" ng-model="dialogData.model.startWithAddButton"/><archetype-localize key="startWithAddButton">Start With Add Button?</archetype-localize><small><archetype-localize key="startWithAddButtonDescription">Empty property shows an add button instead of providing a default fieldset.</archetype-localize></small></label>
         </div>
         <div>
-            <label for="archetypeAdvancedOptionsHideLabels"><input type="checkbox" id="archetypeAdvancedOptionsHideLabels" ng-model="model.hidePropertyLabels"/><archetype-localize key="hidePropertyLabels">Hide Property Labels?</archetype-localize><small><archetype-localize key="hidePropertyLabelsDescription">Hides the property labels.</archetype-localize></small></label>       
+            <label for="archetypeAdvancedOptionsHideLabels"><input type="checkbox" id="archetypeAdvancedOptionsHideLabels" ng-model="dialogData.model.hidePropertyLabels"/><archetype-localize key="hidePropertyLabels">Hide Property Labels?</archetype-localize><small><archetype-localize key="hidePropertyLabelsDescription">Hides the property labels.</archetype-localize></small></label>       
         </div>
         <div>
-            <label for="archetypeAdvancedOptionsCollapsing"><input type="checkbox" id="archetypeAdvancedOptionsCollapsing" ng-model="model.enableCollapsing"/><archetype-localize key="enableCollapsing">Enable Collapsing?</archetype-localize><small><archetype-localize key="enableCollapsingDescription">Enable fieldset collapsing.</archetype-localize></small></label>
+            <label for="archetypeAdvancedOptionsCollapsing"><input type="checkbox" id="archetypeAdvancedOptionsCollapsing" ng-model="dialogData.model.enableCollapsing"/><archetype-localize key="enableCollapsing">Enable Collapsing?</archetype-localize><small><archetype-localize key="enableCollapsingDescription">Enable fieldset collapsing.</archetype-localize></small></label>
+        </div>
+        <div>
+            <label for="archetypeAdvancedOptionsMultipleOpen"><input type="checkbox" id="archetypeAdvancedOptionsMultipleOpen" ng-model="dialogData.model.enableMultipleOpen" /><archetype-localize key="enableMultipleOpen">Enable Multiple Open Fieldsets?</archetype-localize><small><archetype-localize key="enableMultipleOpenDescription">When fieldset collapsing is enabled, this allows multiple fieldsets to be open at the same time.</archetype-localize></small></label>
+        </div>
+        <div>
+            <label for="archetypeAdvancedOptionsMinFieldsets"><archetype-localize key="minFieldsets">Min Fieldsets</archetype-localize><small><archetype-localize key="minFieldsetsDescription">How many Fieldsets are required? Default is none.</archetype-localize></small></label>
+            <input type="number" id="archetypeAdvancedOptionsMinFieldsets" class="archetypeMaxFieldsets" ng-model="dialogData.model.minFieldsets" />
         </div>
         <div>
             <label for="archetypeAdvancedOptionsMaxFieldsets"><archetype-localize key="maxFieldsets">Max Fieldsets</archetype-localize><small><archetype-localize key="maxFieldsetsDescription">How many Fieldsets are allowed? Entering '1' will disable the controls. Default is unlimited.</archetype-localize></small></label>
-            <input type="number" id="archetypeAdvancedOptionsMaxFieldsets" class="archetypeMaxFieldsets" ng-model="model.maxFieldsets"/>
+            <input type="number" id="archetypeAdvancedOptionsMaxFieldsets" class="archetypeMaxFieldsets" ng-model="dialogData.model.maxFieldsets"/>
         </div>
 
         <h4><archetype-localize key="fieldsetControls">Fieldset controls</archetype-localize></h4>
         <div>
-            <label for="archetypeAdvancedOptionsHideControls"><input type="checkbox" id="archetypeAdvancedOptionsHideControls" ng-model="model.hideFieldsetControls"/><archetype-localize key="hideFieldsetControls">Hide Fieldset Controls?</archetype-localize><small><archetype-localize key="hideFieldsetControlsDescription">Hides the fieldset add/remove/sort controls.</archetype-localize></small></label>
+            <label for="archetypeAdvancedOptionsHideControls"><input type="checkbox" id="archetypeAdvancedOptionsHideControls" ng-model="dialogData.model.hideFieldsetControls"/><archetype-localize key="hideFieldsetControls">Hide Fieldset Controls?</archetype-localize><small><archetype-localize key="hideFieldsetControlsDescription">Hides the fieldset add/remove/sort controls.</archetype-localize></small></label>
         </div>
 
         <div>
-            <label for="archetypeAdvancedOptionsCloning"><input type="checkbox" id="archetypeAdvancedOptionsCloning" ng-model="model.enableCloning"/><archetype-localize key="enableCloning">Enable Cloning?</archetype-localize><small><archetype-localize key="enableCloningDescription">Enable fieldset cloning.</archetype-localize></small></label>
+            <label for="archetypeAdvancedOptionsCloning"><input type="checkbox" id="archetypeAdvancedOptionsCloning" ng-model="dialogData.model.enableCloning"/><archetype-localize key="enableCloning">Enable Cloning?</archetype-localize><small><archetype-localize key="enableCloningDescription">Enable fieldset cloning.</archetype-localize></small></label>
         </div>
         <div>
-            <label for="archetypeAdvancedOptionsDisabling"><input type="checkbox" id="archetypeAdvancedOptionsDisabling" ng-model="model.enableDisabling" /><archetype-localize key="enableDisabling">Enable Fieldset Disabling?</archetype-localize><small><archetype-localize key="enableDisablingDescription">Allows fieldsets to be individually enabled/disabled.</archetype-localize></small></label>
+            <label for="archetypeAdvancedOptionsDisabling"><input type="checkbox" id="archetypeAdvancedOptionsDisabling" ng-model="dialogData.model.enableDisabling" /><archetype-localize key="enableDisabling">Enable Fieldset Disabling?</archetype-localize><small><archetype-localize key="enableDisablingDescription">Allows fieldsets to be individually enabled/disabled.</archetype-localize></small></label>
+        </div>
+        <div>
+            <label for="archetypeAdvancedOptionsPublishing"><input type="checkbox" id="archetypeAdvancedOptionsPublishing" ng-model="dialogData.model.enablePublishing" /><archetype-localize key="enablePublishing">Enable Fieldset Publishing?</archetype-localize><small><archetype-localize key="enablePublishingDescription">Allows fieldsets to be automatically published and/or unpublished.</archetype-localize></small></label>
+        </div>
+        <div>
+            <label for="archetypeAdvancedOptionsCrossDragging"><input type="checkbox" id="archetypeAdvancedOptionsCrossDragging" ng-model="dialogData.model.enableCrossDragging" /><archetype-localize key="enableCrossDragging">Enable Cross-Archetype Dragging?</archetype-localize><small><archetype-localize key="enableCrossDraggingDescription">Allows fieldsets to be dragged into other Archetypes.</archetype-localize></small></label>
+		</div>
+		<div>
+            <label for="archetypeAdvancedOptionsMemberGroups"><input type="checkbox" id="archetypeAdvancedOptionsMemberGroups" ng-model="dialogData.model.enableMemberGroups" /><archetype-localize key="enableMemberGroups">Enable Member Group Access?</archetype-localize><small><archetype-localize key="enableMemerGroupsDescription">Allows fieldsets to be displayed for specified member groups only.</archetype-localize></small></label>
         </div>
         
         <h4><archetype-localize key="multipleFieldsets">Multiple fieldsets</archetype-localize></h4>
         <div>
-            <label for="archetypeAdvancedOptionsMultipleFieldsets"><input type="checkbox" id="archetypeAdvancedOptionsMultipleFieldsets" ng-model="model.enableMultipleFieldsets"/><archetype-localize key="enableMultipleFieldsets">Enable Multiple Fieldsets?</archetype-localize><small><archetype-localize key="enableMultipleFieldsetsDescription">Allows multiple types of fieldsets within this archetype.</archetype-localize></small></label>
+            <label for="archetypeAdvancedOptionsMultipleFieldsets"><input type="checkbox" id="archetypeAdvancedOptionsMultipleFieldsets" ng-model="dialogData.model.enableMultipleFieldsets"/><archetype-localize key="enableMultipleFieldsets">Enable Multiple Fieldsets?</archetype-localize><small><archetype-localize key="enableMultipleFieldsetsDescription">Allows multiple types of fieldsets within this archetype.</archetype-localize></small></label>
         </div>
 
-        <div ng-show="model.enableMultipleFieldsets">
+        <div ng-show="dialogData.model.enableMultipleFieldsets">
             <label><archetype-localize key="fieldsetGroups">Fieldset groups</archetype-localize></label>
             <small><archetype-localize key="fieldsetGroupsDescription">If you have a lot of fieldsets to choose from, you may want to consider grouping them in the fieldset picker. Once you have created your groups here, a group picker will be displayed in the fieldset editor and you can assign your fieldsets to their respective groups.</archetype-localize></small>
             <div class="archetypeFieldsetGroups">
-              <ul ui-sortable="sortableOptions" ng-model="model.fieldsetGroups">
-                  <li ng-repeat="fieldsetGroup in model.fieldsetGroups">
+              <ul ui-sortable="sortableOptions" ng-model="dialogData.model.fieldsetGroups">
+                  <li ng-repeat="fieldsetGroup in dialogData.model.fieldsetGroups">
                       <div>
                           <input id="archetypeFieldsetGroupName_{{$index}}" type="text" ng-model="fieldsetGroup.name" />
                           <i class="icon icon-delete" ng-click="removeFieldsetGroup($index)"></i>
-                          <i class="icon icon-navigation handle" ng-show="model.fieldsetGroups.length > 1"></i>
+                          <i class="icon icon-navigation handle" ng-show="dialogData.model.fieldsetGroups.length > 1"></i>
                       </div>
                   </li>
               </ul>

app/views/archetype.config.html

@@ -1,8 +1,17 @@
 {{VERSION_HTML}}
 <div class="archetypeConfig" ng-controller="Imulus.ArchetypeConfigController">
-    <h2 class="archetype-headline"><img src="../App_Plugins/Archetype/assets/logo_50.png"/>Archetype<small>{{dllVersion}}</small><a href="https://twitter.com/archetypekit" target="_blank"><img src="../App_Plugins/Archetype/assets/twitter.png"/></a></h2>
-    <p>At a minimum your Archetype needs at least one fieldset with at least one property. You can configure it to allow for multiple types of fieldsets within a single Archetype and you can even add another Archetype as a property. Please use the link below for the full manual:</p>
-    <p><a class="manual-link" href="https://github.com/kgiszewski/ArchetypeManual" target="_blank">Archetype Manual</a></p>
+    <h2 class="archetype-headline"><img src="../App_Plugins/Archetype/assets/logo_50.png"/>Archetype<small>{{dllVersion}}</small></h2>
+    <p>At a minimum your Archetype needs at least one fieldset with at least one property. Please use the link below for the full manual. We would really love a donation if you find Archetype useful. Your company can also sponsor a sprint!</p>
+    <p>
+        <a class="manual-link" href="https://github.com/kgiszewski/ArchetypeManual" target="_blank">Archetype Manual</a> | 
+        <a class="manual-link" href="https://github.com/kgiszewski/Archetype/blob/master/Information%20Collection%20Disclosure.md" target="_blank">Information Collection Disclosure</a> |
+        <a class="manual-link" href="https://www.youtube.com/watch?v=79LksNwGjLk" target="_blank">Quick Start Video</a> | 
+        <a class="manual-link" href="https://twitter.com/archetypekit" target="_blank">Twitter</a> |
+        <a class="manual-link" href="https://github.com/kgiszewski/Archetype" target="_blank">GitHub</a> |
+        <a class="manual-link" href="https://github.com/kgiszewski/Archetype/blob/master/Sponsors.md" target="_blank">Become a sponsor</a> |
+        <a class="manual-link donate-link" href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=KBKWLURGLGU6L" target="_blank">Donate!</a>
+    </p>
+    
     <ul class="archetypeFieldsets" ui-sortable="sortableOptions" ng-model="archetypeConfigRenderModel.fieldsets">
         <li ng-repeat="fieldset in archetypeConfigRenderModel.fieldsets" ng-hide="fieldset.remove">
             <div class="archetypeFieldsetWrapper" >
@@ -12,14 +21,16 @@
                     <i class="icon icon-navigation handle" ng-show="canSortFieldset()"></i>
                 </div>
                 <div class="archetypeFieldsetTitle" ng-click="focusFieldset(fieldset)">{{fieldset.label}}</div>
-                <div class="archetypeFieldsetCollapser" ng-hide="fieldset.collapse && fieldset.label">
+                <div class="archetypeFieldsetCollapser" ng-hide="fieldset.collapse && fieldset.label" ng-if="isLoaded(fieldset)">
                     <div class="archetypeFieldsetOption">
                         <label for="archetypeFieldLabel_{{$index}}"><archetype-localize key="label">Label</archetype-localize></label>
-                        <input type="text" id="archetypeFieldLabel_{{$index}}" ng-model="fieldset.label" on-keyup="autoPopulateAlias(this)" />
+                        <input type="text" id="archetypeFieldLabel_{{$index}}" ng-model="fieldset.label" on-keyup="autoPopulateAlias(fieldset)" />
+                        <small>The label shown to the editors when adding a new fieldset.</small>
                     </div>
                     <div class="archetypeFieldsetOption">
                         <label for="archetypeFieldAlias_{{$index}}"><archetype-localize key="alias">Alias</archetype-localize></label>
-                        <input type="text" id="archetypeFieldAlias_{{$index}}" ng-model="fieldset.alias" on-keyup="markAliasDirty(this)" required/>
+                        <input type="text" id="archetypeFieldAlias_{{$index}}" ng-model="fieldset.alias" on-keyup="markAliasDirty(fieldset)" required/>
+                        <small>The alias used to identify the fieldset when rendering.</small>
                     </div>
                     <div class="archetypeFieldsetOption" ng-show="archetypeConfigRenderModel.fieldsetGroups.length">
                         <label for="archetypeFieldsetGroup_{{$index}}"><archetype-localize key="fieldsetGroup">Group</archetype-localize></label>
@@ -28,6 +39,12 @@
                     <div class="archetypeFieldsetOption">
                         <label for="archetypeFieldLabelTemplate_{{$index}}"><archetype-localize key="labelTemplate">Label Template</archetype-localize></label>
                         <input type="text" id="archetypeFieldLabelTemplate_{{$index}}" ng-model="fieldset.labelTemplate" />
+                        <small>Generates labels per fieldset. Can contain property aliases, e.g. "Article: &#123;&#123;title&#125;&#125;".</small>
+                    </div>
+                    <div class="archetypeFieldsetOption">
+                        <label for="archetypeFieldPreview_{{$index}}">Preview image</label>
+                        <input type="text" id="archetypeFieldPreview_{{$index}}" ng-model="fieldset.previewImage" on-keyup="markAliasDirty(fieldset)" />
+                        <small>A relative path to a preview image, e.g. "/assets/fieldset.png".</small>
                     </div>
                     <div class="archetypeFieldsetOption" ng-show="archetypeConfigRenderModel.enableMultipleFieldsets">
                         <label for="archetypeFieldIcon_{{$index}}"><archetype-localize key="icon">Icon</archetype-localize></label>
@@ -45,16 +62,16 @@
                                     <i class="icon icon-navigation handle" ng-show="canSortProperty(fieldset)"></i>
                                 </div>
                                 <div class="archetypePropertyTitle" ng-click="focusProperty(fieldset.properties, property)">
-                                    {{property.label}} ({{property.alias}}) - <span>{{getDataTypeNameByGuid(property.dataTypeGuid)}}</span>
+                                    {{property.label}}<span ng-if="property.required" class="property-required">*</span> ({{property.alias}}) - <span>{{getDataTypeNameByGuid(property.dataTypeGuid)}}</span>
                                 </div>
                                 <div class="archetypePropertyCollapser" ng-hide="property.collapse && property.label">
                                     <div>
                                         <label for="archetypePropertyLabel_{{$parent.$index}}_{{$index}}"><archetype-localize key="label">Label</archetype-localize></label>
-                                        <input type="text" id="archetypePropertyLabel_{{$parent.$index}}_{{$index}}" ng-model="property.label" on-keyup="autoPopulateAlias(this)"/>
+                                        <input type="text" id="archetypePropertyLabel_{{$parent.$index}}_{{$index}}" ng-model="property.label" on-keyup="autoPopulateAlias(property)"/>
                                     </div>
                                     <div>
                                         <label for="archetypePropertyAlias_{{$parent.$index}}_{{$index}}"><archetype-localize key="alias">Alias</archetype-localize></label>
-                                        <input type="text" id="archetypePropertyAlias_{{$parent.$index}}_{{$index}}" ng-model="property.alias" on-keyup="markAliasDirty(this)" required/>
+                                        <input type="text" id="archetypePropertyAlias_{{$parent.$index}}_{{$index}}" ng-model="property.alias" on-keyup="markAliasDirty(property)" required/>
                                     </div>
                                     <div>
                                         <label for="archetypePropertyHelpText_{{$parent.$index}}_{{$index}}"><archetype-localize key="helpText">Help Text</archetype-localize></label>

app/views/archetype.config.stylescript.dialog.html

@@ -4,19 +4,19 @@
         <h3><archetype-localize key="custom_style_script_options">Custom Style/Script Options</archetype-localize></h3>
         <div>
             <label for="archetypeAdvancedOptionsCustomClass"><archetype-localize key="customWrapperClass">Custom Wrapper Class</archetype-localize><small><archetype-localize key="customWrapperClassDescription">(Optional) Enter a custom CSS class that will be applied to the wrapper div.</archetype-localize></small></label>
-            <input type="text" id="archetypeAdvancedOptionsCustomClass" ng-model="model.customCssClass"/>
+            <input type="text" id="archetypeAdvancedOptionsCustomClass" ng-model="dialogData.model.customCssClass"/>
         </div>
         <div>
             <label for="archetypeAdvancedOptionsCustomCss"><archetype-localize key="cssFile">CSS File</archetype-localize><small><archetype-localize key="cssFileDescription">(Optional) Enter a path for a custom CSS file to be included on the page.</archetype-localize></small></label>
-            <input type="text" id="archetypeAdvancedOptionsCustomCss" ng-model="model.customCssPath"/>
+            <input type="text" id="archetypeAdvancedOptionsCustomCss" ng-model="dialogData.model.customCssPath"/>
         </div>
         <div>
             <label for="archetypeAdvancedOptionsCustomJs"><archetype-localize key="jsFile">JS File</archetype-localize><small><archetype-localize key="jsFileDescription">(Optional) Enter a path for a custom JS file to be included on the page.</archetype-localize></small></label>
-            <input type="text" id="archetypeAdvancedOptionsCustomJs" ng-model="model.customJsPath"/>
+            <input type="text" id="archetypeAdvancedOptionsCustomJs" ng-model="dialogData.model.customJsPath"/>
         </div>
         <div>
             <label for="archetypeAdvancedOptionsCustomView"><archetype-localize key="viewFile">View File</archetype-localize><small><archetype-localize key="viewFileDescription">(Optional) Enter a path for a custom view file to be used to render this Archetype.</archetype-localize></small></label>
-            <input type="text" id="archetypeAdvancedOptionsCustomView" ng-model="model.customViewPath"/>
+            <input type="text" id="archetypeAdvancedOptionsCustomView" ng-model="dialogData.model.customViewPath"/>
         </div>
     </div>
     <div class="umb-panel-footer">

app/views/archetype.default.html

@@ -1,14 +1,23 @@
 {{VERSION_HTML}}
 <div class="archetypeEditor ng-class:model.config.customCssClass">
     <textarea class="archetypeDeveloperModel" ng-show="model.config.developerMode" ng-model="model.value"></textarea>
-    <ul ui-sortable="sortableOptions" ng-model="model.value.fieldsets" ng-show="!showAddButton()">
+
+    <!-- Mandatory validation. -->
+    <input type="hidden" name="archetypeMandatory" ng-model="model.mandatoryValidation" ng-required="model.validation.mandatory" />
+    <div><span class="help-inline" val-msg-for="archetypeMandatory" val-toggle-msg="required"><archetype-localize key="required">Required</archetype-localize></span></div>
+
+    <!-- Min fieldsets validation. -->
+    <input type="hidden" name="archetypeMinFieldsets" ng-model="model.mandatoryMinFieldsets" ng-required="!minFieldsetsFulfilled()" />
+    <div><span class="help-inline" val-msg-for="archetypeMinFieldsets" val-toggle-msg="required">{{minFieldsetsMessage}}</span></div>
+
+    <!-- Fieldsets. -->
+    <ul ui-sortable="sortableOptions" class="archetypeSortable" ng-class="{archetypeEmpty: model.value.fieldsets.length === 0 || sortingLastItem(), archetypeCrossDraggable: model.config.enableCrossDragging}" ng-model="model.value.fieldsets">
         <li ng-repeat="fieldset in model.value.fieldsets">
-            <fieldset ng-class="['archetype-fieldset-' + fieldset.alias, (getFieldsetValidity(fieldset) == false ? 'archetypeFieldsetError' : '')]" ng-init="fieldsetConfigModel = getConfigFieldsetByAlias(fieldset.alias)">
-                <div class="archetypeFieldsetLabel" ng-class="{enableCollapsing: model.config.enableCollapsing}">
+            <fieldset ng-class="['archetype-fieldset-' + fieldset.alias, (getFieldsetValidity(fieldset) == false ? 'archetypeFieldsetError' : ''), (isCollapsed(fieldset) ? '' : 'is-open')]" ng-init="fieldsetConfigModel = getConfigFieldsetByAlias(fieldset.alias)">
+                <div class="archetypeFieldsetLabel" ng-class="{enableCollapsing: model.config.enableCollapsing, dimmed: isDisabled(fieldset)}">
                     <div ng-click="focusFieldset(fieldset)" class="label-sub module-label">
-                        <span class="caret" ng-hide="fieldset.collapse || !model.config.enableCollapsing"></span>
-                        <span class="caret caret-right" ng-show="fieldset.collapse && model.config.enableCollapsing"></span>
-                        <label ng-class="{dimmed: fieldset.disabled}">
+                        <span class="caret" ng-class="{'caret-right': isCollapsed(fieldset)}" ng-show="model.config.enableCollapsing"></span>
+                        <label>
                             <i class="fieldsetIcon icon ng-class:fieldsetConfigModel.icon"></i>
                             <span ng-bind="getFieldsetTitle(fieldsetConfigModel, $index)"></span>
                         </label>
@@ -17,11 +26,12 @@
                         <i class="icon icon-add" ng-show="canAdd()" ng-click="openFieldsetPicker($index, $event)"></i>
                         <i class="icon icon-navigation handle" ng-show="canSort()"></i>
                         <i class="icon icon-documents" ng-click="cloneRow($index)" ng-show="canClone()"></i>
-                        <i class="icon icon-power" ng-click="enableDisable(fieldset)" ng-show="canDisable()"></i>
-                        <i class="icon icon-delete" ng-click="removeRow($index)" ng-show="canRemove()"></i>
+                        <i class="icon icon-eye" ng-class="{'icon-active': fieldset.disabled}" ng-click="enableDisable(fieldset)" ng-show="showDisableIcon(fieldset)"></i>
+                        <i class="icon icon-time icon-disabled" ng-class="{'icon-active': isDisabledByPublishing(fieldset)}" ng-show="showPublishingIcon(fieldset)"></i>
+                        <i class="icon icon-trash" ng-click="removeRow($index)" ng-show="canRemove()"></i>
                     </div>
                 </div>
-                <div class="archetypeCollapser animate-hide" ng-hide="model.config.enableCollapsing && isCollapsed(fieldset)" ng-if="!isCollapsed(fieldset)">
+                <div class="archetypeCollapser animate-hide" ng-hide="model.config.enableCollapsing && isCollapsed(fieldset)" ng-if="isLoaded(fieldset)">
                     <form class="form-inline">
                         <div ng-class="[('archetype-property-' + property.alias), (getPropertyValidity($parent.$index, property.alias) === false ? 'archetypePropertyError' : '')]" class="archetypeProperty control-group" ng-repeat="property in fieldsetConfigModel.properties">
                             <label ng-hide="model.config.hidePropertyLabels == '1'" class="control-label" for="archetype-property-{{model.alias}}-f{{$parent.$index}}-{{property.alias}}-p{{$index}}" ng-attr-title="{{ isDebuggingEnabled || model.config.developerMode ? property.alias : null }}">
@@ -36,37 +46,117 @@
                                 <archetype-submit-watcher active-submit-watcher="activeSubmitWatcher" load-callback="submitWatcherOnLoad" submit-callback="submitWatcherOnSubmit"></archetype-submit-watcher>
                             </div>
                         </div>
+                        <div class="control-group archetypeProperty settingsWrapper" ng-show="canConfigure()">
+                            <div ng-click="showSettings = !showSettings" class="settingsHeader">
+                                <span class="caret" ng-show="showSettings"></span>
+                                <span class="caret caret-right" ng-hide="showSettings"></span>
+                                <label>
+                                    <span><archetype-localize key="settings">Settings</archetype-localize></span>
+                                </label>
+                            </div>
+                            <div class="settings" ng-show="showSettings">
+                                <!-- misc fieldset settings go here -->
+                                <div ng-if="fieldset.releaseDateModel" ng-show="canPublish()" class="control-group">
+                                    <label ng-hide="model.config.hidePropertyLabels == '1'" class="control-label">
+                                        <span><archetype-localize key="publish">Publishing</archetype-localize></span>
+                                        <div class="archetypeFieldsetHelpText">
+                                            <small><archetype-localize key="publishHelpText">Configure automatic publishing and/or unpublishing of this item</archetype-localize></small>
+                                        </div>
+                                    </label>
+                                    <div class="publishOptions" ng-class="[(model.config.hidePropertyLabels == '1' ? 'controls-no-label' : 'controls')]">
+                                        <div class="publishDate">
+                                            <label for="{{fieldset.releaseDateModel.alias}}">
+                                                <archetype-localize key="publishReleaseDate">Publish at</archetype-localize>
+                                            </label>
+                                            <umb-editor model="fieldset.releaseDateModel"></umb-editor>
+                                        </div>
+                                        <div class="publishDate">
+                                            <label for="{{fieldset.expireDateModel.alias}}">
+                                                <archetype-localize key="publishExpireDate">Unpublish at</archetype-localize>
+                                            </label>
+                                            <umb-editor model="fieldset.expireDateModel"></umb-editor>
+                                        </div>
+                                        <!-- we need a submit watcher here to make sure the publish dates are saved back to their models -->
+                                        <archetype-submit-watcher active-submit-watcher="activeSubmitWatcher" load-callback="submitWatcherOnLoad" submit-callback="submitWatcherOnSubmit"></archetype-submit-watcher>
+                                    </div>
+                                </div>
+                                <div ng-if="fieldset.allowedMemberGroupsModel" ng-show="canUseMemberGroups()" class="control-group allowedGroups">
+                                    <label ng-hide="model.config.hidePropertyLabels == '1'" class="control-label">
+                                        <span><archetype-localize key="allowedMemberGroups">Allowed member groups</archetype-localize></span>
+                                        <div class="archetypeFieldsetHelpText">
+                                            <small><archetype-localize key="allowedMemberGroupsHelpText">Choose the member groups that should be allowed to see this item. Leave empty to allow all member groups.</archetype-localize></small>
+                                        </div>
+                                    </label>
+                                    <div ng-class="[(model.config.hidePropertyLabels == '1' ? 'controls-no-label' : 'controls')]">
+                                        <umb-editor model="fieldset.allowedMemberGroupsModel"></umb-editor>
+                                    </div>
+                                    <!-- we need a submit watcher here to make sure the allowed member groups are saved back to the model -->
+                                    <archetype-submit-watcher active-submit-watcher="activeSubmitWatcher" load-callback="submitWatcherOnLoad" submit-callback="submitWatcherOnSubmit"></archetype-submit-watcher>
+                                </div>
+                            </div>
+                        </div>
                     </form>
                 </div>
             </fieldset>
         </li>
     </ul>
-    <div ng-show="showAddButton()">
-        <a class="archetypeAddButton" ng-click="openFieldsetPicker(0, $event)" prevent-default>
-            <i class="icon icon-add"></i>
+
+    <!-- Empty content display. -->
+    <div class="archetypeEmptyContent" ng-show="showEmptyContentHint()">
+        <span>
             <archetype-localize key="addFieldset">Add an item</archetype-localize>
+        </span>
+    </div>
+
+    <!-- "Add" button. -->
+    <div class="archetypeFooter" ng-show="showAddButton()">
+        <a class="archetypeAddButton" ng-click="openFieldsetPicker(model.value.fieldsets.length, $event)" prevent-default> 
+            <i class="icon icon-add"></i>
         </a>
     </div>
+
+    <!-- Fieldset picker. -->
     <div class="usky-grid fieldsetPicker" ng-class="{withGroups: overlayMenu.fieldsetGroups.length > 1}" ng-if="overlayMenu.show">
         <div class="cell-tools-menu" ng-style="overlayMenu.style" delayed-mouseleave="closeFieldsetPicker()" archetype-click-outside="closeFieldsetPicker()">
-            <h5>
-                <archetype-localize key="addFieldset">Add an item</archetype-localize>
-            </h5>
-            <ul class="groups" ng-show="overlayMenu.fieldsetGroups.length > 1">
-                <li ng-repeat="fieldsetGroup in overlayMenu.fieldsetGroups" ng-class="{active: fieldsetGroup == overlayMenu.activeFieldsetGroup}">
-                    <a ng-click="overlayMenu.activeFieldsetGroup = fieldsetGroup">
-                        {{fieldsetGroup.name}}
+            <div ng-show="!overlayMenu.fieldsetPreview">
+                <h5>
+                    <archetype-localize key="addFieldset">Add an item</archetype-localize>
+                </h5>
+                <ul class="groups" ng-show="overlayMenu.fieldsetGroups.length > 1">
+                    <li ng-repeat="fieldsetGroup in overlayMenu.fieldsetGroups" ng-class="{active: fieldsetGroup == overlayMenu.activeFieldsetGroup}">
+                        <a ng-click="overlayMenu.activeFieldsetGroup = fieldsetGroup">
+                            {{fieldsetGroup.name}}
+                        </a>
+                    </li>
+                </ul>
+                <ul class="elements">
+                    <li ng-repeat="fieldset in overlayMenu.activeFieldsetGroup.fieldsets">
+                        <a ng-click="pickFieldset(fieldset.alias, overlayMenu.index)" href>
+                            <i class="icon {{fieldset.icon}}"></i>
+                            {{fieldset.label}}
+                        </a>
+                        <div class="fieldsetPreviewOpen" ng-if="fieldset.previewImage">
+                            <a href ng-click="openFieldsetPreview(fieldset)"><archetype-localize key="previewFieldsetOpen">(see preview)</archetype-localize></a>
+                        </div>
+                    </li>
+                </ul>
+            </div>
+            <div ng-show="overlayMenu.fieldsetPreview" class="fieldsetPreview">
+                <h5>
+                    <archetype-localize key="previewFieldsetHeader">Preview: </archetype-localize>{{overlayMenu.fieldsetPreview.label}}
+                </h5>
+                <div class="fieldsetPreviewClose">
+                    <a href ng-click="closeFieldsetPreview()"><archetype-localize key="previewFieldsetClose">(close preview)</archetype-localize></a>
+                </div>
+                <div class="fieldsetPreviewImage">
+                    <a href="{{overlayMenu.fieldsetPreview.previewImage}}" target="_blank">
+                        <img ng-src="{{overlayMenu.fieldsetPreview.previewImage}}" />
                     </a>
-                </li>
-            </ul>
-            <ul class="elements">
-                <li ng-repeat="fieldset in overlayMenu.activeFieldsetGroup.fieldsets">
-                    <a ng-click="pickFieldset(fieldset.alias, overlayMenu.index)" href>
-                        <i class="icon {{fieldset.icon}}"></i>
-                        {{fieldset.label}}
-                    </a>
-                </li>
-            </ul>
+                </div>
+                <div class="fieldsetPreviewClose">
+                    <a href ng-click="closeFieldsetPreview()"><archetype-localize key="previewFieldsetClose">(close preview)</archetype-localize></a>
+                </div>
+            </div>
         </div>
     </div>
 </div>

config/meta.json

@@ -1,9 +1,9 @@
 {
 	"name": "Archetype",
-	"version": "1.12.3",
-	"url": "http://github.com/imulus/archetype/",
-	"author": "Imulus - Kevin Giszewski - Tom Fulton - Lee Kelleher - Matt Brailsford - Kenn Jacobsen - Et. Al.",
-	"authorUrl": "http://imulus.com/",
+	"version": "1.17.1",
+	"url": "http://github.com/kgiszewski/archetype/",
+	"author": "Kevin Giszewski - Tom Fulton - Lee Kelleher - Matt Brailsford - Kenn Jacobsen - Nicholas Westby - Et. Al.",
+	"authorUrl": "http://github.com/kgiszewski/archetype/",
 	"license": "MIT",
 	"licenseUrl": "http://opensource.org/licenses/MIT"
 }

config/package.nuspec

@@ -4,15 +4,15 @@
         <id>Archetype</id>
         <version><%= version %></version>
         <title><%= name %></title>
-        <authors>imulus, kgiszewski, tomfulton</authors>
-        <owners>imulus, kgiszewski, tomfulton</owners>
-        <projectUrl>http://github.com/imulus/archetype</projectUrl>
+        <authors>kgiszewski, tomfulton</authors>
+        <owners>kgiszewski, tomfulton</owners>
+        <projectUrl>http://github.com/kgiszewski/archetype</projectUrl>
         <description><![CDATA[Archetype for Umbraco]]></description>
         <tags>umbraco</tags>
-        <iconUrl>http://github.com/imulus/archetype/raw/master/assets/logo.png</iconUrl>
+        <iconUrl>http://kgiszewski.github.io/Archetype/images/logo.png</iconUrl>
         <licenseUrl><%= licenseUrl %></licenseUrl>
         <dependencies>
             <dependency id="Archetype.Binaries" version="<%= version %>" />
         </dependencies>
     </metadata>
-</package>
+</package>

config/package_binaries.nuspec

@@ -4,15 +4,15 @@
         <id>Archetype.Binaries</id>
         <version><%= version %></version>
         <title><%= name %></title>
-        <authors>imulus, kgiszewski, tomfulton</authors>
-        <owners>imulus, kgiszewski, tomfulton</owners>
-        <projectUrl>http://github.com/imulus/archetype</projectUrl>
+        <authors>kgiszewski, tomfulton</authors>
+        <owners>kgiszewski, tomfulton</owners>
+        <projectUrl>http://github.com/kgiszewski/archetype</projectUrl>
         <description><![CDATA[Archetype binaries for Umbraco]]></description>
         <tags>umbraco</tags>
-        <iconUrl>http://github.com/imulus/archetype/raw/master/assets/logo.png</iconUrl>
+        <iconUrl>http://kgiszewski.github.io/Archetype/images/logo.png</iconUrl>
         <licenseUrl><%= licenseUrl %></licenseUrl>
         <dependencies>
             <dependency id="UmbracoCms.Core" version="7.2.2" />
         </dependencies>
     </metadata>
-</package>
+</package>

config/package_courier.nuspec

@@ -6,13 +6,13 @@
         <title><%= name %></title>
         <authors>leekelleher</authors>
         <owners>kgiszewski, leekelleher</owners>
-        <projectUrl>http://github.com/imulus/archetype</projectUrl>
+        <projectUrl>http://github.com/kgiszewski/archetype</projectUrl>
         <description><![CDATA[Archetype Courier extension for Umbraco]]></description>
         <tags>umbraco</tags>
-        <iconUrl>http://github.com/imulus/archetype/raw/master/assets/logo.png</iconUrl>
+        <iconUrl>http://kgiszewski.github.io/Archetype/images/logo.png</iconUrl>
         <licenseUrl><%= licenseUrl %></licenseUrl>
         <dependencies>
             <dependency id="Archetype.Binaries" version="<%= version %>" />
         </dependencies>
     </metadata>
-</package>
+</package>