Merge branch '7-language-variants-support'

Builds/NuGet/Umbraco.MegaNavV8.Api.nuspec

@@ -2,7 +2,7 @@
 <package >
   <metadata>
     <id>AaronSadler.MegaNavV8.Api</id>
-    <version>8.0.11</version>
+    <version>8.0.12</version>
     <title>Umbraco.MegaNavV8.Api</title>
     <authors>Aaron Sadler, Callum Whyte</authors>
     <owners>Aaron Sadler, Callum Whyte</owners>
@@ -12,7 +12,7 @@
     <icon>MegaNavV8-Logo.png</icon>
     <summary>A flexible, draggable link picker for constructing site navigation menus, big or small, in Umbraco</summary>
     <description>A flexible, draggable link picker for constructing site navigation menus, big or small, in Umbraco</description>
-    <releaseNotes><![CDATA[Changed converter to retrieve most recent url from cache]]></releaseNotes>
+    <releaseNotes><![CDATA[Added culture variant support]]></releaseNotes>
     <copyright>Copyright 2020</copyright>
     <tags>umbraco, umbraco-cms, MegaNav, MegaNav-V8</tags>
 	<dependencies>

Builds/NuGet/Umbraco.MegaNavV8.Core.nuspec

@@ -2,7 +2,7 @@
 <package >
   <metadata>
     <id>AaronSadler.MegaNavV8.Core</id>
-    <version>8.0.11</version>
+    <version>8.0.12</version>
     <title>Umbraco.MegaNavV8.Core</title>
     <authors>Aaron Sadler, Callum Whyte</authors>
     <owners>Aaron Sadler, Callum Whyte</owners>
@@ -12,7 +12,7 @@
     <icon>MegaNavV8-Logo.png</icon>
     <summary>A flexible, draggable link picker for constructing site navigation menus, big or small, in Umbraco</summary>
     <description>A flexible, draggable link picker for constructing site navigation menus, big or small, in Umbraco</description>
-    <releaseNotes><![CDATA[Changed converter to retrieve most recent url from cache]]></releaseNotes>
+    <releaseNotes><![CDATA[Added culture variant support]]></releaseNotes>
     <copyright>Copyright 2020</copyright>
     <tags>umbraco, umbraco-cms, MegaNav, MegaNav-V8</tags>
 	<dependencies>

Builds/NuGet/Umbraco.MegaNavV8.Web.nuspec

@@ -2,7 +2,7 @@
 <package >
   <metadata>
     <id>AaronSadler.MegaNavV8.Web</id>
-    <version>8.0.14</version>
+    <version>8.0.15</version>
     <title>Umbraco.MegaNavV8.Web</title>
     <authors>Aaron Sadler, Callum Whyte</authors>
     <owners>Aaron Sadler, Callum Whyte</owners>
@@ -12,12 +12,12 @@
     <icon>MegaNavV8-Logo.png</icon>
     <summary>A flexible, draggable link picker for constructing site navigation menus, big or small, in Umbraco</summary>
     <description>A flexible, draggable link picker for constructing site navigation menus, big or small, in Umbraco</description>
-    <releaseNotes><![CDATA[Changed converter to retrieve most recent url from cache]]></releaseNotes>
+    <releaseNotes><![CDATA[Added culture variant support]]></releaseNotes>
     <copyright>Copyright 2020</copyright>
     <tags>umbraco, umbraco-cms, MegaNav, MegaNav-V8</tags>
 	<dependencies>
-	  <dependency id="AaronSadler.MegaNavV8.Core" version="8.0.11" />
-	  <dependency id="AaronSadler.MegaNavV8.Api" version="8.0.11" />
+	  <dependency id="AaronSadler.MegaNavV8.Core" version="8.0.12" />
+	  <dependency id="AaronSadler.MegaNavV8.Api" version="8.0.12" />
     </dependencies>
   </metadata>
       <files>

CHANGELOG.md

@@ -1,7 +1,9 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
-The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/).
+## [8.0.15] - 2020-08-30
+### Added
+* Added language variant support
 
 ## [8.0.14] - 2020-06-26
 ### Changed

README.md

@@ -2,12 +2,6 @@
 
 # Umbraco MeganavV8
 
-A flexible, draggable link picker for constructing site navigation menus, big or small, in Umbraco 8.
-
-This based on [MegaNav V2.0.0](https://github.com/callumbwhyte/meganav/releases/tag/v2.0.0) by [Callum Whyte](https://our.umbraco.com/members/id:152036/), I have changed it to use UDI instead of ID and it now supports querystrings / anchor urls.
-
-All credit for the initial plugin goes to [Callum Whyte](https://our.umbraco.com/members/id:152036/).
-
 ## Getting started
 
 This package is supported on Umbraco 8.4+.
@@ -27,7 +21,7 @@ To [install Core from NuGet](https://www.nuget.org/packages/AaronSadler.MegaNavV
 
 ## Usage
 
-After installing the package, you will have a new property editor called MegaNav in the Umbraco backoffice.
+After installing the package, you will have a new property editor called MegaNavV8 in the Umbraco backoffice.
 
 Here you can configure the "Max depth" of the navigation - the maximum number of levels deep at which an editor can place nav items. You also have the option to prevent nav items where the _umbracoNaviHide_ property has been set from rendering on the front-end - these items will still appear in the backoffice but not on your website, you can still edit or change them as you wish. By default both of these settings are left unset.
 
@@ -62,11 +56,7 @@ To raise a new bug, create an issue on the GitHub repository. To fix a bug or ad
 ### Who do I talk to?
 This project is maintained by [Aaron Sadler](https://aaronsadler.uk) and contributors. If you have any questions about the project please contact me through [Twitter](https://twitter.com/AaronSadlerUK), or by raising an issue on GitHub.
 
-## Credits
-
-Meganav uses a _slightly_ modified version of [Angular UI Tree](https://github.com/angular-ui-tree/angular-ui-tree) v2.11.0 (MIT license)
-
-### A special #h5yr to our contributors
+### A special #h5yr to the orignal author
 
 * [Callum Whyte](https://github.com/callumbwhyte)
 

TestSite/App_Data/Models/all.generated.cs

@@ -6,7 +6,7 @@
 using  Umbraco.Core.Models.PublishedContent;
 using  Umbraco.Web;
 using  Umbraco.ModelsBuilder.Embedded;
-[assembly:ModelsBuilderAssembly(PureLive = true, SourceHash = "c4de1de1cea5bfb3")]
+[assembly:ModelsBuilderAssembly(PureLive = true, SourceHash = "aeb9685254c299f3")]
 [assembly:System.Reflection.AssemblyVersion("0.0.0.1")]
 
 
@@ -300,6 +300,20 @@ public ContentPage(IPublishedContent content)
 
 		// properties
 
+		///<summary>
+		/// Content Picker
+		///</summary>
+		[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder", "8.6.1")]
+		[ImplementPropertyType("contentPicker")]
+		public global::Umbraco.Core.Models.PublishedContent.IPublishedContent ContentPicker => this.Value<global::Umbraco.Core.Models.PublishedContent.IPublishedContent>("contentPicker");
+
+		///<summary>
+		/// Multi Url Picker
+		///</summary>
+		[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder", "8.6.1")]
+		[ImplementPropertyType("multiUrlPicker")]
+		public global::System.Collections.Generic.IEnumerable<global::Umbraco.Web.Models.Link> MultiUrlPicker => this.Value<global::System.Collections.Generic.IEnumerable<global::Umbraco.Web.Models.Link>>("multiUrlPicker");
+
 		///<summary>
 		/// Content
 		///</summary>

TestSite/App_Data/Models/models.generated.cs

@@ -17,8 +17,8 @@
 using Umbraco.Web;
 using Umbraco.ModelsBuilder.Embedded;
 
-[assembly:ModelsBuilderAssembly(PureLive = true, SourceHash = "c4de1de1cea5bfb3")]
-[assembly:System.Reflection.AssemblyVersion("0.0.0.1")]
+[assembly:ModelsBuilderAssembly(PureLive = true, SourceHash = "aeb9685254c299f3")]
+[assembly:System.Reflection.AssemblyVersion("0.0.0.6")]
 
 namespace Umbraco.Web.PublishedModels
 {
@@ -286,6 +286,20 @@ public ContentPage(IPublishedContent content)
 
 		// properties
 
+		///<summary>
+		/// Content Picker
+		///</summary>
+		[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder", "8.6.1")]
+		[ImplementPropertyType("contentPicker")]
+		public global::Umbraco.Core.Models.PublishedContent.IPublishedContent ContentPicker => this.Value<global::Umbraco.Core.Models.PublishedContent.IPublishedContent>("contentPicker");
+
+		///<summary>
+		/// Multi Url Picker
+		///</summary>
+		[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Umbraco.ModelsBuilder", "8.6.1")]
+		[ImplementPropertyType("multiUrlPicker")]
+		public global::System.Collections.Generic.IEnumerable<global::Umbraco.Web.Models.Link> MultiUrlPicker => this.Value<global::System.Collections.Generic.IEnumerable<global::Umbraco.Web.Models.Link>>("multiUrlPicker");
+
 		///<summary>
 		/// Content
 		///</summary>

TestSite/App_Data/packages/createdPackages.config

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="1" version="8.0.14" url="https://github.com/AaronSadlerUK/Umbraco.MegaNavV8" name="Umbraco.MegaNavV8" packagePath="~/media/created-packages/Umbraco.MegaNavV8_8.0.14.zip" iconUrl="https://raw.githubusercontent.com/AaronSadlerUK/Umbraco.MegaNavV8/master/Builds/MegaNavV8-Logo.png" umbVersion="8.4.0" packageGuid="ab215413-3dee-4475-93f3-fe4736de6533" view="">
+  <package id="1" version="8.0.15" url="https://github.com/AaronSadlerUK/Umbraco.MegaNavV8" name="Umbraco.MegaNavV8" packagePath="~/media/created-packages/Umbraco.MegaNavV8_8.0.15.zip" iconUrl="https://raw.githubusercontent.com/AaronSadlerUK/Umbraco.MegaNavV8/master/Builds/MegaNavV8-Logo.png" umbVersion="8.4.0" packageGuid="ab215413-3dee-4475-93f3-fe4736de6533" view="">
     <license url="http://opensource.org/licenses/MIT"><![CDATA[MIT License]]></license>
     <author url="https://aaronsadler.uk"><![CDATA[Aaron Sadler]]></author>
     <contributors>