Merge pull request #37 from umco/develop

Preparing v2.0.1 release

Author: leekelleher

README.md

@@ -4,7 +4,7 @@
 [![NuGet release](https://img.shields.io/nuget/v/Our.Umbraco.InnerContent.svg)](https://www.nuget.org/packages/Our.Umbraco.InnerContent)
 
 
-A helper library for Umbraco Doc Type based property editors providing overlays and conversion helpers.
+A helper library for Umbraco Content Type based property editors providing overlays and conversion helpers.
 
 ## Getting Started
 
@@ -39,7 +39,7 @@ To clone it locally click the "Clone in Windows" button above or run the followi
 
 ## Known Issues
 
-- _[TBC]_
+- _**Please note that the following property aliases are reserved and can not be used in your Content Types:**_ "`name`", "`key`", "`children`" and "`icon`".
 
 ---
 
@@ -48,6 +48,7 @@ To clone it locally click the "Clone in Windows" button above or run the followi
 Umbraco packages that use Inner Content as a dependency library.
 
 - [Stacked Content](https://github.com/umco/umbraco-stacked-content)
+- [Content List](https://github.com/umco/umbraco-content-list)
 
 ---
 

appveyor.yml

@@ -1,7 +1,7 @@
 image: Visual Studio 2017
 
 # version format
-version: 2.0.0.{build}
+version: 2.0.1.{build}
 
 # UMBRACO_PACKAGE_PRERELEASE_SUFFIX if a rtm release build this should be blank, otherwise if empty will default to alpha
 # example UMBRACO_PACKAGE_PRERELEASE_SUFFIX=beta

build/package.proj

@@ -18,7 +18,7 @@
 	<PropertyGroup>
 		<ProjectName>Our.Umbraco.InnerContent</ProjectName>
 		<PackageName>Inner Content</PackageName>
-		<MinUmbracoVersion>7.4.0</MinUmbracoVersion>
+		<MinUmbracoVersion>7.7.0</MinUmbracoVersion>
 		<Readme>Inner Content is a helper package for other Doc Type based property editors</Readme>
 		<AuthorName>Matt Brailsford, Lee Kelleher</AuthorName>
 		<AuthorUrl>https://github.com/umco/umbraco-inner-content/graphs/contributors</AuthorUrl>

src/Our.Umbraco.InnerContent/Extensions/PreValueFieldExtensions.cs

@@ -0,0 +1,30 @@
+using System.Collections.Generic;
+using Umbraco.Core.PropertyEditors;
+
+namespace Our.Umbraco.InnerContent.PropertyEditors
+{
+    public static class PreValueFieldExtensions
+    {
+        public static void Add(this List<PreValueField> fields, string key, string name, string view, string description)
+        {
+            fields.Add(new PreValueField
+            {
+                Key = key,
+                Name = name,
+                View = view,
+                Description = description
+            });
+        }
+
+        public static void AddHideLabel(this List<PreValueField> fields)
+        {
+            fields.Add(new PreValueField
+            {
+                Key = InnerContentConstants.HideLabelPreValueKey,
+                Name = "Hide Label",
+                View = "boolean",
+                Description = "Set whether to hide the editor label and have the list take up the full width of the editor window."
+            });
+        }
+    }
+}

src/Our.Umbraco.InnerContent/InnerContentConstants.cs

@@ -9,5 +9,7 @@ public static class InnerContentConstants
         internal const string PreValuesCacheKey = "Our.Umbraco.InnerContent.GetPreValuesCollectionByDataTypeId_{0}";
 
         internal const string ContentTypesPreValueKey = "contentTypes";
+
+        internal const string HideLabelPreValueKey = "hideLabel";
     }
 }

src/Our.Umbraco.InnerContent/Our.Umbraco.InnerContent.csproj

@@ -67,6 +67,7 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Bootstrap.cs" />
+    <Compile Include="Extensions\PreValueFieldExtensions.cs" />
     <Compile Include="ValueConverters\InnerContentValueConverter.cs" />
     <Compile Include="Helpers\ContentTypeCacheHelper.cs" />
     <Compile Include="Helpers\InnerContentHelper.cs" />

src/Our.Umbraco.InnerContent/PropertyEditors/InnerContentPropertyValueEditor.cs

@@ -22,9 +22,9 @@ public override void ConfigureForDisplay(PreValueCollection preValues)
         {
             base.ConfigureForDisplay(preValues);
 
-            if (preValues.PreValuesAsDictionary.ContainsKey("hideLabel"))
+            if (preValues.PreValuesAsDictionary.ContainsKey(InnerContentConstants.HideLabelPreValueKey))
             {
-                HideLabel = preValues.PreValuesAsDictionary["hideLabel"].Value == "1";
+                HideLabel = preValues.PreValuesAsDictionary[InnerContentConstants.HideLabelPreValueKey].Value == "1";
             }
         }
 

src/Our.Umbraco.InnerContent/Web/Controllers/InnerContentApiController.cs

@@ -20,7 +20,7 @@ public class InnerContentApiController : UmbracoAuthorizedJsonController
         public IEnumerable<object> GetAllContentTypes()
         {
             return Services.ContentTypeService.GetAllContentTypes()
-                .OrderBy(x => x.SortOrder)
+                .OrderBy(x => x.Name)
                 .Select(x => new
                 {
                     id = x.Id,
@@ -35,7 +35,7 @@ public IEnumerable<object> GetAllContentTypes()
         [HttpGet]
         public IEnumerable<object> GetContentTypesByGuid([ModelBinder] Guid[] guids)
         {
-            var contentTypes = Services.ContentTypeService.GetAllContentTypes(guids).OrderBy(x => x.SortOrder).ToList();
+            var contentTypes = Services.ContentTypeService.GetAllContentTypes(guids).OrderBy(x => Array.IndexOf(guids, x.Key)).ToList();
             var blueprints = Services.ContentService.GetBlueprintsForContentTypes(contentTypes.Select(x => x.Id).ToArray()).ToArray();
 
             // NOTE: Using an anonymous class, as the `ContentTypeBasic` type is heavier than what we need (for our requirements)

src/Our.Umbraco.InnerContent/Web/UI/App_Plugins/InnerContent/views/innercontent.create.html

@@ -9,7 +9,7 @@ <h5 ng-show="selectBlueprint"><localize key="blueprints_selectBlueprint">Select
 
     <ul class="umb-actions umb-actions-child" ng-show="selectContentType">
 
-        <li data-element="action-create-{{docType.alias}}" ng-repeat="docType in allowedTypes | orderBy:'name':false">
+        <li data-element="action-create-{{docType.alias}}" ng-repeat="docType in allowedTypes">
             <a ng-click="createOrSelectBlueprintIfAny(docType)">
                 <i class="large {{docType.icon}}"></i>
                 <span class="menu-label">
@@ -25,7 +25,7 @@ <h5 ng-show="selectBlueprint"><localize key="blueprints_selectBlueprint">Select
 
     <ul class="umb-actions umb-actions-child" ng-show="selectBlueprint">
 
-        <li ng-repeat="(key, value) in selectedDocType.blueprints | orderBy:'name':false">
+        <li ng-repeat="(key, value) in selectedDocType.blueprints">
             <a ng-click="createFromBlueprint(selectedDocType.key, key)">
                 <i class="large {{selectedDocType.icon}}"></i>
                 <span class="menu-label">

src/Our.Umbraco.InnerContent/Web/UI/App_Plugins/InnerContent/views/innercontent.doctypepicker.html

@@ -21,7 +21,7 @@
                 <tr ng-repeat="config in model.value">
                     <td class="icon icon-navigation"></td>
                     <td>
-                        <select ng-options="dt.guid as dt.name for dt in vm.docTypes | orderBy: 'name'"
+                        <select ng-options="dt.guid as dt.name for dt in vm.docTypes"
                                 ng-model="config.icContentTypeGuid" required></select>
                     </td>
                     <td>