Merge pull request #412 from kjac/master

Bump package version
2017-06-13 08:41:09 +02:00 · 2017-06-13 08:38:31 +02:00 · 2017-06-13 08:28:22 +02:00 · 2017-06-13 08:27:39 +02:00 · 2017-06-13 08:25:05 +02:00 · 2017-06-12 22:29:16 +02:00
27 changed files with 514 additions and 106 deletions
@@ -62,4 +62,5 @@ VersionInfo.cs
 .builds
 .svn
 .hg
-.hgignore
+.hgignore
+app/Umbraco/.vs/config/applicationhost.config
@@ -1,6 +1,6 @@
 The MIT License (MIT)

-Copyright (c) 2014 Imulus
+Copyright (c) 2016 Kevin Giszewski LLC

 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in
@@ -11,10 +11,10 @@ Install the selected <a href='https://github.com/imulus/Archetype/releases'>rele
 https://github.com/kgiszewski/ArchetypeManual


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

-##Core Team##
+## Core Team ##
 * Kevin Giszewski (founder/project lead) - University of Notre Dame - https://kevin.giszewski.com/
 * Tom Fulton (founder) - Tonic - http://hellotonic.com/
 * Lee Kelleher - Umbrella - http://www.umbrellainc.co.uk/
@@ -263,6 +263,7 @@
    <Compile Include="Properties\AssemblyInfo.cs" />
    <Compile Include="PropertyValueConverter\PropertyValueConverterTests.cs" />
    <Compile Include="PublishedContent\ArchetypePublishedContentTests.cs" />
+    <Compile Include="PublishedContent\TypeConverterTests.cs" />
  </ItemGroup>
  <ItemGroup>
    <None Include="app.config" />
@@ -0,0 +1,68 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Archetype.Models;
+using Archetype.PropertyConverters;
+using NUnit.Framework;
+using Umbraco.Core;
+using Umbraco.Core.Models;
+
+namespace Archetype.Tests.PublishedContent
+{
+    [TestFixture]
+    public class TypeConverterTests
+    {
+        private ArchetypeModel _archetype;
+
+        [TestFixtureSetUp]
+        public void Init()
+        {
+            var archetypeJson = System.IO.File.ReadAllText("..\\..\\Data\\sample-1.json");
+            var converter = new ArchetypeValueConverter();
+
+            _archetype = (ArchetypeModel)converter.ConvertDataToSource(null, archetypeJson, false);
+        }
+
+        [TestCase(typeof(ArchetypeModel), true)]
+        [TestCase(typeof(ArchetypePublishedContentSet), true)]
+        [TestCase(typeof(IEnumerable<IPublishedContent>), true)]
+        [TestCase(typeof(string), true)]
+        [TestCase(typeof(int), false)]
+        [TestCase(typeof(ArchetypeFieldsetModel), false)]
+        public void ArchetypeModel_ConvertsTo_EnumerablePublishedContent(Type destinationType, bool expected)
+        {
+            Assert.IsNotNull(_archetype);
+
+            var attempt = _archetype.TryConvertTo(destinationType);
+
+            Assert.That(attempt.Success, Is.EqualTo(expected));
+
+            if (attempt.Success)
+            {
+                Assert.IsNotNull(attempt.Result);
+                Assert.That(attempt.Result, Is.InstanceOf(destinationType));
+            }
+        }
+
+        [TestCase(typeof(ArchetypeFieldsetModel), true)]
+        [TestCase(typeof(ArchetypePublishedContent), true)]
+        [TestCase(typeof(IPublishedContent), true)]
+        [TestCase(typeof(string), true)]
+        [TestCase(typeof(int), false)]
+        [TestCase(typeof(ArchetypeModel), false)]
+        public void ArchetypeFieldsetModel_ConvertsTo_PublishedContent(Type destinationType, bool expected)
+        {
+            CollectionAssert.IsNotEmpty(_archetype.Fieldsets);
+
+            var attempt = _archetype.First().TryConvertTo(destinationType);
+
+            Assert.That(attempt.Success, Is.EqualTo(expected));
+
+            if (attempt.Success)
+            {
+                Assert.IsNotNull(attempt.Result);
+                Assert.That(attempt.Result, Is.InstanceOf(destinationType));
+            }
+        }
+    }
+}
@@ -252,6 +252,8 @@
    <Compile Include="Properties\VersionInfo.cs" />
    <Compile Include="PropertyConverters\ArchetypeValueConverter.cs" />
    <Compile Include="PropertyEditors\ArchetypePropertyEditor.cs" />
+    <Compile Include="TypeConverters\ArchetypeFieldsetModelConverter.cs" />
+    <Compile Include="TypeConverters\ArchetypeModelConverter.cs" />
  </ItemGroup>
  <ItemGroup>
    <None Include="app.config" />
@@ -98,7 +98,7 @@ namespace Archetype.Extensions

                return archetype;
            }
-            catch
+            catch (Exception ex)
            {
                return new ArchetypeModel();
            }
@@ -1,15 +1,18 @@
+using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Linq;
 using System.Web.Security;
+using Archetype.TypeConverters;
 using Newtonsoft.Json;
 using Umbraco.Core;
-using System;

 namespace Archetype.Models
 {
    /// <summary>
    /// Model that represents a fieldset stored as content JSON.
    /// </summary>
+    [TypeConverter(typeof(ArchetypeFieldsetModelConverter))]
    public class ArchetypeFieldsetModel
    {
        [JsonProperty("alias")]
@@ -63,7 +66,7 @@ namespace Archetype.Models
        {
            var property = GetProperty(propertyAlias);

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

-            if (IsEmptyProperty(property)) 
+            if (IsEmptyProperty(property))
            {
                return defaultValue;
            }
@@ -100,7 +103,7 @@ namespace Archetype.Models
        /// </summary>
        /// <param name="property">The property.</param>
        /// <returns></returns>
-        private bool IsEmptyProperty(ArchetypePropertyModel property) 
+        private bool IsEmptyProperty(ArchetypePropertyModel property)
        {
            return (property == null || property.Value == null || string.IsNullOrEmpty(property.Value.ToString()));
        }
@@ -145,24 +148,24 @@ namespace Archetype.Models
        /// <returns>true if this fieldset is disabled, false otherwise</returns>
        internal bool IsAvailable()
        {
-			// explicitly disabled or implicitly disabled through publishing?
-	        var disabled = Disabled
+            // explicitly disabled or implicitly disabled through publishing?
+            var disabled = Disabled
                   || (ReleaseDate.HasValue && ReleaseDate > DateTime.UtcNow)
                   || (ExpireDate.HasValue && DateTime.UtcNow > ExpireDate);
-	        if(disabled)
-	        {
-	            // yes - the fieldset is not available
-	            return false;
-	        }
-	        // limitation on member group access?
-	        if(string.IsNullOrEmpty(AllowedMemberGroups))
-	        {
-	            // no - the fieldset is available
-	            return true;
-	        }
-	        // maybe - the fieldset is available if the current member is a member of the configured member groups
-	        var currentUserGroups = Roles.GetRolesForUser() ?? new string[0];
-	        return currentUserGroups.ContainsAny(AllowedMemberGroups.Split(','));
+            if (disabled)
+            {
+                // yes - the fieldset is not available
+                return false;
+            }
+            // limitation on member group access?
+            if (string.IsNullOrEmpty(AllowedMemberGroups))
+            {
+                // no - the fieldset is available
+                return true;
+            }
+            // maybe - the fieldset is available if the current member is a member of the configured member groups
+            var currentUserGroups = Roles.GetRolesForUser() ?? new string[0];
+            return currentUserGroups.ContainsAny(AllowedMemberGroups.Split(','));
        }

        #endregion
@@ -1,7 +1,9 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Linq;
+using Archetype.TypeConverters;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;

@@ -11,6 +13,7 @@ namespace Archetype.Models
    /// Model that represents an entire Archetype.
    /// </summary>
    [JsonObject]
+    [TypeConverter(typeof(ArchetypeModelConverter))]
    public class ArchetypeModel : IEnumerable<ArchetypeFieldsetModel>
    {
        [JsonProperty("fieldsets")]
@@ -25,6 +25,9 @@ namespace Archetype.Models
        [JsonProperty("enableCollapsing")]
        public bool EnableCollapsing { get; set; }

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

@@ -26,6 +26,9 @@ namespace Archetype.Models
        [JsonProperty("label")]
        public string Label { get; set; }

+        [JsonProperty("previewImage")]
+        public string PreviewImage { get; set; }
+
        [JsonProperty("properties")]
        public IEnumerable<ArchetypePreValueProperty> Properties { get; set; }

@@ -1,4 +1,4 @@
 using System.Reflection;

-[assembly: AssemblyVersion("1.13.1")]
-[assembly: AssemblyFileVersion("1.13.1")]
+[assembly: AssemblyVersion("1.14.1")]
+[assembly: AssemblyFileVersion("1.14.1")]
@@ -206,13 +206,28 @@ namespace Archetype.PropertyEditors
 								else if (propDef.EditorState != null && propDef.EditorState.FileNames != null && propDef.EditorState.FileNames.Any())
 								{
 									// pass the uploaded files that belongs to this property (if any) to the value editor
-									var propertyFiles = propDef.EditorState.FileNames.Select(f => uploadedFiles.FirstOrDefault(u => u.FileName == f)).Where(f => f != null).ToList();
+									var propertyFiles = propDef.EditorState.FileNames.Select(fileName =>
+											uploadedFiles.FirstOrDefault(u => u.FileName != null &&
+												// #384, #389 and #394 - look for "safe" file names (using the ToSafeFileName() extension)
+												// - for backwards compatibility we'll look for the raw filename as well as the "safe" file name
+												(u.FileName.Equals(fileName, StringComparison.OrdinalIgnoreCase) || u.FileName.Equals(fileName.ToSafeFileName(), StringComparison.OrdinalIgnoreCase))
+											)
+                                        ).Where(f => f != null).ToList();
 									if(propertyFiles.Any())
 									{
 										additionalData["files"] = propertyFiles;
 									}
 								}
 							}
+							// #397 - pass along "cuid" and "puid" (part of the Umbraco 7.6 scheme)
+							if(editorValue.AdditionalData.ContainsKey("cuid"))
+							{
+								additionalData["cuid"] = editorValue.AdditionalData["cuid"];
+							}
+							if(editorValue.AdditionalData.ContainsKey("puid"))
+							{
+								additionalData["puid"] = editorValue.AdditionalData["puid"];
+							}
 							var propData = new ContentPropertyData(propDef.Value, preValues, additionalData);
 							var propEditor = PropertyEditorResolver.Current.GetByAlias(dtd.PropertyEditorAlias);
 							// make sure to send the current property value (if any) to the PE ValueEditor
@@ -0,0 +1,39 @@
+using System;
+using System.ComponentModel;
+using System.Globalization;
+using Archetype.Extensions;
+using Archetype.Models;
+using Umbraco.Core.Models;
+
+namespace Archetype.TypeConverters
+{
+    public class ArchetypeFieldsetModelConverter : TypeConverter
+    {
+        public override bool CanConvertTo(ITypeDescriptorContext context, Type destinationType)
+        {
+            if (destinationType == typeof(IPublishedContent) ||
+                destinationType == typeof(ArchetypePublishedContent))
+            {
+                return true;
+            }
+
+            if (destinationType == typeof(string))
+            {
+                // NOTE: The converter needs to return false here, otherwise `ArchetypeHelper.DeserializeJsonToArchetype` fails.
+                return false;
+            }
+
+            return base.CanConvertTo(context, destinationType);
+        }
+
+        public override object ConvertTo(ITypeDescriptorContext context, CultureInfo culture, object value, Type destinationType)
+        {
+            if (value is ArchetypeFieldsetModel && (destinationType == typeof(IPublishedContent) || destinationType == typeof(ArchetypePublishedContent)))
+            {
+                return ((ArchetypeFieldsetModel)value).ToPublishedContent();
+            }
+
+            return base.ConvertTo(context, culture, value, destinationType);
+        }
+    }
+}
@@ -0,0 +1,34 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Globalization;
+using Archetype.Extensions;
+using Archetype.Models;
+using Umbraco.Core.Models;
+
+namespace Archetype.TypeConverters
+{
+    public class ArchetypeModelConverter : TypeConverter
+    {
+        public override bool CanConvertTo(ITypeDescriptorContext context, Type destinationType)
+        {
+            if (destinationType == typeof(ArchetypePublishedContentSet) ||
+                destinationType == typeof(IEnumerable<IPublishedContent>))
+            {
+                return true;
+            }
+
+            return base.CanConvertTo(context, destinationType);
+        }
+
+        public override object ConvertTo(ITypeDescriptorContext context, CultureInfo culture, object value, Type destinationType)
+        {
+            if (value is ArchetypeModel && (destinationType == typeof(ArchetypePublishedContentSet) || destinationType == typeof(IEnumerable<IPublishedContent>)))
+            {
+                return ((ArchetypeModel)value).ToPublishedContentSet();
+            }
+
+            return base.ConvertTo(context, culture, value, destinationType);
+        }
+    }
+}
@@ -6,7 +6,7 @@ angular.module("umbraco").controller("Imulus.ArchetypeConfigController", functio
    //define empty items
    var newPropertyModel = '{"alias": "", "remove": false, "collapse": false, "label": "", "helpText": "", "dataTypeGuid": "0cc0eba1-9960-42c9-bf9b-60e150b429ae", "value": ""}';
    var newFieldsetModel = '{"alias": "", "remove": false, "collapse": false, "labelTemplate": "", "icon": "", "label": "", "properties": [' + newPropertyModel + '], "group": null}';
-    var defaultFieldsetConfigModel = JSON.parse('{"showAdvancedOptions": false, "startWithAddButton": false, "hideFieldsetToolbar": false, "enableMultipleFieldsets": false, "hideFieldsetControls": false, "hidePropertyLabel": false, "maxFieldsets": null, "enableCollapsing": true, "enableCloning": false, "enableDisabling": true, "enableDeepDatatypeRequests": false, "enablePublishing": false, "enableMemberGroups": false, "enableCrossDragging": false, "fieldsets": [' + newFieldsetModel + '], "fieldsetGroups": []}');
+    var defaultFieldsetConfigModel = JSON.parse('{"showAdvancedOptions": false, "startWithAddButton": false, "hideFieldsetToolbar": false, "enableMultipleFieldsets": false, "hideFieldsetControls": false, "hidePropertyLabel": false, "maxFieldsets": null, "enableCollapsing": true, "enableMultipleOpen": true, "enableCloning": false, "enableDisabling": true, "enableDeepDatatypeRequests": false, "enablePublishing": false, "enableMemberGroups": false, "enableCrossDragging": false, "fieldsets": [' + newFieldsetModel + '], "fieldsetGroups": []}');

    //ini the model
    $scope.model.value = $scope.model.value || defaultFieldsetConfigModel;
@@ -47,6 +47,12 @@ angular.module("umbraco").controller("Imulus.ArchetypeConfigController", functio
        }
    };

+    // added to track loaded fieldsets 
+    $scope.loadedFieldsets = [];
+    $scope.isLoaded = function (fieldset) {
+        return $scope.loadedFieldsets.indexOf(fieldset) >= 0;
+    }
+
    //function that determines how to manage expanding/collapsing fieldsets
    $scope.focusFieldset = function(fieldset){
        var iniState;
@@ -60,6 +66,7 @@ angular.module("umbraco").controller("Imulus.ArchetypeConfigController", functio
            if($scope.archetypeConfigRenderModel.fieldsets.length == 1 && fieldset.remove == false)
            {
                fieldset.collapse = false;
+                $scope.loadedFieldsets.push(fieldset);
                return;
            }

@@ -70,12 +77,14 @@ angular.module("umbraco").controller("Imulus.ArchetypeConfigController", functio
            else
            {
                fieldset.collapse = false;
+                $scope.loadedFieldsets.push(fieldset);
            }
        });

        if(iniState)
        {
            fieldset.collapse = !iniState;
+            $scope.loadedFieldsets.push(fieldset);
        }
    }

@@ -123,27 +132,20 @@ angular.module("umbraco").controller("Imulus.ArchetypeConfigController", functio

    //watch for changes
    $scope.$watch('archetypeConfigRenderModel', function (v) {
-        //console.log(v);
        if (typeof v === 'string') {
            $scope.archetypeConfigRenderModel = JSON.parse(v);
            $scope.archetypeConfigRenderModel.toString = stringify;
        }
    });

-    $scope.autoPopulateAlias = function(s) {
-        var modelType = s.hasOwnProperty('fieldset') ? 'fieldset' : 'property';
-        var modelProperty = s[modelType];
-
-        if (!modelProperty.aliasIsDirty) {
+    $scope.autoPopulateAlias = function (modelProperty) {
+        if (modelProperty && !modelProperty.aliasIsDirty) {
            modelProperty.alias = modelProperty.label.toUmbracoAlias();
        }
    }

-    $scope.markAliasDirty = function(s) {
-        var modelType = s.hasOwnProperty('fieldset') ? 'fieldset' : 'property';
-        var modelProperty = s[modelType];
-
-        if (!modelProperty.aliasIsDirty) {
+    $scope.markAliasDirty = function (modelProperty) {
+        if (modelProperty && !modelProperty.aliasIsDirty) {
            modelProperty.aliasIsDirty = true;;
        }
    }
@@ -211,6 +211,16 @@ angular.module("umbraco").controller("Imulus.ArchetypeController", function ($sc

    }

+    // Checks if the specified array of fieldsets contains the specified fieldset.
+    function arrayContainsFieldset(fieldset, fieldsets) {
+        for (var i = 0; i < fieldsets.length; i++) {
+            if (fieldsets[i] === fieldset) {
+                return true;
+            }
+        }
+        return false;
+    }
+
    // Confirms that an array of properties is a subset of another array of properties.
    function arePropertiesSubset(subset, superset) {

@@ -254,7 +264,8 @@ angular.module("umbraco").controller("Imulus.ArchetypeController", function ($sc
                alias: fieldset.alias,
                label: fieldset.label,
                icon: (fieldset.icon || "icon-document-dashed-line"), // default icon if none is chosen
-                group: fieldset.group ? fieldset.group.name : null
+                group: fieldset.group ? fieldset.group.name : null,
+                previewImage: fieldset.previewImage
            });
        });
        // sanity check
@@ -294,13 +305,22 @@ angular.module("umbraco").controller("Imulus.ArchetypeController", function ($sc

    $scope.closeFieldsetPicker = function () {
        $scope.overlayMenu.show = false;
+        $scope.overlayMenu.fieldsetPreview = null;
    };
    
    $scope.pickFieldset = function (fieldsetAlias, $index) {
        $scope.closeFieldsetPicker();
        $scope.addRow(fieldsetAlias, $index);
    };    
-    
+
+    $scope.openFieldsetPreview = function (fieldset) {
+        $scope.overlayMenu.fieldsetPreview = fieldset;
+    }
+
+    $scope.closeFieldsetPreview = function () {
+        $scope.overlayMenu.fieldsetPreview = null;
+    }
+
    $scope.addRow = function (fieldsetAlias, $index) {
        if ($scope.canAdd()) {
            if ($scope.model.config.fieldsets) {
@@ -330,6 +350,7 @@ angular.module("umbraco").controller("Imulus.ArchetypeController", function ($sc
            }
            
            $scope.focusFieldset(newFieldset);
+            $scope.handleMandatoryValidation();
        }
    }

@@ -339,6 +360,7 @@ angular.module("umbraco").controller("Imulus.ArchetypeController", function ($sc
                $scope.setDirty();
                $scope.model.value.fieldsets.splice($index, 1);
                $scope.$broadcast("archetypeRemoveFieldset", {index: $index});
+                $scope.handleMandatoryValidation();
            }
        }
    }
@@ -376,6 +398,7 @@ angular.module("umbraco").controller("Imulus.ArchetypeController", function ($sc
        fieldset.disabled = !fieldset.disabled;
        // explicitly set the form as dirty when manipulating the enabled/disabled state of a fieldset
        $scope.setDirty();
+        $scope.handleMandatoryValidation();
    }

    //helpers for determining if a user can do something
@@ -501,10 +524,23 @@ angular.module("umbraco").controller("Imulus.ArchetypeController", function ($sc
        return $scope.isDisabledByPublishing(fieldset);
    }

+    $scope.numberOfEnabledFieldsets = function () {
+        if (!$scope.model.value.fieldsets) {
+            return 0;
+        }
+        return _.filter($scope.model.value.fieldsets, function (f) {
+            return $scope.isDisabled(f) == false;
+        }).length;
+    }
+
    //helper, ini the render model from the server (model.value)
    function init() {
        $scope.model.value = removeNulls($scope.model.value);
        addDefaultProperties($scope.model.value.fieldsets);
+
+        $timeout(function () {
+            $scope.handleMandatoryValidation();
+        }, 50);
    }

    function addDefaultProperties(fieldsets)
@@ -584,17 +620,17 @@ angular.module("umbraco").controller("Imulus.ArchetypeController", function ($sc
            return;
        }

-        var iniState;
-
-        if(fieldset)
+        // collapse all other fieldsets if "multiple open fieldsets" is not enabled
+        if(!$scope.model.config.enableMultipleOpen) 
        {
-            iniState = fieldset.collapse;
+            _.each($scope.model.value.fieldsets, function (f) {
+                if(f != fieldset)
+                {
+                    f.collapse = true;
+                }
+            });
        }

-        _.each($scope.model.value.fieldsets, function(fieldset){
-            fieldset.collapse = true;
-        });
-
        if(!fieldset && $scope.model.value.fieldsets.length == 1)
        {
            $scope.model.value.fieldsets[0].collapse = false;
@@ -602,10 +638,13 @@ angular.module("umbraco").controller("Imulus.ArchetypeController", function ($sc
            return;
        }

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

@@ -798,6 +837,16 @@ angular.module("umbraco").controller("Imulus.ArchetypeController", function ($sc
        });
    });

+    // handle mandatory validation of the entire Archetype
+    // - no fieldsets = not valid
+    $scope.handleMandatoryValidation = function() {
+        var valid = true;
+        if ($scope.model.validation && $scope.model.validation.mandatory) {
+            valid = $scope.numberOfEnabledFieldsets() > 0;
+        }
+        $scope.model.mandatoryValidation = valid ? "valid" : null;
+    }
+
    function toUtc(date) {
        if (!date) {
            return null;
@@ -857,12 +906,15 @@ angular.module("umbraco").controller("Imulus.ArchetypeController", function ($sc
    // The source scope is the scope of the fieldset being dragged.
    // The target scope is the scope of the Archetype to drop into.
    function canMove(sourceScope, targetScope) {
-        var targetFieldsets = targetScope.model.config.fieldsets;
+        var targetFieldsetConfigs = targetScope.model.config.fieldsets;
+        var targetFieldsets = targetScope.model.value.fieldsets;
+        var sourceFieldset = sourceScope.fieldset;
+        var sameArchetype = arrayContainsFieldset(sourceFieldset, targetFieldsets);
        var model = sourceScope.fieldsetConfigModel;
        var canRemove = sourceScope.canRemove();
        var canAdd = targetScope.canAdd();
-        var valid = canRemove && canAdd;
-        valid = valid && modelMatchesAnyFieldset(model, targetFieldsets);
+        var valid = sameArchetype || (canRemove && canAdd);
+        valid = valid && modelMatchesAnyFieldset(model, targetFieldsetConfigs);
        return valid;
    }

@@ -123,16 +123,17 @@ angular.module("umbraco.directives").directive('archetypeProperty', function ($c
                    });

                    scope.$on('archetypeFormSubmitting', function (ev, args) {
-                        if(args.action !== 'save') {
-                            // validate all fieldset properties
-                            _.each(scope.fieldset.properties, function (property) {
-                                archetypeService.validateProperty(scope.fieldset, property, configFieldsetModel);
-                            });
+                        // #385 - revert the changes made in #311 to avoid publishing invalid fieldsets (leaving the code from #311 here, in case we figure out how to re-introduce "save as draft")
+                        // if(args.action !== 'save') {
+                        // validate all fieldset properties
+                        _.each(scope.fieldset.properties, function (property) {
+                            archetypeService.validateProperty(scope.fieldset, property, configFieldsetModel);
+                        });

-                            var validationKey = "validation-f" + scope.fieldsetIndex;
+                        var validationKey = "validation-f" + scope.fieldsetIndex;

-                            ngModelCtrl.$setValidity(validationKey, scope.fieldset.isValid);
-                        }
+                        ngModelCtrl.$setValidity(validationKey, scope.fieldset.isValid);
+                        // }

                        // did the value change (if it did, it most likely did so during the "formSubmitting" event)
                        var property = archetypeService.getFieldsetProperty(scope);
@@ -55,5 +55,8 @@
  "enableMemberGroups": "Aktivér medlems-grupper",
  "enableMemerGroupsDescription": "Tillad at fieldsets kun vises for specifikke medlems-grupper",
  "allowedMemberGroups": "Tilladte medlems-grupper",
-  "allowedMemberGroupsHelpText": "Vælg de medlems-grupper, der skal kunne se dette element. Hvis der ikke er valgt nogen, kan alle se elementet."
+  "allowedMemberGroupsHelpText": "Vælg de medlems-grupper, der skal kunne se dette element. Hvis der ikke er valgt nogen, kan alle se elementet.",
+  "previewFieldsetOpen": "(se eksempel)",
+  "previewFieldsetHeader": "Eksempel: ",
+  "previewFieldsetClose": "(luk eksempel)"
 }
@@ -55,5 +55,8 @@
  "enableMemberGroups": "Aktivér medlems-grupper",
  "enableMemerGroupsDescription": "Tillad at fieldsets kun vises for specifikke medlems-grupper",
  "allowedMemberGroups": "Tilladte medlems-grupper",
-  "allowedMemberGroupsHelpText": "Vælg de medlems-grupper, der skal kunne se dette element. Hvis der ikke er valgt nogen, kan alle se elementet."
+  "allowedMemberGroupsHelpText": "Vælg de medlems-grupper, der skal kunne se dette element. Hvis der ikke er valgt nogen, kan alle se elementet.",
+  "previewFieldsetOpen": "(se eksempel)",
+  "previewFieldsetHeader": "Eksempel: ",
+  "previewFieldsetClose": "(luk eksempel)"
 }
@@ -249,7 +249,7 @@
    .archetypeAddButton {
        color: #ddd;
        .icon {
-            vertical-align: text-top;
+            vertical-align: middle;
        }
        &:hover {
            color: #333;
@@ -290,6 +290,12 @@
            overflow: visible;
            vertical-align: top;  
            height: 90px;        
+            .fieldsetPreviewOpen {
+                font-style: italic;
+                a:hover {
+                    text-decoration: underline;
+                }
+            }
        }
        ul.groups {
            display: block;
@@ -310,6 +316,24 @@
                }
            }
        }
+
+        .fieldsetPreview {
+            .fieldsetPreviewClose {
+                font-style: italic;
+                font-size: 12px;
+                text-align: center;
+            }
+            .fieldsetPreviewImage {
+                padding: 6px 0px;
+                img {
+                    height: auto;
+                    max-width: 100%;
+                    vertical-align: middle;
+                    border: 0;
+                    cursor: zoom-in;
+                }
+            }
+        }
    }

    .settingsWrapper {
@@ -355,9 +379,11 @@

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

@@ -390,10 +416,10 @@
        small {
            margin-left: 5px;
        }
-        
+
        a {
            float: right;
-            
+
            img {
                width: 35px;
            }
@@ -439,7 +465,8 @@
    .archetypeFieldsetOption {
        margin-bottom: 15px;
        margin-right: 15px;
-        input[type=text]{
+
+        input[type=text] {
            max-width: 100%;
            width: 100%;
        }
@@ -457,7 +484,7 @@
            margin-bottom: 5px;
        }

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

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

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

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

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

    function getNativeLabel(datatype, value, scope) {
-
    	switch (datatype.selectedEditor) {
    		case "Imulus.UrlPicker":
    			return imulusUrlPicker(value, scope, {});
@@ -27,13 +26,22 @@ angular.module('umbraco.services').factory('archetypeLabelService', function (ar
    			return coreTinyMce(value, scope, {});
            case "Umbraco.MultiNodeTreePicker":
                return coreMntp(value, scope, datatype);
+            case "Umbraco.MultiNodeTreePicker2":
+                return coreMntpV2(value, scope, datatype);
+            case "Umbraco.MultipleMediaPicker":
            case "Umbraco.MediaPicker":
                return coreMediaPicker(value, scope, datatype);
+            case "Umbraco.MediaPicker2":
+                return coreMediaPickerV2(value, scope, datatype);
            case "Umbraco.DropDown":
                return coreDropdown(value, scope, datatype);
    	    case "RJP.MultiUrlPicker":
    	        return rjpMultiUrlPicker(value, scope, {});
-    		default:
+    	  case "Umbraco.ContentPickerAlias":
+    	    return coreContentPicker(value, scope, datatype);
+    	  case "Umbraco.ContentPicker2":
+    	    return coreContentPickerV2(value, scope, datatype);
+        default:
    			return "";
    	}
    }
@@ -87,6 +95,39 @@ angular.module('umbraco.services').factory('archetypeLabelService', function (ar
        return entityArray.join(', ');
    }

+      function coreMntpV2(value, scope, args) {
+        var ids = value.split(',');
+        if (ids.length == 0) {
+          return "";
+        }
+        var type = "document";
+
+        switch(args.preValues[0].value.type) {
+            case 'content':
+                type = 'document';
+                break;
+            case 'media':
+                type = 'media';
+                break;
+            case 'member':
+                type = 'member';
+                break;
+
+            default:
+                break;
+        }
+
+        var entity;
+
+        _.each(ids, function (id) {            
+            if(id && !entity) {
+              entity = archetypeCacheService.getEntityByUmbracoId(scope, id, type);
+            }
+        });
+
+        return (entity != null ? entity.name : "") + (ids.length > 1 ? ", ..." : "");
+    }
+
    function coreMediaPicker(value, scope, args) {
        if(value) {
             var entity = archetypeCacheService.getEntityById(scope, value, "media");     
@@ -99,6 +140,42 @@ angular.module('umbraco.services').factory('archetypeLabelService', function (ar
        return "";
    }

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

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

@@ -11,6 +11,9 @@
        <div>
            <label for="archetypeAdvancedOptionsCollapsing"><input type="checkbox" id="archetypeAdvancedOptionsCollapsing" ng-model="dialogData.model.enableCollapsing"/><archetype-localize key="enableCollapsing">Enable Collapsing?</archetype-localize><small><archetype-localize key="enableCollapsingDescription">Enable fieldset collapsing.</archetype-localize></small></label>
        </div>
+        <div>
+            <label for="archetypeAdvancedOptionsMultipleOpen"><input type="checkbox" id="archetypeAdvancedOptionsMultipleOpen" ng-model="dialogData.model.enableMultipleOpen" /><archetype-localize key="enableMultipleOpen">Enable Multiple Open Fieldsets?</archetype-localize><small><archetype-localize key="enableMultipleOpenDescription">When fieldset collapsing is enabled, this allows multiple fieldsets to be open at the same time.</archetype-localize></small></label>
+        </div>
        <div>
            <label for="archetypeAdvancedOptionsMaxFieldsets"><archetype-localize key="maxFieldsets">Max Fieldsets</archetype-localize><small><archetype-localize key="maxFieldsetsDescription">How many Fieldsets are allowed? Entering '1' will disable the controls. Default is unlimited.</archetype-localize></small></label>
            <input type="number" id="archetypeAdvancedOptionsMaxFieldsets" class="archetypeMaxFieldsets" ng-model="dialogData.model.maxFieldsets"/>
@@ -12,14 +12,16 @@
                    <i class="icon icon-navigation handle" ng-show="canSortFieldset()"></i>
                </div>
                <div class="archetypeFieldsetTitle" ng-click="focusFieldset(fieldset)">{{fieldset.label}}</div>
-                <div class="archetypeFieldsetCollapser" ng-hide="fieldset.collapse && fieldset.label">
+                <div class="archetypeFieldsetCollapser" ng-hide="fieldset.collapse && fieldset.label" ng-if="isLoaded(fieldset)">
                    <div class="archetypeFieldsetOption">
                        <label for="archetypeFieldLabel_{{$index}}"><archetype-localize key="label">Label</archetype-localize></label>
-                        <input type="text" id="archetypeFieldLabel_{{$index}}" ng-model="fieldset.label" on-keyup="autoPopulateAlias(this)" />
+                        <input type="text" id="archetypeFieldLabel_{{$index}}" ng-model="fieldset.label" on-keyup="autoPopulateAlias(fieldset)" />
+                        <small>The label shown to the editors when adding a new fieldset.</small>
                    </div>
                    <div class="archetypeFieldsetOption">
                        <label for="archetypeFieldAlias_{{$index}}"><archetype-localize key="alias">Alias</archetype-localize></label>
-                        <input type="text" id="archetypeFieldAlias_{{$index}}" ng-model="fieldset.alias" on-keyup="markAliasDirty(this)" required/>
+                        <input type="text" id="archetypeFieldAlias_{{$index}}" ng-model="fieldset.alias" on-keyup="markAliasDirty(fieldset)" required/>
+                        <small>The alias used to identify the fieldset when rendering.</small>
                    </div>
                    <div class="archetypeFieldsetOption" ng-show="archetypeConfigRenderModel.fieldsetGroups.length">
                        <label for="archetypeFieldsetGroup_{{$index}}"><archetype-localize key="fieldsetGroup">Group</archetype-localize></label>
@@ -28,6 +30,12 @@
                    <div class="archetypeFieldsetOption">
                        <label for="archetypeFieldLabelTemplate_{{$index}}"><archetype-localize key="labelTemplate">Label Template</archetype-localize></label>
                        <input type="text" id="archetypeFieldLabelTemplate_{{$index}}" ng-model="fieldset.labelTemplate" />
+                        <small>Generates labels per fieldset. Can contain property aliases, e.g. "Article: &#123;&#123;title&#125;&#125;".</small>
+                    </div>
+                    <div class="archetypeFieldsetOption">
+                        <label for="archetypeFieldPreview_{{$index}}">Preview image</label>
+                        <input type="text" id="archetypeFieldPreview_{{$index}}" ng-model="fieldset.previewImage" on-keyup="markAliasDirty(fieldset)" />
+                        <small>A relative path to a preview image, e.g. "/assets/fieldset.png".</small>
                    </div>
                    <div class="archetypeFieldsetOption" ng-show="archetypeConfigRenderModel.enableMultipleFieldsets">
                        <label for="archetypeFieldIcon_{{$index}}"><archetype-localize key="icon">Icon</archetype-localize></label>
@@ -50,11 +58,11 @@
                                <div class="archetypePropertyCollapser" ng-hide="property.collapse && property.label">
                                    <div>
                                        <label for="archetypePropertyLabel_{{$parent.$index}}_{{$index}}"><archetype-localize key="label">Label</archetype-localize></label>
-                                        <input type="text" id="archetypePropertyLabel_{{$parent.$index}}_{{$index}}" ng-model="property.label" on-keyup="autoPopulateAlias(this)"/>
+                                        <input type="text" id="archetypePropertyLabel_{{$parent.$index}}_{{$index}}" ng-model="property.label" on-keyup="autoPopulateAlias(property)"/>
                                    </div>
                                    <div>
                                        <label for="archetypePropertyAlias_{{$parent.$index}}_{{$index}}"><archetype-localize key="alias">Alias</archetype-localize></label>
-                                        <input type="text" id="archetypePropertyAlias_{{$parent.$index}}_{{$index}}" ng-model="property.alias" on-keyup="markAliasDirty(this)" required/>
+                                        <input type="text" id="archetypePropertyAlias_{{$parent.$index}}_{{$index}}" ng-model="property.alias" on-keyup="markAliasDirty(property)" required/>
                                    </div>
                                    <div>
                                        <label for="archetypePropertyHelpText_{{$parent.$index}}_{{$index}}"><archetype-localize key="helpText">Help Text</archetype-localize></label>
@@ -10,8 +10,12 @@
        </a>
    </div>

+    <!-- Mandatory validation. -->
+    <input type="hidden" name="archetypeMandatory" ng-model="model.mandatoryValidation" ng-required="model.validation.mandatory" />
+    <div><span class="help-inline" val-msg-for="archetypeMandatory" val-toggle-msg="required"><archetype-localize key="required">Required</archetype-localize></span></div>
+
    <!-- Fieldsets. -->
-    <ul ui-sortable="sortableOptions" class="archetypeSortable" ng-class="{archetypeEmpty: model.value.fieldsets.length === 0 || sortingLastItem()}" ng-model="model.value.fieldsets">
+    <ul ui-sortable="sortableOptions" class="archetypeSortable" ng-class="{archetypeEmpty: model.value.fieldsets.length === 0 || sortingLastItem(), archetypeCrossDraggable: model.config.enableCrossDragging}" ng-model="model.value.fieldsets">
        <li ng-repeat="fieldset in model.value.fieldsets">
            <fieldset ng-class="['archetype-fieldset-' + fieldset.alias, (getFieldsetValidity(fieldset) == false ? 'archetypeFieldsetError' : '')]" ng-init="fieldsetConfigModel = getConfigFieldsetByAlias(fieldset.alias)">
                <div class="archetypeFieldsetLabel" ng-class="{enableCollapsing: model.config.enableCollapsing}">
@@ -104,24 +108,45 @@
    <!-- Fieldset picker. -->
    <div class="usky-grid fieldsetPicker" ng-class="{withGroups: overlayMenu.fieldsetGroups.length > 1}" ng-if="overlayMenu.show">
        <div class="cell-tools-menu" ng-style="overlayMenu.style" delayed-mouseleave="closeFieldsetPicker()" archetype-click-outside="closeFieldsetPicker()">
-            <h5>
-                <archetype-localize key="addFieldset">Add an item</archetype-localize>
-            </h5>
-            <ul class="groups" ng-show="overlayMenu.fieldsetGroups.length > 1">
-                <li ng-repeat="fieldsetGroup in overlayMenu.fieldsetGroups" ng-class="{active: fieldsetGroup == overlayMenu.activeFieldsetGroup}">
-                    <a ng-click="overlayMenu.activeFieldsetGroup = fieldsetGroup">
-                        {{fieldsetGroup.name}}
+            <div ng-show="!overlayMenu.fieldsetPreview">
+                <h5>
+                    <archetype-localize key="addFieldset">Add an item</archetype-localize>
+                </h5>
+                <ul class="groups" ng-show="overlayMenu.fieldsetGroups.length > 1">
+                    <li ng-repeat="fieldsetGroup in overlayMenu.fieldsetGroups" ng-class="{active: fieldsetGroup == overlayMenu.activeFieldsetGroup}">
+                        <a ng-click="overlayMenu.activeFieldsetGroup = fieldsetGroup">
+                            {{fieldsetGroup.name}}
+                        </a>
+                    </li>
+                </ul>
+                <ul class="elements">
+                    <li ng-repeat="fieldset in overlayMenu.activeFieldsetGroup.fieldsets">
+                        <a ng-click="pickFieldset(fieldset.alias, overlayMenu.index)" href>
+                            <i class="icon {{fieldset.icon}}"></i>
+                            {{fieldset.label}}
+                        </a>
+                        <div class="fieldsetPreviewOpen" ng-if="fieldset.previewImage">
+                            <a href ng-click="openFieldsetPreview(fieldset)"><archetype-localize key="previewFieldsetOpen">(see preview)</archetype-localize></a>
+                        </div>
+                    </li>
+                </ul>
+            </div>
+            <div ng-show="overlayMenu.fieldsetPreview" class="fieldsetPreview">
+                <h5>
+                    <archetype-localize key="previewFieldsetHeader">Preview: </archetype-localize>{{overlayMenu.fieldsetPreview.label}}
+                </h5>
+                <div class="fieldsetPreviewClose">
+                    <a href ng-click="closeFieldsetPreview()"><archetype-localize key="previewFieldsetClose">(close preview)</archetype-localize></a>
+                </div>
+                <div class="fieldsetPreviewImage">
+                    <a href="{{overlayMenu.fieldsetPreview.previewImage}}" target="_blank">
+                        <img src="{{overlayMenu.fieldsetPreview.previewImage}}" />
                    </a>
-                </li>
-            </ul>
-            <ul class="elements">
-                <li ng-repeat="fieldset in overlayMenu.activeFieldsetGroup.fieldsets">
-                    <a ng-click="pickFieldset(fieldset.alias, overlayMenu.index)" href>
-                        <i class="icon {{fieldset.icon}}"></i>
-                        {{fieldset.label}}
-                    </a>
-                </li>
-            </ul>
+                </div>
+                <div class="fieldsetPreviewClose">
+                    <a href ng-click="closeFieldsetPreview()"><archetype-localize key="previewFieldsetClose">(close preview)</archetype-localize></a>
+                </div>
+            </div>
        </div>
    </div>
 </div>
@@ -1,6 +1,6 @@
 {
 	"name": "Archetype",
-	"version": "1.13.1",
+	"version": "1.14.1",
 	"url": "http://github.com/imulus/archetype/",
 	"author": "Imulus - Kevin Giszewski - Tom Fulton - Lee Kelleher - Matt Brailsford - Kenn Jacobsen - Et. Al.",
 	"authorUrl": "http://imulus.com/",
Author	SHA1	Message	Date
Kenn Jacobsen	aa6505d7f6	Merge pull request #412 from kjac/master Bump package version	2017-06-13 08:41:09 +02:00
Kenn Jacobsen	6ed7af28bc	Bump package version	2017-06-13 08:38:31 +02:00
Kenn Jacobsen	526f4c147a	Merge remote-tracking branch 'refs/remotes/kgiszewski/master'	2017-06-13 08:28:22 +02:00
Kenn Jacobsen	bb0df72dc7	Merge pull request #411 from kjac/fieldset-preview-image Add fieldset image previews	2017-06-13 08:27:39 +02:00
Kenn Jacobsen	3cba5677bf	Whoops... the preview image shouldn't be mandatory	2017-06-13 08:25:05 +02:00
kjac	c4f88ab528	Remove max width comment	2017-06-12 22:29:16 +02:00
kjac	17be4b4253	Merge remote-tracking branch 'refs/remotes/origin/master' into fieldset-preview-image	2017-06-12 22:11:07 +02:00
kjac	2db196af6a	Merge remote-tracking branch 'refs/remotes/kgiszewski/master'	2017-06-12 22:09:29 +02:00
Kenn Jacobsen	b4b27cd1f8	Merge pull request #410 from kjac/mandatory-validation-disabled-fieldsets Handle disabled fieldsets in mandatory validation	2017-06-12 22:07:02 +02:00
kjac	a2cc052944	Handle disabled fieldsets in mandatory validation Disabled fieldsets should not count when performing mandatory validation. This ensures they aren't.	2017-06-12 22:04:46 +02:00
kjac	4d8a4f0b12	Merge remote-tracking branch 'refs/remotes/origin/master' into fieldset-preview-image	2017-06-11 22:10:07 +02:00
kjac	743f37c45f	Merge remote-tracking branch 'refs/remotes/kgiszewski/master'	2017-06-11 22:09:40 +02:00
Kenn Jacobsen	1ba45969ee	Merge pull request #409 from kjac/multiple-open-fieldsets Enable multiple open fieldsets by datatype configuration. It's default enabled on newly created Archetypes.	2017-06-11 22:08:48 +02:00
kjac	349d6f69b3	Enable multiple open fieldsets See #196	2017-06-11 22:06:14 +02:00
kjac	9431a70156	Merge remote-tracking branch 'refs/remotes/origin/master' into fieldset-preview-image	2017-06-11 21:38:04 +02:00
kjac	ab780f72a4	Merge remote-tracking branch 'refs/remotes/kgiszewski/master'	2017-06-11 21:37:39 +02:00
Kenn Jacobsen	7d01be305f	Merge pull request #408 from kjac/fix-mandatory-validation Fix mandatory validation: The mandatory validation implementation prevents a valid Archetype from being submitted on the first go because the mandatory validation isn't initialized.	2017-06-11 21:36:34 +02:00
kjac	694b932e37	Fix mandatory validation issue The mandatory validation implementation prevents a valid Archetype from being submitted on the first go because the mandatory validation isn't initialized.	2017-06-11 21:35:31 +02:00
kjac	a4f6334761	Merge branch 'master' into fieldset-preview-image	2017-06-11 16:18:52 +02:00
kjac	9316e7c3f6	Merge remote-tracking branch 'refs/remotes/kgiszewski/master'	2017-06-11 16:17:46 +02:00
Kenn Jacobsen	8bc6c17921	Merge pull request #407 from kjac/styling-for-7.6 Styling for 7.6: Make the "add new item" button look ok in 7.6 + hide the "drag into" area for non cross draggable Archetypes.	2017-06-11 16:16:53 +02:00
kjac	1161c7e6da	A bit of styling Make the "add new item" button look ok in 7.6 + hide the "drag into" area for non cross draggable Archetypes.	2017-06-11 16:14:58 +02:00
kjac	93db3eb2ee	Merge remote-tracking branch 'refs/remotes/kgiszewski/master'	2017-06-11 16:07:24 +02:00
Kenn Jacobsen	b7b166562f	Merge pull request #406 from kjac/collapsing-dollar-signs Collapsing dollar signs	2017-06-11 16:05:26 +02:00
kjac	e3c4c91de1	Fix #387	2017-06-11 16:03:56 +02:00
kjac	f79849cf8a	Open preview image in a new window when clicked	2017-06-10 08:49:59 +02:00
kjac	f0b27e1507	Merge remote-tracking branch 'refs/remotes/origin/master' into fieldset-preview-image	2017-06-10 08:26:28 +02:00
kjac	42e92a4e74	Merge remote-tracking branch 'refs/remotes/kgiszewski/master'	2017-06-10 08:26:06 +02:00
Kenn Jacobsen	2c363a5d37	Merge pull request #405 from kjac/mandatory-validation Mandatory validation - fixes #395	2017-06-09 21:19:32 +02:00
kjac	738e9282b6	Handle mandatory validation Don't allow submission of an empty Archetype if the property is set to mandatory	2017-06-09 21:11:11 +02:00
kjac	20fa1efc8e	A bit more styling + localization	2017-06-09 21:04:44 +02:00
kjac	718f2deb47	Add preview image to fieldsets See #374	2017-06-09 20:19:17 +02:00
kjac	1cea5d156a	Merge remote-tracking branch 'refs/remotes/kgiszewski/master'	2017-06-08 16:46:00 +02:00
Kenn Jacobsen	109d4c7708	Merge pull request #404 from kjac/label-templates-for-v2-pickers Label templates for the V2 pickers	2017-06-08 16:37:50 +02:00
Kenn Jacobsen	8306be60de	Merge pull request #403 from kjac/lazy-load-configuration Lazy load configuration	2017-06-08 16:36:52 +02:00
Kenn Jacobsen	27d0cb742b	Label templates for the V2 pickers ..and also for the old content picker (it was missing for whatever reason) - fixes #402	2017-06-08 09:02:31 +02:00
kjac	62a250cd83	Lazy load fieldsets in configuration Fixes #393	2017-06-07 23:07:40 +02:00
kjac	6f94d608db	Merge remote-tracking branch 'refs/remotes/kgiszewski/master'	2017-06-07 20:56:35 +02:00
Kenn Jacobsen	854e9873c8	Merge pull request #401 from kjac/image-cropper-and-upload-76 Adjust to 7.6 scheme for upload and image croppers	2017-06-07 17:56:20 +02:00
Kenn Jacobsen	2a6d5eaddf	Merge pull request #400 from kjac/fix-upload-and-image-cropper-again Fix upload and image cropper (again)	2017-06-07 17:48:23 +02:00
kjac	3d7ddb58c2	Adjust to 7.6 scheme for upload and image croppers Fixes #397, at least for newly created sites.	2017-06-06 23:14:40 +02:00
kjac	4c7496840d	Fix upload and image cropper (again) Fixes #384, #389 and #394	2017-06-06 22:41:04 +02:00
Kevin Giszewski	d816103981	Merge pull request #399 from codedemonuk/patch-1 Subheadings were not being rendered correctly in Readme	2017-05-29 11:14:18 -04:00
Pervez Choudhury	b38ccc12f6	Subheadings were not being rendered correctly	2017-05-28 17:48:44 +01:00
Kevin Giszewski	e1deba5b95	Update LICENSE	2017-02-16 12:53:33 -05:00
Kevin Giszewski	5bce4e856a	Merge pull request #386 from kgiszewski/fix-385 Fix #385	2017-02-16 12:42:55 -05:00
Kevin Giszewski	6f4cb1e609	Merge pull request #379 from leekelleher/feature/typeconverter TypeConverter for ArchetypeModel	2017-02-16 12:42:44 -05:00
Kenn Jacobsen	033cbbc8f6	Fix #385	2017-02-16 15:05:21 +01:00
Kenn Jacobsen	7ee3cfca5c	Merge pull request #378 from Nicholas-Westby/fix/372-drag-drop-broken Fix for drag & drop failing when dropping fieldset in the same Archet…	2017-02-16 12:16:44 +01:00
Kenn Jacobsen	e9b478c186	Fix #384 For some reason Umbraco has started lowercasing the names of uploaded files. This fixes the problem by ignoring case when looking for the uploaded files.	2017-02-15 11:17:01 +01:00
leekelleher	21e784424f	TypeConverter for ArchetypeModel Added a TypeConverter for both `ArchetypeModel` and `ArchetypeFieldsetModel`, so that they can be converted to their `IPublishedContent` equivalent. Example usage would be, when you would typically do this... ```csharp var items = Model.Content.GetPropertyValue<ArchetypeModel>myArchetypeAlias"); ``` You can now do this... ```csharp var items = Model.Content.GetPropertyValue<IEnumerable<IPublishedContent>>("myArchetypeAlias"); ``` I know it seems more verbose, but the idea is that this could be hot-swappable with other property-editors, such as Nested Content. The frontend/code would deal purely with `IPublishedContent` objects. --- Also included unit-tests that run via Umbraco Core's `TryConvertTo` extension method, (which is what `Content.GetPropertyValue<T>` uses internally in Umbraco). There's a small caveat with the TypeConverter for `ArchetypeFieldsetModel`, I had to explicitly reject `typeof(string)`, otherwise the JSON deserializer fails (in `ArchetypeHelper.DeserializeJsonToArchetype`). All other unit-tests still pass.	2016-10-19 20:26:46 +01:00
Nicholas-Westby	155355aa00	Fix for drag & drop failing when dropping fieldset in the same Archetype and the max fieldsets is reached: https://github.com/kgiszewski/Archetype/issues/372	2016-09-14 22:08:04 -07:00