Merge pull request #5 from umco/develop

Preparing v1.0.0 release

Author: leekelleher

CONTRIBUTING.md

@@ -16,7 +16,7 @@ The issue tracker is the preferred channel for [bug reports](#bugs),
 requests](#pull-requests), but please respect the following restrictions:
 
 * Please **do not** use the issue tracker for personal support requests (use
-  Our Umbraco or Twitter).
+  [Our Umbraco](https://our.umbraco.org/projects/backoffice-extensions/simple-content/simple-content-feedback) or Twitter).
 
 * Please **do not** derail or troll issues. Keep the discussion on topic and
   respect the opinions of others.

README.md

@@ -1,33 +1,50 @@
-# Simple Content
+# Content List
 
+[![Build status](https://img.shields.io/appveyor/ci/UMCO/umbraco-content-list.svg)](https://ci.appveyor.com/project/UMCO/umbraco-content-list)
+[![NuGet release](https://img.shields.io/nuget/v/Our.Umbraco.ContentList.svg)](https://www.nuget.org/packages/Our.Umbraco.ContentList)
+[![Our Umbraco project page](https://img.shields.io/badge/our-umbraco-orange.svg)](https://our.umbraco.org/projects/backoffice-extensions/content-list)
 
-An Umbraco property editor for creating simple content blocks.
+An Umbraco property editor for creating a list of content blocks.
 
 ## Getting Started
 
 ### Installation
 
-> *Note:* Simple Content has been developed against **Umbraco v7.7.0** and will support that version and above.
+> *Note:* Content List has been developed against **Umbraco v7.7.0** and will support that version and above.
 
-Simple Content can be built manually from the source-code:
+Content List can be installed from either NuGet package repositories, or build manually from the source-code:
+
+#### NuGet package repository
+
+To [install from NuGet](https://www.nuget.org/packages/Our.Umbraco.ContentList), you can run the following command from within Visual Studio:
+
+	PM> Install-Package Our.Umbraco.ContentList
+
+We also have a [MyGet package repository](https://www.myget.org/gallery/umbraco-packages) - for bleeding-edge / development releases.
+
+#### Our Umbraco package repository
+
+To install from Our Umbraco, please download the package from:
+
+> <https://our.umbraco.org/projects/backoffice-extensions/content-list>
 
 #### Manual build
 
-If you prefer, you can compile Simple Content yourself, you'll need:
+If you prefer, you can compile Content List yourself, you'll need:
 
 * Visual Studio 2017 (or above)
 
 To clone it locally click the "Clone in Windows" button above or run the following git commands.
 
-	git clone https://github.com/leekelleher/umbraco-simple-content.git umbraco-simple-content
-	cd umbraco-simple-content
+	git clone https://github.com/umco/umbraco-content-list.git umbraco-content-list
+	cd umbraco-content-list
 	.\build.cmd
 
 ---
 
 ## Known Issues
 
-Please be aware that not all property-editors will work within Simple Content. The following Umbraco core property-editors are known to have compatibility issues:
+Please be aware that not all property-editors will work within Content List. The following Umbraco core property-editors are known to have compatibility issues:
 
 * Image Cropper
 * Tags
@@ -49,14 +66,20 @@ Anyone and everyone is welcome to contribute. Please take a moment to review the
 
 Have a question?
 
-* [Raise an issue](https://github.com/leekelleher/umbraco-simple-content/issues) on GitHub
+* [Simple Content Forum](https://our.umbraco.org/projects/backoffice-extensions/content-list/content-list-feedback) on Our Umbraco
+* [Raise an issue](https://github.com/umco/umbraco-content-list/issues) on GitHub
 
 ## Dev Team
 
 * [Lee Kelleher](https://github.com/leekelleher)
+* [Matt Brailsford](https://github.com/mattbrailsford)
+
+If you enjoy using Content List on your commercial Umbraco projects, please do consider supporting our work on other open-source Umbraco packages.
+
+<a href="https://www.patreon.com/bePatron?u=4312563"><img src="http://weareumco.com/img/umco_patreon.png?v=1" alt="Become a UMCO Patron!" height="60" /></a>
 
 ## License
 
-Copyright &copy; 2018 UMCO, Our Umbraco and [other contributors](https://github.com/leekelleher/umbraco-simple-content/graphs/contributors)
+Copyright &copy; 2018 UMCO, Our Umbraco and [other contributors](https://github.com/umco/umbraco-content-list/graphs/contributors)
 
 Licensed under the [MIT License](LICENSE.md)

appveyor.yml

@@ -6,7 +6,7 @@ version: 1.0.0.{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
 init:
-  - set UMBRACO_PACKAGE_PRERELEASE_SUFFIX=alpha
+  - set UMBRACO_PACKAGE_PRERELEASE_SUFFIX=
 
 cache:
   - src\packages -> **\packages.config  # preserve "packages" directory in the root of build folder but will reset it if packages.config is modified
@@ -15,7 +15,7 @@ before_build:
   - nuget restore src
 
 build_script:
-  - build-appveyor.cmd
+  - build\build-appveyor.cmd
 
 artifacts:
   - path: artifacts\*.nupkg

build/build-appveyor.cmd

@@ -3,6 +3,6 @@ ECHO APPVEYOR_REPO_TAG: %APPVEYOR_REPO_TAG%
 ECHO APPVEYOR_BUILD_NUMBER : %APPVEYOR_BUILD_NUMBER%
 ECHO APPVEYOR_BUILD_VERSION : %APPVEYOR_BUILD_VERSION%
 
-CALL build\tools\NuGet\NuGet.exe restore src\Our.Umbraco.SimpleContent.sln
+CALL build\tools\NuGet\NuGet.exe restore src\Our.Umbraco.ContentList.sln
 CALL "%programfiles(x86)%\Microsoft Visual Studio\2017\Community\MSBuild\15.0\Bin\amd64\MsBuild.exe" build\package.proj
 REM CALL "%programfiles(x86)%\Microsoft Visual Studio\2017\Enterprise\MSBuild\15.0\Bin\amd64\MsBuild.exe" build\package.proj

build/install.ps1

@@ -1,11 +1,11 @@
 param($installPath, $toolsPath, $package, $project)
 
 $appPluginsFolder = $project.ProjectItems | Where-Object { $_.Name -eq "App_Plugins" }
-$contentFolder = $appPluginsFolder.ProjectItems | Where-Object { $_.Name -eq "SimpleContent" }
+$contentFolder = $appPluginsFolder.ProjectItems | Where-Object { $_.Name -eq "ContentList" }
 
 if (!$contentFolder)
 {
-	$newPackageFiles = "$installPath\Content\App_Plugins\SimpleContent"
+	$newPackageFiles = "$installPath\Content\App_Plugins\ContentList"
 
 	$projFile = Get-Item ($project.FullName)
 	$projDirectory = $projFile.DirectoryName

build/package.proj

@@ -16,24 +16,24 @@
 
 	<!-- SHARED PROPERTIES -->
 	<PropertyGroup>
-		<ProjectName>Our.Umbraco.SimpleContent</ProjectName>
-		<PackageName>Simple Content</PackageName>
+		<ProjectName>Our.Umbraco.ContentList</ProjectName>
+		<PackageName>Content List</PackageName>
 		<MinUmbracoVersion>7.7.0</MinUmbracoVersion>
-		<Readme>Simple Content is an Umbraco property-editor for creating simple content blocks.</Readme>
+		<Readme>Content List is an Umbraco property-editor for creating a list of content blocks.</Readme>
 		<AuthorName>Lee Kelleher, Matt Brailsford</AuthorName>
-		<AuthorUrl>https://github.com/leekelleher/umbraco-simple-content/graphs/contributors</AuthorUrl>
+		<AuthorUrl>https://github.com/umco/umbraco-content-list/graphs/contributors</AuthorUrl>
 		<PackageLicenseName>MIT license</PackageLicenseName>
 		<PackageLicenseUrl>http://opensource.org/licenses/MIT</PackageLicenseUrl>
-		<ProjectUrl>https://github.com/leekelleher/umbraco-simple-content</ProjectUrl>
+		<ProjectUrl>https://github.com/umco/umbraco-content-list</ProjectUrl>
 	</PropertyGroup>
 
 	<!-- NUGET ONLY PROPERTIES -->
 	<PropertyGroup>
-		<PackageId>Our.Umbraco.SimpleContent</PackageId>
-		<NuGetPackageName>Simple Content for Umbraco</NuGetPackageName>
+		<PackageId>Our.Umbraco.ContentList</PackageId>
+		<NuGetPackageName>Content List for Umbraco</NuGetPackageName>
 		<Copyright>Copyright &#169; 2018 UMCO, Our Umbraco and other contributors</Copyright>
 		<Owners>Lee Kelleher, Matt Brailsford</Owners>
-		<IconUrl>https://raw.githubusercontent.com/leekelleher/umbraco-simple-content/master/docs/img/logo.png</IconUrl>
+		<IconUrl>https://raw.githubusercontent.com/umco/umbraco-content-list/master/docs/img/logo.png</IconUrl>
 		<Tags>umbraco umco</Tags>
 		<Language>en-GB</Language>
 		<RequireLicenseAcceptance>false</RequireLicenseAcceptance>

docs/img/logo.png

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <packageSources>
+    <add key="AppVeyor CI - Inner Content builds" value="https://ci.appveyor.com/nuget/umbraco-inner-content-w59jhwr5br60" />
+    <add key="MyGet: Umbraco Community Packages" value="https://www.myget.org/F/umbraco-packages/api/v3/index.json" />
+  </packageSources>
+</configuration>

docs/img/logo.psd

@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.27004.2008
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Our.Umbraco.SimpleContent", "Our.Umbraco.SimpleContent\Our.Umbraco.SimpleContent.csproj", "{E0F6B57D-F549-4EF0-B5A7-5C1A9B49FD80}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Our.Umbraco.ContentList", "Our.Umbraco.ContentList\Our.Umbraco.ContentList.csproj", "{E0F6B57D-F549-4EF0-B5A7-5C1A9B49FD80}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{52A49C4D-441F-4D54-A23F-444AF47DB250}"
 	ProjectSection(SolutionItems) = preProject

docs/img/screenshots/simple-content-datatype-prevalues.png

@@ -7,8 +7,8 @@
     <ProjectGuid>{E0F6B57D-F549-4EF0-B5A7-5C1A9B49FD80}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Our.Umbraco.SimpleContent</RootNamespace>
-    <AssemblyName>Our.Umbraco.SimpleContent</AssemblyName>
+    <RootNamespace>Our.Umbraco.ContentList</RootNamespace>
+    <AssemblyName>Our.Umbraco.ContentList</AssemblyName>
     <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
   </PropertyGroup>
@@ -42,8 +42,8 @@
       <HintPath>..\packages\Newtonsoft.Json.10.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="Our.Umbraco.InnerContent, Version=1.1.6675.6337, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Our.Umbraco.InnerContent.Core.1.1.1\lib\net45\Our.Umbraco.InnerContent.dll</HintPath>
+    <Reference Include="Our.Umbraco.InnerContent, Version=2.0.6775.8222, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Our.Umbraco.InnerContent.Core.2.0.0\lib\net45\Our.Umbraco.InnerContent.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="System" />
@@ -57,10 +57,10 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="ValueConverters\SimpleContentValueConverter.cs" />
+    <Compile Include="ValueConverters\ContentListValueConverter.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Properties\VersionInfo.cs" />
-    <Compile Include="PropertyEditors\SimpleContentPropertyEditor.cs" />
+    <Compile Include="PropertyEditors\ContentListPropertyEditor.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="app.config">
@@ -69,19 +69,10 @@
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="Web\UI\App_Plugins\SimpleContent\js\simplecontent.js" />
-    <Content Include="Web\UI\App_Plugins\SimpleContent\views\simplecontent.html" />
+    <Content Include="Web\UI\App_Plugins\ContentList\contentlist.js" />
+    <Content Include="Web\UI\App_Plugins\ContentList\contentlist.html" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <PropertyGroup>
-    <PostBuildEvent>IF %25ComputerName%25 == UMBRELLA-SB (
-  IF NOT "$(SolutionDir)" == "*Undefined*" (
-    XCOPY /s /y "$(TargetPath)" "C:\VCS\Umbrella\Carlsberg\lpb-project\carlsberg-lpb-baseline\bin\"
-    XCOPY /s /y "$(TargetDir)$(ProjectName).pdb" "C:\VCS\Umbrella\Carlsberg\lpb-project\carlsberg-lpb-baseline\bin\"
-    XCOPY /s /y "$(ProjectDir)Web\UI\*.*" "C:\VCS\Umbrella\Carlsberg\lpb-project\carlsberg-lpb-baseline\"
-  )
-)</PostBuildEvent>
-  </PropertyGroup>
   <Import Project="..\packages\AutoMapper.3.3.1\tools\AutoMapper.targets" Condition="Exists('..\packages\AutoMapper.3.3.1\tools\AutoMapper.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.

docs/img/screenshots/simple-content-property-editor-3.png

@@ -1,11 +1,11 @@
 using System.Reflection;
 using System.Runtime.InteropServices;
 
-[assembly: AssemblyTitle("Our.Umbraco.SimpleContent")]
+[assembly: AssemblyTitle("Our.Umbraco.ContentList")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("The Umbraco Community")]
-[assembly: AssemblyProduct("Our.Umbraco.SimpleContent")]
+[assembly: AssemblyProduct("Our.Umbraco.ContentList")]
 [assembly: AssemblyCopyright("Copyright \xa9 The Umbraco Community 2018")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]

docs/img/screenshots/simple-content-property-editor-4.png

@@ -0,0 +1,62 @@
+using ClientDependency.Core;
+using Our.Umbraco.InnerContent.PropertyEditors;
+using Umbraco.Core.PropertyEditors;
+using Umbraco.Web.PropertyEditors;
+
+namespace Our.Umbraco.ContentList.PropertyEditors
+{
+    [PropertyEditor(PropertyEditorAlias, PropertyEditorName, PropertyEditorValueTypes.Json, PropertyEditorViewPath, Group = "rich content", Icon = "icon-page-add")]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, "~/App_Plugins/ContentList/contentlist.js")]
+    public class ContentListPropertyEditor : SimpleInnerContentPropertyEditor
+    {
+        public const string PropertyEditorAlias = "Our.Umbraco.ContentList";
+        public const string PropertyEditorName = "Content List";
+        public const string PropertyEditorViewPath = "~/App_Plugins/ContentList/contentlist.html";
+
+        public ContentListPropertyEditor()
+            : base()
+        {
+            DefaultPreValues.Add("maxItems", 0);
+            DefaultPreValues.Add("hideLabel", "0");
+        }
+
+        protected override PropertyValueEditor CreateValueEditor()
+        {
+            return new SimpleInnerContentPropertyValueEditor(base.CreateValueEditor());
+        }
+
+        protected override PreValueEditor CreatePreValueEditor()
+        {
+            return new ContentListPreValueEditor();
+        }
+
+        internal class ContentListPreValueEditor : SimpleInnerContentPreValueEditor
+        {
+            public ContentListPreValueEditor()
+                : base()
+            {
+                // TODO: Once InnerContent exposes these extension methods, (in v2.0.1), uncomment the following lines. [LK:2018-07-20]
+                ////Fields.Add("maxItems", "Max Items", "number", "Set the maximum number of items allowed.");
+                ////Fields.AddHideLabel();
+
+                Fields.AddRange(new[]
+                {
+                    new PreValueField
+                    {
+                        Key = "maxItems",
+                        Name = "Max Items",
+                        View = "number",
+                        Description = "Set the maximum number of items allowed."
+                    },
+                    new PreValueField
+                    {
+                        Key = "hideLabel",
+                        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/NuGet.config

@@ -2,27 +2,27 @@
 using System.Collections.Generic;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
-using Our.Umbraco.InnerContent.Converters;
-using Our.Umbraco.SimpleContent.PropertyEditors;
+using Our.Umbraco.ContentList.PropertyEditors;
+using Our.Umbraco.InnerContent.ValueConverters;
 using Umbraco.Core;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
 using Umbraco.Core.Models.PublishedContent;
 using Umbraco.Core.PropertyEditors;
 
-namespace Our.Umbraco.SimpleContent.ValueConverters
+namespace Our.Umbraco.ContentList.ValueConverters
 {
-    public class SimpleContentValueConverter : InnerContentValueConverter, IPropertyValueConverterMeta
+    public class ContentListValueConverter : InnerContentValueConverter, IPropertyValueConverterMeta
     {
         public override bool IsConverter(PublishedPropertyType propertyType)
         {
-            return propertyType.PropertyEditorAlias.InvariantEquals(SimpleContentPropertyEditor.PropertyEditorAlias);
+            return propertyType.PropertyEditorAlias.InvariantEquals(ContentListPropertyEditor.PropertyEditorAlias);
         }
 
         public override object ConvertDataToSource(PublishedPropertyType propertyType, object source, bool preview)
         {
             var value = source?.ToString();
-            if (value == null || string.IsNullOrWhiteSpace(value))
+            if (string.IsNullOrWhiteSpace(value))
                 return null;
 
             try
@@ -32,7 +32,7 @@ public override object ConvertDataToSource(PublishedPropertyType propertyType, o
             }
             catch (Exception ex)
             {
-                LogHelper.Error<SimpleContentValueConverter>("Error converting value", ex);
+                LogHelper.Error<ContentListValueConverter>("Error converting value", ex);
             }
 
             return null;

src/Our.Umbraco.SimpleContent.sln renamed to src/Our.Umbraco.ContentList.sln

@@ -1,4 +1,4 @@
-<div class="simple-content" ng-controller="Our.Umbraco.SimpleContent.Controllers.PropertyEditorController as vm">
+<div class="content-list" ng-controller="Our.Umbraco.ContentList.Controllers.PropertyEditorController as vm">
 
     <div ui-sortable="vm.sortableOptions" ng-model="model.value">
         <umb-node-preview ng-repeat="item in model.value"

src/Our.Umbraco.SimpleContent/Our.Umbraco.SimpleContent.csproj renamed to src/Our.Umbraco.ContentList/Our.Umbraco.ContentList.csproj

@@ -1,4 +1,4 @@
-angular.module("umbraco").controller("Our.Umbraco.SimpleContent.Controllers.PropertyEditorController", [
+angular.module("umbraco").controller("Our.Umbraco.ContentList.Controllers.PropertyEditorController", [
 
     "$scope",
     "innerContentService",
@@ -13,12 +13,13 @@
         vm.allowEdit = true;
         vm.allowRemove = true;
         vm.published = true;
-        vm.sortable = true;
+        vm.sortable = $scope.model.config.maxItems !== "1";
 
         vm.sortableOptions = {
             axis: "y",
             containment: "parent",
             cursor: "move",
+            disabled: !vm.sortable,
             opacity: 0.7,
             scroll: true,
             tolerance: "pointer",

src/Our.Umbraco.SimpleContent/Properties/AssemblyInfo.cs renamed to src/Our.Umbraco.ContentList/Properties/AssemblyInfo.cs

@@ -31,7 +31,7 @@
   <package id="MiniProfiler" version="2.1.0" targetFramework="net452" />
   <package id="MySql.Data" version="6.9.9" targetFramework="net452" />
   <package id="Newtonsoft.Json" version="10.0.2" targetFramework="net452" />
-  <package id="Our.Umbraco.InnerContent.Core" version="1.1.1" targetFramework="net452" />
+  <package id="Our.Umbraco.InnerContent.Core" version="2.0.0" targetFramework="net452" />
   <package id="Owin" version="1.0" targetFramework="net452" />
   <package id="semver" version="1.1.2" targetFramework="net452" />
   <package id="SharpZipLib" version="0.86.0" targetFramework="net452" />