Use relative paths for API endpoints

Since the backoffice has `<base href="/yourvdir/umbraco">`, we can just use relative links here to support virtual directories

If this does not work, alternatively we can look at `Umbraco.Sys.ServerVariables.umbracoSettings.umbracoPath`

.gitignore

@@ -17,9 +17,6 @@ tmp/
 pkg/*.nupkg
 pkg/*.zip
 
-*_versioned*
-
-
 [Dd]ebug/
 [Bb]uild/
 [Rr]elease/

Gruntfile.js

@@ -1,39 +1,13 @@
 module.exports = function(grunt) {
   require('load-grunt-tasks')(grunt);
-  var path = require('path');
-  
+  var path = require('path')
+
   grunt.initConfig({
     pkg: grunt.file.readJSON('package.json'),
     pkgMeta: grunt.file.readJSON('config/meta.json'),
     dest: grunt.option('target') || 'dist',
     basePath: path.join('<%= dest %>', 'App_Plugins', '<%= pkgMeta.name %>'),
 
-    'string-replace': {
-      version: {
-        files: {
-          "app/controllers/controller_versioned.js": "app/controllers/controller.js",
-          "app/less/archetype_versioned.less": "app/less/archetype.less",
-          "app/views/archetype.config.developer.dialog_versioned.html": "app/views/archetype.config.developer.dialog.html",
-          "app/views/archetype.config.stylescript.dialog_versioned.html": "app/views/archetype.config.stylescript.dialog.html",
-          "app/views/archetype.config.fieldset.dialog_versioned.html": "app/views/archetype.config.fieldset.dialog.html",
-          "app/views/archetype.config_versioned.html": "app/views/archetype.config.html",
-          "app/views/archetype_versioned.html": "app/views/archetype.html",
-          "app/views/archetype.default_versioned.html": "app/views/archetype.default.html",
-          
-        },
-        options: {
-          replacements: [{
-            pattern: /{{VERSION}}/g,
-            replacement: '/* Version <%= pkgMeta.version %> */'
-          },
-          {
-            pattern: /{{VERSION_HTML}}/g,
-            replacement: '<!-- Version <%= pkgMeta.version %> -->'
-          }]
-        }
-      }
-    },
-    
     watch: {
       options: {
         spawn: false,
@@ -42,27 +16,22 @@ module.exports = function(grunt) {
 
       less: {
         files: ['app/**/*.less'],
-        tasks: ['string-replace', 'less:dist']
+        tasks: ['less:dist']
       },
 
       js: {
         files: ['app/**/*.js'],
-        tasks: ['string-replace', 'concat:dist']
+        tasks: ['concat:dist']
       },
 
       html: {
         files: ['app/**/*.html'],
-        tasks: ['string-replace', 'copy:html']
+        tasks: ['copy:html']
       },
 
       dll: {
         files: ['app/Umbraco/**/*.dll'],
         tasks: ['copy:dll']
-      },
-      
-      assets: {
-        files: ['assets/*.*'],
-        tasks: ['copy:assets']
       }
     },
 
@@ -72,7 +41,7 @@ module.exports = function(grunt) {
           paths: ["app/less", "lib/less", "vendor"],
         },
         files: {
-          '<%= basePath %>/css/archetype.css': 'app/less/archetype_versioned.less',
+          '<%= basePath %>/css/archetype.css': 'app/less/archetype.less',
         }
       }
     },
@@ -83,14 +52,12 @@ module.exports = function(grunt) {
       },
       dist: {
         src: [
-          'app/controllers/controller_versioned.js',
+          'app/controllers/controller.js',
           'app/controllers/config.controller.js',
-          'app/controllers/config.dialog.controller.js',
           'app/directives/archetypeproperty.js',
           'app/directives/archetypesubmitwatcher.js',
           'app/directives/archetypecustomview.js',
           'app/directives/archetypeLocalize.js',
-          'app/directives/archetypeclickoutside.js',
           'app/services/archetypeLocalizationService.js',
           'app/helpers/sampleLabelHelpers.js',
           'app/resources/archetypePropertyEditorResource.js',
@@ -105,24 +72,8 @@ module.exports = function(grunt) {
     copy: {
       html: {
         cwd: 'app/views/',
-        src: [
-            'archetype_versioned.html', 
-            'archetype.default_versioned.html', 
-            'archetype.config_versioned.html', 
-            'archetype.config.fieldset.dialog_versioned.html', 
-            'archetype.config.stylescript.dialog_versioned.html', 
-            'archetype.config.developer.dialog_versioned.html'
-        ],
-        dest: '<%= basePath %>/views/',
-        expand: true,
-        rename: function(dest, src) {
-            return dest + src.replace('_versioned','');
-          }
-      },
-      assets: {
-        cwd: 'assets/',
-        src: ['*.*'],
-        dest: '<%= basePath %>/assets',
+        src: ['archetype.html', 'archetype.default.html', 'archetype.config.html'],
+        dest: '<%= basePath %>/views',
         expand: true
       },
       dll: {
@@ -166,30 +117,31 @@ module.exports = function(grunt) {
     },
 
     nugetpack: {
-        dist: {
-            src: 'tmp/nuget/package.nuspec',
-            dest: 'pkg'
-        }
+    	dist: {
+    		src: 'tmp/nuget/package.nuspec',
+    		dest: 'pkg'
+    	}
     },
 
     template: {
-        'nuspec': {
-            'options': {
-                'data': { 
-                    name: '<%= pkgMeta.name %>',
-                    version: '<%= pkgMeta.version %>',
-                    url: '<%= pkgMeta.url %>',
-                    license: '<%= pkgMeta.license %>',
-                    licenseUrl: '<%= pkgMeta.licenseUrl %>',
-                    author: '<%= pkgMeta.author %>',
-                    authorUrl: '<%= pkgMeta.authorUrl %>',
-                    files: [{ path: 'tmp/nuget/**', target: 'content/App_Plugins/Archetype'}]
-                }
-            },
-            'files': { 
-                'tmp/nuget/package.nuspec': ['config/package.nuspec']
-            }
-        }
+    	'nuspec': {
+			'options': {
+    			'data': { 
+            name: '<%= pkgMeta.name %>',
+    				version: '<%= pkgMeta.version %>',
+            url: '<%= pkgMeta.url %>',
+            license: '<%= pkgMeta.license %>',
+            licenseUrl: '<%= pkgMeta.licenseUrl %>',
+            author: '<%= pkgMeta.author %>',
+            authorUrl: '<%= pkgMeta.authorUrl %>',
+
+    				files: [{ path: 'tmp/nuget/**', target: 'content/App_Plugins/Archetype'}]
+	    		}
+    		},
+    		'files': { 
+    			'tmp/nuget/package.nuspec': ['config/package.nuspec']
+    		}
+    	}
     },
 
     umbracoPackage: {
@@ -210,26 +162,7 @@ module.exports = function(grunt) {
 
     clean: {
       build: '<%= grunt.config("basePath").substring(0, 4) == "dist" ? "dist/**/*" : "null" %>',
-      tmp: ['tmp'],
-      html: [
-        'app/views/*.html',
-        '!app/views/archetype.html', 
-        '!app/views/archetype.default.html', 
-        '!app/views/archetype.config.html', 
-        '!app/views/archetype.config.fieldset.dialog.html', 
-        '!app/views/archetype.config.stylescript.dialog.html', 
-        '!app/views/archetype.config.developer.dialog.html'
-        ],
-      js: [
-        'app/controllers/*.js',
-        '!app/controllers/controller.js',
-        '!app/controllers/config.controller.js',
-        '!app/controllers/config.dialog.controller.js'
-      ],
-      less: [
-        'app/less/*.less',
-        '!app/less/archetype.less'
-      ]
+      tmp: ['tmp']
     },
 
     assemblyinfo: {
@@ -248,7 +181,7 @@ module.exports = function(grunt) {
         src: ['<%= grunt.option("target") %>\\Web.config']
       }
     },
-    
+
     jshint: {
       options: {
         jshintrc: '.jshintrc'
@@ -263,7 +196,7 @@ module.exports = function(grunt) {
         stdout: true,
         verbosity: 'quiet',
         maxCpuCount: 4,
-        version: 4.0,
+		version: 4.0,
         buildParameters: {
           WarningLevel: 2,
           NoWarn: 1607
@@ -277,9 +210,10 @@ module.exports = function(grunt) {
         }
       }
     }
+
   });
 
-  grunt.registerTask('default', ['clean', 'string-replace', 'less', 'concat', 'assemblyinfo', 'msbuild:dist', 'copy:dll', 'copy:assets', 'copy:config', 'clean:html', 'clean:js', 'clean:less']);
+  grunt.registerTask('default', ['clean', 'less', 'concat', 'assemblyinfo', 'msbuild:dist', 'copy:dll', 'copy:config', 'copy:html']);
 
   grunt.registerTask('nuget',   ['clean:tmp', 'default', 'copy:nuget', 'template:nuspec', 'nugetpack', 'clean:tmp']);
   grunt.registerTask('umbraco', ['clean:tmp', 'default', 'copy:umbraco', 'umbracoPackage', 'clean:tmp']);

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

@@ -1,16 +1,13 @@
 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;
 using Umbraco.Web.Models.ContentEditing;
 using Umbraco.Web.Mvc;
 using Umbraco.Web.Editors;
-using Archetype.Extensions;
 
 namespace Archetype.Api
 {
@@ -22,7 +19,7 @@ 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.DefaultPreValues, alias = x.Alias, view = x.ValueEditor.View});
         }
 
         public object GetAll() 
@@ -38,7 +35,6 @@ namespace Archetype.Api
             {
                 throw new HttpResponseException(HttpStatusCode.NotFound);
             }
-
             var dataTypeDisplay = Mapper.Map<IDataTypeDefinition, DataTypeDisplay>(dataType);
             return new { selectedEditor = dataTypeDisplay.SelectedEditor, preValues = dataTypeDisplay.PreValues };
         }
@@ -53,18 +49,5 @@ namespace Archetype.Api
             var dataTypeDisplay = Mapper.Map<IDataTypeDefinition, DataTypeDisplay>(dataType);
             return new { selectedEditor = dataTypeDisplay.SelectedEditor, preValues = dataTypeDisplay.PreValues, contentTypeAlias = contentTypeAlias, propertyTypeAlias = propertyTypeAlias, archetypeAlias = archetypeAlias, nodeId = nodeId };
         }
-
-        public object GetDllVersion()
-        {
-            return new {dllVersion = _version()};
-        }
-
-        private string _version()
-        {
-            var asm = Assembly.GetExecutingAssembly();
-            var fvi = FileVersionInfo.GetVersionInfo(asm.Location);
-
-            return fvi.FileVersion;
-        }
     }
 }

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

@@ -234,12 +234,10 @@
     <Compile Include="Extensions\ArchetypeHelper.cs" />
     <Compile Include="Extensions\HtmlHelperExtensions.cs" />
     <Compile Include="Extensions\ArchetypePropertyModelExtensions.cs" />
-    <Compile Include="Extensions\PropertyEditorExtensions.cs" />
     <Compile Include="Extensions\StringExtensions.cs" />
     <Compile Include="Models\ArchetypeModel.cs" />
     <Compile Include="Models\ArchetypePreValue.cs" />
     <Compile Include="Models\ArchetypePreValueFieldset.cs" />
-    <Compile Include="Models\ArchetypePreValueFieldsetGroup.cs" />
     <Compile Include="Models\ArchetypePreValueProperty.cs" />
     <Compile Include="Models\ArchetypeFieldsetModel.cs" />
     <Compile Include="Models\ArchetypePropertyModel.cs" />

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

@@ -68,7 +68,7 @@ namespace Archetype.Extensions
                 }
                 catch (Exception ex)
                 {
-                    LogHelper.Error<ArchetypeHelper>(string.Format("DeserializeJsonToArchetype Error DatatypeId=>{0} SourceJson=>{1}", dataTypeId, sourceJson), ex);
+                    LogHelper.Error<ArchetypeHelper>("DeserializeJsonToArchetype", ex);
                 }
 
                 return archetype;

app/Umbraco/Umbraco.Archetype/Extensions/PropertyEditorExtensions.cs

@@ -1,58 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using Newtonsoft.Json;
-using Umbraco.Core.PropertyEditors;
-
-namespace Archetype.Extensions
-{
-	public static class PropertyEditorExtensions
-    {
-		/// <summary>
-		/// Formats the default prevalues for a property editor for use within an Archetype clientside context
-		/// </summary>
-		/// <param name="propertyEditor">The property editor</param>
-		/// <returns>The formatted default prevalues</returns>
-		public static IDictionary<string, object> DefaultPreValuesForArchetype(this PropertyEditor propertyEditor)
-        {
-			if (propertyEditor.DefaultPreValues == null || propertyEditor.DefaultPreValues.Any() == false)
-			{
-				return propertyEditor.DefaultPreValues;
-			}
-			var view = propertyEditor.ValueEditor.View.ToLowerInvariant();
-
-			// This is the extension point for default prevalues formatting, in case we need to handle any other
-			// property editors later on. It should be replaced with a switch statement by then, or maybe some fancy 
-			// auto discovery of formatters :)
-			if (view == "imagecropper")
-			{
-				propertyEditor.FormatImageCropperDefaultPreValuesForArchetype();
-			}
-			return propertyEditor.DefaultPreValues;
-        }
-
-		/// <summary>
-		/// Format the default prevalues of the image cropper property editor
-		/// </summary>
-		/// <param name="propertyEditor"></param>
-		/// <remarks>
-		/// In order for the image cropper to work clientside, we need to make sure it's default prevalue "focalpoint" is returned
-		/// as a JSON object and not as the string it's defined as on the image cropper property editor.
-		/// </remarks>
-		private static void FormatImageCropperDefaultPreValuesForArchetype(this PropertyEditor propertyEditor)
-		{
-			const string focalPointKey = "focalPoint";
-
-			if (propertyEditor.DefaultPreValues.ContainsKey(focalPointKey) == false || propertyEditor.DefaultPreValues[focalPointKey] == null)
-			{
-				return;
-			}
-			var focalPoint = propertyEditor.DefaultPreValues[focalPointKey].ToString();
-			if (string.IsNullOrEmpty(focalPoint))
-			{
-				return;
-			}
-			// translate the JSON string to a JSON object
-			propertyEditor.DefaultPreValues[focalPointKey] = JsonConvert.DeserializeObject(focalPoint);
-		}
-    }
-}

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

@@ -2,7 +2,6 @@ using System.Collections.Generic;
 using System.Linq;
 using Newtonsoft.Json;
 using Umbraco.Core;
-using System;
 
 namespace Archetype.Models
 {
@@ -17,9 +16,6 @@ namespace Archetype.Models
         [JsonProperty("properties")]
         public IEnumerable<ArchetypePropertyModel> Properties;
 
-        [JsonProperty("id")]
-        public Guid Id { get; set; }
-
         public ArchetypeFieldsetModel()
         {
             Properties = new List<ArchetypePropertyModel>();
@@ -88,4 +84,4 @@ namespace Archetype.Models
         #endregion
 
     }
-}
+}

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

@@ -1,7 +1,7 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using System.Linq;
+using System.Linq;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 
@@ -31,15 +31,14 @@ namespace Archetype.Models
         public string SerializeForPersistence()
         {
             var json = JObject.Parse(JsonConvert.SerializeObject(this, new JsonSerializerSettings() { ReferenceLoopHandling = ReferenceLoopHandling.Ignore }));
-
-            var propertiesToRemove = new String[] { "propertyEditorAlias", "dataTypeId", "dataTypeGuid", "hostContentType", "editorState" };
+            var propertiesToRemove = new String[] { "propertyEditorAlias", "dataTypeId", "dataTypeGuid", "hostContentType" };
 
             json.Descendants().OfType<JProperty>()
               .Where(p => propertiesToRemove.Contains(p.Name))
               .ToList()
-              .ForEach(x => x.Remove());
-
-            return json.ToString(Formatting.None);
+              .ForEach(x => x.Remove());
+
+            return json.ToString(Formatting.None);
         }
     }
 }

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

@@ -1,5 +1,4 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using Newtonsoft.Json;
 
 namespace Archetype.Models
@@ -13,7 +12,6 @@ namespace Archetype.Models
         public bool StartWithAddButton { get; set; }
 
         [JsonProperty("hideFieldsetToolbar")]
-        [Obsolete("This value is no longer used but is kept to prevent breaking changes.")]
         public bool HideFieldsetToolbar { get; set; }
 
         [JsonProperty("enableMultipleFieldsets")]
@@ -40,9 +38,6 @@ namespace Archetype.Models
         [JsonProperty("fieldsets")]
         public IEnumerable<ArchetypePreValueFieldset> Fieldsets { get; set; }
 
-        [JsonProperty("fieldsetGroups")]
-        public IEnumerable<ArchetypePreValueFieldsetGroup> FieldsetGroups { get; set; }
-
         [JsonProperty("hidePropertyLabels")]
         public bool HidePropertyLabels { get; set; }
 

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

@@ -25,8 +25,5 @@ namespace Archetype.Models
 
         [JsonProperty("properties")]
         public IEnumerable<ArchetypePreValueProperty> Properties { get; set; }
-
-        [JsonProperty("group")]
-        public ArchetypePreValueFieldsetGroup Group { get; set; }
     }
 }

app/Umbraco/Umbraco.Archetype/Models/ArchetypePreValueFieldsetGroup.cs

@@ -1,10 +0,0 @@
-using Newtonsoft.Json;
-
-namespace Archetype.Models
-{
-    public class ArchetypePreValueFieldsetGroup
-    {
-        [JsonProperty("name")]
-        public string Name { get; set; }
-    }
-}

app/Umbraco/Umbraco.Archetype/Models/ArchetypePropertyModel.cs

@@ -26,15 +26,12 @@ namespace Archetype.Models
         [JsonProperty("dataTypeGuid")]
         internal string DataTypeGuid { get; set; }
 
-        // container for temporary editor state from the Umbraco backend
-        [JsonProperty("editorState")]
-        internal UmbracoEditorState EditorState { get; set; }
-
         [JsonProperty("hostContentType")]
         internal PublishedContentType HostContentType { get; set; }
 
         public T GetValue<T>()
         {
+
             // Try Umbraco's PropertyValueConverters
             var converters = UmbracoContext.Current != null ? PropertyValueConvertersResolver.Current.Converters : Enumerable.Empty<IPropertyValueConverter>();
             if (!string.IsNullOrWhiteSpace(this.PropertyEditorAlias) && converters.Any())
@@ -91,12 +88,5 @@ namespace Archetype.Models
 
             return Attempt<T>.Fail();
         }
-
-        internal class UmbracoEditorState
-        {
-            // container for the names of any files selected for a property in the Umbraco backend
-            [JsonProperty("fileNames")]
-            public IEnumerable<string> FileNames;
-        }
     }
 }

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

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

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

@@ -1,191 +1,155 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Archetype.Extensions;
-using ClientDependency.Core;
-using Newtonsoft.Json;
-using Umbraco.Core;
-using Umbraco.Core.Logging;
-using Umbraco.Core.Models;
-using Umbraco.Core.Models.Editors;
-using Umbraco.Core.PropertyEditors;
-using Umbraco.Core.Services;
-using Umbraco.Web.PropertyEditors;
-using Umbraco.Web.Models.ContentEditing;
-
-namespace Archetype.PropertyEditors
-{
-	[PropertyEditorAsset(ClientDependencyType.Javascript, "../App_Plugins/Archetype/js/archetype.js")]
-	[PropertyEditor(Constants.PropertyEditorAlias, "Archetype", "../App_Plugins/Archetype/views/archetype.html", ValueType = "JSON")]
-	public class ArchetypePropertyEditor : PropertyEditor
-	{
-		#region Pre Value Editor
-
-		protected override PreValueEditor CreatePreValueEditor()
-		{
-			return new ArchetypePreValueEditor();
-		}
-
-		internal class ArchetypePreValueEditor : PreValueEditor
-		{
-			[PreValueField("archetypeConfig", "Config", "../App_Plugins/Archetype/views/archetype.config.html",
-				Description = "(Required) Describe your Archetype.")]
-			public string Config { get; set; }
-
-			[PreValueField("hideLabel", "Hide Label", "boolean",
-				Description = "Hide the Umbraco property title and description, making the Archetype span the entire page width")]
-			public bool HideLabel { get; set; }
-		}
-
-		#endregion
-
-		#region Value Editor
-
-		protected override PropertyValueEditor CreateValueEditor()
-		{
-			return new ArchetypePropertyValueEditor(base.CreateValueEditor());
-		}
-
-		internal class ArchetypePropertyValueEditor : PropertyValueEditorWrapper
-		{
-			protected JsonSerializerSettings _jsonSettings;
-
-			public ArchetypePropertyValueEditor(PropertyValueEditor wrapped)
-				: base(wrapped)
-			{
-			}
-
-			public override string ConvertDbToString(Property property, PropertyType propertyType, IDataTypeService dataTypeService)
-			{
-				if(property.Value == null || property.Value.ToString() == "")
-					return string.Empty;
-
-				var archetype = ArchetypeHelper.Instance.DeserializeJsonToArchetype(property.Value.ToString(), propertyType.DataTypeDefinitionId);
-
-				foreach (var fieldset in archetype.Fieldsets)
-				{
-					foreach (var propDef in fieldset.Properties.Where(p => p.DataTypeGuid != null))
-					{
-						try
-						{
-							if(propDef == null || propDef.DataTypeGuid == null) continue;
-							var dtd = ArchetypeHelper.Instance.GetDataTypeByGuid(Guid.Parse(propDef.DataTypeGuid));
-							var propType = new PropertyType(dtd) {Alias = propDef.Alias};
-							var prop = new Property(propType, propDef.Value);
-							var propEditor = PropertyEditorResolver.Current.GetByAlias(dtd.PropertyEditorAlias);
-							propDef.Value = propEditor.ValueEditor.ConvertDbToString(prop, propType, dataTypeService);
-						}
-						catch (Exception ex)
-						{
-							LogHelper.Error<ArchetypePropertyValueEditor>(ex.Message, ex);
-						}
-					}
-				}
-
-				return archetype.SerializeForPersistence();
-			}
-
-			public override object ConvertDbToEditor(Property property, PropertyType propertyType, IDataTypeService dataTypeService)
-			{
-				if(property.Value == null || property.Value.ToString() == "")
-					return string.Empty;
-
-				var archetype = ArchetypeHelper.Instance.DeserializeJsonToArchetype(property.Value.ToString(), propertyType.DataTypeDefinitionId);
-
-				foreach (var fieldset in archetype.Fieldsets)
-				{
-					foreach (var propDef in fieldset.Properties.Where(p => p.DataTypeGuid != null))
-					{
-						try
-						{
-							var dtd = ArchetypeHelper.Instance.GetDataTypeByGuid(Guid.Parse(propDef.DataTypeGuid));
-							var propType = new PropertyType(dtd) {Alias = propDef.Alias};
-							var prop = new Property(propType, propDef.Value);
-							var propEditor = PropertyEditorResolver.Current.GetByAlias(dtd.PropertyEditorAlias);
-							propDef.Value = propEditor.ValueEditor.ConvertDbToEditor(prop, propType, dataTypeService);
-						}
-						catch (Exception ex)
-						{
-							LogHelper.Error<ArchetypePropertyValueEditor>(ex.Message, ex);
-						}
-					}
-				}
-
-				return archetype;
-			}
-
-			public override object ConvertEditorToDb(ContentPropertyData editorValue, object currentValue)
-			{
-				if(editorValue.Value == null || editorValue.Value.ToString() == "")
-					return string.Empty;
-
-				// attempt to deserialize the current property value as an Archetype
-				var currentArchetype = currentValue != null ? ArchetypeHelper.Instance.DeserializeJsonToArchetype(currentValue.ToString(), editorValue.PreValues) : null;
-				var archetype = ArchetypeHelper.Instance.DeserializeJsonToArchetype(editorValue.Value.ToString(), editorValue.PreValues);
-
-				// get all files uploaded via the file manager (if any)
-				var uploadedFiles = editorValue.AdditionalData.ContainsKey("files") ? editorValue.AdditionalData["files"] as IEnumerable<ContentItemFile> : null;
-				foreach (var fieldset in archetype.Fieldsets)
-				{
-					// assign an id to the fieldset if it has none (e.g. newly created fieldset)
-					fieldset.Id = fieldset.Id == Guid.Empty ? Guid.NewGuid() : fieldset.Id;
-					// find the corresponding fieldset in the current Archetype value (if any)
-					var currentFieldset = currentArchetype != null ? currentArchetype.Fieldsets.FirstOrDefault(f => f.Id == fieldset.Id) : null;
-					foreach (var propDef in fieldset.Properties)
-					{
-						try
-						{
-							// find the corresponding property in the current Archetype value (if any)
-							var currentProperty = currentFieldset != null ? currentFieldset.Properties.FirstOrDefault(p => p.Alias == propDef.Alias) : null;
-							var dtd = ArchetypeHelper.Instance.GetDataTypeByGuid(Guid.Parse(propDef.DataTypeGuid));
-							var preValues = ApplicationContext.Current.Services.DataTypeService.GetPreValuesCollectionByDataTypeId(dtd.Id);
-
-							var additionalData = new Dictionary<string, object>();
-
-							// figure out if we need to pass a files collection in the additional data to the property value editor
-							if(uploadedFiles != null)
-							{
-								if(dtd.PropertyEditorAlias == Constants.PropertyEditorAlias)
-								{
-									// it's a nested Archetype - just pass all uploaded files to the value editor
-									additionalData["files"] = uploadedFiles.ToList();
-								}
-								else if (propDef.EditorState != null && propDef.EditorState.FileNames != null && propDef.EditorState.FileNames.Any())
-								{
-									// pass the uploaded files that belongs to this property (if any) to the value editor
-									var propertyFiles = propDef.EditorState.FileNames.Select(f => uploadedFiles.FirstOrDefault(u => u.FileName == f)).Where(f => f != null).ToList();
-									if(propertyFiles.Any())
-									{
-										additionalData["files"] = propertyFiles;
-									}
-								}
-							}
-							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
-							propDef.Value = propEditor.ValueEditor.ConvertEditorToDb(propData, currentProperty != null ? currentProperty.Value : null);
-						}
-						catch (Exception ex)
-						{
-							LogHelper.Error<ArchetypePropertyValueEditor>(ex.Message, ex);
-						}
-					}
-				}
-
-				return archetype.SerializeForPersistence();
-			}
-
-			internal virtual PropertyEditor GetPropertyEditor(IDataTypeDefinition dtd)
-			{
-				if(dtd.Id != 0)
-					return PropertyEditorResolver.Current.GetByAlias(dtd.PropertyEditorAlias);
-
-				return dtd.PropertyEditorAlias.Equals(Constants.PropertyEditorAlias)
-					? new ArchetypePropertyEditor()
-					: (PropertyEditor) new TextboxPropertyEditor();
-			}
-		}
-
-		#endregion
-	}
-}
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Archetype.Extensions;
+using ClientDependency.Core;
+using Newtonsoft.Json;
+using Umbraco.Core;
+using Umbraco.Core.Logging;
+using Umbraco.Core.Models;
+using Umbraco.Core.Models.Editors;
+using Umbraco.Core.PropertyEditors;
+using Umbraco.Core.Services;
+using Umbraco.Web.PropertyEditors;
+
+namespace Archetype.PropertyEditors
+{
+	[PropertyEditorAsset(ClientDependencyType.Javascript, "~/App_Plugins/Archetype/js/archetype.js")]
+	[PropertyEditor(Constants.PropertyEditorAlias, "Archetype", "~/App_Plugins/Archetype/views/archetype.html", ValueType = "JSON")]
+	public class ArchetypePropertyEditor : PropertyEditor
+	{
+		#region Pre Value Editor
+
+		protected override PreValueEditor CreatePreValueEditor()
+		{
+			return new ArchetypePreValueEditor();
+		}
+
+		internal class ArchetypePreValueEditor : PreValueEditor
+		{
+			[PreValueField("archetypeConfig", "Config", "~/App_Plugins/Archetype/views/archetype.config.html",
+				Description = "(Required) Describe your Archetype.")]
+			public string Config { get; set; }
+
+			[PreValueField("hideLabel", "Hide Label", "boolean",
+				Description = "Hide the Umbraco property title and description, making the Archetype span the entire page width")]
+			public bool HideLabel { get; set; }
+		}
+
+		#endregion
+
+		#region Value Editor
+
+		protected override PropertyValueEditor CreateValueEditor()
+		{
+			return new ArchetypePropertyValueEditor(base.CreateValueEditor());
+		}
+
+		internal class ArchetypePropertyValueEditor : PropertyValueEditorWrapper
+		{
+			protected JsonSerializerSettings _jsonSettings;
+
+			public ArchetypePropertyValueEditor(PropertyValueEditor wrapped)
+				: base(wrapped) { }
+
+			public override string ConvertDbToString(Property property, PropertyType propertyType, IDataTypeService dataTypeService)
+			{
+				if (property.Value == null || property.Value.ToString() == "")
+					return string.Empty;
+
+				var archetype = ArchetypeHelper.Instance.DeserializeJsonToArchetype(property.Value.ToString(), propertyType.DataTypeDefinitionId);
+
+				foreach (var fieldset in archetype.Fieldsets)
+				{
+                    foreach (var propDef in fieldset.Properties.Where(p => p.DataTypeGuid != null))
+					{
+                        try
+                        {
+                            if(propDef == null || propDef.DataTypeGuid == null) continue;
+                            var dtd = ArchetypeHelper.Instance.GetDataTypeByGuid(Guid.Parse(propDef.DataTypeGuid));
+						    var propType = new PropertyType(dtd) { Alias = propDef.Alias };
+						    var prop = new Property(propType, propDef.Value);
+						    var propEditor = PropertyEditorResolver.Current.GetByAlias(dtd.PropertyEditorAlias);
+						    propDef.Value = propEditor.ValueEditor.ConvertDbToString(prop, propType, dataTypeService);
+                        }
+                        catch (Exception ex)
+                        {
+                            LogHelper.Error<ArchetypePropertyValueEditor>(ex.Message, ex);
+                        }
+					}
+				}
+
+                return archetype.SerializeForPersistence();
+			}
+
+			public override object ConvertDbToEditor(Property property, PropertyType propertyType, IDataTypeService dataTypeService)
+			{
+				if (property.Value == null || property.Value.ToString() == "")
+					return string.Empty;;
+
+				var archetype = ArchetypeHelper.Instance.DeserializeJsonToArchetype(property.Value.ToString(), propertyType.DataTypeDefinitionId);
+
+				foreach (var fieldset in archetype.Fieldsets)
+				{
+                    foreach (var propDef in fieldset.Properties.Where(p => p.DataTypeGuid != null))
+					{
+                        try
+                        {
+                            var dtd = ArchetypeHelper.Instance.GetDataTypeByGuid(Guid.Parse(propDef.DataTypeGuid));
+                            var propType = new PropertyType(dtd) { Alias = propDef.Alias };
+                            var prop = new Property(propType, propDef.Value);
+                            var propEditor = PropertyEditorResolver.Current.GetByAlias(dtd.PropertyEditorAlias);
+                            propDef.Value = propEditor.ValueEditor.ConvertDbToEditor(prop, propType, dataTypeService);
+                        }
+                        catch (Exception ex)
+                        {
+                            LogHelper.Error<ArchetypePropertyValueEditor>(ex.Message, ex);
+                        }
+					}
+				}
+
+				return archetype;
+			}
+            public override object ConvertEditorToDb(ContentPropertyData editorValue, object currentValue)
+			{
+				if (editorValue.Value == null || editorValue.Value.ToString() == "")
+					return string.Empty;
+
+				var archetype = ArchetypeHelper.Instance.DeserializeJsonToArchetype(editorValue.Value.ToString(), editorValue.PreValues);
+
+				foreach (var fieldset in archetype.Fieldsets)
+				{    
+                    foreach (var propDef in fieldset.Properties.Where(p => p.DataTypeGuid != null))
+					{
+                        try
+                        {
+                            var dtd = ArchetypeHelper.Instance.GetDataTypeByGuid(Guid.Parse(propDef.DataTypeGuid));
+						    var preValues = ApplicationContext.Current.Services.DataTypeService.GetPreValuesCollectionByDataTypeId(dtd.Id);
+						    var propData = new ContentPropertyData(propDef.Value, preValues, new Dictionary<string, object>());
+                            var propEditor = PropertyEditorResolver.Current.GetByAlias(dtd.PropertyEditorAlias);
+						    propDef.Value = propEditor.ValueEditor.ConvertEditorToDb(propData, propDef.Value);
+                        }
+                        catch (Exception ex)
+                        {
+                            LogHelper.Error<ArchetypePropertyValueEditor>(ex.Message, ex);
+                        }
+					}
+				}
+
+                return archetype.SerializeForPersistence();
+			}
+
+		    internal virtual PropertyEditor GetPropertyEditor(IDataTypeDefinition dtd)
+		    {
+		        if (dtd.Id != 0) 
+                    return PropertyEditorResolver.Current.GetByAlias(dtd.PropertyEditorAlias);
+
+		        return dtd.PropertyEditorAlias.Equals(Constants.PropertyEditorAlias)
+		            ? new ArchetypePropertyEditor()
+                    : (PropertyEditor)new TextboxPropertyEditor();
+		    }
+		}
+
+		#endregion	
+	}
+}

app/controllers/config.controller.js

@@ -5,18 +5,12 @@ angular.module("umbraco").controller("Imulus.ArchetypeConfigController", functio
 
     //define empty items
     var newPropertyModel = '{"alias": "", "remove": false, "collapse": false, "label": "", "helpText": "", "dataTypeGuid": "0cc0eba1-9960-42c9-bf9b-60e150b429ae", "value": ""}';
-    var newFieldsetModel = '{"alias": "", "remove": false, "collapse": false, "labelTemplate": "", "icon": "", "label": "", "properties": [' + newPropertyModel + '], "group": null}';
-    var defaultFieldsetConfigModel = JSON.parse('{"showAdvancedOptions": false, "startWithAddButton": false, "hideFieldsetToolbar": false, "enableMultipleFieldsets": false, "hideFieldsetControls": false, "hidePropertyLabel": false, "maxFieldsets": null, "enableCollapsing": true, "enableCloning": false, "enableDisabling": true, "enableDeepDatatypeRequests": false, "fieldsets": [' + newFieldsetModel + '], "fieldsetGroups": []}');
+    var newFieldsetModel = '{"alias": "", "remove": false, "collapse": false, "labelTemplate": "", "icon": "", "label": "", "properties": [' + newPropertyModel + ']}';
+    var defaultFieldsetConfigModel = JSON.parse('{"showAdvancedOptions": false, "startWithAddButton": false, "hideFieldsetToolbar": false, "enableMultipleFieldsets": false, "hideFieldsetControls": false, "hidePropertyLabel": false, "maxFieldsets": null, "enableCollapsing": true, "enableCloning": false, "enableDisabling": true, "enableDeepDatatypeRequests": false, "fieldsets": [' + newFieldsetModel + ']}');
 
     //ini the model
     $scope.model.value = $scope.model.value || defaultFieldsetConfigModel;
 
-    $scope.dllVersion = "";
-
-    archetypePropertyEditorResource.getDllVersion().then(function(data){
-        $scope.dllVersion = data.dllVersion;
-    });
-
     //ini the render model
     initConfigRenderModel();
 
@@ -110,7 +104,7 @@ angular.module("umbraco").controller("Imulus.ArchetypeConfigController", functio
 
     //ini the properties
     _.each($scope.archetypeConfigRenderModel.fieldsets, function(fieldset){
-        $scope.focusProperty(fieldset.properties);
+            $scope.focusProperty(fieldset.properties);
     });
 
     //setup JSON.stringify helpers
@@ -244,18 +238,8 @@ angular.module("umbraco").controller("Imulus.ArchetypeConfigController", functio
     function initConfigRenderModel()
     {
         $scope.archetypeConfigRenderModel = $scope.model.value;
-        if (!$scope.archetypeConfigRenderModel.fieldsetGroups) {
-            $scope.archetypeConfigRenderModel.fieldsetGroups = [];
-        }
 
-        _.each($scope.archetypeConfigRenderModel.fieldsets, function(fieldset) {
-
-            if (fieldset.group) {
-                // tie the fieldset group back up to the actual group object, not the clone that's been persisted
-                fieldset.group = _.find($scope.archetypeConfigRenderModel.fieldsetGroups, function(fieldsetGroup) {
-                    return fieldsetGroup.name == fieldset.group.name;
-                })
-            }
+        _.each($scope.archetypeConfigRenderModel.fieldsets, function(fieldset){
 
             fieldset.remove = false;
             if (fieldset.alias.length > 0)
@@ -305,21 +289,6 @@ angular.module("umbraco").controller("Imulus.ArchetypeConfigController", functio
         $scope.model.value.fieldsets = fieldsets;
     }
 
-    $scope.showOptions = function ($event, template) {
-        $event.preventDefault();
-
-        dialogService.closeAll();
-
-        dialogService.open({
-            template: template,
-            show: true,
-            callback: function(data) {
-                $scope.archetypeConfigRenderModel = data;
-            },
-            dialogData: $scope.archetypeConfigRenderModel
-        });
-    }
-
     //archetype css
-    assetsService.loadCss("../App_Plugins/Archetype/css/archetype.css");
+    assetsService.loadCss("/App_Plugins/Archetype/css/archetype.css");
 });

app/controllers/config.dialog.controller.js

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

app/controllers/controller.js

@@ -1,5 +1,4 @@
-{{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, assetsService, angularHelper, notificationsService, $timeout, entityResource, archetypeService, archetypeLabelService, archetypeCacheService, archetypePropertyEditorResource) {
 
     //$scope.model.value = "";
     $scope.model.hideLabel = $scope.model.config.hideLabel == 1;
@@ -16,11 +15,6 @@ angular.module("umbraco").controller("Imulus.ArchetypeController", function ($sc
     // store the umbraco property alias to help generate unique IDs.  Hopefully there's a better way to get this in the future :)
     $scope.umbracoHostPropertyAlias = $scope.$parent.$parent.model.alias;
 
-    $scope.overlayMenu = {
-        show: false,
-        style: {}
-    };
-
     init();
 
     //hold references to helper resources 
@@ -42,7 +36,7 @@ angular.module("umbraco").controller("Imulus.ArchetypeController", function ($sc
     }
 
     var draggedRteSettings;
-    var rteClass = ".umb-rte textarea";
+    var rteClass = ".mce-tinymce";
 
     //sort config
     $scope.sortableOptions = {
@@ -51,86 +45,35 @@ angular.module("umbraco").controller("Imulus.ArchetypeController", function ($sc
         handle: ".handle",
         start: function(ev, ui) {
             draggedRteSettings = {};
-            $(rteClass, ui.item.parent()).each(function () {
-                var id = $(this).attr("id");
-                draggedRteSettings[id] = _.findWhere(tinyMCE.editors, { id: id }).settings;
-                tinymce.execCommand('mceRemoveEditor', false, id);
-                $(this).css("visibility", "hidden");
+            ui.item.parent().find(rteClass).each(function () {
+                // remove all RTEs in the dragged row and save their settings
+                var $element = $(this);
+                var wrapperId = $element.attr('id');
+                var $textarea = $element.siblings('textarea');
+                var textareaId = $textarea.attr('id');
+
+                draggedRteSettings[textareaId] = _.findWhere(tinyMCE.editors, { id: textareaId }).settings;
+                tinyMCE.execCommand('mceRemoveEditor', false, wrapperId);
             });
         },
         update: function (ev, ui) {
             $scope.setDirty();
         },
         stop: function (ev, ui) {
-            $(rteClass, ui.item.parent()).each(function () {
-                var id = $(this).attr("id");
-                draggedRteSettings[id] = draggedRteSettings[id] || _.findWhere(tinyMCE.editors, { id: id }).settings;
-                tinyMCE.execCommand("mceRemoveEditor", false, id);
-                tinyMCE.init(draggedRteSettings[id]);
+            ui.item.parent().find(rteClass).each(function () {
+                var $element = $(this);
+                var wrapperId = $element.attr('id');
+                var $textarea = $element.siblings('textarea');
+                var textareaId = $textarea.attr('id');
+
+                draggedRteSettings[textareaId] = draggedRteSettings[textareaId] || _.findWhere(tinyMCE.editors, { id: textareaId }).settings;
+                tinyMCE.execCommand('mceRemoveEditor', false, wrapperId);
+                tinyMCE.init(draggedRteSettings[textareaId]);
             });
         }
     };
 
     //handles a fieldset add
-    $scope.openFieldsetPicker = function ($index, event) {
-        if ($scope.canAdd() == false) {
-            return;
-        }
-
-        var allFieldsets = [];
-        _.each($scope.model.config.fieldsets, function (fieldset) {
-            var icon = fieldset.icon;
-            allFieldsets.push({
-                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
-            });
-        });
-        // sanity check
-        if (allFieldsets == 0) {
-            return;
-        }
-        if (allFieldsets.length == 1) {
-            // only one fieldset type - no need to display the picker
-            $scope.addRow(allFieldsets[0].alias, $index);
-            return;
-        }
-
-        $scope.overlayMenu.fieldsetGroups = [];
-        if ($scope.model.config.fieldsetGroups && $scope.model.config.fieldsetGroups.length > 0) {
-            _.each($scope.model.config.fieldsetGroups, function (fieldsetGroup) {
-                $scope.overlayMenu.fieldsetGroups.push({ name: fieldsetGroup.name, fieldsets: $filter("filter")(allFieldsets, { group: fieldsetGroup.name }, true) });
-            })
-        }
-        else {
-            $scope.overlayMenu.fieldsetGroups.push({ name: "", fieldsets: allFieldsets });
-        }
-        $scope.overlayMenu.index = $index;
-        $scope.overlayMenu.activeFieldsetGroup = $scope.overlayMenu.fieldsetGroups[0];
-
-        // calculate overlay position
-        // - yeah... it's jQuery (ungh!) but that's how the Grid does it.
-        var offset = $(event.target).offset();
-        var scrollTop = $(event.target).closest(".umb-panel-body").scrollTop();
-        if (offset.top < 400) {
-            $scope.overlayMenu.style.top = 300 + scrollTop;
-        }
-        else {
-            $scope.overlayMenu.style.top = offset.top - 150 + scrollTop;
-        }
-        $scope.overlayMenu.show = true;
-    };
-
-    $scope.closeFieldsetPicker = function () {
-        $scope.overlayMenu.show = false;
-    };
-    
-    $scope.pickFieldset = function (fieldsetAlias, $index) {
-        $scope.closeFieldsetPicker();
-        $scope.addRow(fieldsetAlias, $index);
-    };    
-    
     $scope.addRow = function (fieldsetAlias, $index) {
         if ($scope.canAdd()) {
             if ($scope.model.config.fieldsets) {
@@ -145,13 +88,9 @@ angular.module("umbraco").controller("Imulus.ArchetypeController", function ($sc
                     $scope.model.value.fieldsets.push(newFieldset);
                 }
             }
-
             $scope.setDirty();
 
-            $scope.$broadcast("archetypeAddFieldset", {index: $index, visible: countVisible()});
-
             newFieldset.collapse = $scope.model.config.enableCollapsing ? true : false;
-            
             $scope.focusFieldset(newFieldset);
         }
     }
@@ -313,36 +252,11 @@ angular.module("umbraco").controller("Imulus.ArchetypeController", function ($sc
     //developerMode helpers
     $scope.model.value.toString = stringify;
 
-    // issue 114: register handler for file selection
-    $scope.model.value.setFiles = setFiles;
-
     //encapsulate stringify (should be built into browsers, not sure of IE support)
     function stringify() {
         return JSON.stringify(this);
     }
 
-    // issue 114: handler for file selection
-    function setFiles(files) {
-        // get all currently selected files from file manager
-        var currentFiles = fileManager.getFiles();
-        
-        // get the files already selected for this archetype (by alias)
-        var archetypeFiles = [];
-        _.each(currentFiles, function (item) {
-            if (item.alias === $scope.model.alias) {
-                archetypeFiles.push(item.file);
-            }
-        });
-
-        // add the newly selected files
-        _.each(files, function (file) {
-            archetypeFiles.push(file);
-        });
-
-        // update the selected files for this archetype (by alias)
-        fileManager.setFiles($scope.model.alias, archetypeFiles);
-    }
-
     //watch for changes
     $scope.$watch('model.value', function (v) {
         if ($scope.model.config.developerMode) {
@@ -352,11 +266,6 @@ angular.module("umbraco").controller("Imulus.ArchetypeController", function ($sc
                 $scope.model.value.toString = stringify;
             }
         }
-
-        // issue 114: re-register handler for files selection and reset the currently selected files on the file manager
-        $scope.model.value.setFiles = setFiles;
-        fileManager.setFiles($scope.model.alias, []);
-
         // reset submit watcher counter on save
         $scope.activeSubmitWatcher = 0;
     });
@@ -451,7 +360,7 @@ angular.module("umbraco").controller("Imulus.ArchetypeController", function ($sc
     }
 
     //archetype css
-    assetsService.loadCss("../App_Plugins/Archetype/css/archetype.css");
+    assetsService.loadCss("/App_Plugins/Archetype/css/archetype.css");
 
     //custom css
     if($scope.model.config.customCssPath)

app/directives/archetypeclickoutside.js

@@ -1,29 +0,0 @@
-angular.module("umbraco.directives")
-    .directive('archetypeClickOutside', function ($timeout, $parse) {
-        return {
-            restrict: 'A',
-            link: function (scope, element, attrs, ctrl) {
-                var fn = $parse(attrs.archetypeClickOutside);
-
-                // add click event handler (delayed so we don't trigger the callback immediately if this directive itself was triggered by a mouse click)
-                $timeout(function () {
-                  $(document).on("click", mouseClick);
-                }, 500);
-
-                function mouseClick(event) {  
-                    if($(event.target).closest(element).length > 0) {
-                        return;
-                    }
-                    var callback = function () {
-                        fn(scope, { $event: event });
-                    };
-                    scope.$apply(callback);
-                }
-
-                // unbind event
-                scope.$on('$destroy', function () {
-                    $(document).off("click", mouseClick);
-                });
-            }
-        };
-    });

app/directives/archetypeproperty.js

@@ -1,4 +1,4 @@
-angular.module("umbraco.directives").directive('archetypeProperty', function ($compile, $http, archetypePropertyEditorResource, umbPropEditorHelper, $timeout, $rootScope, $q, fileManager, editorState, archetypeService, archetypeCacheService) {
+angular.module("umbraco.directives").directive('archetypeProperty', function ($compile, $http, archetypePropertyEditorResource, umbPropEditorHelper, $timeout, $rootScope, $q, editorState, archetypeService, archetypeCacheService) {
 
     var linker = function (scope, element, attrs, ngModelCtrl) {
         var configFieldsetModel = archetypeService.getFieldsetByAlias(scope.archetypeConfig.fieldsets, scope.fieldset.alias);
@@ -40,12 +40,64 @@ angular.module("umbraco.directives").directive('archetypeProperty', function ($c
 
                 var mergedConfig = _.extend(defaultConfigObj, config);
 
-                loadView(pathToView, mergedConfig, defaultValue, alias, propertyAlias, scope, element, ngModelCtrl, configFieldsetModel);
+                loadView(pathToView, mergedConfig, defaultValue, alias, propertyAlias, scope, element, ngModelCtrl, propertyValueChanged);
             });
         });
+
+        scope.$on("archetypeFormSubmitting", function (ev, args) {
+            // validate all fieldset properties
+            _.each(scope.fieldset.properties, function (property) {
+                validateProperty(scope.fieldset, property);
+            });
+
+            var validationKey = "validation-f" + scope.fieldsetIndex;
+            ngModelCtrl.$setValidity(validationKey, scope.fieldset.isValid);
+        });
+
+        scope.$on("archetypeRemoveFieldset", function (ev, args) {
+            var validationKey = "validation-f" + args.index;
+            ngModelCtrl.$setValidity(validationKey, true);
+        });
+
+
+        // called when the value of any property in a fieldset changes
+        function propertyValueChanged(fieldset, property) {
+            // it's the Umbraco way to hide the invalid state when altering an invalid property, even if the new value isn't valid either
+            property.isValid = true;
+            setFieldsetValidity(fieldset);
+        }
+
+        // validate a property in a fieldset
+        function validateProperty(fieldset, property) {
+            var propertyConfig = archetypeService.getPropertyByAlias(configFieldsetModel, property.alias);
+            if (propertyConfig) {
+                // use property.value !== property.value to check for NaN values on numeric inputs
+                if (propertyConfig.required && (property.value == null || property.value === "" || property.value !== property.value)) {
+                    property.isValid = false;
+                }
+                // issue 116: RegEx validate property value
+                // Only validate the property value if anything has been entered - RegEx is considered a supplement to "required".
+                if (property.isValid == true && propertyConfig.regEx && property.value) {
+                    var regEx = new RegExp(propertyConfig.regEx);
+                    if (regEx.test(property.value) == false) {
+                        property.isValid = false;
+                    }
+                }
+            }
+
+            setFieldsetValidity(fieldset);
+        }
+
+        function setFieldsetValidity(fieldset) {
+            // mark the entire fieldset as invalid if there are any invalid properties in the fieldset, otherwise mark it as valid
+            fieldset.isValid =
+                _.find(fieldset.properties, function (property) {
+                    return property.isValid == false
+                }) == null;
+        }
     }
 
-    function loadView(view, config, defaultValue, alias, propertyAlias, scope, element, ngModelCtrl, configFieldsetModel) {
+    function loadView(view, config, defaultValue, alias, propertyAlias, scope, element, ngModelCtrl, propertyValueChanged) {
         if (view)
         {
             $http.get(view, { cache: true }).success(function (data) {
@@ -68,13 +120,9 @@ angular.module("umbraco.directives").directive('archetypeProperty', function ($c
                         archetypeService.getFieldset(scope).properties.push(JSON.parse('{"alias": "' + alias + '", "value": "' + defaultValue + '"}'));
                         scope.renderModelPropertyIndex = archetypeService.getPropertyIndexByAlias(archetypeService.getFieldset(scope).properties, alias);
                     }
-
                     scope.renderModel = {};
                     scope.model.value = archetypeService.getFieldsetProperty(scope).value;
 
-                    //init the property editor state
-                    archetypeService.getFieldsetProperty(scope).editorState = {};
-
                     //set the config from the prevalues
                     scope.model.config = config;
 
@@ -93,37 +141,18 @@ angular.module("umbraco.directives").directive('archetypeProperty', function ($c
                         }
                     }
 
-                    //upload datatype hack
-                    if(view.indexOf('fileupload.html') != -1) {
-                        scope.propertyForm = scope.form;
-                        scope.model.validation = {};
-                        scope.model.validation.mandatory = 0;
-                    }
-
                     //some items need an alias
                     scope.model.alias = "archetype-property-" + propertyAlias;
-                    //some items also need an id (file upload for example)
-                    scope.model.id = propertyAlias;
 
                     //watch for changes since there is no two-way binding with the local model.value
                     scope.$watch('model.value', function (newValue, oldValue) {
-                        
                         archetypeService.getFieldsetProperty(scope).value = newValue;
 
                         // notify the linker that the property value changed
-                        archetypeService.propertyValueChanged(archetypeService.getFieldset(scope), archetypeService.getFieldsetProperty(scope));
+                        propertyValueChanged(archetypeService.getFieldset(scope), archetypeService.getFieldsetProperty(scope));
                     });
 
                     scope.$on('archetypeFormSubmitting', function (ev, args) {
-                        // validate all fieldset properties
-                        _.each(scope.fieldset.properties, function (property) {
-                            archetypeService.validateProperty(scope.fieldset, property, configFieldsetModel);
-                        });
-
-                        var validationKey = "validation-f" + scope.fieldsetIndex;
-
-                        ngModelCtrl.$setValidity(validationKey, scope.fieldset.isValid);
-
                         // did the value change (if it did, it most likely did so during the "formSubmitting" event)
                         var property = archetypeService.getFieldsetProperty(scope);
 
@@ -133,34 +162,10 @@ angular.module("umbraco.directives").directive('archetypeProperty', function ($c
                             archetypeService.getFieldsetProperty(scope).value = scope.model.value;
 
                             // notify the linker that the property value changed
-                            archetypeService.propertyValueChanged(archetypeService.getFieldset(scope), archetypeService.getFieldsetProperty(scope));
+                            propertyValueChanged(archetypeService.getFieldset(scope), archetypeService.getFieldsetProperty(scope));
                         }
                     });
 
-                    // issue 114: handle file selection on property editors
-                    scope.$on("filesSelected", function (event, args) {
-                        // populate the fileNames collection on the property editor state
-                        var property = archetypeService.getFieldsetProperty(scope);
-
-                        property.editorState.fileNames = [];
-
-                        _.each(args.files, function (item) {
-                            property.editorState.fileNames.push(item.name);
-                        });
-
-                        // remove the files set for this property
-                        // NOTE: we can't use property.alias because the file manager registers the selected files on the assigned Archetype property alias (e.g. "archetype-property-archetype-property-archetype-property-content-0-2-0-1-0-0")
-                        fileManager.setFiles(scope.model.alias, []);
-
-                        // now tell the containing Archetype to pick up the selected files
-                        scope.archetypeRenderModel.setFiles(args.files);
-                    });
-
-                    scope.$on("archetypeRemoveFieldset", function (ev, args) {
-                        var validationKey = "validation-f" + args.index;
-                        ngModelCtrl.$setValidity(validationKey, true);
-                    });
-
                     element.html(data).show();
                     $compile(element.contents())(scope);
 
@@ -191,4 +196,4 @@ angular.module("umbraco.directives").directive('archetypeProperty', function ($c
             umbracoForm: '='
         }
     }
-});
+});

app/langs/da-dk.js

@@ -1,7 +1,6 @@
 {
 	"label": "Label",
 	"alias": "Alias",
-	"addFieldset": "Tilføj et element",
 	"hideFieldsetControls": "Skjul fieldsets?",
 	"hideFieldsetControlsDescription": "Skjuler kontrollerne tilføj/fjern/sortér.",
 	"toggleAdvanced": "Slå avancerede muligheder til/fra",
@@ -40,9 +39,5 @@
     "overrideDefaultConverterDescription":"Check this if you wish to use your own custom property value converter.",
     "overrideDefaultConverter":"Override Default Property Value Converter?",
     "enableCloning":"Enable Cloning?",
- 	"enableCloningDescription":"Enable Fieldset Cloning.",
-  "fieldsetGroups":"Fieldset-grupper",
-  "fieldsetGroupsDescription":"Hvis du har mange fieldsets, skal du måske overveje at gruppere dem i fieldset-vælgeren. Når du først har defineret dine grupper her, vil en gruppe-vælger dukke op i fieldset-editoren, og du kan derefter vælge grupper for alle dine fieldsets.",
-  "fieldsetGroupName":"Navn",
-  "addFieldsetGroup":"Tilføj gruppe"
+ 	"enableCloningDescription":"Enable Fieldset Cloning."    
 }

app/langs/da.js

@@ -1,7 +1,6 @@
 {
 	"label": "Label",
 	"alias": "Alias",
-	"addFieldset": "Tilføj et element",
 	"hideFieldsetControls": "Skjul fieldsets?",
 	"hideFieldsetControlsDescription": "Skjuler kontrollerne tilføj/fjern/sortér.",
 	"toggleAdvanced": "Slå avancerede muligheder til/fra",
@@ -40,9 +39,5 @@
     "overrideDefaultConverterDescription":"Check this if you wish to use your own custom property value converter.",
     "overrideDefaultConverter":"Override Default Property Value Converter?",
     "enableCloning":"Enable Cloning?",
- 	"enableCloningDescription":"Enable Fieldset Cloning.",
-  "fieldsetGroups":"Fieldset-grupper",
-  "fieldsetGroupsDescription":"Hvis du har mange fieldsets, skal du måske overveje at gruppere dem i fieldset-vælgeren. Når du først har defineret dine grupper her, vil en gruppe-vælger dukke op i fieldset-editoren, og du kan derefter vælge grupper for alle dine fieldsets.",
-  "fieldsetGroupName":"Navn",
-  "addFieldsetGroup":"Tilføj gruppe"    
+ 	"enableCloningDescription":"Enable Fieldset Cloning."    
 }

app/langs/de-de.js

@@ -1,7 +1,6 @@
 {
 	"label": "Label",
 	"alias": "Alias",
-	"addFieldset": "Add an item",
 	"hideFieldsetControls": "Hide Fieldset Controls?",
 	"hideFieldsetControlsDescription": "Hides the fieldset add/remove/sort controls.",
 	"toggleAdvanced": "Toggle Advanced Options",
@@ -40,9 +39,5 @@
     "overrideDefaultConverterDescription":"Check this if you wish to use your own custom property value converter.",
     "overrideDefaultConverter":"Override Default Property Value Converter?",
     "enableCloning":"Enable Cloning?",
- 	"enableCloningDescription":"Enable Fieldset Cloning.",
-  "fieldsetGroups":"Fieldset groups",
-  "fieldsetGroupsDescription":"If you have a lot of fieldsets to choose from, you may want to consider grouping them in the fieldset picker. Once you have created your groups here, a group picker will be displayed in the fieldset editor and you can assign your fieldsets to their respective groups.",
-  "fieldsetGroupName":"Name",
-  "addFieldsetGroup":"Add group"
+ 	"enableCloningDescription":"Enable Fieldset Cloning."  
 }

app/langs/de.js

@@ -1,7 +1,6 @@
 {
 	"label": "Label",
 	"alias": "Alias",
-	"addFieldset": "Add an item",
 	"hideFieldsetControls": "Hide Fieldset Controls?",
 	"hideFieldsetControlsDescription": "Hides the fieldset add/remove/sort controls.",
 	"toggleAdvanced": "Toggle Advanced Options",
@@ -40,9 +39,5 @@
     "overrideDefaultConverterDescription":"Check this if you wish to use your own custom property value converter.",
     "overrideDefaultConverter":"Override Default Property Value Converter?",
     "enableCloning":"Enable Cloning?",
- 	"enableCloningDescription":"Enable Fieldset Cloning.",
-  "fieldsetGroups":"Fieldset groups",
-  "fieldsetGroupsDescription":"If you have a lot of fieldsets to choose from, you may want to consider grouping them in the fieldset picker. Once you have created your groups here, a group picker will be displayed in the fieldset editor and you can assign your fieldsets to their respective groups.",
-  "fieldsetGroupName":"Name",
-  "addFieldsetGroup":"Add group"
+ 	"enableCloningDescription":"Enable Fieldset Cloning."  
 }

app/langs/en-gb.js

@@ -1,7 +1,6 @@
 {
 	"label": "Label",
 	"alias": "Alias", 
-	"addFieldset": "Add an item",
 	"hideFieldsetControls": "Hide Fieldset Controls?",
 	"hideFieldsetControlsDescription": "Hides the fieldset add/remove/sort controls.",
 	"toggleAdvanced": "Toggle Advanced Options",
@@ -40,9 +39,5 @@
     "overrideDefaultConverterDescription":"Check this if you wish to use your own custom property value converter.",
     "overrideDefaultConverter":"Override Default Property Value Converter?",
     "enableCloning":"Enable Cloning?",
- 	"enableCloningDescription":"Enable Fieldset Cloning.",
-  "fieldsetGroups":"Fieldset groups",
-  "fieldsetGroupsDescription":"If you have a lot of fieldsets to choose from, you may want to consider grouping them in the fieldset picker. Once you have created your groups here, a group picker will be displayed in the fieldset editor and you can assign your fieldsets to their respective groups.",
-  "fieldsetGroupName":"Name",
-  "addFieldsetGroup":"Add group"
+ 	"enableCloningDescription":"Enable Fieldset Cloning."  
 }

app/langs/en-us.js

@@ -1,7 +1,6 @@
 {
 	"label": "Label",
 	"alias": "Alias",
-	"addFieldset": "Add an item",
 	"hideFieldsetControls": "Hide Fieldset Controls?",
 	"hideFieldsetControlsDescription": "Hides the fieldset add/remove/sort controls.",
 	"toggleAdvanced": "Toggle Advanced Options",
@@ -40,9 +39,5 @@
     "overrideDefaultConverterDescription":"Check this if you wish to use your own custom property value converter.",
     "overrideDefaultConverter":"Override Default Property Value Converter?",
     "enableCloning":"Enable Cloning?",
- 	"enableCloningDescription":"Enable Fieldset Cloning.",
-  "fieldsetGroups":"Fieldset groups",
-  "fieldsetGroupsDescription":"If you have a lot of fieldsets to choose from, you may want to consider grouping them in the fieldset picker. Once you have created your groups here, a group picker will be displayed in the fieldset editor and you can assign your fieldsets to their respective groups.",
-  "fieldsetGroupName":"Name",
-  "addFieldsetGroup":"Add group"
+ 	"enableCloningDescription":"Enable Fieldset Cloning."  
 }

app/langs/en.js

@@ -1,7 +1,6 @@
 {
 	"label": "Label",
 	"alias": "Alias",
-	"addFieldset": "Add an item",
 	"hideFieldsetControls": "Hide Fieldset Controls?",
 	"hideFieldsetControlsDescription": "Hides the fieldset add/remove/sort controls.",
 	"toggleAdvanced": "Toggle Advanced Options",
@@ -40,9 +39,5 @@
     "overrideDefaultConverterDescription":"Check this if you wish to use your own custom property value converter.",
     "overrideDefaultConverter":"Override Default Property Value Converter?",
     "enableCloning":"Enable Cloning?",
- 	"enableCloningDescription":"Enable Fieldset Cloning.",
-  "fieldsetGroups":"Fieldset groups",
-  "fieldsetGroupsDescription":"If you have a lot of fieldsets to choose from, you may want to consider grouping them in the fieldset picker. Once you have created your groups here, a group picker will be displayed in the fieldset editor and you can assign your fieldsets to their respective groups.",
-  "fieldsetGroupName":"Name",
-  "addFieldsetGroup":"Add group"
+ 	"enableCloningDescription":"Enable Fieldset Cloning."  
 }

app/langs/es-es.js

@@ -1,7 +1,6 @@
 {
 	"label": "Label",
 	"alias": "Alias",
-	"addFieldset": "Add an item",
 	"hideFieldsetControls": "Hide Fieldset Controls?",
 	"hideFieldsetControlsDescription": "Hides the fieldset add/remove/sort controls.",
 	"toggleAdvanced": "Toggle Advanced Options",
@@ -40,9 +39,5 @@
     "overrideDefaultConverterDescription":"Check this if you wish to use your own custom property value converter.",
     "overrideDefaultConverter":"Override Default Property Value Converter?",
     "enableCloning":"Enable Cloning?",
- 	"enableCloningDescription":"Enable Fieldset Cloning.",
-  "fieldsetGroups":"Fieldset groups",
-  "fieldsetGroupsDescription":"If you have a lot of fieldsets to choose from, you may want to consider grouping them in the fieldset picker. Once you have created your groups here, a group picker will be displayed in the fieldset editor and you can assign your fieldsets to their respective groups.",
-  "fieldsetGroupName":"Name",
-  "addFieldsetGroup":"Add group"
+ 	"enableCloningDescription":"Enable Fieldset Cloning."
 }

app/langs/es.js

@@ -1,7 +1,6 @@
 {
 	"label": "Label",
 	"alias": "Alias",
-	"addFieldset": "Add an item",
 	"hideFieldsetControls": "Hide Fieldset Controls?",
 	"hideFieldsetControlsDescription": "Hides the fieldset add/remove/sort controls.",
 	"toggleAdvanced": "Toggle Advanced Options",
@@ -40,9 +39,5 @@
     "overrideDefaultConverterDescription":"Check this if you wish to use your own custom property value converter.",
     "overrideDefaultConverter":"Override Default Property Value Converter?",
     "enableCloning":"Enable Cloning?",
- 	"enableCloningDescription":"Enable Fieldset Cloning.",
-  "fieldsetGroups":"Fieldset groups",
-  "fieldsetGroupsDescription":"If you have a lot of fieldsets to choose from, you may want to consider grouping them in the fieldset picker. Once you have created your groups here, a group picker will be displayed in the fieldset editor and you can assign your fieldsets to their respective groups.",
-  "fieldsetGroupName":"Name",
-  "addFieldsetGroup":"Add group"
+ 	"enableCloningDescription":"Enable Fieldset Cloning."
 }

app/langs/fr-fr.js

@@ -1,7 +1,6 @@
 {
 	"label": "Label",
 	"alias": "Alias",
-	"addFieldset": "Add an item",
 	"hideFieldsetControls": "Hide Fieldset Controls?",
 	"hideFieldsetControlsDescription": "Hides the fieldset add/remove/sort controls.",
 	"toggleAdvanced": "Toggle Advanced Options",
@@ -40,9 +39,5 @@
     "overrideDefaultConverterDescription":"Check this if you wish to use your own custom property value converter.",
     "overrideDefaultConverter":"Override Default Property Value Converter?",
     "enableCloning":"Enable Cloning?",
- 	"enableCloningDescription":"Enable Fieldset Cloning.",
-  "fieldsetGroups":"Fieldset groups",
-  "fieldsetGroupsDescription":"If you have a lot of fieldsets to choose from, you may want to consider grouping them in the fieldset picker. Once you have created your groups here, a group picker will be displayed in the fieldset editor and you can assign your fieldsets to their respective groups.",
-  "fieldsetGroupName":"Name",
-  "addFieldsetGroup":"Add group"
+ 	"enableCloningDescription":"Enable Fieldset Cloning."
 }

app/langs/he-il.js

@@ -1,7 +1,6 @@
 {
 	"label": "Label",
 	"alias": "Alias",
-	"addFieldset": "Add an item",
 	"hideFieldsetControls": "Hide Fieldset Controls?",
 	"hideFieldsetControlsDescription": "Hides the fieldset add/remove/sort controls.",
 	"toggleAdvanced": "Toggle Advanced Options",
@@ -40,9 +39,5 @@
     "overrideDefaultConverterDescription":"Check this if you wish to use your own custom property value converter.",
     "overrideDefaultConverter":"Override Default Property Value Converter?",
     "enableCloning":"Enable Cloning?",
- 	"enableCloningDescription":"Enable Fieldset Cloning.",
-  "fieldsetGroups":"Fieldset groups",
-  "fieldsetGroupsDescription":"If you have a lot of fieldsets to choose from, you may want to consider grouping them in the fieldset picker. Once you have created your groups here, a group picker will be displayed in the fieldset editor and you can assign your fieldsets to their respective groups.",
-  "fieldsetGroupName":"Name",
-  "addFieldsetGroup":"Add group"
+ 	"enableCloningDescription":"Enable Fieldset Cloning."
 }

app/langs/it-it.js

@@ -1,7 +1,6 @@
 {
 	"label": "Label",
 	"alias": "Alias",
-	"addFieldset": "Add an item",
 	"hideFieldsetControls": "Hide Fieldset Controls?",
 	"hideFieldsetControlsDescription": "Hides the fieldset add/remove/sort controls.",
 	"toggleAdvanced": "Toggle Advanced Options",
@@ -40,9 +39,5 @@
     "overrideDefaultConverterDescription":"Check this if you wish to use your own custom property value converter.",
     "overrideDefaultConverter":"Override Default Property Value Converter?",
     "enableCloning":"Enable Cloning?",
- 	"enableCloningDescription":"Enable Fieldset Cloning.",
-  "fieldsetGroups":"Fieldset groups",
-  "fieldsetGroupsDescription":"If you have a lot of fieldsets to choose from, you may want to consider grouping them in the fieldset picker. Once you have created your groups here, a group picker will be displayed in the fieldset editor and you can assign your fieldsets to their respective groups.",
-  "fieldsetGroupName":"Name",
-  "addFieldsetGroup":"Add group"
+ 	"enableCloningDescription":"Enable Fieldset Cloning."
 }

app/langs/ja-jp.js

@@ -1,7 +1,6 @@
 {
 	"label": "Label",
 	"alias": "Alias",
-	"addFieldset": "Add an item",
 	"hideFieldsetControls": "Hide Fieldset Controls?",
 	"hideFieldsetControlsDescription": "Hides the fieldset add/remove/sort controls.",
 	"toggleAdvanced": "Toggle Advanced Options",
@@ -40,9 +39,5 @@
     "overrideDefaultConverterDescription":"Check this if you wish to use your own custom property value converter.",
     "overrideDefaultConverter":"Override Default Property Value Converter?",
     "enableCloning":"Enable Cloning?",
- 	"enableCloningDescription":"Enable Fieldset Cloning.",
-  "fieldsetGroups":"Fieldset groups",
-  "fieldsetGroupsDescription":"If you have a lot of fieldsets to choose from, you may want to consider grouping them in the fieldset picker. Once you have created your groups here, a group picker will be displayed in the fieldset editor and you can assign your fieldsets to their respective groups.",
-  "fieldsetGroupName":"Name",
-  "addFieldsetGroup":"Add group"
+ 	"enableCloningDescription":"Enable Fieldset Cloning."
 }

app/langs/ko-kr.js

@@ -1,7 +1,6 @@
 {
 	"label": "Label",
 	"alias": "Alias",
-	"addFieldset": "Add an item",
 	"hideFieldsetControls": "Hide Fieldset Controls?",
 	"hideFieldsetControlsDescription": "Hides the fieldset add/remove/sort controls.",
 	"toggleAdvanced": "Toggle Advanced Options",
@@ -40,9 +39,5 @@
     "overrideDefaultConverterDescription":"Check this if you wish to use your own custom property value converter.",
     "overrideDefaultConverter":"Override Default Property Value Converter?",
     "enableCloning":"Enable Cloning?",
- 	"enableCloningDescription":"Enable Fieldset Cloning.",
-  "fieldsetGroups":"Fieldset groups",
-  "fieldsetGroupsDescription":"If you have a lot of fieldsets to choose from, you may want to consider grouping them in the fieldset picker. Once you have created your groups here, a group picker will be displayed in the fieldset editor and you can assign your fieldsets to their respective groups.",
-  "fieldsetGroupName":"Name",
-  "addFieldsetGroup":"Add group"
+ 	"enableCloningDescription":"Enable Fieldset Cloning."
 }

app/langs/nb-no.js

@@ -1,7 +1,6 @@
 {
 	"label": "Label",
 	"alias": "Alias",
-	"addFieldset": "Add an item",
 	"hideFieldsetControls": "Hide Fieldset Controls?",
 	"hideFieldsetControlsDescription": "Hides the fieldset add/remove/sort controls.",
 	"toggleAdvanced": "Toggle Advanced Options",
@@ -40,9 +39,5 @@
     "overrideDefaultConverterDescription":"Check this if you wish to use your own custom property value converter.",
     "overrideDefaultConverter":"Override Default Property Value Converter?",
     "enableCloning":"Enable Cloning?",
- 	"enableCloningDescription":"Enable Fieldset Cloning.",
-  "fieldsetGroups":"Fieldset groups",
-  "fieldsetGroupsDescription":"If you have a lot of fieldsets to choose from, you may want to consider grouping them in the fieldset picker. Once you have created your groups here, a group picker will be displayed in the fieldset editor and you can assign your fieldsets to their respective groups.",
-  "fieldsetGroupName":"Name",
-  "addFieldsetGroup":"Add group"
+ 	"enableCloningDescription":"Enable Fieldset Cloning."
 }

app/langs/nl-nl.js

@@ -1,7 +1,6 @@
 {
 	"label": "Label",
 	"alias": "Alias",
-	"addFieldset": "Add an item",
 	"hideFieldsetControls": "Hide Fieldset Controls?",
 	"hideFieldsetControlsDescription": "Hides the fieldset add/remove/sort controls.",
 	"toggleAdvanced": "Toggle Advanced Options",
@@ -40,9 +39,5 @@
     "overrideDefaultConverterDescription":"Check this if you wish to use your own custom property value converter.",
     "overrideDefaultConverter":"Override Default Property Value Converter?",
     "enableCloning":"Enable Cloning?",
- 	"enableCloningDescription":"Enable Fieldset Cloning.",
-  "fieldsetGroups":"Fieldset groups",
-  "fieldsetGroupsDescription":"If you have a lot of fieldsets to choose from, you may want to consider grouping them in the fieldset picker. Once you have created your groups here, a group picker will be displayed in the fieldset editor and you can assign your fieldsets to their respective groups.",
-  "fieldsetGroupName":"Name",
-  "addFieldsetGroup":"Add group"
+ 	"enableCloningDescription":"Enable Fieldset Cloning."
 }

app/langs/pl-pl.js

@@ -1,7 +1,6 @@
 {
 	"label": "Label",
 	"alias": "Alias",
-	"addFieldset": "Add an item",
 	"hideFieldsetControls": "Hide Fieldset Controls?",
 	"hideFieldsetControlsDescription": "Hides the fieldset add/remove/sort controls.",
 	"toggleAdvanced": "Toggle Advanced Options",
@@ -40,9 +39,5 @@
     "overrideDefaultConverterDescription":"Check this if you wish to use your own custom property value converter.",
     "overrideDefaultConverter":"Override Default Property Value Converter?",
     "enableCloning":"Enable Cloning?",
- 	"enableCloningDescription":"Enable Fieldset Cloning.",
-  "fieldsetGroups":"Fieldset groups",
-  "fieldsetGroupsDescription":"If you have a lot of fieldsets to choose from, you may want to consider grouping them in the fieldset picker. Once you have created your groups here, a group picker will be displayed in the fieldset editor and you can assign your fieldsets to their respective groups.",
-  "fieldsetGroupName":"Name",
-  "addFieldsetGroup":"Add group"
+ 	"enableCloningDescription":"Enable Fieldset Cloning."
 }

app/langs/pt-br.js

@@ -1,7 +1,6 @@
 {
 	"label": "Label",
 	"alias": "Alias",
-	"addFieldset": "Add an item",
 	"hideFieldsetControls": "Hide Fieldset Controls?",
 	"hideFieldsetControlsDescription": "Hides the fieldset add/remove/sort controls.",
 	"toggleAdvanced": "Toggle Advanced Options",
@@ -40,9 +39,5 @@
     "overrideDefaultConverterDescription":"Check this if you wish to use your own custom property value converter.",
     "overrideDefaultConverter":"Override Default Property Value Converter?",
     "enableCloning":"Enable Cloning?",
- 	"enableCloningDescription":"Enable Fieldset Cloning.",
-  "fieldsetGroups":"Fieldset groups",
-  "fieldsetGroupsDescription":"If you have a lot of fieldsets to choose from, you may want to consider grouping them in the fieldset picker. Once you have created your groups here, a group picker will be displayed in the fieldset editor and you can assign your fieldsets to their respective groups.",
-  "fieldsetGroupName":"Name",
-  "addFieldsetGroup":"Add group"
+ 	"enableCloningDescription":"Enable Fieldset Cloning."
 }

app/langs/ru-ru.js

@@ -1,7 +1,6 @@
 {
 	"label": "Label",
 	"alias": "Alias",
-	"addFieldset": "Add an item",
 	"hideFieldsetControls": "Hide Fieldset Controls?",
 	"hideFieldsetControlsDescription": "Hides the fieldset add/remove/sort controls.",
 	"toggleAdvanced": "Toggle Advanced Options",
@@ -40,9 +39,5 @@
     "overrideDefaultConverterDescription":"Check this if you wish to use your own custom property value converter.",
     "overrideDefaultConverter":"Override Default Property Value Converter?",
     "enableCloning":"Enable Cloning?",
- 	"enableCloningDescription":"Enable Fieldset Cloning.",
-  "fieldsetGroups":"Fieldset groups",
-  "fieldsetGroupsDescription":"If you have a lot of fieldsets to choose from, you may want to consider grouping them in the fieldset picker. Once you have created your groups here, a group picker will be displayed in the fieldset editor and you can assign your fieldsets to their respective groups.",
-  "fieldsetGroupName":"Name",
-  "addFieldsetGroup":"Add group"
+ 	"enableCloningDescription":"Enable Fieldset Cloning."
 }

app/langs/sv-se.js

@@ -1,7 +1,6 @@
 {
 	"label": "Label",
 	"alias": "Alias",
-	"addFieldset": "Add an item",
 	"hideFieldsetControls": "Hide Fieldset Controls?",
 	"hideFieldsetControlsDescription": "Hides the fieldset add/remove/sort controls.",
 	"toggleAdvanced": "Toggle Advanced Options",
@@ -40,9 +39,5 @@
     "overrideDefaultConverterDescription":"Check this if you wish to use your own custom property value converter.",
     "overrideDefaultConverter":"Override Default Property Value Converter?",
     "enableCloning":"Enable Cloning?",
- 	"enableCloningDescription":"Enable Fieldset Cloning.",
-  "fieldsetGroups":"Fieldset groups",
-  "fieldsetGroupsDescription":"If you have a lot of fieldsets to choose from, you may want to consider grouping them in the fieldset picker. Once you have created your groups here, a group picker will be displayed in the fieldset editor and you can assign your fieldsets to their respective groups.",
-  "fieldsetGroupName":"Name",
-  "addFieldsetGroup":"Add group"
+ 	"enableCloningDescription":"Enable Fieldset Cloning."
 }

app/langs/zh-cn.js

@@ -1,7 +1,6 @@
 {
 	"label": "Label",
 	"alias": "Alias",
-	"addFieldset": "Add an item",
 	"hideFieldsetControls": "Hide Fieldset Controls?",
 	"hideFieldsetControlsDescription": "Hides the fieldset add/remove/sort controls.",
 	"toggleAdvanced": "Toggle Advanced Options",
@@ -40,9 +39,5 @@
     "overrideDefaultConverterDescription":"Check this if you wish to use your own custom property value converter.",
     "overrideDefaultConverter":"Override Default Property Value Converter?",
     "enableCloning":"Enable Cloning?",
- 	"enableCloningDescription":"Enable Fieldset Cloning.",
-  "fieldsetGroups":"Fieldset groups",
-  "fieldsetGroupsDescription":"If you have a lot of fieldsets to choose from, you may want to consider grouping them in the fieldset picker. Once you have created your groups here, a group picker will be displayed in the fieldset editor and you can assign your fieldsets to their respective groups.",
-  "fieldsetGroupName":"Name",
-  "addFieldsetGroup":"Add group"
+ 	"enableCloningDescription":"Enable Fieldset Cloning."
 }

app/less/archetype.less

@@ -1,19 +1,8 @@
-{{VERSION}}
+/* TODO: clean this up */
 
 .archetypeEditor {
     width: 98%;
 
-    .usky-grid {
-        .cell-tools-menu {
-            height: 385px;
-        }
-        &.withGroups {
-            .cell-tools-menu {
-                height: 415px;
-            }
-        }
-    }
-
     .open {
         position: relative;
     }
@@ -34,28 +23,19 @@
     }
 
     .icon {
-        color: #ddd;
-        padding: 2px;
-        font-size: 16px;
-        &:hover {
-            color: #333;
-        }
-        &.icon-delete:hover {
-            color: #b94a48;
-        }
+        color: #333;
     }
 
     .fieldsetIcon {
         float: left;
-        padding: 0 4px 0 0;
-        color: #333;
-        vertical-align: text-bottom;
+        padding-right: 4px;
     }
 
     fieldset {
-        border-bottom: 1px dashed #dddddd;
+        border: 1px solid #dddddd;
         padding: 0;
         margin-bottom: 5px;
+        background-color: #f1f1f1;
         clear: both;
         display: inline-block;
         width: 100%;
@@ -84,28 +64,11 @@
             min-height: 42px;
 
             .label-sub {
-                padding: 8px 0 8px 0;
+                padding: 8px 0 4px 0;
                 display: inline-block;
-                min-height: 20px; /* this makes the header clickable when there's no icon and no text */
                 &.module-label {
                     width: 100%;
                 }
-                &:hover {
-                    cursor: pointer;
-    
-                    label  {
-                        span {
-                            text-decoration: underline;
-                        }
-                        &:hover {
-                            cursor: pointer;
-                        }
-                    }
-                    
-                    .caret-right {
-                        border-left-color: #333;
-                    }
-                }
             }
 
             .dropdown-menu {
@@ -126,14 +89,27 @@
                 cursor: default;
             }
 
+            &.enableCollapsing:hover {
+                cursor: pointer;
+
+                label  {
+                    span {
+                        text-decoration: underline;
+                    }
+                    &:hover {
+                        cursor: pointer;
+                    }
+                }
+            }
+
             .caret {
-                margin: 8px 1px 0 2px;
+                margin: 8px 1px 0 15px;
                 position: absolute;
 
                 &.caret-right {
                     border-bottom: 4px solid transparent;
                     border-top: 4px solid transparent;
-                    border-left: 4px solid #ddd;
+                    border-left: 4px solid #000000;
                     content: "";
                     margin-top: 6px;
                 }
@@ -141,10 +117,10 @@
 
             label {
                 margin-bottom: 0;
-                margin-left: 18px;
+                margin-left: 38px;
                 white-space: nowrap;
                 padding: 0;
-                width: ~"calc(100% - 144px)";
+                width: ~"calc(100% - 132px)";
                 position: absolute;
                 span {
                     display: block;
@@ -152,9 +128,7 @@
                     text-overflow: ellipsis;
                 }
                 &.dimmed {
-                    i, span {
-                        color: #d9d9d9 !important;
-                    }
+                    color: #d9d9d9;
                 }
             }
 
@@ -164,9 +138,6 @@
                 right: 15px;
                 top: 0;
             }
-            
-            &:hover {
-            }
         }
 
         .archetypePropertyError {
@@ -186,8 +157,9 @@
         .archetypeCollapser {
             clear: both;
             height: 100%;
-            padding: 12px 0 0 20px;
+            padding-top: 12px;
             background-color: #fff;
+            border-top: 1px solid silver;
             border-radius: 0 0 0 5px;
 
             form {
@@ -219,25 +191,13 @@
         border: 1px solid #b94a48;
     }
 
-    .archetypeAddButton {
-        color: #ddd;
-        .icon {
-            vertical-align: text-top;
+    .archetypeAddButton:hover {
+        text-decoration: none;
+        cursor: pointer;
+
+        .archetypeAddButtonText {
+            text-decoration: underline;
         }
-        &:hover {
-            color: #333;
-            text-decoration: none;
-            cursor: pointer;
-
-            .archetypeAddButtonText {
-                text-decoration: underline;
-            }
-
-            .icon {
-                color: #333;
-            }
-        }
-
     }
 
     .multiPropertyTextbox {
@@ -254,43 +214,12 @@
             color: #343434;
         }
     }
-
-    .fieldsetPicker {
-        .icon {
-            color: #333;
-        }
-        ul.elements li {
-            overflow: visible;
-            vertical-align: top;  
-            height: 90px;        
-        }
-        ul.groups {
-            display: block;
-            margin: 0;
-            padding: 4px;
-            li {
-                width: auto;
-                margin: 0;
-                padding: 0 20px;
-                font-weight: bold;
-                a {
-                    color: #d9d9d9;
-                    cursor: pointer;
-                }
-                &.active a, a:hover {
-                    color: #999;
-                    text-decoration: none;
-                }
-            }
-        }
-    }
 }
 
 .archetypeEditor, .archetypeConfig {
     .archetypeEditorControls {
         float: right;
-    }
-    .archetypeEditorControls, .archetypeFieldsetGroups {
+
         i {
             cursor: pointer;
             &.handle {
@@ -306,21 +235,6 @@
 .archetypeConfig {
     margin-bottom: 20px;
 
-    .archetype-headline {
-
-        img {
-            margin-right: 5px;
-        }
-
-        small {
-            margin-left: 5px;
-        }
-    }
-
-    .manual-link {
-        color: blue;
-    }
-
     ul {
         list-style: none;
     }
@@ -402,41 +316,13 @@
     }
 
     .archetypeAdvancedOptions {
+        margin-top: 15px;
+        div {
+            margin-bottom: 10px;
+        }
         label {
-            width: 100%;
+            width: 400px;
         }
-
-        input[type=checkbox] {
-            margin-top: 0;
-            margin-right: 2px;
-        }
-
-        small {
-            color: #b3b3b3;
-        }
-
-        .archetypeFieldsetGroups {
-            padding: 0 10px;
-            margin-bottom: 20px;
-
-            ul {
-                padding: 0;
-                margin: 0;
-                margin-top: 15px;
-
-                li {
-
-                    label {
-                        width: 120px;
-                    }
-
-                    input {
-                        vertical-align: middle;
-                        width: 240px;
-                    }
-                }
-            }
-        }        
     }
 
     .archetypeMaxFieldsets{
@@ -470,7 +356,3 @@
     visibility: visible !important;
     background-color:   #d0e7f1 !important;
 }
-
-.archetype-dialog {
-    margin: 10px;
-}

app/resources/archetypePropertyEditorResource.js

@@ -31,11 +31,6 @@ angular.module('umbraco.resources').factory('archetypePropertyEditorResource', f
 
                 return "";
             });
-        },
-        getDllVersion: function() {
-            return umbRequestHelper.resourcePromise(
-                $http.get("backoffice/ArchetypeApi/ArchetypeDataType/GetDllVersion", { cache: true }), 'Failed to retrieve dll version'
-            );
         }
     }
 }); 

app/services/archetypeLabelService.js

@@ -140,7 +140,7 @@ angular.module('umbraco.services').factory('archetypeLabelService', function (ar
         }
 
         var suffix = "";
-        var strippedText = $("<div/>").html(value).text();
+        var strippedText = $(value).text();
 
         if(strippedText.length > args.contentLength) {
         	suffix = "…";

app/services/archetypeLocalizationService.js

@@ -24,7 +24,7 @@ angular.module('umbraco.services').factory('archetypeLocalizationService', funct
         initLocalizedResources:function () {
             var deferred = $q.defer();
             userService.getCurrentUser().then(function(user){
-                $http.get("../App_plugins/Archetype/langs/" + user.locale + ".js", { cache: true }) 
+                $http.get("/App_plugins/Archetype/langs/" + user.locale + ".js", { cache: true }) 
                     .then(function(response){
                         service.resourceFileLoaded = true;
                         service.dictionary = response.data;

app/services/archetypeService.js

@@ -1,4 +1,5 @@
 angular.module('umbraco.services').factory('archetypeService', function () {
+
     //public
     return {
         //helper that returns a JS ojbect from 'value' string or the original string
@@ -66,39 +67,6 @@ angular.module('umbraco.services').factory('archetypeService', function () {
         },
         getFieldsetProperty: function (scope) {
             return this.getFieldset(scope).properties[scope.renderModelPropertyIndex];
-        },
-        setFieldsetValidity: function (fieldset) {
-            // mark the entire fieldset as invalid if there are any invalid properties in the fieldset, otherwise mark it as valid
-            fieldset.isValid =
-                _.find(fieldset.properties, function (property) {
-                    return property.isValid == false
-                }) == null;
-        },
-        validateProperty: function (fieldset, property, configFieldsetModel) {
-            var propertyConfig = this.getPropertyByAlias(configFieldsetModel, property.alias);
-
-            if (propertyConfig) {
-                // use property.value !== property.value to check for NaN values on numeric inputs
-                if (propertyConfig.required && (property.value == null || property.value === "" || property.value !== property.value)) {
-                    property.isValid = false;
-                }
-                // issue 116: RegEx validate property value
-                // Only validate the property value if anything has been entered - RegEx is considered a supplement to "required".
-                if (property.isValid == true && propertyConfig.regEx && property.value) {
-                    var regEx = new RegExp(propertyConfig.regEx);
-                    if (regEx.test(property.value) == false) {
-                        property.isValid = false;
-                    }
-                }
-            }
-
-            this.setFieldsetValidity(fieldset);
-        },
-        // called when the value of any property in a fieldset changes
-        propertyValueChanged: function (fieldset, property) {
-            // it's the Umbraco way to hide the invalid state when altering an invalid property, even if the new value isn't valid either
-            property.isValid = true;
-            this.setFieldsetValidity(fieldset);
         }
     }
 });

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

@@ -1,33 +0,0 @@
-{{VERSION_HTML}}
-<div class="umb-panel archetype-dialog archetypeConfig" ng-controller="ArchetypeConfigOptionsController">
-    <div class="umb-panel-body no-header with-footer umb-scrollable archetypeAdvancedOptions">
-        <h3><archetype-localize key="developer_options">Developer Options</archetype-localize></h3>
-        <div>
-            <label for="archetypeAdvancedOptionsDeepDatatypeRequest"><input type="checkbox" id="archetypeAdvancedOptionsDeepDatatypeRequest" ng-model="model.enableDeepDatatypeRequests"/><archetype-localize key="deepDatatypeRequest">Enable Deep Datatype Requests?</archetype-localize><small><archetype-localize key="deepDatatypeRequestDescription">Allows for easier datatype interception at the cost of caching performance.</archetype-localize></small></label>
-        </div>
-        <div>
-            <label for="archetypeAdvancedOptionsDeveloperMode"><input type="checkbox" id="archetypeAdvancedOptionsDeveloperMode" ng-model="model.developerMode"/><archetype-localize key="toggleDeveloperMode">Enable Developer Mode?</archetype-localize><small><archetype-localize key="toggleDeveloperModeDescription">Toggle Developer Mode</archetype-localize></small></label>
-        </div>
-        <div>
-            <label for="archetypeOverrideDefaultConverter"><input type="checkbox" id="archetypeOverrideDefaultConverter" ng-model="model.overrideDefaultPropertyValueConverter" /><archetype-localize key="overrideDefaultConverter">Override Default Property Value Converter?</archetype-localize><small><archetype-localize key="overrideDefaultConverterDescription">Check this if you wish to use your own custom property value converter.</archetype-localize></small></label>
-        </div>
-
-        <div>
-            <label for="archetypeAdvancedOptionsConfigModel"><archetype-localize key="configModel">Config Model</archetype-localize><small><archetype-localize key="configModelDescription">Be careful editing the text below, it controls the schema for this archetype.</archetype-localize></small></label>
-            <textarea class="archetypeDeveloperModel" id="archetypeAdvancedOptionsConfigModel" ng-model="model"></textarea>
-        </div>
-    </div>
-    <div class="umb-panel-footer">
-        <div class="umb-el-wrap umb-panel-buttons">
-            <div class="btn-toolbar umb-btn-toolbar pull-right">
-                <a href="" ng-click="close()" class="btn btn-link">
-                    <localize key="general_cancel" class="ng-isolate-scope ng-scope">Cancel</localize>
-                </a>
-
-                <button class="btn btn-primary" ng-click="apply()">
-                    <archetype-localize key="button_apply">Apply</archetype-localize>
-                </button>
-            </div>
-        </div>
-    </div>
-</div>

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

@@ -1,66 +0,0 @@
-{{VERSION_HTML}}
-<div class="umb-panel archetype-dialog archetypeConfig" ng-controller="ArchetypeConfigOptionsController">
-    <div class="umb-panel-body no-header with-footer umb-scrollable archetypeAdvancedOptions">
-        <h3><archetype-localize key="global_fieldset_options">Global Fieldset Options</archetype-localize></h3>
-        <div>
-            <label for="archetypeAdvancedOptionsStartWithAddButton"><input type="checkbox" id="archetypeAdvancedOptionsStartWithAddButton" ng-model="model.startWithAddButton"/><archetype-localize key="startWithAddButton">Start With Add Button?</archetype-localize><small><archetype-localize key="startWithAddButtonDescription">Empty property shows an add button instead of providing a default fieldset.</archetype-localize></small></label>
-        </div>
-        <div>
-            <label for="archetypeAdvancedOptionsHideLabels"><input type="checkbox" id="archetypeAdvancedOptionsHideLabels" ng-model="model.hidePropertyLabels"/><archetype-localize key="hidePropertyLabels">Hide Property Labels?</archetype-localize><small><archetype-localize key="hidePropertyLabelsDescription">Hides the property labels.</archetype-localize></small></label>       
-        </div>
-        <div>
-            <label for="archetypeAdvancedOptionsCollapsing"><input type="checkbox" id="archetypeAdvancedOptionsCollapsing" ng-model="model.enableCollapsing"/><archetype-localize key="enableCollapsing">Enable Collapsing?</archetype-localize><small><archetype-localize key="enableCollapsingDescription">Enable fieldset collapsing.</archetype-localize></small></label>
-        </div>
-        <div>
-            <label for="archetypeAdvancedOptionsMaxFieldsets"><archetype-localize key="maxFieldsets">Max Fieldsets</archetype-localize><small><archetype-localize key="maxFieldsetsDescription">How many Fieldsets are allowed? Entering '1' will disable the controls. Default is unlimited.</archetype-localize></small></label>
-            <input type="number" id="archetypeAdvancedOptionsMaxFieldsets" class="archetypeMaxFieldsets" ng-model="model.maxFieldsets"/>
-        </div>
-
-        <h4><archetype-localize key="fieldsetControls">Fieldset controls</archetype-localize></h4>
-        <div>
-            <label for="archetypeAdvancedOptionsHideControls"><input type="checkbox" id="archetypeAdvancedOptionsHideControls" ng-model="model.hideFieldsetControls"/><archetype-localize key="hideFieldsetControls">Hide Fieldset Controls?</archetype-localize><small><archetype-localize key="hideFieldsetControlsDescription">Hides the fieldset add/remove/sort controls.</archetype-localize></small></label>
-        </div>
-
-        <div>
-            <label for="archetypeAdvancedOptionsCloning"><input type="checkbox" id="archetypeAdvancedOptionsCloning" ng-model="model.enableCloning"/><archetype-localize key="enableCloning">Enable Cloning?</archetype-localize><small><archetype-localize key="enableCloningDescription">Enable fieldset cloning.</archetype-localize></small></label>
-        </div>
-        <div>
-            <label for="archetypeAdvancedOptionsDisabling"><input type="checkbox" id="archetypeAdvancedOptionsDisabling" ng-model="model.enableDisabling" /><archetype-localize key="enableDisabling">Enable Fieldset Disabling?</archetype-localize><small><archetype-localize key="enableDisablingDescription">Allows fieldsets to be individually enabled/disabled.</archetype-localize></small></label>
-        </div>
-        
-        <h4><archetype-localize key="multipleFieldsets">Multiple fieldsets</archetype-localize></h4>
-        <div>
-            <label for="archetypeAdvancedOptionsMultipleFieldsets"><input type="checkbox" id="archetypeAdvancedOptionsMultipleFieldsets" ng-model="model.enableMultipleFieldsets"/><archetype-localize key="enableMultipleFieldsets">Enable Multiple Fieldsets?</archetype-localize><small><archetype-localize key="enableMultipleFieldsetsDescription">Allows multiple types of fieldsets within this archetype.</archetype-localize></small></label>
-        </div>
-
-        <div ng-show="model.enableMultipleFieldsets">
-            <label><archetype-localize key="fieldsetGroups">Fieldset groups</archetype-localize></label>
-            <small><archetype-localize key="fieldsetGroupsDescription">If you have a lot of fieldsets to choose from, you may want to consider grouping them in the fieldset picker. Once you have created your groups here, a group picker will be displayed in the fieldset editor and you can assign your fieldsets to their respective groups.</archetype-localize></small>
-            <div class="archetypeFieldsetGroups">
-              <ul ui-sortable="sortableOptions" ng-model="model.fieldsetGroups">
-                  <li ng-repeat="fieldsetGroup in model.fieldsetGroups">
-                      <div>
-                          <input id="archetypeFieldsetGroupName_{{$index}}" type="text" ng-model="fieldsetGroup.name" />
-                          <i class="icon icon-delete" ng-click="removeFieldsetGroup($index)"></i>
-                          <i class="icon icon-navigation handle" ng-show="model.fieldsetGroups.length > 1"></i>
-                      </div>
-                  </li>
-              </ul>
-              <label ng-click="addFieldsetGroup($index)"><i class="icon icon-add"></i> <archetype-localize key="addFieldsetGroup">Add fieldset group</archetype-localize></label>
-            </div>
-        </div>
-    </div>
-    <div class="umb-panel-footer">
-        <div class="umb-el-wrap umb-panel-buttons">
-            <div class="btn-toolbar umb-btn-toolbar pull-right">
-                <a href="" ng-click="close()" class="btn btn-link">
-                    <localize key="general_cancel" class="ng-isolate-scope ng-scope">Cancel</localize>
-                </a>
-
-                <button class="btn btn-primary" ng-click="apply()">
-                    <archetype-localize key="button_apply">Apply</archetype-localize>
-                </button>
-            </div>
-        </div>
-    </div>
-</div>

app/views/archetype.config.html

@@ -1,8 +1,4 @@
-{{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>
     <ul class="archetypeFieldsets" ui-sortable="sortableOptions" ng-model="archetypeConfigRenderModel.fieldsets">
         <li ng-repeat="fieldset in archetypeConfigRenderModel.fieldsets" ng-hide="fieldset.remove">
             <div class="archetypeFieldsetWrapper" >
@@ -21,10 +17,6 @@
                         <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/>
                     </div>
-                    <div class="archetypeFieldsetOption" ng-show="archetypeConfigRenderModel.fieldsetGroups.length">
-                        <label for="archetypeFieldsetGroup_{{$index}}"><archetype-localize key="fieldsetGroup">Group</archetype-localize></label>
-                        <select id="archetypeFieldsetGroup_{{$index}}" ng-model="fieldset.group" ng-options="fieldsetGroup as fieldsetGroup.name for fieldsetGroup in archetypeConfigRenderModel.fieldsetGroups"></select>
-                    </div>
                     <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" />
@@ -87,9 +79,79 @@
 
     <div class="archetypeOptions">
         <div>
-            <button class="btn btn-default" ng-click="showOptions($event, '../App_Plugins/archetype/views/archetype.config.fieldset.dialog.html')"><archetype-localize key="global_fieldset_options">Global Fieldset Options</archetype-localize></button>
-            <button class="btn btn-default" ng-click="showOptions($event, '../App_Plugins/archetype/views/archetype.config.stylescript.dialog.html')"><archetype-localize key="custom_style_script_options">Custom Style/Script Options</archetype-localize></button>
-            <button class="btn btn-default" ng-click="showOptions($event, '../App_Plugins/archetype/views/archetype.config.developer.dialog.html')"><archetype-localize key="developer_options">Developer Options</archetype-localize></button>
+            <label for="archetypeOptionsToggle"><archetype-localize key="toggleAdvanced">Toggle Advanced Options</archetype-localize><small><archetype-localize key="toggleAdvancedDescription">Show advanced options.</archetype-localize></small></label>
+            <input type="checkbox" id="archetypeOptionsToggle" ng-model="archetypeConfigRenderModel.showAdvancedOptions"/>
+        </div>
+    </div>
+
+    <div class="archetypeAdvancedOptions" ng-show="archetypeConfigRenderModel.showAdvancedOptions">
+        <div>
+            <label for="archetypeAdvancedOptionsStartWithAddButton"><archetype-localize key="startWithAddButton">Start With Add Button?</archetype-localize><small><archetype-localize key="startWithAddButtonDescription">Empty property shows an add button instead of providing a default fieldset.</archetype-localize></small></label>
+            <input type="checkbox" id="archetypeAdvancedOptionsStartWithAddButton" ng-model="archetypeConfigRenderModel.startWithAddButton"/>
+        </div>
+        <div>
+            <label for="archetypeAdvancedOptionsHideControls"><archetype-localize key="hideFieldsetControls">Hide Fieldset Controls?</archetype-localize><small><archetype-localize key="hideFieldsetControlsDescription">Hides the fieldset add/remove/sort controls.</archetype-localize></small></label>
+            <input type="checkbox" id="archetypeAdvancedOptionsHideControls" ng-model="archetypeConfigRenderModel.hideFieldsetControls"/>
+        </div>
+        <div>
+            <label for="archetypeAdvancedOptionsHideLabels"><archetype-localize key="hidePropertyLabels">Hide Property Labels?</archetype-localize><small><archetype-localize key="hidePropertyLabelsDescription">Hides the property labels.</archetype-localize></small></label>
+            <input type="checkbox" id="archetypeAdvancedOptionsHideLabels" ng-model="archetypeConfigRenderModel.hidePropertyLabels"/>
+        </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="archetypeConfigRenderModel.maxFieldsets"/>
+        </div>
+        <div>
+            <label for="archetypeAdvancedOptionsMultipleFieldsets"><archetype-localize key="enableMultipleFieldsets">Enable Multiple Fieldsets?</archetype-localize><small><archetype-localize key="enableMultipleFieldsetsDescription">Allows multiple types of fieldsets within this archetype.</archetype-localize></small></label>
+            <input type="checkbox" id="archetypeAdvancedOptionsMultipleFieldsets" ng-model="archetypeConfigRenderModel.enableMultipleFieldsets"/>
+        </div>
+        <div>
+            <label for="archetypeAdvancedOptionsCollapsing"><archetype-localize key="enableCollapsing">Enable Collapsing?</archetype-localize><small><archetype-localize key="enableCollapsingDescription">Enable fieldset collapsing.</archetype-localize></small></label>
+            <input type="checkbox" id="archetypeAdvancedOptionsCollapsing" ng-model="archetypeConfigRenderModel.enableCollapsing"/>
+        </div>
+                <div>
+            <label for="archetypeAdvancedOptionsCloning"><archetype-localize key="enableCloning">Enable Cloning?</archetype-localize><small><archetype-localize key="enableCloningDescription">Enable fieldset cloning.</archetype-localize></small></label>
+            <input type="checkbox" id="archetypeAdvancedOptionsCloning" ng-model="archetypeConfigRenderModel.enableCloning"/>
+        </div>
+        <div>
+            <label for="archetypeAdvancedOptionsDisabling"><archetype-localize key="enableDisabling">Enable Fieldset Disabling?</archetype-localize><small><archetype-localize key="enableDisablingDescription">Allows fieldsets to be individually enabled/disabled.</archetype-localize></small></label>
+            <input type="checkbox" id="archetypeAdvancedOptionsDisabling" ng-model="archetypeConfigRenderModel.enableDisabling" />
+        </div>
+        <div>
+            <label for="archetypeAdvancedOptionsFieldsetToolbar"><archetype-localize key="hideFieldsetToolbar">Hide Fieldset Toolbar?</archetype-localize><small><archetype-localize key="hideFieldsetToolbarDescription">Hides the fieldset toolbar that appears when more than one fieldset model appears.</archetype-localize></small></label>
+            <input type="checkbox" id="archetypeAdvancedOptionsFieldsetToolbar" ng-model="archetypeConfigRenderModel.hideFieldsetToolbar"/>
+        </div>
+        <div>
+            <label for="archetypeAdvancedOptionsCustomClass"><archetype-localize key="customWrapperClass">Custom Wrapper Class</archetype-localize><small><archetype-localize key="customWrapperClassDescription">(Optional) Enter a custom CSS class that will be applied to the wrapper div.</archetype-localize></small></label>
+            <input type="text" id="archetypeAdvancedOptionsCustomClass" ng-model="archetypeConfigRenderModel.customCssClass"/>
+        </div>
+        <div>
+            <label for="archetypeAdvancedOptionsCustomCss"><archetype-localize key="cssFile">CSS File</archetype-localize><small><archetype-localize key="cssFileDescription">(Optional) Enter a path for a custom CSS file to be included on the page.</archetype-localize></small></label>
+            <input type="text" id="archetypeAdvancedOptionsCustomCss" ng-model="archetypeConfigRenderModel.customCssPath"/>
+        </div>
+        <div>
+            <label for="archetypeAdvancedOptionsCustomJs"><archetype-localize key="jsFile">JS File</archetype-localize><small><archetype-localize key="jsFileDescription">(Optional) Enter a path for a custom JS file to be included on the page.</archetype-localize></small></label>
+            <input type="text" id="archetypeAdvancedOptionsCustomJs" ng-model="archetypeConfigRenderModel.customJsPath"/>
+        </div>
+        <div>
+            <label for="archetypeAdvancedOptionsCustomView"><archetype-localize key="viewFile">View File</archetype-localize><small><archetype-localize key="viewFileDescription">(Optional) Enter a path for a custom view file to be used to render this Archetype.</archetype-localize></small></label>
+            <input type="text" id="archetypeAdvancedOptionsCustomView" ng-model="archetypeConfigRenderModel.customViewPath"/>
+        </div>
+        <div>
+            <label for="archetypeAdvancedOptionsDeepDatatypeRequest"><archetype-localize key="deepDatatypeRequest">Enable Deep Datatype Requests?</archetype-localize><small><archetype-localize key="deepDatatypeRequestDescription">Allows for easier datatype interception at the cost of caching performance.</archetype-localize></small></label>
+            <input type="checkbox" id="archetypeAdvancedOptionsDeepDatatypeRequest" ng-model="archetypeConfigRenderModel.enableDeepDatatypeRequests"/>
+        </div>
+        <div>
+            <label for="archetypeAdvancedOptionsDeveloperMode"><archetype-localize key="toggleDeveloperMode">Enable Developer Mode?</archetype-localize><small><archetype-localize key="toggleDeveloperModeDescription">Toggle Developer Mode</archetype-localize></small></label>
+            <input type="checkbox" id="archetypeAdvancedOptionsDeveloperMode" ng-model="archetypeConfigRenderModel.developerMode"/>
+        </div>
+        <div>
+            <label for="archetypeOverrideDefaultConverter"><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>
+            <input type="checkbox" id="archetypeOverrideDefaultConverter" ng-model="archetypeConfigRenderModel.overrideDefaultPropertyValueConverter" />
+        </div>
+        <div>
+            <label for="archetypeAdvancedOptionsConfigModel"><archetype-localize key="configModel">Config Model</archetype-localize><small><archetype-localize key="configModelDescription">Be careful editing the text below, it controls the schema for this archetype.</archetype-localize></small></label>
+            <textarea class="archetypeDeveloperModel" id="archetypeAdvancedOptionsConfigModel" ng-model="archetypeConfigRenderModel"></textarea>
         </div>
     </div>
 </div>

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

@@ -1,35 +0,0 @@
-{{VERSION_HTML}}
-<div class="umb-panel archetype-dialog archetypeConfig" ng-controller="ArchetypeConfigOptionsController">
-    <div class="umb-panel-body no-header with-footer umb-scrollable archetypeAdvancedOptions">
-        <h3><archetype-localize key="custom_style_script_options">Custom Style/Script Options</archetype-localize></h3>
-        <div>
-            <label for="archetypeAdvancedOptionsCustomClass"><archetype-localize key="customWrapperClass">Custom Wrapper Class</archetype-localize><small><archetype-localize key="customWrapperClassDescription">(Optional) Enter a custom CSS class that will be applied to the wrapper div.</archetype-localize></small></label>
-            <input type="text" id="archetypeAdvancedOptionsCustomClass" ng-model="model.customCssClass"/>
-        </div>
-        <div>
-            <label for="archetypeAdvancedOptionsCustomCss"><archetype-localize key="cssFile">CSS File</archetype-localize><small><archetype-localize key="cssFileDescription">(Optional) Enter a path for a custom CSS file to be included on the page.</archetype-localize></small></label>
-            <input type="text" id="archetypeAdvancedOptionsCustomCss" ng-model="model.customCssPath"/>
-        </div>
-        <div>
-            <label for="archetypeAdvancedOptionsCustomJs"><archetype-localize key="jsFile">JS File</archetype-localize><small><archetype-localize key="jsFileDescription">(Optional) Enter a path for a custom JS file to be included on the page.</archetype-localize></small></label>
-            <input type="text" id="archetypeAdvancedOptionsCustomJs" ng-model="model.customJsPath"/>
-        </div>
-        <div>
-            <label for="archetypeAdvancedOptionsCustomView"><archetype-localize key="viewFile">View File</archetype-localize><small><archetype-localize key="viewFileDescription">(Optional) Enter a path for a custom view file to be used to render this Archetype.</archetype-localize></small></label>
-            <input type="text" id="archetypeAdvancedOptionsCustomView" ng-model="model.customViewPath"/>
-        </div>
-    </div>
-    <div class="umb-panel-footer">
-        <div class="umb-el-wrap umb-panel-buttons">
-            <div class="btn-toolbar umb-btn-toolbar pull-right">
-                <a href="" ng-click="close()" class="btn btn-link">
-                    <localize key="general_cancel" class="ng-isolate-scope ng-scope">Cancel</localize>
-                </a>
-
-                <button class="btn btn-primary" ng-click="apply()">
-                    <archetype-localize key="button_apply">Apply</archetype-localize>
-                </button>
-            </div>
-        </div>
-    </div>
-</div>

app/views/archetype.default.html

@@ -1,4 +1,3 @@
-{{VERSION_HTML}}
 <div class="archetypeEditor ng-class:model.config.customCssClass">
     <textarea class="archetypeDeveloperModel" ng-show="model.config.developerMode" ng-model="model.value"></textarea>
     <ul ui-sortable="sortableOptions" ng-model="model.value.fieldsets" ng-show="!showAddButton()">
@@ -14,11 +13,19 @@
                         </label>
                     </div>
                     <div class="archetypeEditorControls label-sub" ng-hide="model.config.hideFieldsetControls">
-                        <i class="icon icon-add" ng-show="canAdd()" ng-click="openFieldsetPicker($index, $event)"></i>
-                        <i class="icon icon-navigation handle" ng-show="canSort()"></i>
+                        <i class="icon icon-add dropdown-toggle" ng-show="canAdd()" data-toggle="{{ model.config.fieldsets.length > 1 ? 'dropdown' : ''}}" ng-click="model.config.fieldsets.length == 1 ? addRow(fieldset.alias, $index) : return"></i>
+                        <ul class="dropdown-menu umb-actions">
+                            <li ng-repeat="fieldsetModel in model.config.fieldsets" ng-click="addRow(fieldsetModel.alias, $parent.$index)">
+                                <a>
+                                    <i class="fieldsetIcon icon ng-class:fieldsetModel.icon"></i>
+                                    <span class="menu-label">{{fieldsetModel.label}}</span>
+                                </a>
+                            </li>
+                        </ul>
                         <i class="icon icon-documents" ng-click="cloneRow($index)" ng-show="canClone()"></i>
-                        <i class="icon icon-power" ng-click="enableDisable(fieldset)" ng-show="canDisable()"></i>
-                        <i class="icon icon-delete" ng-click="removeRow($index)" ng-show="canRemove()"></i>
+                        <i class="icon icon-remove" ng-click="removeRow($index)" ng-show="canRemove()"></i>
+                        <i class="icon icon-power" ng-class="{dimmed: fieldset.disabled}" ng-click="enableDisable(fieldset)" ng-show="canDisable()"></i>
+                        <i class="icon icon-navigation handle" ng-show="canSort()"></i>
                     </div>
                 </div>
                 <div class="archetypeCollapser animate-hide" ng-hide="model.config.enableCollapsing && isCollapsed(fieldset)">
@@ -42,31 +49,17 @@
         </li>
     </ul>
     <div ng-show="showAddButton()">
-        <a class="archetypeAddButton" ng-click="openFieldsetPicker(0, $event)" prevent-default>
-            <i class="icon icon-add"></i>
-            <archetype-localize key="addFieldset">Add an item</archetype-localize>
+        <a class="archetypeAddButton" data-toggle="{{ model.config.fieldsets.length > 1 ? 'dropdown' : ''}}" ng-click="model.config.fieldsets.length == 1 ? addRow(model.config.fieldsets[0].alias, 0) : return" prevent-default>
+            <i class="icon icon-add dropdown-toggle"></i>
+            <localize key="general_add" class="archetypeAddButtonText">Add</localize>
         </a>
-    </div>
-    <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}}
-                    </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>
+        <ul class="dropdown-menu umb-actions">
+            <li ng-repeat="fieldsetModel in model.config.fieldsets" ng-click="addRow(fieldsetModel.alias, 0)">
+                <a>
+                    <i class="fieldsetIcon icon ng-class:fieldsetModel.icon"></i>
+                    <span class="menu-label">{{fieldsetModel.label}}</span>
+                </a>
+            </li>
+        </ul>
     </div>
 </div>

app/views/archetype.html

@@ -1,2 +1 @@
-{{VERSION_HTML}}
 <div archetype-custom-view ng-controller="Imulus.ArchetypeController"></div>

config/meta.json

@@ -1,6 +1,6 @@
 {
 	"name": "Archetype",
-	"version": "1.11",
+	"version": "1.8",
 	"url": "http://github.com/imulus/archetype/",
 	"author": "Imulus - Kevin Giszewski - Tom Fulton - Lee Kelleher - Matt Brailsford - Kenn Jacobsen - Et. Al.",
 	"authorUrl": "http://imulus.com/",

package.json

@@ -29,7 +29,6 @@
     "url": "https://github.com/imulus/Archetype.git"
   },
   "devDependencies": {
-    "grunt-msbuild": "^0.1.12",
-    "grunt-string-replace": "^1.2.0"
+    "grunt-msbuild": "^0.1.12"
   }
 }