Merge pull request #7446 from greystate/issue-7220-upload-field

Update documentation and codesamples for upload field, multiurl picker and richtext mce

Author: eshanrnh

15/umbraco-cms/fundamentals/backoffice/property-editors/built-in-umbraco-property-editors/file-upload.md

@@ -33,42 +33,36 @@ Example: `"/media/o01axaqu/guidelines-on-remote-working.pdf"`
 ### Without Models Builder
 
 ```csharp
-@using System.IO;
-@{
-    if (Model.HasValue("myFile"))
-    {
-        var myFile = Model.Value<string>("myFile");
-
-        <a href="@myFile">@System.IO.Path.GetFileName(myFile)</a>
-    }
+@if (Model.HasValue("myFile"))
+{
+    var myFile = Model.Value<string>("myFile");
 
+    <a href="@myFile">@System.IO.Path.GetFileName(myFile)</a>
 }
 ```
 
 ### With Models Builder
 
 ```csharp
-@if (!Model.HasValue(Model.MyFile))
+@if (Model.HasValue("MyFile"))
 {
    <a href="@Model.MyFile">@System.IO.Path.GetFileName(Model.MyFile)</a>
 }
 ```
 
 ## Add values programmatically
 
-{% hint style="info" %}
-The samples in this section have not been verified against the latest version of Umbraco.
-
-Instead, we recommend using the [Media Picker](media-picker-3.md) for uploading files to your Umbraco website.
-{% endhint %}
-
 See the example below to see how a value can be added or changed programmatically. To update a value of this property editor you need the [Content Service](https://apidocs.umbraco.com/v15/csharp/api/Umbraco.Cms.Core.Services.ContentService.html) and the [Media Service](https://apidocs.umbraco.com/v15/csharp/api/Umbraco.Cms.Core.Services.MediaService.html).
 
 {% hint style="info" %}
 The example below demonstrates how to add values programmatically using a Razor view. However, this is used for illustrative purposes only and is not the recommended method for production environments.
 {% endhint %}
 
 ```csharp
+@using System.Net
+@using Umbraco.Cms.Core
+@using Umbraco.Cms.Core.Services
+@using Umbraco.Cms.Core.PropertyEditors
 @using Umbraco.Cms.Core.IO
 @using Umbraco.Cms.Core.Serialization
 @using Umbraco.Cms.Core.Strings
@@ -115,22 +109,13 @@ The example below demonstrates how to add values programmatically using a Razor
 }
 ```
 
-Although the use of a GUID is preferable, you can also use the numeric ID to get the page:
-
-```csharp
-@{
-    // Get the page using it's id
-    var content = ContentService.GetById(1234); 
-}
-```
-
 If Models Builder is enabled you can get the alias of the desired property without using a magic string:
 
 ```csharp
 @using Umbraco.Cms.Core.PublishedCache
 @inject IPublishedContentTypeCache PublishedContentTypeCache
 @{
-    // Set the value of the property with alias 'myFile'
-    content.SetValue(Home.GetModelPropertyType(PublishedContentTypeCache, x => x.MyFile).Alias, publishedMedia.Url();
+    // Set the value of the property `MyFile` by looking up its alias
+    content.SetValue(Home.GetModelPropertyType(PublishedContentTypeCache, x => x.MyFile).Alias, publishedMedia.Url());
 }
 ```

15/umbraco-cms/fundamentals/backoffice/property-editors/built-in-umbraco-property-editors/images/Multi-Url-Picker-Content.png

@@ -6,19 +6,27 @@
 
 `Returns: IEnumerable<Link> or Link`
 
-Multi Url Picker allows an editor to pick and sort multiple urls. This property editor returns a single item if the "Maximum number of items" Data Type setting is set to 1 or a collection if it is 0. These can either be internal, external or media.
+Multi Url Picker allows an editor to pick and sort multiple URLs.
+It returns either a single item or a collection. This depends on the "Maximum number of items" Data Type setting.
+When that is set to 1, it returns a single item, otherwise a collection.
+Multi URL Picker allows editors to select and sort multiple URLs. The property returns either a single item or a collection, depending on the **Maximum number of items** setting in the Data Type configuration.
+
+- When the maximum is set to 1, it returns a single item.
+- When the maximum is greater than 1, it returns a collection.
+
+The URLs can point to **internal**, **external**, or **media** items.
 
 ## Data Type Definition Example
 
-![Related Links Data Type Definition](images/Multi-Url-Picker-DataType.png)
+![Multi URL Picker Data Type Definition](images/Multi-Url-Picker-DataType.png)
 
 ## Content Example
 
-![Media Picker Content](../../../../../../10/umbraco-cms/fundamentals/backoffice/property-editors/built-in-property-editors/images/Multy-Url-Picker-Content-v8.png)
+![Multi Url Picker Content](images/Multi-Url-Picker-Content.png)
 
-## MVC View Example - value converters enabled
+## MVC View Example
 
-## Typed
+### Without Models Builder
 
 ```csharp
 @using Umbraco.Cms.Core.Models
@@ -36,7 +44,7 @@ Multi Url Picker allows an editor to pick and sort multiple urls. This property
 }
 ```
 
-If `Max number of items` is configured to `1`
+This example handles the case of `Maximum number of items` set to `1`:
 
 ```csharp
 @using Umbraco.Cms.Core.Models
@@ -49,6 +57,36 @@ If `Max number of items` is configured to `1`
 }
 ```
 
+### With Models Builder
+
+```csharp
+@{
+    var links = Model.FooterLinks;
+    if (links.Any())
+    {
+        <ul>
+            @foreach (var link in links)
+            {
+                <li><a href="@link.Url" target="@link.Target">@link.Name</a></li>
+            }
+        </ul>
+    }
+}
+```
+
+And here is the case of `Maximum number of items` set to `1`:
+
+```csharp
+@{
+    var link = Model.Link;
+    if (link != null)
+    {
+        <a href="@link.Url" target="@link.Target">@link.Name</a>
+    }
+}
+```
+
+
 ## Add values programmatically
 
 See the example below to see how a value can be added or changed programmatically. To update a value of a property editor you need the [Content Service](https://apidocs.umbraco.com/v15/csharp/api/Umbraco.Cms.Core.Services.ContentService.html).
@@ -126,15 +164,6 @@ The example below demonstrates how to add values programmatically using a Razor
 }
 ```
 
-Although the use of a GUID is preferable, you can also use the numeric ID to get the page:
-
-```csharp
-@{
-    // Get the page using it's id
-    var content = ContentService.GetById(1234); 
-}
-```
-
 If Models Builder is enabled you can get the alias of the desired property without using a magic string:
 
 ```csharp

15/umbraco-cms/fundamentals/backoffice/property-editors/built-in-umbraco-property-editors/images/file-upload-definition.png

@@ -7,15 +7,17 @@
 `Returns: HTML`
 
 {% hint style="warning" %}
-This article is a work in progress and may undergo further revisions, updates, or amendments. The information contained herein is subject to change without notice.
+In Umbraco 15, the Rich Text Editor has a new default property editor UI that introduces Tiptap as an alternative.
+
+You can continue to use the TinyMCE UI for the Rich Text Editor, but this UI will be removed in Umbraco 16.
 {% endhint %}
 
 The Rich Text Editor (RTE) is highly configurable and based on [TinyMCE](https://www.tinymce.com/). Depending on the configuration, it will give your content editors more flexibility when working with content that should be more than plain text.
 
 {% hint style="info" %}
 **Are you using custom configurations or plugins with TinyMCE?**
 
-In Umbraco 11 the TinyMCE version supported has been upgraded from version 4 to version 6. You need to migrate to the latest version if you are using TinyMCE plugins or custom configuration.
+In Umbraco 11 the TinyMCE version supported was upgraded from version 4 to version 6. You need to migrate to the latest version if you are using TinyMCE plugins or custom configuration.
 
 If your site is upgraded from an older version, follow the migration guides below to upgrade the TinyMCE version as well.
 
@@ -25,7 +27,7 @@ If your site is upgraded from an older version, follow the migration guides belo
 
 ## [Configuration options](configuration.md)
 
-Customize everything from toolbar options to editor size to where pasted images are saved.
+Customize everything from toolbar options and editor size to where pasted images are saved.
 
 ## [Styles](styles.md)
 
@@ -41,11 +43,11 @@ Extend the functionality of the Rich Text Editor with plugins.
 
 ## Data Type Definition Example
 
-![Rich Text Editor - Data Type](images/rte-datatype-v10.png)
+![Rich Text Editor - Data Type](images/rte-datatype-v15.png)
 
 ## Content Example
 
-![Rich Text Editor - Content](images/rte-content-11.png)
+![Rich Text Editor - Content](images/rte-content-v15.png)
 
 ## MVC View Example
 
@@ -99,15 +101,6 @@ The example below demonstrates how to add values programmatically using a Razor
 }
 ```
 
-Although the use of a GUID is preferable, you can also use the numeric ID to get the page:
-
-```csharp
-@{
-    // Get the page using it's id
-    var content = ContentService.GetById(1234);
-}
-```
-
 If Models Builder is enabled you can get the alias of the desired property without using a magic string.
 
 ```csharp

15/umbraco-cms/fundamentals/backoffice/property-editors/built-in-umbraco-property-editors/multi-url-picker.md

@@ -22,7 +22,7 @@ Find the full documentation for the property in the [Media Picker](media-picker-
 
 ## Content Example
 
-![Content Example Empty](../../../../../../10/umbraco-cms/fundamentals/backoffice/property-editors/built-in-property-editors/images/content-example-empty.png) ![Content Example](../../../../../../10/umbraco-cms/fundamentals/backoffice/property-editors/built-in-property-editors/images/File-Upload-content-example.png)
+![Content Example Empty](images/fileupload-content-empty.png) ![Content Example](images/fileupload-content.png)
 
 In code, the property is a string, which references the location of the file.
 
@@ -33,42 +33,36 @@ Example: `"/media/o01axaqu/guidelines-on-remote-working.pdf"`
 ### Without Models Builder
 
 ```csharp
-@using System.IO;
-@{
-    if (Model.HasValue("myFile"))
-    {
-        var myFile = Model.Value<string>("myFile");
-
-        <a href="@myFile">@System.IO.Path.GetFileName(myFile)</a>
-    }
+@if (Model.HasValue("myFile"))
+{
+    var myFile = Model.Value<string>("myFile");
 
+    <a href="@myFile">@System.IO.Path.GetFileName(myFile)</a>
 }
 ```
 
 ### With Models Builder
 
 ```csharp
-@if (!Model.HasValue(Model.MyFile))
+@if (Model.HasValue("myFile"))
 {
    <a href="@Model.MyFile">@System.IO.Path.GetFileName(Model.MyFile)</a>
 }
 ```
 
 ## Add values programmatically
 
-{% hint style="info" %}
-The samples in this section have not been verified against the latest version of Umbraco.
-
-Instead, we recommend using the [Media Picker](media-picker-3.md) for uploading files to your Umbraco website.
-{% endhint %}
-
 See the example below to see how a value can be added or changed programmatically. To update a value of this property editor you need the [Content Service](https://apidocs.umbraco.com/v15/csharp/api/Umbraco.Cms.Core.Services.ContentService.html) and the [Media Service](https://apidocs.umbraco.com/v15/csharp/api/Umbraco.Cms.Core.Services.MediaService.html).
 
 {% hint style="info" %}
 The example below demonstrates how to add values programmatically using a Razor view. However, this is used for illustrative purposes only and is not the recommended method for production environments.
 {% endhint %}
 
 ```csharp
+@using System.Net
+@using Umbraco.Cms.Core
+@using Umbraco.Cms.Core.Services
+@using Umbraco.Cms.Core.PropertyEditors
 @using Umbraco.Cms.Core.IO
 @using Umbraco.Cms.Core.Serialization
 @using Umbraco.Cms.Core.Strings
@@ -115,15 +109,6 @@ The example below demonstrates how to add values programmatically using a Razor
 }
 ```
 
-Although the use of a GUID is preferable, you can also use the numeric ID to get the page:
-
-```csharp
-@{
-    // Get the page using it's id
-    var content = ContentService.GetById(1234); 
-}
-```
-
 If Models Builder is enabled you can get the alias of the desired property without using a magic string:
 
 ```csharp