Add sponsors

Test Sponsors
Add locking to the file saving. Update casing on English lang files.
2017-09-08 09:09:38 -04:00 · 2017-09-07 14:15:28 -04:00 · 2017-09-07 13:13:37 -04:00 · 2017-09-07 11:01:29 -04:00 · 2017-09-07 09:08:47 -04:00 · 2017-09-07 09:03:39 -04:00
47 changed files with 986 additions and 160 deletions
@@ -62,4 +62,5 @@ VersionInfo.cs
 .builds
 .svn
 .hg
-.hgignore
+.hgignore
+app/Umbraco/.vs/config/applicationhost.config
@@ -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',
@@ -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
@@ -10,17 +10,23 @@ Install the selected <a href='https://github.com/imulus/Archetype/releases'>rele
 ## Official Docs ##
 https://github.com/kgiszewski/ArchetypeManual

+Get up and running in 15 minutes! https://www.youtube.com/watch?v=79LksNwGjLk

-##News and Updates##
+## News and Updates ##
 Follow us on Twitter https://twitter.com/ArchetypeKit

-##Core Team##
+## Core Team ##
 * Kevin Giszewski (founder/project lead) - University of Notre Dame - 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/

+## 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 :)
+
 ## 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.
@@ -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" />
@@ -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));
+            }
+        }
+    }
+}
@@ -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,12 +9,14 @@ 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
    {
@@ -24,14 +24,14 @@ namespace Archetype.Api
        {
            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() 
+        public object GetAll()
        {
            var dataTypes = Services.DataTypeService.GetAllDataTypeDefinitions();
            return dataTypes.Select(t => new { guid = t.Key, name = t.Name });
@@ -68,11 +68,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 +85,58 @@ 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)
+            {
+                return new
+                {
+                    isUpdateAvailable = false
+                };
+            }
+
+            var updateNotificationModel = ArchetypeHelper.Instance.CheckForUpdates();
+
+            return new
+            {
+                isUpdateAvailable = updateNotificationModel.IsUpdateAvailable,
+                headline = updateNotificationModel.Headline,
+                type = updateNotificationModel.Type,
+                message = updateNotificationModel.Message,
+                url = updateNotificationModel.Url
+            };
        }
    }
 }
@@ -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" />
@@ -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";
    }
 }
@@ -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;
+        }
    }
 }
@@ -0,0 +1,10 @@
+using System;
+
+namespace Archetype.Models
+{
+    public class ArchetypeConfigFileModel
+    {
+        public Guid Id { get; set; }
+        public bool CheckForUpdates { get; set; }
+    }
+}
@@ -1,15 +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")]
@@ -63,7 +66,7 @@ namespace Archetype.Models
        {
            var property = GetProperty(propertyAlias);

-            if (IsEmptyProperty(property)) 
+            if (IsEmptyProperty(property))
            {
                return default(T);
            }
@@ -87,7 +90,7 @@ namespace Archetype.Models
        {
            var property = GetProperty(propertyAlias);

-            if (IsEmptyProperty(property)) 
+            if (IsEmptyProperty(property))
            {
                return defaultValue;
            }
@@ -100,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()));
        }
@@ -145,24 +148,24 @@ namespace Archetype.Models
        /// <returns>true if this fieldset is disabled, false otherwise</returns>
        internal bool IsAvailable()
        {
-			// explicitly disabled or implicitly disabled through publishing?
-	        var disabled = Disabled
+            // 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(','));
+            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
@@ -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));
+        }
+    }
+}
@@ -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")]
@@ -25,6 +25,9 @@ namespace Archetype.Models
        [JsonProperty("enableCollapsing")]
        public bool EnableCollapsing { get; set; }

+        [JsonProperty("enableMultipleOpen")]
+        public bool EnableMultipleOpen { get; set; }
+
        [JsonProperty("enableCloning")]
        public bool EnableCloning { get; set; }

@@ -46,6 +49,9 @@ namespace Archetype.Models
        [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; }

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

@@ -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
@@ -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; }
+    }
+}
@@ -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("")]
@@ -1,4 +1,4 @@
 using System.Reflection;

-[assembly: AssemblyVersion("1.13.1")]
-[assembly: AssemblyFileVersion("1.13.1")]
+[assembly: AssemblyVersion("1.16.0")]
+[assembly: AssemblyFileVersion("1.16.0")]
@@ -206,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 != null && u.FileName.Equals(f, StringComparison.OrdinalIgnoreCase))).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
@@ -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);
+        }
+    }
+}
@@ -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);
+        }
+    }
+}
@@ -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, "enablePublishing": false, "enableMemberGroups": false, "enableCrossDragging": 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;;
        }
    }
@@ -1,4 +1,5 @@
 angular.module('umbraco').controller('ArchetypeConfigOptionsController', function ($scope) {
+    
    //handles a fieldset group add
    $scope.addFieldsetGroup = function () {
        $scope.dialogData.model.fieldsetGroups.push({ name: "" });
@@ -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();
+    }
+});
@@ -1,5 +1,5 @@
 {{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;
@@ -264,7 +264,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
@@ -304,13 +305,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) {
@@ -340,6 +350,7 @@ angular.module("umbraco").controller("Imulus.ArchetypeController", function ($sc
            }
            
            $scope.focusFieldset(newFieldset);
+            $scope.handleMandatoryValidation();
        }
    }

@@ -349,6 +360,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();
            }
        }
    }
@@ -386,6 +398,7 @@ 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
@@ -511,10 +524,30 @@ angular.module("umbraco").controller("Imulus.ArchetypeController", function ($sc
        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);
+
+        $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)
@@ -594,17 +627,17 @@ 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;
@@ -612,10 +645,13 @@ angular.module("umbraco").controller("Imulus.ArchetypeController", function ($sc
            return;
        }

-        if(iniState && fieldset)
+        if(fieldset)
        {
-            fieldset.collapse = !iniState;
-            $scope.loadedFieldsets.push(fieldset);
+            fieldset.collapse = !fieldset.collapse;
+            if($scope.loadedFieldsets.indexOf(fieldset) < 0)
+            {
+                $scope.loadedFieldsets.push(fieldset);
+            }
        }
    }

@@ -769,6 +805,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);
@@ -808,6 +851,16 @@ angular.module("umbraco").controller("Imulus.ArchetypeController", function ($sc
        });
    });

+    // 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;
@@ -65,7 +65,8 @@ 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);
                    }

@@ -55,5 +55,8 @@
  "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."
+  "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)"
 }
@@ -55,5 +55,8 @@
  "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."
+  "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)"
 }
@@ -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",
@@ -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",
@@ -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",
@@ -249,7 +249,7 @@
    .archetypeAddButton {
        color: #ddd;
        .icon {
-            vertical-align: text-top;
+            vertical-align: middle;
        }
        &:hover {
            color: #333;
@@ -290,6 +290,12 @@
            overflow: visible;
            vertical-align: top;  
            height: 90px;        
+            .fieldsetPreviewOpen {
+                font-style: italic;
+                a:hover {
+                    text-decoration: underline;
+                }
+            }
        }
        ul.groups {
            display: block;
@@ -310,6 +316,24 @@
                }
            }
        }
+
+        .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 {
@@ -333,6 +357,7 @@
                }
            }
        }
+        
        .settings {
            padding: 14px;
            background-color: #f8f8f8;
@@ -355,9 +380,11 @@

    // Necessary to ensure empty lists can be dropped onto when sorting nested fieldsets.
    .archetypeSortable.archetypeEmpty {
-        min-height: 42px;
-        border: 1px dashed #dddddd;
-        margin-top: 5px;
+        &.archetypeCrossDraggable {
+            min-height: 42px;
+            border: 1px dashed #dddddd;
+            margin-top: 5px;
+        }
    }
 }

@@ -365,6 +392,7 @@
    .archetypeEditorControls {
        float: right;
    }
+    
    .archetypeEditorControls, .archetypeFieldsetGroups {
        i {
            cursor: pointer;
@@ -390,10 +418,10 @@
        small {
            margin-left: 5px;
        }
-        
+
        a {
            float: right;
-            
+
            img {
                width: 35px;
            }
@@ -403,6 +431,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;
@@ -423,6 +471,8 @@

    .archetypeFieldsets {
        margin-left: 0;
+        border-top: 5px solid;
+        padding-top: 5px;
    }

    .archetypeFieldsetWrapper {
@@ -439,7 +489,8 @@
    .archetypeFieldsetOption {
        margin-bottom: 15px;
        margin-right: 15px;
-        input[type=text]{
+
+        input[type=text] {
            max-width: 100%;
            width: 100%;
        }
@@ -457,7 +508,7 @@
            margin-bottom: 5px;
        }

-        label{
+        label {
            width: 400px;
        }
    }
@@ -497,7 +548,7 @@
        label {
            width: 100%;
        }
-        
+
        input[type=text] {
            width: 100%;
        }
@@ -532,10 +583,10 @@
                    }
                }
            }
-        }        
+        }
    }

-    .archetypeMaxFieldsets{
+    .archetypeMaxFieldsets {
        border: 1px solid #ddd;
        width: 40px;
        text-align: right;
@@ -548,7 +599,7 @@

    .archetypePropertyCollapser {
        margin-top: 10px;
-        
+
        div {
            margin-bottom: 10px;
            margin-right: 15px;
@@ -562,6 +613,10 @@
    .fieldsetIcon {
        margin-right: 10px;
    }
+
+    small {
+        color: #817f85;
+    }
 }

 .ui-sortable-placeholder {
@@ -73,6 +73,34 @@ angular.module('umbraco.services').factory('archetypeCacheService', function (ar
 	        }

 	        return null;
-	    }
+     	},
+
+     	getEntityByUmbracoId: function(scope, udi, type) {
+	        var cachedEntity = _.find(entityCache, function (e){
+	            return e.udi == udi;
+	        });
+
+	        if(cachedEntity) {
+	            return cachedEntity;
+	        }
+
+	        //go get it from server
+	        if (!isEntityLookupLoading) {
+	            isEntityLookupLoading = true;
+
+	            scope.resources.entityResource.getByIds([udi], type).then(function (entities) {
+                  // prevent infinite lookups with a default entity
+                  var entity = entities.length > 0 ? entities[0] : { udi: udi, name: "" };
+
+                  entityCache.push(entity);
+
+                  isEntityLookupLoading = false;
+
+	                return entity;
+	            });
+	        }
+
+	        return null;
+     	}
    }
 });
@@ -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!'
+            );
+        }
+    }
+});
@@ -19,7 +19,6 @@ angular.module('umbraco.services').factory('archetypeLabelService', function (ar
    }

    function getNativeLabel(datatype, value, scope) {
-
    	switch (datatype.selectedEditor) {
    		case "Imulus.UrlPicker":
    			return imulusUrlPicker(value, scope, {});
@@ -27,13 +26,22 @@ angular.module('umbraco.services').factory('archetypeLabelService', function (ar
    			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, {});
-    		default:
+    	  case "Umbraco.ContentPickerAlias":
+    	    return coreContentPicker(value, scope, datatype);
+    	  case "Umbraco.ContentPicker2":
+    	    return coreContentPickerV2(value, scope, datatype);
+        default:
    			return "";
    	}
    }
@@ -87,6 +95,39 @@ angular.module('umbraco.services').factory('archetypeLabelService', function (ar
        return entityArray.join(', ');
    }

+      function coreMntpV2(value, scope, args) {
+        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 entity;
+
+        _.each(ids, function (id) {            
+            if(id && !entity) {
+              entity = archetypeCacheService.getEntityByUmbracoId(scope, id, type);
+            }
+        });
+
+        return (entity != null ? entity.name : "") + (ids.length > 1 ? ", ..." : "");
+    }
+
    function coreMediaPicker(value, scope, args) {
        if(value) {
             var entity = archetypeCacheService.getEntityById(scope, value, "media");     
@@ -99,6 +140,42 @@ angular.module('umbraco.services').factory('archetypeLabelService', function (ar
        return "";
    }

+    function coreMediaPickerV2(value, scope, args) {
+        if(value) {
+            var entity = archetypeCacheService.getEntityByUmbracoId(scope, value, "media");
+             
+            if(entity) {
+                return entity.name; 
+            }
+        }
+
+        return "";
+    }
+
+    function coreContentPicker(value, scope, args) {
+      if (value) {
+        var entity = archetypeCacheService.getEntityById(scope, value, "document");
+
+        if (entity) {
+          return entity.name;
+        }
+      }
+
+      return "";
+    }
+
+    function coreContentPickerV2(value, scope, args) {
+      if (value) {
+        var entity = archetypeCacheService.getEntityByUmbracoId(scope, value, "document");
+
+        if (entity) {
+          return entity.name;
+        }
+      }
+
+      return "";
+    }
+
    function imulusUrlPicker(value, scope, args) {

        if(!args.propertyName) {
@@ -269,7 +346,10 @@ angular.module('umbraco.services').factory('archetypeLabelService', function (ar
                if(!templateLabelValue) {
                    templateLabelValue = "";
                }
-                
+                // handle collapsing dollar signs in labels (#387)
+                if (templateLabelValue.indexOf("$$") >= 0) {
+                    templateLabelValue = templateLabelValue.replace(/\$\$/g, "$$$$$$$$");
+                }
                parsedTemplate = parsedTemplate.replace(match, templateLabelValue);
            });

@@ -11,9 +11,11 @@
        <div>
            <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></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>
+            <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>
@@ -11,6 +11,13 @@
        <div>
            <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="dialogData.model.maxFieldsets"/>
@@ -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/Terms%20of%20Service.md" target="_blank">Terms of Service</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>
@@ -50,11 +67,11 @@
                                <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>
@@ -10,8 +10,16 @@
        </a>
    </div>

+    <!-- 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()}" ng-model="model.value.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}">
@@ -104,24 +112,45 @@
    <!-- 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>
@@ -1,9 +1,9 @@
 {
 	"name": "Archetype",
-	"version": "1.13.1",
-	"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.16.0",
+	"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"
 }
@@ -4,12 +4,12 @@
        <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://imulus.github.io/Archetype/images/logo.png</iconUrl>
        <licenseUrl><%= licenseUrl %></licenseUrl>
        <dependencies>
            <dependency id="Archetype.Binaries" version="<%= version %>" />
@@ -4,12 +4,12 @@
        <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://imulus.github.io/Archetype/images/logo.png</iconUrl>
        <licenseUrl><%= licenseUrl %></licenseUrl>
        <dependencies>
            <dependency id="UmbracoCms.Core" version="7.2.2" />
@@ -6,10 +6,10 @@
        <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://imulus.github.io/Archetype/images/logo.png</iconUrl>
        <licenseUrl><%= licenseUrl %></licenseUrl>
        <dependencies>
            <dependency id="Archetype.Binaries" version="<%= version %>" />
Author	SHA1	Message	Date
Kevin Giszewski	9a2e14d8f6	Add sponsors	2017-09-08 09:09:38 -04:00
Kevin Giszewski	7d8a6e28fa	Test Sponsors	2017-09-07 14:15:28 -04:00
Kevin Giszewski	6a9c56df58	Add locking to the file saving. Update casing on English lang files.	2017-09-07 13:13:37 -04:00
Kevin Giszewski	078f4a506e	Add obfuscation	2017-09-07 11:01:29 -04:00
Kevin Giszewski	a54170b915	Naming is hard.	2017-09-07 09:08:47 -04:00
Kevin Giszewski	757ba890f5	Update links and blurb in the config	2017-09-07 09:03:39 -04:00
Kevin Giszewski	a127dac03a	Move off the web.config in favor of an Archetype config	2017-09-07 08:55:26 -04:00
Kevin Giszewski	77ec2d7a9c	Update meta.json	2017-09-06 21:22:00 -04:00
Kevin Giszewski	0d55f0ed86	Add a URL to the notification	2017-09-06 21:00:32 -04:00
Kevin Giszewski	6a7ac205bc	Update the url to call and use JSON Convert	2017-09-06 19:53:25 -04:00
Kevin Giszewski	1cb2139137	More WIP	2017-09-06 18:32:48 -04:00
Kevin Giszewski	b9179f4140	WIP on version checking	2017-09-06 12:20:52 -04:00
Kevin Giszewski	bae1ee508b	Update README.md	2017-09-04 17:26:56 -04:00
Kevin Giszewski	20b6a78af1	Update some stuffs for nuget	2017-08-18 09:20:45 -04:00
Kevin Giszewski	014b407abb	Let's do purple	2017-08-18 09:03:03 -04:00
Kenn Jacobsen	5aa16a6636	Bump package version	2017-08-18 08:10:43 +02:00
Kenn Jacobsen	7206bba46a	Merge pull request #423 from kjac/min-fieldsets-feature Add minimum fieldsets feature	2017-08-15 12:43:07 +02:00
Kenn Jacobsen	af9db94fb6	Merge pull request #421 from kjac/Fix-418 Fix #418	2017-08-09 13:37:50 +02:00
Kenn Jacobsen	d2014be81b	Fix #418 Don't let the entire published content conversion break if one property no longer exists.	2017-08-09 13:36:59 +02:00
Kenn Jacobsen	01b8b3b508	Merge remote-tracking branch 'refs/remotes/origin/master' into min-fieldsets-feature	2017-08-09 13:24:35 +02:00
Kenn Jacobsen	734125fa25	Merge remote-tracking branch 'refs/remotes/kgiszewski/master'	2017-08-09 13:24:06 +02:00
Kenn Jacobsen	76678f538d	Merge pull request #420 from kjac/fix-414 Fix #414	2017-08-09 13:22:55 +02:00
Kenn Jacobsen	7fe23fdf4c	Fix #414 Using ng-src instead of src fixes the issue.	2017-08-09 13:22:05 +02:00
Kenn Jacobsen	c956c12cdf	Merge remote-tracking branch 'refs/remotes/kgiszewski/master'	2017-08-09 13:16:19 +02:00
Kenn Jacobsen	8706feb882	Merge pull request #419 from kjac/fix-417 Tested with a custom property editor to make sure the JSON default value works.	2017-08-09 12:58:59 +02:00
Kenn Jacobsen	c8364986a2	Fix #417 Don't turn an object into a string if it's not...	2017-08-09 12:49:47 +02:00
Kenn Jacobsen	4d24150bdc	Merge remote-tracking branch 'refs/remotes/kgiszewski/master'	2017-08-09 12:48:17 +02:00
kjac	a16c4b4da9	Merge remote-tracking branch 'refs/remotes/kgiszewski/master' into min-fieldsets-feature	2017-07-28 16:09:49 +02:00
Kevin Giszewski	75a312c309	Update README.md	2017-06-26 09:12:11 -04:00
Kenn Jacobsen	aa6505d7f6	Merge pull request #412 from kjac/master Bump package version	2017-06-13 08:41:09 +02:00
Kenn Jacobsen	6ed7af28bc	Bump package version	2017-06-13 08:38:31 +02:00
Kenn Jacobsen	526f4c147a	Merge remote-tracking branch 'refs/remotes/kgiszewski/master'	2017-06-13 08:28:22 +02:00
Kenn Jacobsen	bb0df72dc7	Merge pull request #411 from kjac/fieldset-preview-image Add fieldset image previews	2017-06-13 08:27:39 +02:00
Kenn Jacobsen	3cba5677bf	Whoops... the preview image shouldn't be mandatory	2017-06-13 08:25:05 +02:00
kjac	c4f88ab528	Remove max width comment	2017-06-12 22:29:16 +02:00
kjac	7bc9584940	Add min fieldsets handling	2017-06-12 22:26:03 +02:00
kjac	17be4b4253	Merge remote-tracking branch 'refs/remotes/origin/master' into fieldset-preview-image	2017-06-12 22:11:07 +02:00
kjac	2db196af6a	Merge remote-tracking branch 'refs/remotes/kgiszewski/master'	2017-06-12 22:09:29 +02:00
Kenn Jacobsen	b4b27cd1f8	Merge pull request #410 from kjac/mandatory-validation-disabled-fieldsets Handle disabled fieldsets in mandatory validation	2017-06-12 22:07:02 +02:00
kjac	a2cc052944	Handle disabled fieldsets in mandatory validation Disabled fieldsets should not count when performing mandatory validation. This ensures they aren't.	2017-06-12 22:04:46 +02:00
kjac	4d8a4f0b12	Merge remote-tracking branch 'refs/remotes/origin/master' into fieldset-preview-image	2017-06-11 22:10:07 +02:00
kjac	743f37c45f	Merge remote-tracking branch 'refs/remotes/kgiszewski/master'	2017-06-11 22:09:40 +02:00
Kenn Jacobsen	1ba45969ee	Merge pull request #409 from kjac/multiple-open-fieldsets Enable multiple open fieldsets by datatype configuration. It's default enabled on newly created Archetypes.	2017-06-11 22:08:48 +02:00
kjac	349d6f69b3	Enable multiple open fieldsets See #196	2017-06-11 22:06:14 +02:00
kjac	9431a70156	Merge remote-tracking branch 'refs/remotes/origin/master' into fieldset-preview-image	2017-06-11 21:38:04 +02:00
kjac	ab780f72a4	Merge remote-tracking branch 'refs/remotes/kgiszewski/master'	2017-06-11 21:37:39 +02:00
Kenn Jacobsen	7d01be305f	Merge pull request #408 from kjac/fix-mandatory-validation Fix mandatory validation: The mandatory validation implementation prevents a valid Archetype from being submitted on the first go because the mandatory validation isn't initialized.	2017-06-11 21:36:34 +02:00
kjac	694b932e37	Fix mandatory validation issue The mandatory validation implementation prevents a valid Archetype from being submitted on the first go because the mandatory validation isn't initialized.	2017-06-11 21:35:31 +02:00
kjac	a4f6334761	Merge branch 'master' into fieldset-preview-image	2017-06-11 16:18:52 +02:00
kjac	9316e7c3f6	Merge remote-tracking branch 'refs/remotes/kgiszewski/master'	2017-06-11 16:17:46 +02:00
Kenn Jacobsen	8bc6c17921	Merge pull request #407 from kjac/styling-for-7.6 Styling for 7.6: Make the "add new item" button look ok in 7.6 + hide the "drag into" area for non cross draggable Archetypes.	2017-06-11 16:16:53 +02:00
kjac	1161c7e6da	A bit of styling Make the "add new item" button look ok in 7.6 + hide the "drag into" area for non cross draggable Archetypes.	2017-06-11 16:14:58 +02:00
kjac	93db3eb2ee	Merge remote-tracking branch 'refs/remotes/kgiszewski/master'	2017-06-11 16:07:24 +02:00
Kenn Jacobsen	b7b166562f	Merge pull request #406 from kjac/collapsing-dollar-signs Collapsing dollar signs	2017-06-11 16:05:26 +02:00
kjac	e3c4c91de1	Fix #387	2017-06-11 16:03:56 +02:00
kjac	f79849cf8a	Open preview image in a new window when clicked	2017-06-10 08:49:59 +02:00
kjac	f0b27e1507	Merge remote-tracking branch 'refs/remotes/origin/master' into fieldset-preview-image	2017-06-10 08:26:28 +02:00
kjac	42e92a4e74	Merge remote-tracking branch 'refs/remotes/kgiszewski/master'	2017-06-10 08:26:06 +02:00
Kenn Jacobsen	2c363a5d37	Merge pull request #405 from kjac/mandatory-validation Mandatory validation - fixes #395	2017-06-09 21:19:32 +02:00
kjac	738e9282b6	Handle mandatory validation Don't allow submission of an empty Archetype if the property is set to mandatory	2017-06-09 21:11:11 +02:00
kjac	20fa1efc8e	A bit more styling + localization	2017-06-09 21:04:44 +02:00
kjac	718f2deb47	Add preview image to fieldsets See #374	2017-06-09 20:19:17 +02:00
kjac	1cea5d156a	Merge remote-tracking branch 'refs/remotes/kgiszewski/master'	2017-06-08 16:46:00 +02:00
Kenn Jacobsen	109d4c7708	Merge pull request #404 from kjac/label-templates-for-v2-pickers Label templates for the V2 pickers	2017-06-08 16:37:50 +02:00
Kenn Jacobsen	8306be60de	Merge pull request #403 from kjac/lazy-load-configuration Lazy load configuration	2017-06-08 16:36:52 +02:00
Kenn Jacobsen	27d0cb742b	Label templates for the V2 pickers ..and also for the old content picker (it was missing for whatever reason) - fixes #402	2017-06-08 09:02:31 +02:00
kjac	62a250cd83	Lazy load fieldsets in configuration Fixes #393	2017-06-07 23:07:40 +02:00
kjac	6f94d608db	Merge remote-tracking branch 'refs/remotes/kgiszewski/master'	2017-06-07 20:56:35 +02:00
Kenn Jacobsen	854e9873c8	Merge pull request #401 from kjac/image-cropper-and-upload-76 Adjust to 7.6 scheme for upload and image croppers	2017-06-07 17:56:20 +02:00
Kenn Jacobsen	2a6d5eaddf	Merge pull request #400 from kjac/fix-upload-and-image-cropper-again Fix upload and image cropper (again)	2017-06-07 17:48:23 +02:00
kjac	3d7ddb58c2	Adjust to 7.6 scheme for upload and image croppers Fixes #397, at least for newly created sites.	2017-06-06 23:14:40 +02:00
kjac	4c7496840d	Fix upload and image cropper (again) Fixes #384, #389 and #394	2017-06-06 22:41:04 +02:00
Kevin Giszewski	d816103981	Merge pull request #399 from codedemonuk/patch-1 Subheadings were not being rendered correctly in Readme	2017-05-29 11:14:18 -04:00
Pervez Choudhury	b38ccc12f6	Subheadings were not being rendered correctly	2017-05-28 17:48:44 +01:00
Kevin Giszewski	e1deba5b95	Update LICENSE	2017-02-16 12:53:33 -05:00
Kevin Giszewski	5bce4e856a	Merge pull request #386 from kgiszewski/fix-385 Fix #385	2017-02-16 12:42:55 -05:00
Kevin Giszewski	6f4cb1e609	Merge pull request #379 from leekelleher/feature/typeconverter TypeConverter for ArchetypeModel	2017-02-16 12:42:44 -05:00
leekelleher	21e784424f	TypeConverter for ArchetypeModel Added a TypeConverter for both `ArchetypeModel` and `ArchetypeFieldsetModel`, so that they can be converted to their `IPublishedContent` equivalent. Example usage would be, when you would typically do this... ```csharp var items = Model.Content.GetPropertyValue<ArchetypeModel>myArchetypeAlias"); ``` You can now do this... ```csharp var items = Model.Content.GetPropertyValue<IEnumerable<IPublishedContent>>("myArchetypeAlias"); ``` I know it seems more verbose, but the idea is that this could be hot-swappable with other property-editors, such as Nested Content. The frontend/code would deal purely with `IPublishedContent` objects. --- Also included unit-tests that run via Umbraco Core's `TryConvertTo` extension method, (which is what `Content.GetPropertyValue<T>` uses internally in Umbraco). There's a small caveat with the TypeConverter for `ArchetypeFieldsetModel`, I had to explicitly reject `typeof(string)`, otherwise the JSON deserializer fails (in `ArchetypeHelper.DeserializeJsonToArchetype`). All other unit-tests still pass.	2016-10-19 20:26:46 +01:00