Add version to assembly

Expose the Datatype Service GetById

.gitignore

@@ -10,6 +10,7 @@ ehthumbs.db
 Desktop.ini
 $RECYCLE.BIN/
 
+app/less/*.css
 dist/
 node_modules/
 pkg/tmp/

Gruntfile.js

@@ -25,7 +25,7 @@ module.exports = function(grunt) {
       },
 
       dev: {
-        files: ['app/**'],
+        files: ['app/**', '!app/Umbraco/**', 'app/Umbraco/**/*.dll'],
         tasks: ['deploy'],
         options: {
           spawn: false
@@ -62,7 +62,9 @@ module.exports = function(grunt) {
           'app/controllers/controller.js',
           'app/controllers/config.controller.js',
           'app/directives/archetypeproperty.js',
-          'app/services/propertyeditor.js'
+          'app/directives/localize.js',
+          'app/services/localization.js',
+          'app/resources/propertyeditor.js'
         ],
         dest: '<%= dest %>/js/archetype.js'
       }
@@ -104,27 +106,28 @@ module.exports = function(grunt) {
       build: {
        files: [
         {expand: true, cwd: 'app/', src: ['package.manifest'], dest: '<%= dest %>', flatten: true},
-        {expand: true, cwd: 'app/config/', src: ['config.views.js'], dest: '<%= dest %>/js', flatten: true},
         {expand: true, cwd: 'app/views/', src: ['archetype.html', 'archetype.config.html'], dest: '<%= dest %>/views', flatten: true},
-        {expand: true, cwd: 'app/Umbraco/Umbraco.Archetype/bin/Debug/', src: ['Archetype.dll'], dest: '<%= dest %>/bin', flatten: true} 
+        {expand: true, cwd: 'app/config/', src: ['propertyEditors.views.js'], dest: '<%= dest %>/js', flatten: true},
+        {expand: true, cwd: 'app/langs/', src: ['**'], dest: '<%= dest %>/langs', flatten: true},
+        {expand: true, cwd: 'app/Umbraco/Umbraco.Archetype/bin/Debug/', src: ['Archetype.dll', 'Archetype.pdb'], dest: '<%= dest %>/bin', flatten: true} 
         ]
       },
       deploy: {
         files: [
-          {expand: true, cwd: '<%= dest %>/', src: ['**/*', '!bin/*'], dest: '<%= grunt.option("target") %>\\App_Plugins\\Archetype', flatten: false},
-          {expand: true, cwd: '<%= dest %>/', src: ['bin/*'], dest: '<%= grunt.option("target") %>\\bin', flatten: false},
+          {expand: true, cwd: '<%= dest %>/', src: ['**/*', "!bin", "!bin/**/*"], dest: '<%= grunt.option("target") %>\\App_Plugins\\Archetype', flatten: false},
+          {expand: true, cwd: '<%= dest %>/', src: ['bin/**/*'], dest: '<%= grunt.option("target") %>', flatten: false},
         ]
       },
       nuget_prepare: {
         files: [
-          {expand: true, cwd: '<%= dest %>/', src: ['**/*', '!bin/*'], dest: '<%= package_temp_dir %>/nuget/content/', flatten: false},
-          {expand: true, cwd: '<%= dest %>/', src: ['bin/*'], dest: '<%= package_temp_dir %>/nuget/lib/net40/', flatten: false}
+          {expand: true, cwd: '<%= dest %>/', src: ['**/*', '!bin', '!bin/*'], dest: '<%= package_temp_dir %>/nuget/content/', flatten: false},
+          {expand: true, cwd: '<%= dest %>/', src: ['bin/**/*.dll'], dest: '<%= package_temp_dir %>/nuget/lib/net40/', flatten: true}
         ]
       },
       umbracopackage: {
         files: [
-          {expand: true, cwd: '<%= dest %>/', src: ['**/*', "!bin/*"], dest: 'pkg/tmp/umbraco/App_Plugins/Archetype', flatten: false},
-          {expand: true, cwd: '<%= dest %>/', src: ['bin/*'], dest: 'pkg/tmp/umbraco', flatten: false}
+          {expand: true, cwd: '<%= dest %>/', src: ['**/*', '!bin', "!bin/*"], dest: 'pkg/tmp/umbraco/App_Plugins/Archetype', flatten: false},
+          {expand: true, cwd: '<%= dest %>/', src: ['bin/**/*.dll'], dest: 'pkg/tmp/umbraco', flatten: false}
         ]
       }
     },
@@ -155,6 +158,7 @@ module.exports = function(grunt) {
     clean: {
       build: ['<%= dest %>'],
       package_temp: ['pkg/tmp'],
+      package_artifacts: ['pkg/*.zip', 'pkg/*.nupkg'],
     },
 
     msbuild: {
@@ -189,7 +193,7 @@ module.exports = function(grunt) {
   grunt.loadTasks('tasks');
 
 
-  grunt.registerTask('package', ['package:nuget', 'package:umbraco']);
+  grunt.registerTask('package', ['clean:package_artifacts', 'default', 'package:nuget', 'package:umbraco']);
   grunt.registerTask('package:nuget', ['copy:nuget_prepare', 'template:nuget_manifest', 'nugetpack', 'clean:package_temp']);
   grunt.registerTask('package:umbraco', ['copy:umbracopackage', 'umbracoPackage', 'clean:package_temp']);
   grunt.registerTask('touchwebconfigifenabled', function() { if (grunt.option("touch")) grunt.task.run("touch:webconfig") });

README.md

@@ -1,66 +1,30 @@
 Archetype
 =========
 
-## Install Dependencies ##
+## Installation
+Install the selected <a href='https://github.com/imulus/Archetype/releases'>release</a> through the Umbraco package installer or via <a href='http://www.nuget.org/packages/Archetype/'>NuGet</a>.
+
+
+## Official Docs ##
+http://imulus.github.io/Archetype
+
+## Contribute ##
+
+Want to contribute to Archetype?  You'll want to use Grunt (our task runner) to help you integrate with a local copy of Umbraco.
+
+### Install Dependencies ###
 *Requires Node.js to be installed and in your system path*
 
     npm install -g grunt-cli && npm install -g grunt
     npm install
 
-## Build ##
+### Build ###
     grunt
 
 
-## Deploy ##
+### Deploy ###
     grunt deploy --target=C:\\path\\to\\umbraco\\site
     grunt watch:dev --target=C:\\path\to\\umbraco\\site
 
 Add `--touch` to either command to automatically touch the web.config on a deploy
 
-## Installation
-1) Install the <a href='http://bit.ly/1gUYKW8'>package</a> through the Umbraco package installer.  Recommended if you want to just see the packaged version.
-
-OR
-
-2) Deploy with Grunt (see above).  Recommended if you wish to extend this repo as this will inject this project into an existing v7 Umbraco install.
-
-OR
-
-3) Not recommended but a down and dirty way is to manually download and copy the files into the appropriate spot:
-
-Your /App_Plugins and /bin should contain this structure:
-
-    /App_Plugins
-    - package.manifest
-    - /css
-    -- archetype.css
-    - /js
-    -- archetype.js (our Grunt script concats the controller.js/config.controller.js, services and all directives into one file, you will have to do so manually)
-    -- config.views.js
-    - /views
-    -- archetype.html
-    -- archetype.config.html
-    /bin
-    -- archetype.dll (you'll have to build it)
-
-## Prevalue Configs ##
-
-Most of the fields are self evident, the following fields will be discussed further:
-    
-###Developer Mode###
-
-By turning this on, you will get a textarea visible with the data model (not prevalue model).  You can change the contents of the textarea for real-time editing.  Additionally when in developer mode, the console will reflect the scope object of each property.
-
-##View Compatibility##
-The basis of compatibility is based on the following:
-
-- The model of the view must use `$scope.model.value` and the config must use `$scope.model.config`.
-
-All core properties have not been tested yet :)
-
-##Developer Notes##
-If you decide to extend this project locally, you'll want to set the `<compilation>` `debug` property in your `web.config` to `true`:
-
-    <compilation defaultLanguage="c#" debug="true" batch="false" targetFramework="4.5">
-
-This is in order to circumvent the minification and caching of the JavaScript files.

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

@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{21F3E6CF-B76F-4059-9474-1AF1CE63CD6B}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Archetype.Tests</RootNamespace>
+    <AssemblyName>Archetype.Tests</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Moq">
+      <HintPath>..\packages\Moq.4.2.1312.1622\lib\net40\Moq.dll</HintPath>
+    </Reference>
+    <Reference Include="nunit.framework">
+      <HintPath>..\packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+    <Reference Include="Umbraco.Core">
+      <HintPath>..\packages\UmbracoCms.Core.7.0.1\lib\Umbraco.Core.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Models\FieldsetTests.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="PropertyValueConverter\PropertyValueConverterTests.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Data\sample-1.json" />
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Umbraco.Archetype\Archetype.Umbraco.csproj">
+      <Project>{7D185D41-4228-4978-ACB8-83F9A48AD94F}</Project>
+      <Name>Archetype.Umbraco</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>

app/Umbraco/Archetype.Tests/Data/sample-1.json

@@ -0,0 +1 @@
+{"fieldsets":[{"alias":"archUi","properties":[{"alias":"blurb","value":"A blurb here"},{"alias":"boxHeadline","value":"Box 1 Title"},{"alias":"link","value":"3175"},{"alias":"show","value":"1"}],"remove":false,"collapse":true,"isValid":true},{"alias":"archUi","properties":[{"alias":"boxHeadline","value":"Another Box"},{"alias":"blurb","value":"Some content"},{"alias":"link","value":"3175"},{"alias":"show","value":"0"}],"remove":false,"collapse":true,"isValid":true}]}

app/Umbraco/Archetype.Tests/Models/FieldsetTests.cs

@@ -0,0 +1,64 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Archetype.Umbraco.PropertyConverters;
+using NUnit.Framework;
+
+namespace Archetype.Tests.Models
+{
+
+    [TestFixture]
+    public class FieldsetTests
+    {
+
+        private string _sampleJson;
+
+        [SetUp]
+        public void SetUp()
+        {
+            _sampleJson = File.ReadAllText("..\\..\\Data\\sample-1.json");
+        }
+
+        [Test]
+        public void Can_Get_Fieldset_Property_By_Alias()
+        {
+            var converter = new ArchetypeValueConverter();
+            var result = (Archetype.Umbraco.Models.Archetype)converter.ConvertDataToSource(null, _sampleJson, false);
+
+            var fieldset = result.Fieldsets.First();
+            var propertyValue = fieldset.GetValue("boxHeadline");
+
+            Assert.That(propertyValue == "Box 1 Title");
+        }
+
+        [Test]
+        public void Can_Convert_Property_Value_Types()
+        {
+            var converter = new ArchetypeValueConverter();
+            var result = (Archetype.Umbraco.Models.Archetype)converter.ConvertDataToSource(null, _sampleJson, false);
+
+            var fieldset = result.Fieldsets.First();
+
+            Assert.That(fieldset.GetValue<int>("link") == 3175);
+            Assert.That(fieldset.GetValue<bool>("show") == true);
+            Assert.That(fieldset.GetValue<string>("blurb") == "A blurb here");
+        }
+
+        [Test]
+        public void Returns_String_When_No_Type_Specified()
+        {
+            var converter = new ArchetypeValueConverter();
+            var result = (Archetype.Umbraco.Models.Archetype)converter.ConvertDataToSource(null, _sampleJson, false);
+
+            var fieldset = result.Fieldsets.First();
+
+            var property = fieldset.GetValue("link");
+            Assert.That(property is string);
+            Assert.That(property == "3175");
+        }
+
+    }
+}

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

@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("Archetype.Tests")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("Archetype.Tests")]
+[assembly: AssemblyCopyright("Copyright ©  2014")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("de11df59-e1eb-4aae-87fd-59c33606a1f5")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers 
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]

app/Umbraco/Archetype.Tests/PropertyValueConverter/PropertyValueConverterTests.cs

@@ -0,0 +1,65 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Archetype.Umbraco.PropertyConverters;
+using Moq;
+using NUnit.Framework;
+using Umbraco.Core.Models.PublishedContent;
+
+namespace Archetype.Tests.PropertyValueConverter
+{
+    [TestFixture]
+    public class PropertyValueConverterTests
+    {
+
+        private string _sampleJson;
+
+        [SetUp]
+        public void SetUp()
+        {
+            _sampleJson = File.ReadAllText("..\\..\\Data\\sample-1.json");
+        }
+
+        [Test]
+        public void Returns_Null_When_Data_Is_Null()
+        {
+            var converter = new ArchetypeValueConverter();
+            var result = converter.ConvertDataToSource(null, null, false);
+
+            Assert.IsNull(result);
+        }
+
+        [Test]
+        public void Returns_Empty_String_When_Data_Is_Empty_String()
+        {
+            var data = "";
+            var converter = new ArchetypeValueConverter();
+            var result = converter.ConvertDataToSource(null, data, false);
+
+            Assert.AreEqual("", result);
+        }
+
+        [Test]
+        public void Returns_Original_String_When_Data_Is_Invalid_Json()
+        {
+            var data = "{ invalid";
+            var converter = new ArchetypeValueConverter();
+            var result = converter.ConvertDataToSource(null, data, false);
+            
+            Assert.AreEqual(data, result);
+        }
+
+        [Test]
+        public void Can_Serialize_From_Json_Model()
+        {
+            var converter = new ArchetypeValueConverter();
+            var result = (Archetype.Umbraco.Models.Archetype)converter.ConvertDataToSource(null, _sampleJson, false);
+
+            Assert.That(result != null);
+            Assert.That(result.Fieldsets.Count() == 2);
+        }
+    }
+}

app/Umbraco/Archetype.Tests/packages.config

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Moq" version="4.2.1312.1622" targetFramework="net45" />
+  <package id="NUnit" version="2.6.3" targetFramework="net45" />
+</packages>

app/Umbraco/Umbraco.Archetype.sln

@@ -10,6 +10,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{D84AA4
 		.nuget\NuGet.targets = .nuget\NuGet.targets
 	EndProjectSection
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Archetype.Tests", "Archetype.Tests\Archetype.Tests.csproj", "{21F3E6CF-B76F-4059-9474-1AF1CE63CD6B}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -20,6 +22,10 @@ Global
 		{7D185D41-4228-4978-ACB8-83F9A48AD94F}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{7D185D41-4228-4978-ACB8-83F9A48AD94F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7D185D41-4228-4978-ACB8-83F9A48AD94F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{21F3E6CF-B76F-4059-9474-1AF1CE63CD6B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{21F3E6CF-B76F-4059-9474-1AF1CE63CD6B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{21F3E6CF-B76F-4059-9474-1AF1CE63CD6B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{21F3E6CF-B76F-4059-9474-1AF1CE63CD6B}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

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

@@ -0,0 +1,25 @@
+using System.Net;
+using System.Web.Http;
+using AutoMapper;
+using Umbraco.Core.Models;
+using Umbraco.Web.Models.ContentEditing;
+using Umbraco.Web.Mvc;
+using Umbraco.Web.Editors;
+
+namespace Archetype.Umbraco.Api
+{
+    [PluginController("ArchetypeApi")]
+    public class ArchetypeDataTypeController : UmbracoAuthorizedJsonController
+    {
+        public object GetById(int id)
+        {
+            var dataType = Services.DataTypeService.GetDataTypeDefinitionById(id);
+            if (dataType == null)
+            {
+                throw new HttpResponseException(HttpStatusCode.NotFound);
+            }
+            var dataTypeDisplay = Mapper.Map<IDataTypeDefinition, DataTypeDisplay>(dataType);
+            return new { selectedEditor = dataTypeDisplay.SelectedEditor, preValues = dataTypeDisplay.PreValues };
+        }
+    }
+}

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

@@ -34,114 +34,138 @@
   <ItemGroup>
     <Reference Include="AutoMapper">
       <HintPath>..\packages\AutoMapper.3.0.0\lib\net40\AutoMapper.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="AutoMapper.Net4">
       <HintPath>..\packages\AutoMapper.3.0.0\lib\net40\AutoMapper.Net4.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="businesslogic">
       <HintPath>..\packages\UmbracoCms.Core.7.0.1\lib\businesslogic.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="ClientDependency.Core">
       <HintPath>..\packages\ClientDependency.1.7.0.4\lib\ClientDependency.Core.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="ClientDependency.Core.Mvc">
       <HintPath>..\packages\ClientDependency-Mvc.1.7.0.4\lib\ClientDependency.Core.Mvc.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="cms">
       <HintPath>..\packages\UmbracoCms.Core.7.0.1\lib\cms.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="controls">
       <HintPath>..\packages\UmbracoCms.Core.7.0.1\lib\controls.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="CookComputing.XmlRpcV2">
       <HintPath>..\packages\xmlrpcnet.2.5.0\lib\net20\CookComputing.XmlRpcV2.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="Examine">
       <HintPath>..\packages\UmbracoCms.Core.7.0.1\lib\Examine.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="HtmlAgilityPack">
       <HintPath>..\packages\HtmlAgilityPack.1.4.6\lib\Net45\HtmlAgilityPack.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="ICSharpCode.SharpZipLib">
       <HintPath>..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="interfaces">
       <HintPath>..\packages\UmbracoCms.Core.7.0.1\lib\interfaces.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="log4net">
       <HintPath>..\packages\UmbracoCms.Core.7.0.1\lib\log4net.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="Lucene.Net">
       <HintPath>..\packages\Lucene.Net.2.9.4.1\lib\net40\Lucene.Net.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="Microsoft.ApplicationBlocks.Data">
       <HintPath>..\packages\UmbracoCms.Core.7.0.1\lib\Microsoft.ApplicationBlocks.Data.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="Microsoft.Web.Helpers">
       <HintPath>..\packages\UmbracoCms.Core.7.0.1\lib\Microsoft.Web.Helpers.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <Private>True</Private>
+      <Private>False</Private>
       <HintPath>..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Web.Mvc.FixedDisplayModes">
       <HintPath>..\packages\Microsoft.AspNet.Mvc.FixedDisplayModes.1.0.1\lib\net40\Microsoft.Web.Mvc.FixedDisplayModes.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="MiniProfiler">
       <HintPath>..\packages\MiniProfiler.2.1.0\lib\net40\MiniProfiler.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="MySql.Data">
       <HintPath>..\packages\MySql.Data.6.6.5\lib\net40\MySql.Data.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="Newtonsoft.Json">
       <HintPath>..\packages\Newtonsoft.Json.4.5.11\lib\net40\Newtonsoft.Json.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="SQLCE4Umbraco">
       <HintPath>..\packages\UmbracoCms.Core.7.0.1\lib\SQLCE4Umbraco.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Data.SqlServerCe, Version=4.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
-      <Private>True</Private>
+      <Private>False</Private>
       <HintPath>..\packages\UmbracoCms.Core.7.0.1\lib\System.Data.SqlServerCe.dll</HintPath>
     </Reference>
     <Reference Include="System.Data.SqlServerCe.Entity, Version=4.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
-      <Private>True</Private>
+      <Private>False</Private>
       <HintPath>..\packages\UmbracoCms.Core.7.0.1\lib\System.Data.SqlServerCe.Entity.dll</HintPath>
     </Reference>
     <Reference Include="System.Net.Http" />
     <Reference Include="System.Net.Http.Formatting, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.AspNet.WebApi.Client.4.0.30506.0\lib\net40\System.Net.Http.Formatting.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="System.Net.Http.WebRequest" />
     <Reference Include="System.Web.Helpers, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <Private>True</Private>
+      <Private>False</Private>
       <HintPath>..\packages\Microsoft.AspNet.WebPages.2.0.30506.0\lib\net40\System.Web.Helpers.dll</HintPath>
     </Reference>
     <Reference Include="System.Web.Http, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.AspNet.WebApi.Core.4.0.30506.0\lib\net40\System.Web.Http.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="System.Web.Http.WebHost, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.AspNet.WebApi.WebHost.4.0.30506.0\lib\net40\System.Web.Http.WebHost.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="System.Web.Mvc, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <Private>True</Private>
+      <Private>False</Private>
       <HintPath>..\packages\Microsoft.AspNet.Mvc.4.0.30506.0\lib\net40\System.Web.Mvc.dll</HintPath>
     </Reference>
     <Reference Include="System.Web.Razor, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <Private>True</Private>
+      <Private>False</Private>
       <HintPath>..\packages\Microsoft.AspNet.Razor.2.0.30506.0\lib\net40\System.Web.Razor.dll</HintPath>
     </Reference>
     <Reference Include="System.Web.WebPages, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <Private>True</Private>
+      <Private>False</Private>
       <HintPath>..\packages\Microsoft.AspNet.WebPages.2.0.30506.0\lib\net40\System.Web.WebPages.dll</HintPath>
     </Reference>
     <Reference Include="System.Web.WebPages.Deployment, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <Private>True</Private>
+      <Private>False</Private>
       <HintPath>..\packages\Microsoft.AspNet.WebPages.2.0.30506.0\lib\net40\System.Web.WebPages.Deployment.dll</HintPath>
     </Reference>
     <Reference Include="System.Web.WebPages.Razor, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <Private>True</Private>
+      <Private>False</Private>
       <HintPath>..\packages\Microsoft.AspNet.WebPages.2.0.30506.0\lib\net40\System.Web.WebPages.Razor.dll</HintPath>
     </Reference>
     <Reference Include="System.Xml.Linq" />
@@ -151,41 +175,57 @@
     <Reference Include="System.Xml" />
     <Reference Include="TidyNet">
       <HintPath>..\packages\UmbracoCms.Core.7.0.1\lib\TidyNet.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="umbraco">
       <HintPath>..\packages\UmbracoCms.Core.7.0.1\lib\umbraco.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="Umbraco.Core">
       <HintPath>..\packages\UmbracoCms.Core.7.0.1\lib\Umbraco.Core.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="umbraco.DataLayer">
       <HintPath>..\packages\UmbracoCms.Core.7.0.1\lib\umbraco.DataLayer.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="umbraco.editorControls">
       <HintPath>..\packages\UmbracoCms.Core.7.0.1\lib\umbraco.editorControls.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="umbraco.MacroEngines">
       <HintPath>..\packages\UmbracoCms.Core.7.0.1\lib\umbraco.MacroEngines.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="umbraco.providers">
       <HintPath>..\packages\UmbracoCms.Core.7.0.1\lib\umbraco.providers.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="Umbraco.Web.UI">
       <HintPath>..\packages\UmbracoCms.Core.7.0.1\lib\Umbraco.Web.UI.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="umbraco.XmlSerializers">
       <HintPath>..\packages\UmbracoCms.Core.7.0.1\lib\umbraco.XmlSerializers.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="UmbracoExamine">
       <HintPath>..\packages\UmbracoCms.Core.7.0.1\lib\UmbracoExamine.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="UrlRewritingNet.UrlRewriter">
       <HintPath>..\packages\UmbracoCms.Core.7.0.1\lib\UrlRewritingNet.UrlRewriter.dll</HintPath>
+      <Private>False</Private>
     </Reference>
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Api\ArchetypeDataTypeController.cs" />
+    <Compile Include="Constants.cs" />
     <Compile Include="Extensions\Extensions.cs" />
     <Compile Include="Models\Archetype.cs" />
+    <Compile Include="Models\ArchetypePreValue.cs" />
+    <Compile Include="Models\ArchetypePreValueFieldset.cs" />
+    <Compile Include="Models\ArchetypePreValueProperty.cs" />
     <Compile Include="Models\Fieldset.cs" />
     <Compile Include="Models\Property.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />

app/Umbraco/Umbraco.Archetype/Constants.cs

@@ -0,0 +1,9 @@
+namespace Archetype.Umbraco
+{
+    public static class Constants
+    {
+        public const string PropertyEditorAlias = "Imulus.Archetype";
+
+        public const string PreValueAlias = "archetypeConfig";
+    }
+}

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

@@ -1,8 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using Umbraco.Core;
+using Archetype.Umbraco.Models;
 
 namespace Archetype.Umbraco.Extensions
 {
@@ -15,5 +12,10 @@ namespace Archetype.Umbraco.Extensions
             return input.StartsWith("{") && input.EndsWith("}")
                    || input.StartsWith("[") && input.EndsWith("]");
         }
+
+        public static bool IsArchetype(this Property prop)
+        {
+            return prop.PropertyEditorAlias.InvariantEquals(Constants.PropertyEditorAlias);
+        }
     }
 }

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

@@ -1,13 +1,11 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Collections.Generic;
+using Newtonsoft.Json;
 
 namespace Archetype.Umbraco.Models
 {
     public class Archetype
     {
+        [JsonProperty("fieldsets")]
         public IEnumerable<Fieldset> Fieldsets { get; set; }
 
         public Archetype()

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

@@ -0,0 +1,44 @@
+using System.Collections.Generic;
+using Newtonsoft.Json;
+
+namespace Archetype.Umbraco.Models
+{
+    public class ArchetypePreValue
+    {
+        [JsonProperty("showAdvancedOptions")]
+        public bool ShowAdvancedOptions { get; set; }
+
+        [JsonProperty("hideFieldsetToolbar")]
+        public bool HideFieldsetToolbar { get; set; }
+
+        [JsonProperty("enableMultipleFieldsets")]
+        public bool EnableMultipleFieldsets { get; set; }
+
+        [JsonProperty("hideFieldsetControls")]
+        public bool HideFieldsetControls { get; set; }
+
+        [JsonProperty("hidePropertyLabel")]
+        public bool HidePropertyLabel { get; set; }
+
+        [JsonProperty("maxFieldsets", NullValueHandling = NullValueHandling.Ignore)]
+        public int MaxFieldsets { get; set; }
+
+        [JsonProperty("fieldsets")]
+        public IEnumerable<ArchetypePreValueFieldset> Fieldsets { get; set; }
+
+        [JsonProperty("hidePropertyLabels")]
+        public bool HidePropertyLabels { get; set; }
+
+        [JsonProperty("customCssClass")]
+        public string CustomCssClass { get; set; }
+
+        [JsonProperty("customCssPath")]
+        public string CustomCssPath { get; set; }
+
+        [JsonProperty("customJsPath")]
+        public string CustomJsPath { get; set; }
+
+        [JsonProperty("developerMode")]
+        public bool DeveloperMode { get; set; }
+    }
+}

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

@@ -0,0 +1,29 @@
+using System.Collections.Generic;
+using Newtonsoft.Json;
+
+namespace Archetype.Umbraco.Models
+{
+    public class ArchetypePreValueFieldset
+    {
+        [JsonProperty("alias")]
+        public string Alias { get; set; }
+
+        [JsonProperty("remove")]
+        public bool Remove { get; set; }
+
+        [JsonProperty("collapse")]
+        public bool Collapse { get; set; }
+
+        [JsonProperty("labelTemplate")]
+        public string LabelTemplate { get; set; }
+
+        [JsonProperty("icon")]
+        public string Icon { get; set; }
+
+        [JsonProperty("label")]
+        public string Label { get; set; }
+
+        [JsonProperty("properties")]
+        public IEnumerable<ArchetypePreValueProperty> Properties { get; set; }
+    }
+}

app/Umbraco/Umbraco.Archetype/Models/ArchetypePreValueProperty.cs

@@ -0,0 +1,37 @@
+using Newtonsoft.Json;
+
+namespace Archetype.Umbraco.Models
+{
+    public class ArchetypePreValueProperty
+    {
+        [JsonProperty("alias")]
+        public string Alias { get; set; }
+
+        [JsonProperty("remove")]
+        public bool Remove { get; set; }
+
+        [JsonProperty("collapse")]
+        public bool Collapse { get; set; }
+
+        [JsonProperty("label")]
+        public string Label { get; set; }
+
+        [JsonProperty("helpText")]
+        public string HelpText { get; set; }
+
+        [JsonProperty("dataTypeId")]
+        public int DataTypeId { get; set; }
+
+        [JsonProperty("dataTypeGuid")]
+        public string DataTypeGuid { get; set; }
+
+        [JsonProperty("propertyEditorAlias")]
+        public string PropertyEditorAlias { get; set; }
+
+        [JsonProperty("value")]
+        public string Value { get; set; }
+
+        [JsonProperty("required")]
+        public bool Required { get; set; }
+    }
+}

app/Umbraco/Umbraco.Archetype/Models/Fieldset.cs

@@ -1,15 +1,16 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using Newtonsoft.Json;
 using Umbraco.Core;
 
 namespace Archetype.Umbraco.Models
 {
     public class Fieldset
     {
+        [JsonProperty("alias")]
         public string Alias { get; set; }
+
+        [JsonProperty("properties")]
         public IEnumerable<Property> Properties;
 
         public Fieldset()
@@ -17,6 +18,8 @@ namespace Archetype.Umbraco.Models
             Properties = new List<Property>();
         }
 
+        #region Helper Methods
+
         public string GetValue(string propertyAlias)
         {
             return GetValue<string>(propertyAlias);
@@ -26,15 +29,10 @@ namespace Archetype.Umbraco.Models
         {
             var property = GetProperty(propertyAlias);
 
-            if (property == null || string.IsNullOrEmpty(property.Value))
+            if (property == null || string.IsNullOrEmpty(property.Value.ToString()))
                 return default(T);
 
-            var convertAttempt = property.Value.TryConvertTo<T>();
-
-            if (convertAttempt.Success)
-                return convertAttempt.Result;
-
-            return default(T);
+            return property.GetValue<T>();
         }
 
         private Property GetProperty(string propertyAlias)
@@ -42,5 +40,7 @@ namespace Archetype.Umbraco.Models
             return Properties.FirstOrDefault(p => p.Alias.InvariantEquals(propertyAlias));
         }
 
+        #endregion
+
     }
 }

app/Umbraco/Umbraco.Archetype/Models/Property.cs

@@ -1,14 +1,78 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Linq;
+using Newtonsoft.Json;
+using Umbraco.Core;
+using Umbraco.Core.Models;
+using Umbraco.Core.Models.PublishedContent;
+using Umbraco.Core.PropertyEditors;
 
 namespace Archetype.Umbraco.Models
 {
     public class Property
     {
-        public string Alias { get; set; }
-        public string Value { get; set; }
+        [JsonProperty("alias")]
+        public string Alias { get; internal set; }
+
+        [JsonProperty("value")]
+        public object Value { get; set; }
+
+        [JsonProperty("propertyEditorAlias")]
+        public string PropertyEditorAlias { get; internal set; }
+
+        [JsonProperty("dataTypeId")]
+        public int DataTypeId { get; internal set; }
+
+        public T GetValue<T>()
+        {
+            // If the value is of type T, just return it
+            if (Value is T)
+                return (T)Value;
+
+            // Umbraco has the concept of a IPropertyEditorValueConverter which it 
+            // also queries for property resolvers. However I'm not sure what these
+            // are for, nor can I find any implementations in core, so am currently
+            // just ignoring these when looking up converters.
+            // NB: IPropertyEditorValueConverter not to be confused with
+            // IPropertyValueConverter which are the ones most people are creating
+            var properyType = CreateDummyPropertyType(DataTypeId, PropertyEditorAlias);
+            var converters = PropertyValueConvertersResolver.Current.Converters.ToArray();
+
+            // In umbraco, there are default value converters that try to convert the 
+            // value if all else fails. The problem is, they are also in the list of
+            // converters, and the means for filtering these out is internal, so
+            // we currently have to try ALL converters to see if they can convert
+            // rather than just finding the most appropreate. If the ability to filter
+            // out default value converters becomes public, the following logic could
+            // and probably should be changed.
+            foreach (var converter in converters.Where(x => x.IsConverter(properyType)))
+            {
+                // Convert the type using a found value converter
+                var value2 = converter.ConvertDataToSource(properyType, Value, false);
+
+                // If the value is of type T, just return it
+                if (value2 is T)
+                    return (T)value2;
+
+                // Value is not final value type, so try a regular type conversion aswell
+                var convertAttempt = value2.TryConvertTo<T>();
+                if (convertAttempt.Success)
+                    return convertAttempt.Result;
+            }
+
+            // Value is not final value type, so try a regular type conversion
+            var convertAttempt2 = Value.TryConvertTo<T>();
+            if (convertAttempt2.Success)
+                return convertAttempt2.Result;
+
+            return default(T);
+        }
+
+        private PublishedPropertyType CreateDummyPropertyType(int dataTypeId, string propertyEditorAlias)
+        {
+            return new PublishedPropertyType(null,
+                new PropertyType(new DataTypeDefinition(-1, propertyEditorAlias)
+                {
+                    Id = dataTypeId
+                }));
+        }
     }
 }

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

@@ -1,37 +1,18 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
 [assembly: AssemblyTitle("Archetype")]
-[assembly: AssemblyDescription("")]
+[assembly: AssemblyDescription("Archetype's supporting code library for Umbraco")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
+[assembly: AssemblyCompany("Imulus")]
 [assembly: AssemblyProduct("Archetype")]
-[assembly: AssemblyCopyright("Copyright ©  2014")]
+[assembly: AssemblyCopyright("Copyright \xa9 Imulus 2014")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
 [assembly: ComVisible(false)]
+[assembly: Guid("E37E94F9-C7BA-4B54-B7E1-64419B3DBA0B")]
 
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("e37e94f9-c7ba-4b54-b7e1-64419b3dba0b")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.1.0.0")]
-[assembly: AssemblyFileVersion("0.1.0.0")]
-[assembly: AssemblyInformationalVersion("0.1.0-alpha")]
+[assembly: AssemblyVersion("0.5.0.0")]
+[assembly: AssemblyFileVersion("0.5.0.0")]
+[assembly: AssemblyInformationalVersion("0.5.0-alpha")]

app/Umbraco/Umbraco.Archetype/PropertyConverters/ArchetypeValueConverter.cs

@@ -1,13 +1,12 @@
 using System;
-using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Newtonsoft.Json;
-using Umbraco.Core.PropertyEditors;
-using Umbraco.Core.Models.PublishedContent;
-using Archetype.Umbraco.Models;
 using Archetype.Umbraco.Extensions;
+using Archetype.Umbraco.Models;
+using Newtonsoft.Json;
+using Umbraco.Core;
+using Umbraco.Core.Models.PublishedContent;
+using Umbraco.Core.PropertyEditors;
+using Umbraco.Core.Services;
 
 namespace Archetype.Umbraco.PropertyConverters
 {
@@ -16,22 +15,66 @@ namespace Archetype.Umbraco.PropertyConverters
     [PropertyValueCache(PropertyCacheValue.All, PropertyCacheLevel.Content)]
     public class ArchetypeValueConverter : PropertyValueConverterBase
     {
+        protected JsonSerializerSettings _jsonSettings;
+
+        public ArchetypeValueConverter()
+        {
+            var dcr = new Newtonsoft.Json.Serialization.DefaultContractResolver();
+            dcr.DefaultMembersSearchFlags |= System.Reflection.BindingFlags.NonPublic;
+
+            _jsonSettings = new JsonSerializerSettings { ContractResolver = dcr };
+        }
+
+        public ServiceContext Services
+        {
+            get { return ApplicationContext.Current.Services; }
+        }
+
         public override bool IsConverter(PublishedPropertyType propertyType)
         {
-            return propertyType.PropertyEditorAlias.Equals("Imulus.Archetype");
+            return propertyType.PropertyEditorAlias.Equals(Constants.PropertyEditorAlias);
         }
 
         public override object ConvertDataToSource(PublishedPropertyType propertyType, object source, bool preview)
         {
-            if (source == null) return null;
-            
-            var sourceString = source.ToString();         
+            if (source == null)
+                return null;
+
+            var sourceString = source.ToString();
 
             if (sourceString.DetectIsJson())
             {
                 try
                 {
-                    var archetype = JsonConvert.DeserializeObject <Archetype.Umbraco.Models.Archetype> (sourceString);
+                    // Deserialize value to archetype model
+                    var archetype = JsonConvert.DeserializeObject<Models.Archetype>(sourceString, _jsonSettings);
+
+                    try
+                    {
+                        // Get list of configured properties and their types 
+                        // and map them to the deserialized archetype model
+                        var preValue = GetArchetypePreValueFromDataTypeId(propertyType.DataTypeId);
+                        foreach (var fieldset in preValue.Fieldsets)
+                        {
+                            var fieldsetAlias = fieldset.Alias;
+                            foreach (var fieldsetInst in archetype.Fieldsets.Where(x => x.Alias == fieldsetAlias))
+                            {
+                                foreach (var property in fieldset.Properties)
+                                {
+                                    var propertyAlias = property.Alias;
+                                    foreach (var propertyInst in fieldsetInst.Properties.Where(x => x.Alias == propertyAlias))
+                                    {
+                                        propertyInst.DataTypeId = property.DataTypeId;
+                                        propertyInst.PropertyEditorAlias = property.PropertyEditorAlias;
+                                    }
+                                }
+                            }
+                        }
+                    }
+                    catch (Exception ex)
+                    {
+                    }
+
                     return archetype;
                 }
                 catch (Exception ex)
@@ -42,5 +85,33 @@ namespace Archetype.Umbraco.PropertyConverters
 
             return sourceString;
         }
+
+        internal ArchetypePreValue GetArchetypePreValueFromDataTypeId(int dataTypeId)
+        {
+            var preValues = Services.DataTypeService.GetPreValuesCollectionByDataTypeId(dataTypeId);
+
+            var configJson = preValues.IsDictionaryBased
+                ? preValues.PreValuesAsDictionary[Constants.PreValueAlias].Value
+                : preValues.PreValuesAsArray.First().Value;
+
+            var config = JsonConvert.DeserializeObject<Models.ArchetypePreValue>(configJson, _jsonSettings);
+
+            foreach (var fieldset in config.Fieldsets)
+            {
+                foreach (var property in fieldset.Properties)
+                {
+                    // Lookup the properties property editor alias
+                    // (See if we've already looked it up first though to save a database hit)
+                    var propertyWithSameDataType = config.Fieldsets.SelectMany(x => x.Properties)
+                        .FirstOrDefault(x => x.DataTypeId == property.DataTypeId && !string.IsNullOrWhiteSpace(x.PropertyEditorAlias));
+
+                    property.PropertyEditorAlias = propertyWithSameDataType != null
+                        ? propertyWithSameDataType.PropertyEditorAlias
+                        : Services.DataTypeService.GetDataTypeDefinitionById(property.DataTypeId).PropertyEditorAlias;
+                }
+            }
+
+            return config;
+        }
     }
 }

app/config/config.views.js

@@ -1,22 +0,0 @@
-[
-    {
-        "name": "Textstring",
-        "path": "/umbraco/views/propertyeditors/textbox/textbox.html"
-    },
-    {
-        "name": "Content Picker",
-        "path": "/umbraco/views/propertyeditors/contentpicker/contentpicker.html"
-    },
-    {
-        "name": "Boolean",
-        "path": "/umbraco/views/propertyeditors/boolean/boolean.html"
-    },
-    {
-        "name": "Checkbox List",
-        "path": "/umbraco/views/propertyeditors/checkboxlist/checkboxlist.html"
-    },
-    {
-        "name": "Radio Buttons",
-        "path": "/umbraco/views/propertyeditors/radiobuttons/radiobuttons.html"
-    }
-]

app/config/propertyEditors.views.js

@@ -0,0 +1,148 @@
+[
+	{
+		"propertyEditorAlias": "Umbraco.CheckBoxList",
+		"view": "checkboxlist"
+	},
+	{
+		"propertyEditorAlias": "Umbraco.ColorPickerAlias",
+		"view": "colorpicker"
+	},
+	{
+		"propertyEditorAlias": "Umbraco.ContentPickerAlias",
+		"view": "contentpicker"
+	},
+	{
+		"propertyEditorAlias": "Umbraco.Date",
+		"view": "datepicker",
+		"defaultPreValues": [{ "format": "yyyy-MM-dd", "pickTime": false }]
+	},
+	{
+		"propertyEditorAlias": "Umbraco.DateTime",
+		"view": "datepicker",
+		"format": "yyyy-MM-dd hh:mm:ss"
+	},
+	{
+		"propertyEditorAlias": "Umbraco.DropDown",
+		"view": "dropdown"
+	},
+	{
+		"propertyEditorAlias": "Umbraco.DropDownMultiple",
+		"view": "dropdown"
+	},
+	{
+		"propertyEditorAlias": "Umbraco.DropDownMultiplePublishKeys",
+		"view": "dropdown"
+	},
+	{
+		"propertyEditorAlias": "Umbraco.DropdownlistPublishingKeys",
+		"view": "dropdown"
+	},
+	{
+		"propertyEditorAlias": "Umbraco.EmailAddress",
+		"view": "email"
+	},
+	{
+		"propertyEditorAlias": "Umbraco.UploadField",
+		"view": "fileupload"
+	},
+	{
+		"propertyEditorAlias": "Umbraco.FolderBrowser",
+		"view": "folderbrowser"
+	},
+	{
+		"propertyEditorAlias": "Umbraco.Integer",
+		"view": "integer"
+	},
+	{
+		"propertyEditorAlias": "Umbraco.NoEdit",
+		"view": "readonlyvalue"
+	},
+	{
+		"propertyEditorAlias": "Umbraco.ListView",
+		"view": "listview"
+	},
+	{
+		"propertyEditorAlias": "Umbraco.MacroContainer",
+		"view": "macrocontainer"
+	},
+	{
+		"propertyEditorAlias": "Umbraco.MarkdownEditor",
+		"view": "markdowneditor"
+	},
+	{
+		"propertyEditorAlias": "Umbraco.MediaPicker",
+		"view": "mediapicker",
+		"defaultPreValues": [{ "multiPicker": "0" }]
+	},
+	{
+		"propertyEditorAlias": "Umbraco.MemberGroupPicker",
+		"view": "membergrouppicker"
+	},
+	{
+		"propertyEditorAlias": "Umbraco.MemberPicker",
+		"view": "memberpicker"
+	},
+	{
+		"propertyEditorAlias": "Umbraco.MultiNodeTreePicker",
+		"view": "contentpicker",
+		"defaultPreValues": [{ "multiPicker": "1" }]
+	},
+	{
+		"propertyEditorAlias": "Umbraco.MultipleMediaPicker",
+		"view": "mediapicker"
+	},
+	{
+		"propertyEditorAlias": "Umbraco.MultipleTextstring",
+		"view": "multipletextbox"
+	},
+	{
+		"propertyEditorAlias": "Umbraco.RadioButtonList",
+		"view": "radiobuttons"
+	},
+	{
+		"propertyEditorAlias": "Umbraco.RelatedLinks",
+		"view": "relatedlinks"
+	},
+	{
+		"propertyEditorAlias": "Umbraco.TinyMCEv3",
+		"view": "rte"
+	},
+	{
+		"propertyEditorAlias": "Umbraco.Slider",
+		"view": "slider"
+	},
+	{
+		"propertyEditorAlias": "Umbraco.Tags",
+		"view": "tags",
+		"defaultPreValues": [{ "group": "default" }]
+	},
+	{
+		"propertyEditorAlias": "Umbraco.TextboxMultiple",
+		"view": "textarea"
+	},
+	{
+		"propertyEditorAlias": "Umbraco.Textbox",
+		"view": "textbox"
+	},
+	{
+		"propertyEditorAlias": "Umbraco.TrueFalse",
+		"view": "boolean"
+	},
+	{
+		"propertyEditorAlias": "Umbraco.UserPicker",
+		"view": "entitypicker",
+		"defaultPreValues": [{ "entityType": "User" }]
+	},
+	{
+		"propertyEditorAlias": "Umbraco.NoEdit",
+		"view": "readonlyvalue"
+	},
+	{
+		"propertyEditorAlias": "Umbraco.Textbox",
+		"view": "textbox"
+	},
+	{
+		"propertyEditorAlias": "Imulus.Archetype",
+		"view": "/App_Plugins/Archetype/views/archetype.html"
+	}
+]

app/controllers/config.controller.js

@@ -1,21 +1,34 @@
-angular.module("umbraco").controller("Imulus.ArchetypeConfigController", function ($scope, $http, assetsService, propertyEditorService) {
+angular.module("umbraco").controller("Imulus.ArchetypeConfigController", function ($scope, $http, assetsService, dialogService, archetypePropertyEditorResource) {
     
-    //$scope.model.value = "";
+    //$scope.model.value = ""; 
     //console.log($scope.model.value); 
 
-    var newPropertyModel = '{alias: "", remove: false, collapse: false, label: "", helpText: "", view: "", value: "", config: ""}';
-    var newFieldsetModel = '{alias: "", remove: false, collapse: false, labelTemplate: "", tooltip: "", icon: "", label: "", headerText: "", footerText: "", properties:[' + newPropertyModel + ']}';
-    var defaultFieldsetConfigModel = eval("({showAdvancedOptions: false, hideFieldsetToolbar: false, enableMultipleFieldsets: false, hideFieldsetControls: false, hideFieldsetLabels: false, hidePropertyLabel: false, maxFieldsets: null, fieldsets: [" + newFieldsetModel + "]})");
-    
+    //define empty items
+    var newPropertyModel = '{"alias": "", "remove": false, "collapse": false, "label": "", "helpText": "", "dataTypeId": "-88", "value": ""}';
+    var newFieldsetModel = '{"alias": "", "remove": false, "collapse": false, "labelTemplate": "", "icon": "", "label": "", "properties": [' + newPropertyModel + ']}';
+    var defaultFieldsetConfigModel = JSON.parse('{"showAdvancedOptions": false, "hideFieldsetToolbar": false, "enableMultipleFieldsets": false, "hideFieldsetControls": false, "hidePropertyLabel": false, "maxFieldsets": null, "fieldsets": [' + newFieldsetModel + ']}');
+
+    //ini the model
     $scope.model.value = $scope.model.value || defaultFieldsetConfigModel;
     
+    //ini the render model
     initConfigRenderModel();
-
-    //get the available views
-    propertyEditorService.getViews().then(function(data){
-        $scope.availableViews = data;
+ 
+    //get the available datatypes
+    archetypePropertyEditorResource.getAllDataTypes().then(function(data) {
+        $scope.availableDataTypes = data;
     });
-      
+
+    //iconPicker
+    $scope.selectIcon = function(fieldset){
+        var dialog = dialogService.iconPicker({
+            callback: function(data){
+                fieldset.icon = data;
+            }
+        });
+    }
+
+    //config for the sorting
     $scope.sortableOptions = {
         axis: 'y',
         cursor: "move",
@@ -28,6 +41,7 @@ angular.module("umbraco").controller("Imulus.ArchetypeConfigController", functio
         }
     };
     
+    //function that determines how to manage expanding/collapsing fieldsets
     $scope.focusFieldset = function(fieldset){
         var iniState;
         
@@ -58,9 +72,11 @@ angular.module("umbraco").controller("Imulus.ArchetypeConfigController", functio
             fieldset.collapse = !iniState;
         }
     }
-    //ini
+
+    //ini the fieldsets
     $scope.focusFieldset();
 
+    //function that determines how to manage expanding/collapsing properties
     $scope.focusProperty = function(properties, property){
         var iniState;
         
@@ -85,6 +101,11 @@ angular.module("umbraco").controller("Imulus.ArchetypeConfigController", functio
             property.collapse = !iniState;
         }
     }
+
+    //ini the properties
+    _.each($scope.archetypeConfigRenderModel.fieldsets, function(fieldset){
+            $scope.focusProperty(fieldset.properties);
+    });
     
     //setup JSON.stringify helpers
     $scope.archetypeConfigRenderModel.toString = stringify;
@@ -101,7 +122,7 @@ angular.module("umbraco").controller("Imulus.ArchetypeConfigController", functio
             $scope.archetypeConfigRenderModel = JSON.parse(v);
             $scope.archetypeConfigRenderModel.toString = stringify;
         }
-    }, true);
+    });
     
     //helper that returns if an item can be removed
     $scope.canRemoveFieldset = function ()
@@ -126,6 +147,17 @@ angular.module("umbraco").controller("Imulus.ArchetypeConfigController", functio
     {
         return countVisibleProperty(fieldset) > 1;
     }
+
+    $scope.getDataTypeNameById = function (id) {
+        if ($scope.availableDataTypes == null) // Might not be initialized yet?
+            return "";
+
+        var dataType = _.find($scope.availableDataTypes, function(d) {
+            return d.id == id;
+        });
+
+        return dataType == null ? "" : dataType.name;
+    }
     
     //helper to count what is visible
     function countVisibleFieldset()
@@ -141,6 +173,7 @@ angular.module("umbraco").controller("Imulus.ArchetypeConfigController", functio
         return count;
     }
     
+    //determines how many properties are visible
     function countVisibleProperty(fieldset)
     {
         var count = 0;
@@ -156,7 +189,7 @@ angular.module("umbraco").controller("Imulus.ArchetypeConfigController", functio
    
     //handles a fieldset add
     $scope.addFieldsetRow = function ($index, $event) {
-        $scope.archetypeConfigRenderModel.fieldsets.splice($index + 1, 0, eval("(" + newFieldsetModel + ")"));
+        $scope.archetypeConfigRenderModel.fieldsets.splice($index + 1, 0, JSON.parse(newFieldsetModel));
         $scope.focusFieldset();
     }
     
@@ -171,7 +204,7 @@ angular.module("umbraco").controller("Imulus.ArchetypeConfigController", functio
     
     //handles a property add
     $scope.addPropertyRow = function (fieldset, $index) {
-        fieldset.properties.splice($index + 1, 0, eval("(" + newPropertyModel + ")"));
+        fieldset.properties.splice($index + 1, 0, JSON.parse(newPropertyModel));
     }
     
     //rather than splice the archetypeConfigRenderModel, we're hiding this and cleaning onFormSubmitting

app/controllers/controller.js

@@ -1,23 +1,29 @@
-angular.module("umbraco").controller("Imulus.ArchetypeController", function ($scope, $http, $interpolate, assetsService, angularHelper, notificationsService) {
+angular.module("umbraco").controller("Imulus.ArchetypeController", function ($scope, $http, assetsService, angularHelper, notificationsService) {
  
     //$scope.model.value = "";
-    //set default value of the model
-    //this works by checking to see if there is a model; then cascades to the default model then to an empty fieldset
 
+    //get a reference to the current form
     var form = angularHelper.getCurrentForm($scope);
 
+    //set the config equal to our prevalue config
     $scope.model.config = $scope.model.config.archetypeConfig;
    
+    //ini the model
     $scope.model.value = $scope.model.value || { fieldsets: [getEmptyRenderFieldset($scope.model.config.fieldsets[0])] };
 
-    //ini
+    //ini the render model
     $scope.archetypeRenderModel = {};
     initArchetypeRenderModel();
      
     //helper to get $eval the labelTemplate
     $scope.getFieldsetTitle = function(fieldsetConfigModel, fieldsetIndex) {
         var fieldset = $scope.archetypeRenderModel.fieldsets[fieldsetIndex];
+        var fieldsetConfig = $scope.getConfigFieldsetByAlias(fieldset.alias);
         var template = fieldsetConfigModel.labelTemplate;
+
+        if (template.length < 1)
+            return fieldsetConfig.label;
+
         var rgx = /{{(.*?)}}*/g;
         var results;
         var parsedTemplate = template;
@@ -31,10 +37,7 @@
         return parsedTemplate;
     };
 
-    /* add/remove/sort */
-
-    //defines the options for the jquery sortable 
-    //i used an ng-model="archetypeRenderModel" so the sort updates the right model
+    //sort config
     $scope.sortableOptions = {
         axis: 'y',
         cursor: "move",
@@ -103,7 +106,7 @@
 
     //helper, ini the render model from the server (model.value)
     function initArchetypeRenderModel() {
-        $scope.archetypeRenderModel = $scope.model.value;
+        $scope.archetypeRenderModel = removeNulls($scope.model.value);
 
         _.each($scope.archetypeRenderModel.fieldsets, function (fieldset)
         {
@@ -128,7 +131,7 @@
         return (typeof property !== 'undefined') ? property.value : '';
     };
     
-    //helper for collapsing
+    //helper for expanding/collapsing fieldsets
     $scope.focusFieldset = function(fieldset){
         
         var iniState;
@@ -154,24 +157,9 @@
         }
     }
     
-    //ini
+    //ini the fieldset expand/collapse
     $scope.focusFieldset();
 
-    //helper returns valid JS or null
-    function getValidJson(variable, json)
-    {
-        if(!json) return null;
-
-        try {
-            return eval("(" + json + ")");
-        }
-        catch (e) {
-            console.log("There was an error while using 'eval' on " + variable);
-            console.log(json);
-            return null;
-        }
-    }
-
     //developerMode helpers
     $scope.archetypeRenderModel.toString = stringify;
 
@@ -211,83 +199,70 @@
         $scope.model.value = { fieldsets: [] };
 
         _.each($scope.archetypeRenderModel.fieldsets, function(fieldset){
-            if (typeof fieldset != 'function' && !fieldset.remove){
+            var cleanedFieldset =  cleanFieldset(fieldset);
 
-                //clone and clean
-                var tempFieldset = JSON.parse(JSON.stringify(fieldset));
-                delete tempFieldset.remove;
-                delete tempFieldset.isValid;
-                delete tempFieldset.collapse;
-
-                _.each(tempFieldset.properties, function(property){
-                    delete property.isValid;
-                });
-
-                $scope.model.value.fieldsets.push(tempFieldset);
+            if(cleanedFieldset){
+                $scope.model.value.fieldsets.push(cleanedFieldset);
             }
         });
     }
 
-    //helper to add an empty fieldset
+    //helper to remove properties only used during editing that we don't want in the saved data
+    //also removes properties that are no longer in the config
+    function cleanFieldset(fieldset)
+    {
+        if (typeof fieldset != 'function' && !fieldset.remove){
+
+            var fieldsetConfig = $scope.getConfigFieldsetByAlias(fieldset.alias);
+
+            //clone and clean
+            var tempFieldset = JSON.parse(JSON.stringify(fieldset));
+            delete tempFieldset.remove;
+            delete tempFieldset.isValid;
+            delete tempFieldset.collapse;
+
+            _.each(tempFieldset.properties, function(property, index){
+                var propertyConfig = _.find(fieldsetConfig.properties, function(p){
+                    return property.alias == p.alias;
+                });
+
+                //just prune the property
+                if(propertyConfig){
+                    delete property.isValid;
+                }
+                else 
+                {
+                    //need to remove the whole property
+                    tempFieldset.properties.splice(index, 1);
+                }
+
+            });
+
+            return tempFieldset;
+        }
+    }
+
+    //helper to add an empty fieldset to the render model
     function getEmptyRenderFieldset (fieldsetModel)
     {
-        return eval("({ alias: '" + fieldsetModel.alias + "', remove: false, properties: []})");
+        return JSON.parse('{"alias": "' + fieldsetModel.alias + '", "remove": false, "isValid": true, "properties": []}');
     }
 
-    //helper for validation
-    function getValidation()
-    {
-        var validation = {}
-        validation.isValid = true;
-        validation.requiredAliases = [];
-        validation.invalidProperties = [];
-
-        //determine which fields are required
-        _.each($scope.model.config.fieldsets, function(fieldset){
-            _.each(fieldset.properties, function(property){
-                if(property.required)
-                {
-                    validation.requiredAliases.push(property.alias);
+    //helper to ensure no nulls make it into the model
+    function removeNulls(model){
+        if(model.fieldsets){
+            _.each(model.fieldsets, function(fieldset, index){
+                if(!fieldset){
+                    model.fieldsets.splice(index, 1);
+                    removeNulls(model);
                 }
             });
-        });
-
-        //if nothing required; let's go
-        if(validation.requiredAliases.length == 0)
-        {
-            return validation;
+            
+            return model;
         }
-
-        //otherwise we need to check the required aliases
-        _.each($scope.archetypeRenderModel.fieldsets, function(fieldset){
-            fieldset.isValid = true;
-
-            _.each(fieldset.properties, function(property){
-                property.isValid = true;
-
-                //if a required field
-                if(_.find(validation.requiredAliases, function(alias){ return alias == property.alias }))
-                {                
-                    //TODO: do a better validation test
-                    if(property.value == ""){
-                        fieldset.isValid = false;
-                        property.isValid = false;
-                        validation.isValid = false;
-
-                        validation.invalidProperties.push(property);
-                    }
-                }
-            });
-        });
-
-        if($scope.model.config.developerMode == '1')
-        {
-            console.log(validation);
-        }
-
-        return validation;
     }
 
+    //helper to lookup validity when given a fieldsetIndex and property alias
     $scope.getPropertyValidity = function(fieldsetIndex, alias)
     {
         if($scope.archetypeRenderModel.fieldsets[fieldsetIndex])
@@ -302,18 +277,18 @@
 
     //sync things up on save
     $scope.$on("formSubmitting", function (ev, args) {
-        
-        var validation = getValidation();
 
-        if(!validation.isValid)
+        //test for form; may have to do this differently for nested archetypes
+        if(!form)
+            return;
+
+        if(form.$invalid)
         {
             notificationsService.warning("Cannot Save Document", "The document could not be saved because of missing required fields.")
-            form.$setValidity("archetypeError", false);
         }
         else 
         {
             syncModelToRenderModel();
-            form.$setValidity("archetypeError", true);
         }
     });
 

app/directives/archetypeproperty.js

@@ -1,18 +1,13 @@
-angular.module("umbraco").directive('archetypeProperty', function ($compile, $http) {
+angular.module("umbraco.directives").directive('archetypeProperty', function ($compile, $http, archetypePropertyEditorResource, umbPropEditorHelper) {
     
     function getFieldsetByAlias(fieldsets, alias)
     {
-        for (var i in fieldsets)
-        {
-            if (fieldsets[i].alias == alias)
-            {
-                return fieldsets[i];
-            }
-        }
+        return _.find(fieldsets, function(fieldset){
+            return fieldset.alias == alias;
+        });
     }
 
-    function getPropertyIdByAlias(properties, alias)
-    {
+    function getPropertyIndexByAlias(properties, alias){
         for (var i in properties)
         {
             if (properties[i].alias == alias) {
@@ -21,56 +16,103 @@
         }
     }
 
-    var linker = function (scope, element, attrs) {
-         
-        var configFieldsetModel = getFieldsetByAlias(scope.archetypeConfig.fieldsets, scope.fieldset.alias);
+    function getPropertyByAlias(fieldset, alias){
+        return _.find(fieldset.properties, function(property){
+            return property.alias == alias; 
+        });
+    }
 
-        var view = configFieldsetModel.properties[scope.propertyConfigIndex].view;
+    //helper that returns a JS ojbect from 'value' string or the original string
+    function jsonOrString(value, developerMode, debugLabel){
+        if(value && typeof value == 'string'){
+            try{
+                if(developerMode == '1'){
+                    console.log("Trying to parse " + debugLabel + ": " + value); 
+                }
+                value = JSON.parse(value);
+            }
+            catch(exception)
+            {
+                if(developerMode == '1'){
+                    console.log("Failed to parse " + debugLabel + "."); 
+                }
+            }
+        }
+
+        if(value && developerMode == '1'){
+            console.log(debugLabel + " post-parsing: ");
+            console.log(value); 
+        }
+
+        return value;
+    }
+
+    var linker = function (scope, element, attrs, ngModelCtrl) {
+        var configFieldsetModel = getFieldsetByAlias(scope.archetypeConfig.fieldsets, scope.fieldset.alias);
+        var view = "";
         var label = configFieldsetModel.properties[scope.propertyConfigIndex].label;
-        var config = configFieldsetModel.properties[scope.propertyConfigIndex].config;
+        var dataTypeId = configFieldsetModel.properties[scope.propertyConfigIndex].dataTypeId;
+        var config = null;
         var alias = configFieldsetModel.properties[scope.propertyConfigIndex].alias;
         var defaultValue = configFieldsetModel.properties[scope.propertyConfigIndex].value;
-        
-        //try to convert the config to a JS object
-        if(config && typeof config == 'string'){
-            try{
-                if(scope.archetypeConfig.developerMode == '1'){
-                    console.log("Trying to eval config: " + config); 
-                }
-                config = eval("(" + config + ")");
-            }
-            catch(exception)
-            {
-                if(scope.archetypeConfig.developerMode == '1'){
-                    console.log("Failed to eval config."); 
-                }
-            }
-        }
-
-        if(config && scope.archetypeConfig.developerMode == '1'){
-            console.log("Config post-eval: " + config); 
-        }
+        var umbracoPropertyAlias = scope.umbracoPropertyAlias;
 
         //try to convert the defaultValue to a JS object
-        if(defaultValue && typeof defaultValue == 'string'){
-            try{
-                if(scope.archetypeConfig.developerMode == '1'){
-                    console.log("Trying to eval default value: " + defaultValue); 
-                }
-                defaultValue = eval("(" + defaultValue + ")");
-            }
-            catch(exception)
-            {
-                if(scope.archetypeConfig.developerMode == '1'){
-                    console.log("Failed to eval defaultValue."); 
-                }
-            }
-        }
+        defaultValue = jsonOrString(defaultValue, scope.archetypeConfig.developerMode, "defaultValue");
 
-        if(defaultValue && scope.archetypeConfig.developerMode == '1'){
-            console.log("Default value post-eval: " + defaultValue); 
-        }
+        //grab info for the selected datatype, prepare for view
+        archetypePropertyEditorResource.getDataType(dataTypeId).then(function (data) {
+            //transform preValues array into object expected by propertyeditor views
+            var configObj = {};
+            _.each(data.preValues, function(p) {
+                configObj[p.key] = p.value;
+            });
+            config = configObj;
 
+            //determine the view to use [...] and load it
+            archetypePropertyEditorResource.getPropertyEditorMapping(data.selectedEditor).then(function(propertyEditor) {
+                var pathToView = umbPropEditorHelper.getViewPath(propertyEditor.view);
+
+                //load in the DefaultPreValues for the PropertyEditor, if any
+                var defaultConfigObj =  {};
+                if (propertyEditor.hasOwnProperty('defaultPreValues')) {
+                    _.each(propertyEditor.defaultPreValues, function(p) {
+                        _.extend(defaultConfigObj, p)
+                    });
+                }
+                var mergedConfig = _.extend(defaultConfigObj, config);
+
+                loadView(pathToView, mergedConfig, defaultValue, alias, umbracoPropertyAlias, scope, element, ngModelCtrl);
+            });
+        });
+
+        ngModelCtrl.$parsers.push(validate);
+        ngModelCtrl.$formatters.push(validate);
+
+        function validate(renderModel){
+            var valid = true;
+
+            _.each(renderModel, function(fieldset){
+                fieldset.isValid = true;
+                _.each(fieldset.properties, function(property){
+                    property.isValid = true;
+
+                    var propertyConfig = getPropertyByAlias(configFieldsetModel, property.alias);
+
+                    if(propertyConfig && propertyConfig.required && property.value == ""){
+                        fieldset.isValid = false;
+                        property.isValid = false;
+                        valid = false;
+                    }
+                });
+            });
+
+            ngModelCtrl.$setValidity('validation', valid);
+            return renderModel;
+        }
+    }
+
+    function loadView(view, config, defaultValue, alias, umbracoPropertyAlias, scope, element, ngModelCtrl) {
         if (view)
         {
             $http.get(view).success(function (data) {
@@ -80,19 +122,17 @@
                         console.log(scope);
                     }
 
-                    var rawTemplate = data;
-
                     //define the initial model and config
                     scope.model = {};
                     scope.model.config = {};
 
                     //ini the property value after test to make sure a prop exists in the renderModel
-                    var renderModelPropertyIndex = getPropertyIdByAlias(scope.archetypeRenderModel.fieldsets[scope.fieldsetIndex].properties, alias);
+                    var renderModelPropertyIndex = getPropertyIndexByAlias(scope.archetypeRenderModel.fieldsets[scope.fieldsetIndex].properties, alias);
 
                     if (!renderModelPropertyIndex)
                     {
-                        scope.archetypeRenderModel.fieldsets[scope.fieldsetIndex].properties.push(eval("({alias: '" + alias + "', value:'" + defaultValue + "'})"));
-                        renderModelPropertyIndex = getPropertyIdByAlias(scope.archetypeRenderModel.fieldsets[scope.fieldsetIndex].properties, alias);
+                        scope.archetypeRenderModel.fieldsets[scope.fieldsetIndex].properties.push(JSON.parse('{"alias": "' + alias + '", "value": "' + defaultValue + '"}'));
+                        renderModelPropertyIndex = getPropertyIndexByAlias(scope.archetypeRenderModel.fieldsets[scope.fieldsetIndex].properties, alias);
                     }
                     scope.model.value = scope.archetypeRenderModel.fieldsets[scope.fieldsetIndex].properties[renderModelPropertyIndex].value;
 
@@ -100,14 +140,17 @@
                     scope.model.config = config;
 
                     //some items need an alias
-                    scope.model.alias = "scope-" + scope.$id;
+                    scope.model.alias = "archetype-property-" + umbracoPropertyAlias + "-" + scope.fieldsetIndex + "-" + scope.propertyConfigIndex;
 
                     //watch for changes since there is no two-way binding with the local model.value
                     scope.$watch('model.value', function (newValue, oldValue) {
                         scope.archetypeRenderModel.fieldsets[scope.fieldsetIndex].properties[renderModelPropertyIndex].value = newValue;
+
+                        //trigger the validation pipeline
+                        ngModelCtrl.$setViewValue(ngModelCtrl.$viewValue);
                     });
 
-                    element.html(rawTemplate).show();
+                    element.html(data).show();
                     $compile(element.contents())(scope);
                 }
             });
@@ -115,6 +158,7 @@
     }
 
     return {
+        require: "^ngModel",
         restrict: "E",
         rep1ace: true,
         link: linker,
@@ -124,7 +168,8 @@
             archetypeConfig: '=',
             fieldset: '=',
             fieldsetIndex: '=',
-            archetypeRenderModel: '='
+            archetypeRenderModel: '=',
+            umbracoPropertyAlias: '='
         }
     }
 });

app/directives/localize.js

@@ -0,0 +1,21 @@
+angular.module("umbraco.directives").directive('archetypeLocalize', function (archetypeLocalizationService) {
+	var linker = function (scope, element, attrs){
+
+		var key = scope.key;
+        
+        archetypeLocalizationService.localize(key).then(function(value){
+        	if(value){
+        		element.html(value);
+        	}
+        });
+	}   
+
+	return {
+	    restrict: "E",
+	    rep1ace: true,
+	    link: linker,
+	    scope: {
+	    	key: '@'
+	    }
+	}
+});

app/langs/da-dk.js

@@ -0,0 +1,34 @@
+{
+	"label": "Label",
+	"alias": "Alias",
+	"hideFieldsetControls": "Hide Fieldset Controls?",
+	"hideFieldsetControlsDescription": "Hides the fieldset add/remove/sort controls.",
+	"toggleAdvanced": "Toggle Advanced Options",
+	"toggleAdvancedDescription": "Show advanced options.",
+	"hidePropertyLabels": "Hide Property Labels?",
+	"hidePropertyLabelsDescription": "Hides the property labels.",
+	"maxFieldsets": "Max Fieldsets",
+	"maxFieldsetsDescription": "How many Fieldsets are allowed? Entering '1' will disable the controls. Default is unlimited.",
+	"enableMultipleFieldsets": "Enable Multiple Fieldsets?",
+	"enableMultipleFieldsetsDescription": "Allows multiple types of fieldsets within this archetype.",
+	"hideFieldsetToolbar": "Hide Fieldset Toolbar?",
+	"hideFieldsetToolbarDescription": "Hides the fieldset toolbar that appears when more than one fieldset model appears.",
+	"customWrapperClass": "Custom Wrapper Class",
+	"customWrapperClassDescription": "(Optional) Enter a custom CSS class that will be applied to the wrapper div.",
+	"cssFile": "CSS File",
+	"cssFileDescription": "(Optional) Enter a path for a custom CSS file to be included on the page.",
+	"jsFile": "JS File",
+	"jsFileDescription": "(Optional) Enter a path for a custom JS file to be included on the page.",
+	"toggleDeveloperMode": "Toggle Developer Mode",
+	"toggleDeveloperModeDescription": "Turn on for developer options.",
+	"configModel": "Config Model",
+	"configModelDescription": "Be careful editing the text below, it controls the schema for this archetype.",
+	"helpText": "Help Text",
+	"defaultValue": "Default Value",
+	"dataType": "DataType",
+	"required": "Required",
+	"properties": "Properties",
+	"labelTemplate": "Label Template",
+	"select": "Select",
+	"icon": "Icon"
+}

app/langs/de-de.js

@@ -0,0 +1,34 @@
+{
+	"label": "Label",
+	"alias": "Alias",
+	"hideFieldsetControls": "Hide Fieldset Controls?",
+	"hideFieldsetControlsDescription": "Hides the fieldset add/remove/sort controls.",
+	"toggleAdvanced": "Toggle Advanced Options",
+	"toggleAdvancedDescription": "Show advanced options.",
+	"hidePropertyLabels": "Hide Property Labels?",
+	"hidePropertyLabelsDescription": "Hides the property labels.",
+	"maxFieldsets": "Max Fieldsets",
+	"maxFieldsetsDescription": "How many Fieldsets are allowed? Entering '1' will disable the controls. Default is unlimited.",
+	"enableMultipleFieldsets": "Enable Multiple Fieldsets?",
+	"enableMultipleFieldsetsDescription": "Allows multiple types of fieldsets within this archetype.",
+	"hideFieldsetToolbar": "Hide Fieldset Toolbar?",
+	"hideFieldsetToolbarDescription": "Hides the fieldset toolbar that appears when more than one fieldset model appears.",
+	"customWrapperClass": "Custom Wrapper Class",
+	"customWrapperClassDescription": "(Optional) Enter a custom CSS class that will be applied to the wrapper div.",
+	"cssFile": "CSS File",
+	"cssFileDescription": "(Optional) Enter a path for a custom CSS file to be included on the page.",
+	"jsFile": "JS File",
+	"jsFileDescription": "(Optional) Enter a path for a custom JS file to be included on the page.",
+	"toggleDeveloperMode": "Toggle Developer Mode",
+	"toggleDeveloperModeDescription": "Turn on for developer options.",
+	"configModel": "Config Model",
+	"configModelDescription": "Be careful editing the text below, it controls the schema for this archetype.",
+	"helpText": "Help Text",
+	"defaultValue": "Default Value",
+	"dataType": "DataType",
+	"required": "Required",
+	"properties": "Properties",
+	"labelTemplate": "Label Template",
+	"select": "Select",
+	"icon": "Icon"
+}

app/langs/en-gb.js

@@ -0,0 +1,34 @@
+{
+	"label": "Label",
+	"alias": "Alias", 
+	"hideFieldsetControls": "Hide Fieldset Controls?",
+	"hideFieldsetControlsDescription": "Hides the fieldset add/remove/sort controls.",
+	"toggleAdvanced": "Toggle Advanced Options",
+	"toggleAdvancedDescription": "Show advanced options.",
+	"hidePropertyLabels": "Hide Property Labels?",
+	"hidePropertyLabelsDescription": "Hides the property labels.",
+	"maxFieldsets": "Max Fieldsets",
+	"maxFieldsetsDescription": "How many Fieldsets are allowed? Entering '1' will disable the controls. Default is unlimited.",
+	"enableMultipleFieldsets": "Enable Multiple Fieldsets?",
+	"enableMultipleFieldsetsDescription": "Allows multiple types of fieldsets within this archetype.",
+	"hideFieldsetToolbar": "Hide Fieldset Toolbar?",
+	"hideFieldsetToolbarDescription": "Hides the fieldset toolbar that appears when more than one fieldset model appears.",
+	"customWrapperClass": "Custom Wrapper Class",
+	"customWrapperClassDescription": "(Optional) Enter a custom CSS class that will be applied to the wrapper div.",
+	"cssFile": "CSS File",
+	"cssFileDescription": "(Optional) Enter a path for a custom CSS file to be included on the page.",
+	"jsFile": "JS File",
+	"jsFileDescription": "(Optional) Enter a path for a custom JS file to be included on the page.",
+	"toggleDeveloperMode": "Toggle Developer Mode",
+	"toggleDeveloperModeDescription": "Turn on for developer options.",
+	"configModel": "Config Model",
+	"configModelDescription": "Be careful editing the text below, it controls the schema for this archetype.",
+	"helpText": "Help Text",
+	"defaultValue": "Default Value",
+	"dataType": "DataType",
+	"required": "Required",
+	"properties": "Properties",
+	"labelTemplate": "Label Template",
+	"select": "Select",
+	"icon": "Icon"
+}

app/langs/en-us.js

@@ -0,0 +1,34 @@
+{
+	"label": "Label",
+	"alias": "Alias",
+	"hideFieldsetControls": "Hide Fieldset Controls?",
+	"hideFieldsetControlsDescription": "Hides the fieldset add/remove/sort controls.",
+	"toggleAdvanced": "Toggle Advanced Options",
+	"toggleAdvancedDescription": "Show advanced options.",
+	"hidePropertyLabels": "Hide Property Labels?",
+	"hidePropertyLabelsDescription": "Hides the property labels.",
+	"maxFieldsets": "Max Fieldsets",
+	"maxFieldsetsDescription": "How many Fieldsets are allowed? Entering '1' will disable the controls. Default is unlimited.",
+	"enableMultipleFieldsets": "Enable Multiple Fieldsets?",
+	"enableMultipleFieldsetsDescription": "Allows multiple types of fieldsets within this archetype.",
+	"hideFieldsetToolbar": "Hide Fieldset Toolbar?",
+	"hideFieldsetToolbarDescription": "Hides the fieldset toolbar that appears when more than one fieldset model appears.",
+	"customWrapperClass": "Custom Wrapper Class",
+	"customWrapperClassDescription": "(Optional) Enter a custom CSS class that will be applied to the wrapper div.",
+	"cssFile": "CSS File",
+	"cssFileDescription": "(Optional) Enter a path for a custom CSS file to be included on the page.",
+	"jsFile": "JS File",
+	"jsFileDescription": "(Optional) Enter a path for a custom JS file to be included on the page.",
+	"toggleDeveloperMode": "Toggle Developer Mode",
+	"toggleDeveloperModeDescription": "Turn on for developer options.",
+	"configModel": "Config Model",
+	"configModelDescription": "Be careful editing the text below, it controls the schema for this archetype.",
+	"helpText": "Help Text",
+	"defaultValue": "Default Value",
+	"dataType": "DataType",
+	"required": "Required",
+	"properties": "Properties",
+	"labelTemplate": "Label Template",
+	"select": "Select",
+	"icon": "Icon"
+}

app/langs/es-es.js

@@ -0,0 +1,34 @@
+{
+	"label": "Label",
+	"alias": "Alias",
+	"hideFieldsetControls": "Hide Fieldset Controls?",
+	"hideFieldsetControlsDescription": "Hides the fieldset add/remove/sort controls.",
+	"toggleAdvanced": "Toggle Advanced Options",
+	"toggleAdvancedDescription": "Show advanced options.",
+	"hidePropertyLabels": "Hide Property Labels?",
+	"hidePropertyLabelsDescription": "Hides the property labels.",
+	"maxFieldsets": "Max Fieldsets",
+	"maxFieldsetsDescription": "How many Fieldsets are allowed? Entering '1' will disable the controls. Default is unlimited.",
+	"enableMultipleFieldsets": "Enable Multiple Fieldsets?",
+	"enableMultipleFieldsetsDescription": "Allows multiple types of fieldsets within this archetype.",
+	"hideFieldsetToolbar": "Hide Fieldset Toolbar?",
+	"hideFieldsetToolbarDescription": "Hides the fieldset toolbar that appears when more than one fieldset model appears.",
+	"customWrapperClass": "Custom Wrapper Class",
+	"customWrapperClassDescription": "(Optional) Enter a custom CSS class that will be applied to the wrapper div.",
+	"cssFile": "CSS File",
+	"cssFileDescription": "(Optional) Enter a path for a custom CSS file to be included on the page.",
+	"jsFile": "JS File",
+	"jsFileDescription": "(Optional) Enter a path for a custom JS file to be included on the page.",
+	"toggleDeveloperMode": "Toggle Developer Mode",
+	"toggleDeveloperModeDescription": "Turn on for developer options.",
+	"configModel": "Config Model",
+	"configModelDescription": "Be careful editing the text below, it controls the schema for this archetype.",
+	"helpText": "Help Text",
+	"defaultValue": "Default Value",
+	"dataType": "DataType",
+	"required": "Required",
+	"properties": "Properties",
+	"labelTemplate": "Label Template",
+	"select": "Select",
+	"icon": "Icon"
+}

app/langs/fr-fr.js

@@ -0,0 +1,34 @@
+{
+	"label": "Label",
+	"alias": "Alias",
+	"hideFieldsetControls": "Hide Fieldset Controls?",
+	"hideFieldsetControlsDescription": "Hides the fieldset add/remove/sort controls.",
+	"toggleAdvanced": "Toggle Advanced Options",
+	"toggleAdvancedDescription": "Show advanced options.",
+	"hidePropertyLabels": "Hide Property Labels?",
+	"hidePropertyLabelsDescription": "Hides the property labels.",
+	"maxFieldsets": "Max Fieldsets",
+	"maxFieldsetsDescription": "How many Fieldsets are allowed? Entering '1' will disable the controls. Default is unlimited.",
+	"enableMultipleFieldsets": "Enable Multiple Fieldsets?",
+	"enableMultipleFieldsetsDescription": "Allows multiple types of fieldsets within this archetype.",
+	"hideFieldsetToolbar": "Hide Fieldset Toolbar?",
+	"hideFieldsetToolbarDescription": "Hides the fieldset toolbar that appears when more than one fieldset model appears.",
+	"customWrapperClass": "Custom Wrapper Class",
+	"customWrapperClassDescription": "(Optional) Enter a custom CSS class that will be applied to the wrapper div.",
+	"cssFile": "CSS File",
+	"cssFileDescription": "(Optional) Enter a path for a custom CSS file to be included on the page.",
+	"jsFile": "JS File",
+	"jsFileDescription": "(Optional) Enter a path for a custom JS file to be included on the page.",
+	"toggleDeveloperMode": "Toggle Developer Mode",
+	"toggleDeveloperModeDescription": "Turn on for developer options.",
+	"configModel": "Config Model",
+	"configModelDescription": "Be careful editing the text below, it controls the schema for this archetype.",
+	"helpText": "Help Text",
+	"defaultValue": "Default Value",
+	"dataType": "DataType",
+	"required": "Required",
+	"properties": "Properties",
+	"labelTemplate": "Label Template",
+	"select": "Select",
+	"icon": "Icon"
+}

app/langs/he-il.js

@@ -0,0 +1,34 @@
+{
+	"label": "Label",
+	"alias": "Alias",
+	"hideFieldsetControls": "Hide Fieldset Controls?",
+	"hideFieldsetControlsDescription": "Hides the fieldset add/remove/sort controls.",
+	"toggleAdvanced": "Toggle Advanced Options",
+	"toggleAdvancedDescription": "Show advanced options.",
+	"hidePropertyLabels": "Hide Property Labels?",
+	"hidePropertyLabelsDescription": "Hides the property labels.",
+	"maxFieldsets": "Max Fieldsets",
+	"maxFieldsetsDescription": "How many Fieldsets are allowed? Entering '1' will disable the controls. Default is unlimited.",
+	"enableMultipleFieldsets": "Enable Multiple Fieldsets?",
+	"enableMultipleFieldsetsDescription": "Allows multiple types of fieldsets within this archetype.",
+	"hideFieldsetToolbar": "Hide Fieldset Toolbar?",
+	"hideFieldsetToolbarDescription": "Hides the fieldset toolbar that appears when more than one fieldset model appears.",
+	"customWrapperClass": "Custom Wrapper Class",
+	"customWrapperClassDescription": "(Optional) Enter a custom CSS class that will be applied to the wrapper div.",
+	"cssFile": "CSS File",
+	"cssFileDescription": "(Optional) Enter a path for a custom CSS file to be included on the page.",
+	"jsFile": "JS File",
+	"jsFileDescription": "(Optional) Enter a path for a custom JS file to be included on the page.",
+	"toggleDeveloperMode": "Toggle Developer Mode",
+	"toggleDeveloperModeDescription": "Turn on for developer options.",
+	"configModel": "Config Model",
+	"configModelDescription": "Be careful editing the text below, it controls the schema for this archetype.",
+	"helpText": "Help Text",
+	"defaultValue": "Default Value",
+	"dataType": "DataType",
+	"required": "Required",
+	"properties": "Properties",
+	"labelTemplate": "Label Template",
+	"select": "Select",
+	"icon": "Icon"
+}

app/langs/it-it.js

@@ -0,0 +1,34 @@
+{
+	"label": "Label",
+	"alias": "Alias",
+	"hideFieldsetControls": "Hide Fieldset Controls?",
+	"hideFieldsetControlsDescription": "Hides the fieldset add/remove/sort controls.",
+	"toggleAdvanced": "Toggle Advanced Options",
+	"toggleAdvancedDescription": "Show advanced options.",
+	"hidePropertyLabels": "Hide Property Labels?",
+	"hidePropertyLabelsDescription": "Hides the property labels.",
+	"maxFieldsets": "Max Fieldsets",
+	"maxFieldsetsDescription": "How many Fieldsets are allowed? Entering '1' will disable the controls. Default is unlimited.",
+	"enableMultipleFieldsets": "Enable Multiple Fieldsets?",
+	"enableMultipleFieldsetsDescription": "Allows multiple types of fieldsets within this archetype.",
+	"hideFieldsetToolbar": "Hide Fieldset Toolbar?",
+	"hideFieldsetToolbarDescription": "Hides the fieldset toolbar that appears when more than one fieldset model appears.",
+	"customWrapperClass": "Custom Wrapper Class",
+	"customWrapperClassDescription": "(Optional) Enter a custom CSS class that will be applied to the wrapper div.",
+	"cssFile": "CSS File",
+	"cssFileDescription": "(Optional) Enter a path for a custom CSS file to be included on the page.",
+	"jsFile": "JS File",
+	"jsFileDescription": "(Optional) Enter a path for a custom JS file to be included on the page.",
+	"toggleDeveloperMode": "Toggle Developer Mode",
+	"toggleDeveloperModeDescription": "Turn on for developer options.",
+	"configModel": "Config Model",
+	"configModelDescription": "Be careful editing the text below, it controls the schema for this archetype.",
+	"helpText": "Help Text",
+	"defaultValue": "Default Value",
+	"dataType": "DataType",
+	"required": "Required",
+	"properties": "Properties",
+	"labelTemplate": "Label Template",
+	"select": "Select",
+	"icon": "Icon"
+}

app/langs/ja-jp.js

@@ -0,0 +1,34 @@
+{
+	"label": "Label",
+	"alias": "Alias",
+	"hideFieldsetControls": "Hide Fieldset Controls?",
+	"hideFieldsetControlsDescription": "Hides the fieldset add/remove/sort controls.",
+	"toggleAdvanced": "Toggle Advanced Options",
+	"toggleAdvancedDescription": "Show advanced options.",
+	"hidePropertyLabels": "Hide Property Labels?",
+	"hidePropertyLabelsDescription": "Hides the property labels.",
+	"maxFieldsets": "Max Fieldsets",
+	"maxFieldsetsDescription": "How many Fieldsets are allowed? Entering '1' will disable the controls. Default is unlimited.",
+	"enableMultipleFieldsets": "Enable Multiple Fieldsets?",
+	"enableMultipleFieldsetsDescription": "Allows multiple types of fieldsets within this archetype.",
+	"hideFieldsetToolbar": "Hide Fieldset Toolbar?",
+	"hideFieldsetToolbarDescription": "Hides the fieldset toolbar that appears when more than one fieldset model appears.",
+	"customWrapperClass": "Custom Wrapper Class",
+	"customWrapperClassDescription": "(Optional) Enter a custom CSS class that will be applied to the wrapper div.",
+	"cssFile": "CSS File",
+	"cssFileDescription": "(Optional) Enter a path for a custom CSS file to be included on the page.",
+	"jsFile": "JS File",
+	"jsFileDescription": "(Optional) Enter a path for a custom JS file to be included on the page.",
+	"toggleDeveloperMode": "Toggle Developer Mode",
+	"toggleDeveloperModeDescription": "Turn on for developer options.",
+	"configModel": "Config Model",
+	"configModelDescription": "Be careful editing the text below, it controls the schema for this archetype.",
+	"helpText": "Help Text",
+	"defaultValue": "Default Value",
+	"dataType": "DataType",
+	"required": "Required",
+	"properties": "Properties",
+	"labelTemplate": "Label Template",
+	"select": "Select",
+	"icon": "Icon"
+}

app/langs/ko-kr.js

@@ -0,0 +1,34 @@
+{
+	"label": "Label",
+	"alias": "Alias",
+	"hideFieldsetControls": "Hide Fieldset Controls?",
+	"hideFieldsetControlsDescription": "Hides the fieldset add/remove/sort controls.",
+	"toggleAdvanced": "Toggle Advanced Options",
+	"toggleAdvancedDescription": "Show advanced options.",
+	"hidePropertyLabels": "Hide Property Labels?",
+	"hidePropertyLabelsDescription": "Hides the property labels.",
+	"maxFieldsets": "Max Fieldsets",
+	"maxFieldsetsDescription": "How many Fieldsets are allowed? Entering '1' will disable the controls. Default is unlimited.",
+	"enableMultipleFieldsets": "Enable Multiple Fieldsets?",
+	"enableMultipleFieldsetsDescription": "Allows multiple types of fieldsets within this archetype.",
+	"hideFieldsetToolbar": "Hide Fieldset Toolbar?",
+	"hideFieldsetToolbarDescription": "Hides the fieldset toolbar that appears when more than one fieldset model appears.",
+	"customWrapperClass": "Custom Wrapper Class",
+	"customWrapperClassDescription": "(Optional) Enter a custom CSS class that will be applied to the wrapper div.",
+	"cssFile": "CSS File",
+	"cssFileDescription": "(Optional) Enter a path for a custom CSS file to be included on the page.",
+	"jsFile": "JS File",
+	"jsFileDescription": "(Optional) Enter a path for a custom JS file to be included on the page.",
+	"toggleDeveloperMode": "Toggle Developer Mode",
+	"toggleDeveloperModeDescription": "Turn on for developer options.",
+	"configModel": "Config Model",
+	"configModelDescription": "Be careful editing the text below, it controls the schema for this archetype.",
+	"helpText": "Help Text",
+	"defaultValue": "Default Value",
+	"dataType": "DataType",
+	"required": "Required",
+	"properties": "Properties",
+	"labelTemplate": "Label Template",
+	"select": "Select",
+	"icon": "Icon"
+}

app/langs/nb-no.js

@@ -0,0 +1,34 @@
+{
+	"label": "Label",
+	"alias": "Alias",
+	"hideFieldsetControls": "Hide Fieldset Controls?",
+	"hideFieldsetControlsDescription": "Hides the fieldset add/remove/sort controls.",
+	"toggleAdvanced": "Toggle Advanced Options",
+	"toggleAdvancedDescription": "Show advanced options.",
+	"hidePropertyLabels": "Hide Property Labels?",
+	"hidePropertyLabelsDescription": "Hides the property labels.",
+	"maxFieldsets": "Max Fieldsets",
+	"maxFieldsetsDescription": "How many Fieldsets are allowed? Entering '1' will disable the controls. Default is unlimited.",
+	"enableMultipleFieldsets": "Enable Multiple Fieldsets?",
+	"enableMultipleFieldsetsDescription": "Allows multiple types of fieldsets within this archetype.",
+	"hideFieldsetToolbar": "Hide Fieldset Toolbar?",
+	"hideFieldsetToolbarDescription": "Hides the fieldset toolbar that appears when more than one fieldset model appears.",
+	"customWrapperClass": "Custom Wrapper Class",
+	"customWrapperClassDescription": "(Optional) Enter a custom CSS class that will be applied to the wrapper div.",
+	"cssFile": "CSS File",
+	"cssFileDescription": "(Optional) Enter a path for a custom CSS file to be included on the page.",
+	"jsFile": "JS File",
+	"jsFileDescription": "(Optional) Enter a path for a custom JS file to be included on the page.",
+	"toggleDeveloperMode": "Toggle Developer Mode",
+	"toggleDeveloperModeDescription": "Turn on for developer options.",
+	"configModel": "Config Model",
+	"configModelDescription": "Be careful editing the text below, it controls the schema for this archetype.",
+	"helpText": "Help Text",
+	"defaultValue": "Default Value",
+	"dataType": "DataType",
+	"required": "Required",
+	"properties": "Properties",
+	"labelTemplate": "Label Template",
+	"select": "Select",
+	"icon": "Icon"
+}

app/langs/nl-nl.js

@@ -0,0 +1,34 @@
+{
+	"label": "Label",
+	"alias": "Alias",
+	"hideFieldsetControls": "Hide Fieldset Controls?",
+	"hideFieldsetControlsDescription": "Hides the fieldset add/remove/sort controls.",
+	"toggleAdvanced": "Toggle Advanced Options",
+	"toggleAdvancedDescription": "Show advanced options.",
+	"hidePropertyLabels": "Hide Property Labels?",
+	"hidePropertyLabelsDescription": "Hides the property labels.",
+	"maxFieldsets": "Max Fieldsets",
+	"maxFieldsetsDescription": "How many Fieldsets are allowed? Entering '1' will disable the controls. Default is unlimited.",
+	"enableMultipleFieldsets": "Enable Multiple Fieldsets?",
+	"enableMultipleFieldsetsDescription": "Allows multiple types of fieldsets within this archetype.",
+	"hideFieldsetToolbar": "Hide Fieldset Toolbar?",
+	"hideFieldsetToolbarDescription": "Hides the fieldset toolbar that appears when more than one fieldset model appears.",
+	"customWrapperClass": "Custom Wrapper Class",
+	"customWrapperClassDescription": "(Optional) Enter a custom CSS class that will be applied to the wrapper div.",
+	"cssFile": "CSS File",
+	"cssFileDescription": "(Optional) Enter a path for a custom CSS file to be included on the page.",
+	"jsFile": "JS File",
+	"jsFileDescription": "(Optional) Enter a path for a custom JS file to be included on the page.",
+	"toggleDeveloperMode": "Toggle Developer Mode",
+	"toggleDeveloperModeDescription": "Turn on for developer options.",
+	"configModel": "Config Model",
+	"configModelDescription": "Be careful editing the text below, it controls the schema for this archetype.",
+	"helpText": "Help Text",
+	"defaultValue": "Default Value",
+	"dataType": "DataType",
+	"required": "Required",
+	"properties": "Properties",
+	"labelTemplate": "Label Template",
+	"select": "Select",
+	"icon": "Icon"
+}

app/langs/pl-pl.js

@@ -0,0 +1,34 @@
+{
+	"label": "Label",
+	"alias": "Alias",
+	"hideFieldsetControls": "Hide Fieldset Controls?",
+	"hideFieldsetControlsDescription": "Hides the fieldset add/remove/sort controls.",
+	"toggleAdvanced": "Toggle Advanced Options",
+	"toggleAdvancedDescription": "Show advanced options.",
+	"hidePropertyLabels": "Hide Property Labels?",
+	"hidePropertyLabelsDescription": "Hides the property labels.",
+	"maxFieldsets": "Max Fieldsets",
+	"maxFieldsetsDescription": "How many Fieldsets are allowed? Entering '1' will disable the controls. Default is unlimited.",
+	"enableMultipleFieldsets": "Enable Multiple Fieldsets?",
+	"enableMultipleFieldsetsDescription": "Allows multiple types of fieldsets within this archetype.",
+	"hideFieldsetToolbar": "Hide Fieldset Toolbar?",
+	"hideFieldsetToolbarDescription": "Hides the fieldset toolbar that appears when more than one fieldset model appears.",
+	"customWrapperClass": "Custom Wrapper Class",
+	"customWrapperClassDescription": "(Optional) Enter a custom CSS class that will be applied to the wrapper div.",
+	"cssFile": "CSS File",
+	"cssFileDescription": "(Optional) Enter a path for a custom CSS file to be included on the page.",
+	"jsFile": "JS File",
+	"jsFileDescription": "(Optional) Enter a path for a custom JS file to be included on the page.",
+	"toggleDeveloperMode": "Toggle Developer Mode",
+	"toggleDeveloperModeDescription": "Turn on for developer options.",
+	"configModel": "Config Model",
+	"configModelDescription": "Be careful editing the text below, it controls the schema for this archetype.",
+	"helpText": "Help Text",
+	"defaultValue": "Default Value",
+	"dataType": "DataType",
+	"required": "Required",
+	"properties": "Properties",
+	"labelTemplate": "Label Template",
+	"select": "Select",
+	"icon": "Icon"
+}

app/langs/pt-br.js

@@ -0,0 +1,34 @@
+{
+	"label": "Label",
+	"alias": "Alias",
+	"hideFieldsetControls": "Hide Fieldset Controls?",
+	"hideFieldsetControlsDescription": "Hides the fieldset add/remove/sort controls.",
+	"toggleAdvanced": "Toggle Advanced Options",
+	"toggleAdvancedDescription": "Show advanced options.",
+	"hidePropertyLabels": "Hide Property Labels?",
+	"hidePropertyLabelsDescription": "Hides the property labels.",
+	"maxFieldsets": "Max Fieldsets",
+	"maxFieldsetsDescription": "How many Fieldsets are allowed? Entering '1' will disable the controls. Default is unlimited.",
+	"enableMultipleFieldsets": "Enable Multiple Fieldsets?",
+	"enableMultipleFieldsetsDescription": "Allows multiple types of fieldsets within this archetype.",
+	"hideFieldsetToolbar": "Hide Fieldset Toolbar?",
+	"hideFieldsetToolbarDescription": "Hides the fieldset toolbar that appears when more than one fieldset model appears.",
+	"customWrapperClass": "Custom Wrapper Class",
+	"customWrapperClassDescription": "(Optional) Enter a custom CSS class that will be applied to the wrapper div.",
+	"cssFile": "CSS File",
+	"cssFileDescription": "(Optional) Enter a path for a custom CSS file to be included on the page.",
+	"jsFile": "JS File",
+	"jsFileDescription": "(Optional) Enter a path for a custom JS file to be included on the page.",
+	"toggleDeveloperMode": "Toggle Developer Mode",
+	"toggleDeveloperModeDescription": "Turn on for developer options.",
+	"configModel": "Config Model",
+	"configModelDescription": "Be careful editing the text below, it controls the schema for this archetype.",
+	"helpText": "Help Text",
+	"defaultValue": "Default Value",
+	"dataType": "DataType",
+	"required": "Required",
+	"properties": "Properties",
+	"labelTemplate": "Label Template",
+	"select": "Select",
+	"icon": "Icon"
+}

app/langs/ru-ru.js

@@ -0,0 +1,34 @@
+{
+	"label": "Label",
+	"alias": "Alias",
+	"hideFieldsetControls": "Hide Fieldset Controls?",
+	"hideFieldsetControlsDescription": "Hides the fieldset add/remove/sort controls.",
+	"toggleAdvanced": "Toggle Advanced Options",
+	"toggleAdvancedDescription": "Show advanced options.",
+	"hidePropertyLabels": "Hide Property Labels?",
+	"hidePropertyLabelsDescription": "Hides the property labels.",
+	"maxFieldsets": "Max Fieldsets",
+	"maxFieldsetsDescription": "How many Fieldsets are allowed? Entering '1' will disable the controls. Default is unlimited.",
+	"enableMultipleFieldsets": "Enable Multiple Fieldsets?",
+	"enableMultipleFieldsetsDescription": "Allows multiple types of fieldsets within this archetype.",
+	"hideFieldsetToolbar": "Hide Fieldset Toolbar?",
+	"hideFieldsetToolbarDescription": "Hides the fieldset toolbar that appears when more than one fieldset model appears.",
+	"customWrapperClass": "Custom Wrapper Class",
+	"customWrapperClassDescription": "(Optional) Enter a custom CSS class that will be applied to the wrapper div.",
+	"cssFile": "CSS File",
+	"cssFileDescription": "(Optional) Enter a path for a custom CSS file to be included on the page.",
+	"jsFile": "JS File",
+	"jsFileDescription": "(Optional) Enter a path for a custom JS file to be included on the page.",
+	"toggleDeveloperMode": "Toggle Developer Mode",
+	"toggleDeveloperModeDescription": "Turn on for developer options.",
+	"configModel": "Config Model",
+	"configModelDescription": "Be careful editing the text below, it controls the schema for this archetype.",
+	"helpText": "Help Text",
+	"defaultValue": "Default Value",
+	"dataType": "DataType",
+	"required": "Required",
+	"properties": "Properties",
+	"labelTemplate": "Label Template",
+	"select": "Select",
+	"icon": "Icon"
+}

app/langs/sv-se.js

@@ -0,0 +1,34 @@
+{
+	"label": "Label",
+	"alias": "Alias",
+	"hideFieldsetControls": "Hide Fieldset Controls?",
+	"hideFieldsetControlsDescription": "Hides the fieldset add/remove/sort controls.",
+	"toggleAdvanced": "Toggle Advanced Options",
+	"toggleAdvancedDescription": "Show advanced options.",
+	"hidePropertyLabels": "Hide Property Labels?",
+	"hidePropertyLabelsDescription": "Hides the property labels.",
+	"maxFieldsets": "Max Fieldsets",
+	"maxFieldsetsDescription": "How many Fieldsets are allowed? Entering '1' will disable the controls. Default is unlimited.",
+	"enableMultipleFieldsets": "Enable Multiple Fieldsets?",
+	"enableMultipleFieldsetsDescription": "Allows multiple types of fieldsets within this archetype.",
+	"hideFieldsetToolbar": "Hide Fieldset Toolbar?",
+	"hideFieldsetToolbarDescription": "Hides the fieldset toolbar that appears when more than one fieldset model appears.",
+	"customWrapperClass": "Custom Wrapper Class",
+	"customWrapperClassDescription": "(Optional) Enter a custom CSS class that will be applied to the wrapper div.",
+	"cssFile": "CSS File",
+	"cssFileDescription": "(Optional) Enter a path for a custom CSS file to be included on the page.",
+	"jsFile": "JS File",
+	"jsFileDescription": "(Optional) Enter a path for a custom JS file to be included on the page.",
+	"toggleDeveloperMode": "Toggle Developer Mode",
+	"toggleDeveloperModeDescription": "Turn on for developer options.",
+	"configModel": "Config Model",
+	"configModelDescription": "Be careful editing the text below, it controls the schema for this archetype.",
+	"helpText": "Help Text",
+	"defaultValue": "Default Value",
+	"dataType": "DataType",
+	"required": "Required",
+	"properties": "Properties",
+	"labelTemplate": "Label Template",
+	"select": "Select",
+	"icon": "Icon"
+}

app/langs/zh-cn.js

@@ -0,0 +1,34 @@
+{
+	"label": "Label",
+	"alias": "Alias",
+	"hideFieldsetControls": "Hide Fieldset Controls?",
+	"hideFieldsetControlsDescription": "Hides the fieldset add/remove/sort controls.",
+	"toggleAdvanced": "Toggle Advanced Options",
+	"toggleAdvancedDescription": "Show advanced options.",
+	"hidePropertyLabels": "Hide Property Labels?",
+	"hidePropertyLabelsDescription": "Hides the property labels.",
+	"maxFieldsets": "Max Fieldsets",
+	"maxFieldsetsDescription": "How many Fieldsets are allowed? Entering '1' will disable the controls. Default is unlimited.",
+	"enableMultipleFieldsets": "Enable Multiple Fieldsets?",
+	"enableMultipleFieldsetsDescription": "Allows multiple types of fieldsets within this archetype.",
+	"hideFieldsetToolbar": "Hide Fieldset Toolbar?",
+	"hideFieldsetToolbarDescription": "Hides the fieldset toolbar that appears when more than one fieldset model appears.",
+	"customWrapperClass": "Custom Wrapper Class",
+	"customWrapperClassDescription": "(Optional) Enter a custom CSS class that will be applied to the wrapper div.",
+	"cssFile": "CSS File",
+	"cssFileDescription": "(Optional) Enter a path for a custom CSS file to be included on the page.",
+	"jsFile": "JS File",
+	"jsFileDescription": "(Optional) Enter a path for a custom JS file to be included on the page.",
+	"toggleDeveloperMode": "Toggle Developer Mode",
+	"toggleDeveloperModeDescription": "Turn on for developer options.",
+	"configModel": "Config Model",
+	"configModelDescription": "Be careful editing the text below, it controls the schema for this archetype.",
+	"helpText": "Help Text",
+	"defaultValue": "Default Value",
+	"dataType": "DataType",
+	"required": "Required",
+	"properties": "Properties",
+	"labelTemplate": "Label Template",
+	"select": "Select",
+	"icon": "Icon"
+}

app/less/archetype.less

@@ -1,20 +1,66 @@
-.archetypeEditor fieldset{
-    border: 1px solid #666;
-    padding: 5px;
+.archetypeEditor {
+    width: 98%;
+}
+
+.archetypeEditor fieldset{
+    border: 1px solid #dddddd;
+    padding: 0;
     margin-bottom: 5px;
-    background-color: #fff;
+    background-color: #f1f1f1;
     clear: both;
+    display: inline-block;
+    width: 100%;
 }
 
-.archetypeEditor label{
-    width: 75px;
+.archetypeEditor .archetypeFieldsetLabel {
+    padding: 8px 25px 8px 3px;
     float: left;
+    width: 98%;
+
+    span {
+        font-weight: bold;
+    }
+
+    &:hover {
+        cursor: pointer;
+
+        label span {
+            text-decoration: underline;
+        }
+    }
+
+    .caret {
+        float:left;
+        margin: 8px 1px 0 7px;
+        &.caret-right {
+            border-bottom: 4px solid transparent;
+            border-top: 4px solid transparent;
+            border-left: 4px solid #000000;
+            content: "";
+            margin-top: 6px;
+        }
+    }
+
+    label{
+        float: left;
+        width: 80%;
+        margin-bottom: 0;
+        margin-left: 5px;
+        padding: 0;
+        span {
+            display: inline-block;
+        }
+    }
 }
 
-.archetypeEditor fieldset>label{
-    float: left;
-    width: 200px;
-    padding-left: 0;
+.archetypeEditor .archetypeCollapser{
+    clear: both;
+    height: 100%;
+    margin-top: 10px;
+    padding-top: 12px;
+    background-color: #fff;
+    border-top: 1px solid silver;
+    border-radius: 0 0 0 5px;
 }
 
 .archetypeEditor .multiPropertyTextbox{
@@ -23,10 +69,27 @@
 
 .archetypeEditor ul{
     list-style: none;
+    margin-left: 0;
 }
 
-.archetypeEditor .archetypeEditorControls{
-    float: right;
+.archetypeEditor, .archetypeConfig{
+    .archetypeEditorControls{
+        float: right;
+        i {
+            cursor: pointer;
+            &.handle {
+                cursor: move;
+            }
+        }
+    }
+}
+
+.archetypeEditor form {
+    margin-left:20px;
+
+    .control-label {
+        padding-top: 0 !important;
+    }
 }
 
 .archetypeEditor .archetypeProperty{
@@ -35,13 +98,9 @@
     margin-top: 3px;
 }
 
-.archetypeEditor .umb-contentpicker{
-    margin-left: 60px;
-    padding-left: 25px;
-}
-
 .archetypeEditor .archetypeDeveloperModel
 {
+    font-family: monospace;
     width: 98%;
     min-height: 100px;
     margin-bottom: 10px;
@@ -51,14 +110,14 @@
 .archetypeEditor .archetypeFieldsetToolbar {
     margin-bottom: 10px;
     overflow: hidden;
-}
 
-.archetypeEditor .archetypeFieldsetToolbar li {
-    float: left;
-    padding: 2px 4px;
-    margin-right: 10px;
-    border: 1px solid #ddd;
-    cursor: pointer;
+    li {
+        float: left;
+        padding: 2px 4px;
+        margin-right: 10px;
+        border: 1px solid #ddd;
+        cursor: pointer;
+    }
 }
 
 .archetypeEditor .archetypeFieldsetHeaderText{
@@ -87,10 +146,6 @@
     list-style: none;
 }
 
-.archetypeConfig .archetypeEditorControls{
-    float: right;
-}
-
 .archetypeConfig li{
     background-color: #fff;
 }
@@ -101,41 +156,53 @@
 
 .archetypeConfig .archetypeFieldsetWrapper{
     border: 1px solid #ccc;
-    padding: 10px 5px;
+    padding: 10px;
     margin-bottom: 10px;
 }
 
-.archetypeConfig .archetypeFieldsetOption input[type=text]{
-    width: 600px;
+.archetypeConfig .archetypeFieldsetOption{
+    margin-bottom: 15px;
+    input[type=text]{
+        max-width: 300px;
+    }
 }
 
 .archetypeConfig .archetypeDeveloperModel {
+    font-family: monospace;
     width: 88%;
-    margin-left: 30px;
-    height: 100px;
+    margin: 5px 10px 10px;
+    height: 130px;
 }
 
-.archetypeConfig .archetypePropertiesWrapper{
+.archetypeConfig .archetypePropertiesWrapper {
     border: 1px solid #ddd;
-    padding: 10px;
-    margin: 10px;
-    margin-left: 50px;
-    width: 665px;
-}
+    padding: 8px;
+    margin: -40px 10px 10px 140px;
+    max-width: 475px;
 
-.archetypeConfig .archetypePropertiesWrapper ul{
-    padding: 0;
-    margin: 0;
-}
+    ul {
+        padding: 0;
+        margin: 0;
+    }
 
-.archetypeConfig .archetypePropertiesWrapper li{
-    padding: 10px;
-    margin-bottom: 10px;
-    background-color: #eee;
-}
+    li {
+        padding: 10px;
+        margin-bottom: 10px;
+        background-color: #eee;
 
-.archetypeConfig .archetypePropertiesWrapper li:last-child{
-    margin-bottom: 0;
+        input[type=text] {
+            max-width: 190px;
+            width: auto;
+        }
+
+        select {
+            max-width: 160px;
+        }
+    }
+
+    li:last-child {
+        margin-bottom: 0;
+    }
 }
 
 .archetypeConfig .archetypeFieldsets {
@@ -143,48 +210,75 @@
 }
 
 .archetypeConfig .archetypeFieldsetTitle {
+    cursor: pointer;
     overflow: hidden;
 }
 
-.archetypeConfig .archetypeFieldsetCollapser{
-    margin-top: 10px;
-}
-
 .archetypeConfig .archetypeOptions label{
-    width: 200px;
-}
-
-.archetypeConfig .archetypeAdvancedOptions label{
     width: 400px;
 }
 
-.archetypeConfig .archetypeDeveloperModel {
-    margin-bottom: 10px;
+.archetypeConfig .archetypeAdvancedOptions {
+    margin-top: 15px;
+    div {
+        margin-bottom: 10px;
+    }
+    label {
+        width: 400px;
+    }
 }
 
 .archetypeConfig .archetypeMaxFieldsets{
     border: 1px solid #ddd;
-    width: 25px;
+    width: 40px;
     text-align: right;
 }
 
-.archetypeConfig .archetypePropertyTitle{
+.archetypeConfig .archetypePropertyTitle {
+    cursor: pointer;
     overflow: hidden;
 }
 
 .archetypeConfig .archetypePropertyCollapser{
     margin-top: 10px;
+    div {
+        margin-bottom: 10px;
+    }
 }
 
 .archetypeEditor .archetypeFieldsetError{
-    border: 1px solid red;
+    border: 1px solid #b94a48;
 }
 
 .archetypeEditor .archetypePropertyError{
-    border: 1px solid red;
-    background-color: #8b0000;
-    color: #fff;
     margin-bottom: 5px;
     padding-top: 3px;
     padding-bottom: 3px;
+
+    label {
+
+        span {
+            color: #b94a48;
+            font-weight: bold;
+        }
+    }
+}
+
+.ui-sortable-placeholder {
+    visibility: visible !important;
+    background-color:   #d0e7f1 !important;
+}
+
+.archetypeConfig .archetypeFieldsetCollapser {
+    margin-top: 15px;
+}
+
+.archetypeConfig .fieldsetIcon {
+    margin-right: 10px;
+}
+
+.archetypeEditor .show-validation.ng-invalid .control-group.error .control-label {
+    span {
+        color: #343434;
+    }
 }

app/resources/propertyeditor.js

@@ -0,0 +1,33 @@
+angular.module('umbraco.resources').factory('archetypePropertyEditorResource', function($q, $http, umbRequestHelper){
+    return { 
+        getAllDataTypes: function() {
+            // Hack - grab DataTypes from Tree API, as `dataTypeService.getAll()` isn't implemented yet
+            return umbRequestHelper.resourcePromise(
+                $http.get("/umbraco/backoffice/UmbracoTrees/DataTypeTree/GetNodes?id=-1&application=developer&tree=&isDialog=false"), 'Failed to retrieve datatypes from tree service'
+            ).then(function (data) {
+                return data.map(function(d) {
+                    return { "id": d.id, "name": d.name }
+                }); 
+            });
+        },
+        getDataType: function(id) {
+        	return umbRequestHelper.resourcePromise(
+        		$http.get("/umbraco/backoffice/ArchetypeApi/ArchetypeDataType/GetById?id=" + id), 'Failed to retrieve datatype'
+    		);
+        },
+        getPropertyEditorMapping: function(alias) {
+            return umbRequestHelper.resourcePromise(
+                $http.get("/App_plugins/Archetype/js/propertyEditors.views.js"), 'Failed to retrieve datatype mappings'
+            ).then(function (data) {
+                var result = _.find(data, function(d) {
+                    return d.propertyEditorAlias === alias;
+                });
+
+                if (result != null) 
+                    return result;
+
+                return "";
+            });
+        }
+    }
+}); 

app/services/localization.js

@@ -0,0 +1,42 @@
+angular.module('umbraco.services').factory('archetypeLocalizationService', function($http, $q, userService){
+    var service = {
+        resourceFileLoaded: false,
+        dictionary: {},
+        localize: function(key) {
+            var deferred = $q.defer();
+
+            if(service.resourceFileLoaded){
+                var value = service._lookup(key);
+                deferred.resolve(value);
+            }
+            else{
+                service.initLocalizedResources().then(function(dictionary){
+                   var value = service._lookup(key);
+                   deferred.resolve(value); 
+                });
+            } 
+
+            return deferred.promise;
+        },
+        _lookup: function(key){
+            return service.dictionary[key];
+        },
+        initLocalizedResources:function () {
+            var deferred = $q.defer();
+            userService.getCurrentUser().then(function(user){
+                $http.get("/App_plugins/Archetype/langs/" + user.locale + ".js") 
+                    .then(function(response){
+                        service.resourceFileLoaded = true;
+                        service.dictionary = response.data;
+
+                        return deferred.resolve(service.dictionary);
+                    }, function(err){
+                        return deferred.reject("Lang file missing");
+                    });
+            });
+            return deferred.promise;
+        }
+    }
+
+    return service;
+});

app/services/propertyeditor.js

@@ -1,9 +0,0 @@
-angular.module('umbraco').factory('propertyEditorService', function($q, $http, umbRequestHelper){
-    return {
-        getViews: function() {
-            return umbRequestHelper.resourcePromise(
-                $http.get("/App_Plugins/Archetype/js/config.views.js"), 'Failed to retreive config for views.'
-            );
-        }
-    };
-});

app/views/archetype.config.html

@@ -6,63 +6,63 @@
                     <i class="icon icon-add" ng-click="addFieldsetRow($index, $event)"></i>
                     <i class="icon icon-delete" ng-click="removeFieldsetRow($index)" ng-show="canRemoveFieldset()"></i>
                     <i class="icon icon-navigation handle" ng-show="canSortFieldset()"></i>
-                </div> 
+                </div>
                 <div class="archetypeFieldsetTitle" ng-click="focusFieldset(fieldset)">{{fieldset.label}}</div>
                 <div class="archetypeFieldsetCollapser" ng-hide="fieldset.collapse && fieldset.label">
                     <div class="archetypeFieldsetOption">
-                        <label>Label</label><input type="text" ng-model="fieldset.label" />
+                        <label for="archetypeFieldLabel_{{$index}}"><archetype-localize key="label">Label</archetype-localize></label>
+                        <input type="text" id="archetypeFieldLabel_{{$index}}" ng-model="fieldset.label" />
                     </div>
                     <div class="archetypeFieldsetOption">
-                        <label>Alias</label><input type="text" ng-model="fieldset.alias" />
+                        <label for="archetypeFieldAlias_{{$index}}"><archetype-localize key="alias">Alias</archetype-localize></label>
+                        <input type="text" id="archetypeFieldAlias_{{$index}}" ng-model="fieldset.alias" required/>
                     </div>
                     <div class="archetypeFieldsetOption">
-                        <label>Label Template</label><input type="text" ng-model="fieldset.labelTemplate" />
+                        <label for="archetypeFieldLabelTemplate_{{$index}}"><archetype-localize key="labelTemplate">Label Template</archetype-localize></label>
+                        <input type="text" id="archetypeFieldLabelTemplate_{{$index}}" ng-model="fieldset.labelTemplate" />
+                    </div>
+                    <div class="archetypeFieldsetOption" ng-show="archetypeConfigRenderModel.enableMultipleFieldsets">
+                        <label for="archetypeFieldIcon_{{$index}}"><archetype-localize key="icon">Icon</archetype-localize></label>
+                        <i class="fieldsetIcon icon ng-class:fieldset.icon"></i><a ng-click="selectIcon(fieldset)"><archetype-localize key="select">Select</archetype-localize>…</a>
                     </div>
                     <div class="archetypeFieldsetOption">
-                        <label>Tooltip</label><input type="text" ng-model="fieldset.tooltip" />
-                    </div>
-                    <div class="archetypeFieldsetOption">
-                        <label>Icon</label><input type="text" ng-model="fieldset.icon" />
-                    </div>
-                    <div class="archetypeFieldsetOption">
-                        <label>Header Text</label><input type="text" ng-model="fieldset.headerText" />
-                    </div>
-                    <div class="archetypeFieldsetOption">
-                        <label>Footer Text</label><input type="text" ng-model="fieldset.footerText" />
-                    </div>
-                    <div class="archetypeFieldsetOption">
-                        <label>Properties</label>
-                    </div>
+                        <label><archetype-localize key="properties">Properties</archetype-localize></label>
+                    </div> 
                     <div class="archetypePropertiesWrapper">
                         <ul ui-sortable="sortableOptions" ng-model="fieldset.properties">
-                            <li ng-repeat="property in fieldset.properties" ng-hide="property.remove">                              
+                            <li ng-repeat="property in fieldset.properties" ng-hide="property.remove">
                                 <div class="archetypeEditorControls">
                                     <i class="icon icon-add" ng-click="addPropertyRow(fieldset, $index)"></i>
                                     <i class="icon icon-delete" ng-click="removePropertyRow(fieldset, $index)" ng-show="canRemoveProperty(fieldset)"></i>
                                     <i class="icon icon-navigation handle" ng-show="canSortProperty(fieldset)"></i>
                                 </div>
-                                <div class="archetypePropertyTitle" ng-click="focusProperty(fieldset.properties, property)">{{property.label}}</div>
+                                <div class="archetypePropertyTitle" ng-click="focusProperty(fieldset.properties, property)">
+                                    {{property.label}} ({{property.alias}}) - <span>{{getDataTypeNameById(property.dataTypeId)}}</span>
+                                </div>
                                 <div class="archetypePropertyCollapser" ng-hide="property.collapse && property.label">
                                     <div>
-                                         <label>Label</label><input type="text" ng-model="property.label" />
+                                        <label for="archetypePropertyLabel_{{$parent.$index}}_{{$index}}"><archetype-localize key="label">Label</archetype-localize></label>
+                                        <input type="text" id="archetypePropertyLabel_{{$parent.$index}}_{{$index}}" ng-model="property.label" />
                                     </div>
                                     <div>
-                                         <label>Alias</label><input type="text" ng-model="property.alias" />
+                                        <label for="archetypePropertyAlias_{{$parent.$index}}_{{$index}}"><archetype-localize key="alias">Alias</archetype-localize></label>
+                                        <input type="text" id="archetypePropertyAlias_{{$parent.$index}}_{{$index}}" ng-model="property.alias" required/>
                                     </div>
                                     <div>
-                                         <label>Help Text</label><input type="text" ng-model="property.helpText" />
+                                        <label for="archetypePropertyHelpText_{{$parent.$index}}_{{$index}}"><archetype-localize key="helpText">Help Text</archetype-localize></label>
+                                        <input type="text" id="archetypePropertyHelpText_{{$parent.$index}}_{{$index}}" ng-model="property.helpText" />
                                     </div>
                                     <div>
-                                         <label>View</label><select ng-model="property.view" ng-options="view.path as view.name for view in availableViews"></select>
-                                    </div>                            
-                                    <div>
-                                         <label>Default Value</label><input type="text" ng-model="property.value" />
+                                        <label for="archetypePropertyDataType_{{$parent.$index}}_{{$index}}"><archetype-localize key="dataType">Datatype</archetype-localize></label>
+                                        <select id="archetypePropertyDataType_{{$parent.$index}}_{{$index}}" ng-model="property.dataTypeId" ng-options="datatype.id as datatype.name for datatype in availableDataTypes"></select>
                                     </div>
                                     <div>
-                                         <label>Config</label><textarea ng-model="property.config" /></textarea>
+                                        <label for="archetypePropertyDefaultValue_{{$parent.$index}}_{{$index}}"><archetype-localize key="defaultValue">Default Value</archetype-localize></label>
+                                        <input type="text" id="archetypePropertyDefaultValue_{{$parent.$index}}_{{$index}}" ng-model="property.value" />
                                     </div>
                                     <div>
-                                         <label>Required</label><input type="checkbox" ng-model="property.required" />
+                                        <label for="archetypePropertyRequired_{{$parent.$index}}_{{$index}}"><archetype-localize key="required">Required</archetype-localize></label>
+                                        <input type="checkbox" id="archetypePropertyRequired_{{$parent.$index}}_{{$index}}" ng-model="property.required" />
                                     </div>
                                 </div>
                             </li>
@@ -72,48 +72,54 @@
             </div>
         </li>
     </ul>
-    
+
     <div class="archetypeOptions">
-            
         <div>
-            <label>Toggle Advanced Options<small>Show advanced options.</small></label><input type="checkbox" ng-model="archetypeConfigRenderModel.showAdvancedOptions"/>
+            <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>Hide fieldset editor controls?<small>Hides the fieldset add/remove/sort controls.</small></label><input type="checkbox" ng-model="archetypeConfigRenderModel.hideFieldsetControls"/>
+            <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>Hide fieldset labels?<small>Hides the fieldset labels.</small></label><input type="checkbox" ng-model="archetypeConfigRenderModel.hideFieldsetLabels"/>
+            <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>Hide property labels?<small>Hides the property labels.</small></label><input type="checkbox" ng-model="archetypeConfigRenderModel.hidePropertyLabels"/>
+            <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>Max fieldsets<small>How many Fieldsets are allowed? Entering '1' will disable the controls. Default is unlimited.</small></label><input type="text" class="archetypeMaxFieldsets" ng-model="archetypeConfigRenderModel.maxFieldsets"/>
+            <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>Enable multiple fieldsets?<small>Allows multiple types of fieldsets within this archetype.</small></label><input type="checkbox" ng-model="archetypeConfigRenderModel.enableMultipleFieldsets"/>
-        </div> 
-        <div>
-            <label>Hide fieldset toolbar?<small>Hides the fieldset toolbar that appears when more than one fieldset model appears.</small></label><input type="checkbox" ng-model="archetypeConfigRenderModel.hideFieldsetToolbar"/>
-        </div>  
-        <div>
-            <label>Custom Wrapper Class<small>(Optional) Enter a custom CSS class that will be applied to the wrapper div.</small></label><input type="text" ng-model="archetypeConfigRenderModel.customCssClass"/>
+            <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>CSS File<small>(Optional) Enter a path for a custom CSS file to be included on the page.</small></label><input type="text" ng-model="archetypeConfigRenderModel.customCssPath"/>
+            <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>JS File<small>(Optional) Enter a path for a custom JS file to be included on the page.</small></label><input type="text" ng-model="archetypeConfigRenderModel.customJsPath"/>
+            <label for="archetypeAdvancedOptionsDeveloperMode"><archetype-localize key="toggleDeveloperMode">Toggle 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>Toggle Developer Mode<small>Turn on for developer options.</small></label><input type="checkbox" ng-model="archetypeConfigRenderModel.developerMode"/>
-        </div>
-        <div>
-            <label>Config Model<small>Be careful editing the text below, it controls the schema for this archetype.</small></label>
-            <textarea class="archetypeDeveloperModel" ng-model="archetypeConfigRenderModel"></textarea>
+            <label for="archetypeAdvancedOptionsConfigModel"><archetype-localize key="configModel">Config Model</archetype-localize><small><archetype-localize key="configModelDescription">Be careful editing the text below, it controls the schema for this archetype.</archetype-localize></small></label>
+            <textarea class="archetypeDeveloperModel" id="archetypeAdvancedOptionsConfigModel" ng-model="archetypeConfigRenderModel"></textarea>
         </div>
     </div>
 </div>

app/views/archetype.html

@@ -1,42 +1,47 @@
-<div class="archetypeEditor ng-class:model.config.customCssClass" ng-controller="Imulus.ArchetypeController">
+<div class="archetypeEditor ng-class:model.config.customCssClass" ng-controller="Imulus.ArchetypeController">
     <textarea class="archetypeDeveloperModel" ng-show="model.config.developerMode" ng-model="archetypeRenderModel"></textarea>
     <div class="archetypeFieldsetToolbar" ng-show="model.config.fieldsets.length > 1 && model.config.hideFieldsetToolbar != '1'">
-        <ul> 
+        <ul>
             <li ng-repeat="fieldsetModel in model.config.fieldsets" ng-click="addRow(fieldsetModel.alias)">
-                <img ng-src='{{fieldsetModel.icon}}' title="{{fieldsetModel.tooltip}}" />
+                <i class="fieldsetIcon icon ng-class:fieldsetModel.icon"></i>
                 <span>{{fieldsetModel.label}}</span>
             </li>
         </ul>
-    </div> 
+    </div>
+
     <ul ui-sortable="sortableOptions" ng-model="archetypeRenderModel.fieldsets">
         <li ng-repeat="fieldset in archetypeRenderModel.fieldsets" ng-hide="fieldset.remove">
             <fieldset ng-class="{archetypeFieldsetError: !fieldset.isValid}" ng-init="fieldsetConfigModel = getConfigFieldsetByAlias(fieldset.alias)">
-                <label ng-hide="model.config.hideFieldsetLabels == '1'" ng-click="focusFieldset(fieldset)">
-                    <img ng-src='{{fieldsetConfigModel.icon}}' title="{{fieldsetConfigModel.tooltip}}"/>
-                    <span ng-bind="getFieldsetTitle(fieldsetConfigModel, $index)"></span>
-                </label>
-                <div class="archetypeEditorControls" ng-hide="model.config.hideFieldsetControls || model.config.maxFieldsets == '1'">
-                    <i class="icon icon-add" ng-click="addRow(fieldset.alias, $index)" ng-show="canAdd()"></i>
-                    <i class="icon icon-delete" ng-click="removeRow($index)" ng-show="canRemove()"></i>
-                    <i class="icon icon-navigation handle" ng-show="canSort()"></i>
-                </div>  
-                <div class="arechetypeCollapser" ng-hide="fieldset.collapse">
-                    <div class="archetypeFieldsetHeaderText" ng-show="fieldsetConfigModel.headerText">
-                        <em>{{fieldsetConfigModel.headerText}}</em>
-                    </div>             
-                    <div ng-class="{archetypePropertyError: getPropertyValidity($parent.$index, property.alias) === false}" class="archetypeProperty" ng-repeat="property in fieldsetConfigModel.properties">
-                        <label ng-hide="archetypeConfig.hidePropertyLabels == '1'">
-                            <span>{{property.label}}</span>
-                            <div class="archetypeFieldsetHelpText" ng-show="property.helpText">
-                                <em>{{property.helpText}}</em>
-                            </div> 
-                        </label>
+                <div class="archetypeFieldsetLabel">
+                    <span class="caret" ng-hide="fieldset.collapse"></span>
+                    <span class="caret caret-right" ng-show="fieldset.collapse"></span>
 
-                        <archetype-property class="archetypeEditor ng-class:property.alias" property="property" fieldset-index="$parent.$index" fieldset="fieldset" archetype-config="model.config" property-config-index="$index" archetype-render-model="archetypeRenderModel"></archetype-property>
+                    <label ng-click="focusFieldset(fieldset)">
+                        <i class="fieldsetIcon icon ng-class:fieldsetConfigModel.icon"></i>
+                        <span ng-bind="getFieldsetTitle(fieldsetConfigModel, $index)"></span>
+                    </label>
+
+                    <div class="archetypeEditorControls" ng-hide="model.config.hideFieldsetControls || model.config.maxFieldsets == '1'">
+                        <i class="icon icon-add" ng-click="addRow(fieldset.alias, $index)" ng-show="canAdd()"></i>
+                        <i class="icon icon-delete" ng-click="removeRow($index)" ng-show="canRemove()"></i>
+                        <i class="icon icon-navigation handle" ng-show="canSort()"></i>
                     </div>
-                    <div class="archetypeFieldsetFooterText" ng-show="fieldsetConfigModel.footerText">
-                        <em>{{fieldsetConfigModel.footerText}}</em>
-                    </div>     
+                </div>
+                <div class="archetypeCollapser animate-hide" ng-hide="fieldset.collapse">
+                    <form class="form-inline">
+                        <div ng-class="{archetypePropertyError: getPropertyValidity($parent.$index, property.alias) === false}" class="archetypeProperty control-group" ng-repeat="property in fieldsetConfigModel.properties">
+                            <label ng-hide="archetypeConfig.hidePropertyLabels == '1'" class="control-label" for="archetype-property-{{model.alias}}-{{$parent.$index}}-{{$index}}">
+                                <span>{{property.label}}</span>
+                                <div class="archetypeFieldsetHelpText" ng-show="property.helpText">
+                                    <em>{{property.helpText}}</em>
+                                </div>
+                            </label>
+
+                            <div class="controls">
+                                <archetype-property class="archetypeEditor ng-class:property.alias" property="property" fieldset-index="$parent.$index" fieldset="fieldset" archetype-config="model.config" property-config-index="$index" archetype-render-model="archetypeRenderModel" umbraco-property-alias="model.alias"></archetype-property>
+                            </div>
+                        </div>
+                    </form>
                 </div>
             </fieldset>
         </li>

package.json

@@ -21,5 +21,9 @@
     "grunt-touch": "~0.1.0",
     "fs-extra": "~0.8.1",
     "grunt-msbuild": "~0.1.9"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/imulus/Archetype.git"
   }
 }

pkg/meta.json

@@ -1,6 +1,6 @@
 {
 	"name": "Archetype",
-	"version": "0.1.0-alpha",
+	"version": "0.5.0-alpha",
 	"url": "http://github.com/imulus/archetype/",
 	"author": "Imulus",
 	"authorUrl": "http://imulus.com/",