Cleared the conflicts

ej2-asp-core-mvc/code-snippet/diagram/interaction/nodefixeduserhandle2/node.cs

@@ -0,0 +1,33 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.Mvc;
+using Syncfusion.EJ2.Diagrams;
+using System.Drawing;
+
+namespace EJ2MVCSampleBrowser.Controllers.Diagram {
+    public partial class DiagramController: Controller {
+        public ActionResult Nodes() {
+            List < DiagramNode > nodes = new List < DiagramNode > ();
+            // A fixed user handle is created and stored in fixed user handle collection of Node.
+            List<DiagramNodeFixedUserHandle> handle = new List<DiagramNodeFixedUserHandle>();
+            handle.Add(new DiagramNodeFixedUserHandle() { Tooltip = new DiagramDiagramTooltip() { Content = "handle1", Position = "TopLeft",  RelativeMode= TooltipRelativeMode.Object}, Margin = new DiagramMargin() {Right=20 },Width=20,Height=20, PathData = "M60.3,18H27.5c-3,0-5.5,2.4-5.5,5.5v38.2h5.5V23.5h32.7V18z M68.5,28.9h-30c-3,0-5.5,2.4-5.5,5.5v38.2c0,3,2.4,5.5,5.5,5.5h30c3,0,5.5-2.4,5.5-5.5V34.4C73.9,31.4,71.5,28.9,68.5,28.9z M68.5,72.5h-30V34.4h30V72.5z" });
+            nodes.Add(new DiagramNode() {
+                Id = "node1",
+                    Width = 100,
+                    Height = 100,
+                    BorderWidth=2,
+                    Style = new NodeStyleNodes() {
+                        Fill = "darkcyan"
+                    },
+                    OffsetX = 100,
+                    OffsetY = 100,
+                    FixedUserHandles = handle
+            });
+            ViewBag.nodes = nodes;
+            return View();
+        }
+    }
+
+}

ej2-asp-core-mvc/code-snippet/diagram/interaction/nodefixeduserhandle2/tagHelper

@@ -0,0 +1,2 @@
+<ejs-diagram id="container" width="100%" height="700px" nodes="@ViewBag.nodes">
+</ejs-diagram>

ej2-asp-core-mvc/code-snippet/floating-action-button/styles/custom-outline/fabstyles.cs

@@ -0,0 +1,4 @@
+public ActionResult FabStyles()
+{
+    return View();
+}

ej2-asp-core-mvc/code-snippet/floating-action-button/styles/custom-outline/razor

@@ -0,0 +1,11 @@
+@using Syncfusion.EJ2.Buttons
+
+<div id="target" style="min-height:200px; position:relative; width:300px; border:1px solid;">
+    @Html.EJS().Fab("fab").Target("#target").IconCss("e-icons e-people").Content("Contact").CssClass("custom-css").Render()
+</div>
+<style>
+    .custom-css.e-fab.e-btn {
+        border-color: darkgrey;
+        border-width: 4px;
+    }
+</style>

ej2-asp-core-mvc/code-snippet/floating-action-button/styles/custom-outline/tagHelper

@@ -0,0 +1,11 @@
+@using Syncfusion.EJ2.Buttons
+
+<div id="target" style="min-height:200px; position:relative; width:300px; border:1px solid;">
+    <ejs-fab id="fab" target="#target" cssClass="custom-css" iconCss="e-icons e-people" content="Contact"></ejs-fab>
+</div>
+<style>
+    .custom-css.e-fab.e-btn {
+        border-color: darkgrey;
+        border-width: 4px;
+    }
+</style>

ej2-asp-core-mvc/code-snippet/rich-text-editor/basic/default/razor

@@ -1,4 +1,4 @@
-@Html.EJS().RichTextEditor("defaultRTE").ContentTemplate(@<div>
+@Html.EJS().RichTextEditor("editor").ContentTemplate(@<div>
     <div>
         <p>The Rich Text Editor is WYSIWYG ('what you see is what you get') editor useful to create and edit content, and return the valid <a href='https://ej2.syncfusion.com/aspnetmvc/RichTextEditor/Overview'>HTML markup</a> or <a href='https://ej2.syncfusion.com/aspnetmvc/RichTextEditor/DefaultMode'>markdown</a> of the content</p>
         <p><b> Toolbar </b></p>

ej2-asp-core-mvc/code-snippet/rich-text-editor/basic/default/tagHelper

@@ -1,4 +1,4 @@
-<ejs-richtexteditor id="defaultRTE">
+<ejs-richtexteditor id="editor">
     <e-content-template>
         <div>
             <p>The Rich Text Editor is WYSIWYG ('what you see is what you get') editor useful to create and edit content, and return the valid <a href='https://ej2.syncfusion.com/aspnetcore/RichTextEditor/Overview'>HTML markup</a> or <a href='https://ej2.syncfusion.com/aspnetcore/RichTextEditor/DefaultMode'>markdown</a> of the content</p>

ej2-asp-core-mvc/common/EJ2_ASP.MVC/accessibility.md

@@ -134,7 +134,7 @@ letter-spacing: 0.7px;
         <div class="controlanchorlink"><a target="_self" href="https://ej2.syncfusion.com/aspnetmvc/documentation/tree-grid/accessibility">Tree Grid</a></div>
          <div class="controlanchorlink"><a target="_self" href="https://ej2.syncfusion.com/aspnetmvc/documentation/spreadsheet/accessibility">Spreadsheet</a></div>
         <div><p class="controlcategory">FILE VIEWERS & EDITORS</p></div>
-        <div class="controlanchorlink"><a target="_self" href="">In-place Editor</a></div>
+        <div class="controlanchorlink"><a target="_self" href="https://ej2.syncfusion.com/aspnetmvc/documentation/in-place-editor/accessibility">In-place Editor</a></div>
         <div class="controlanchorlink"><a target="_self" href="https://ej2.syncfusion.com/aspnetmvc/documentation/pdfviewer/accessibility">PDF Viewer</a></div>
         <div class="controlanchorlink"><a target="_self" href="https://ej2.syncfusion.com/aspnetmvc/documentation/rich-text-editor/accessibility">RichTextEditor</a></div>
         <div class="controlanchorlink"><a target="_self" href="">Word Processor</a></div>
@@ -154,7 +154,7 @@ letter-spacing: 0.7px;
         <div class="controlanchorlink"><a target="_self" href="https://ej2.syncfusion.com/aspnetmvc/documentation/stock-chart/accessibility">Stock Chart</a></div>
         <div class="controlanchorlink"><a target="_self" href="https://ej2.syncfusion.com/aspnetmvc/documentation/circular-gauge/accessibility">Circular Gauge</a></div>
         <div class="controlanchorlink"><a target="_self" href="https://ej2.syncfusion.com/aspnetmvc/documentation/diagram/accessibility">Diagram</a></div>
-        <div class="controlanchorlink"><a target="_self" href="">HeatMap Chart</a></div>
+        <div class="controlanchorlink"><a target="_self" href="https://ej2.syncfusion.com/aspnetmvc/documentation/heatmap-chart/accessibility">HeatMap Chart</a></div>
         <div class="controlanchorlink"><a target="_self" href="https://ej2.syncfusion.com/aspnetmvc/documentation/linear-gauge/accessibility">Linear Gauge</a></div>
         <div class="controlanchorlink"><a target="_self" href="https://ej2.syncfusion.com/aspnetmvc/documentation/maps/accessibility">Maps</a></div>
         <div class="controlanchorlink"><a target="_self" href="https://ej2.syncfusion.com/aspnetmvc/documentation/range-navigator/accessibility">Range Selector</a></div>

ej2-asp-core-mvc/common/EJ2_ASP.MVC/content-security-policy.md

@@ -0,0 +1,49 @@
+---
+layout: post
+title: Content Security Policy in ##Platform_Name## Common Control | Syncfusion
+description: Learn here all about Content Security Policy in Syncfusion ##Platform_Name## Common control of Syncfusion Essential JS 2 and more.
+platform: ej2-asp-core-mvc
+control: Common
+publishingplatform: ##Platform_Name##
+documentation: ug
+---
+
+# Content Security Policy
+
+Content Security Policy (CSP) is a security feature implemented by web browsers that helps to protect against attacks such as cross-site scripting (XSS) and data injection. It limits the sources from which content can be loaded on a web page.
+
+To enable strict [Content Security Policy (CSP)](https://csp.withgoogle.com/docs/strict-csp.html), certain browser features are disabled by default. In order to use Syncfusion controls with strict CSP mode, it is essential to include following directives in the CSP meta tag.
+
+* Syncfusion controls are rendered with calculated **inline styles** and **base64** font icons, which are blocked on a strict CSP-enabled site. To allow them, add the [`style-src 'self' 'unsafe-inline';`](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy/style-src) and [`font-src 'self' data:;`](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy/font-src) directives in the meta tag as follows.
+
+{% tabs %}
+{% highlight c# tabtitle="~/_Layout.cshtml" %}
+
+<meta http-equiv="Content-Security-Policy" content="default-src 'self';
+    script-src 'self' 'unsafe-inline'  https://cdn.syncfusion.com;
+    style-src 'self' 'unsafe-inline';
+    font-src 'self'  data:;" />
+
+{% endhighlight %}
+{% endtabs %}
+
+* Syncfusion **material** and **tailwind** built-in themes contain a reference to the [`Roboto’s external font`](https://fonts.googleapis.com/css?family=Roboto:400,500), which is also blocked. To allow them, add the [`external font`](https://fonts.googleapis.com/css?family=Roboto:400,500) reference to the [`style-src`](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy/style-src) and [`font-src`](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy/font-src) directives in the above meta tag.
+
+The resultant meta tag is included within the `<head>` tag and resolves the CSP violation on the application's side when utilizing Syncfusion controls with material and tailwind themes.
+
+{% tabs %}
+{% highlight c# tabtitle="~/_Layout.cshtml" %}
+
+<head>
+    ...
+    <meta http-equiv="Content-Security-Policy" content="default-src 'self';
+    script-src 'self' 'unsafe-inline'  https://cdn.syncfusion.com;
+    style-src 'self' https://fonts.googleapis.com/ 'unsafe-inline';
+    font-src 'self' https://fonts.googleapis.com/ https://fonts.gstatic.com/ data:;" />
+</head>
+
+{% endhighlight %}
+{% endtabs %}
+
+N> The `unsafe-eval` directive needs to be added in `script-src` for controls which uses the templates.
+

ej2-asp-core-mvc/common/EJ2_ASP.MVC/showcase-samples.md

@@ -16,4 +16,4 @@ Syncfusion has a collection of sample applications that demonstrate the use of S
 | ------------- | ------------- | ------------- |
 | [Expense Tracker](https://ej2.syncfusion.com/showcase/aspnetmvc/expense-tracker/) | Track and visualize your daily expenses with a great UI. | [GitHub code](https://github.com/syncfusion/ej2-showcase-aspnetmvc-expensetracker) |
 | [Loan Calculator](https://ej2.syncfusion.com/showcase/aspnetmvc/loancalculator/) | Calculate loan payments, interest rates, and amortization schedules. When you are planning for a personal loan or analyzing business financing options, this provides accurate results and helps you make informed financial decisions. | [GitHub code](https://github.com/syncfusion/ej2-showcase-aspnetmvc-loan-calculator) |
-| [Web Mail](https://ej2.syncfusion.com/showcase/aspnetmvc/webmail/) | Outlook like user interface to manage your mailbox. | [GitHub code](https://github.com/syncfusion/ej2-showcase-aspnetmvc-outlook) |
+| [Web Mail](https://ej2.syncfusion.com/showcase/aspnetmvc/webmail/) | Outlook like user interface to manage your mailbox. | [GitHub code](https://github.com/syncfusion/ej2-showcase-aspnetmvc-outlook) |

ej2-asp-core-mvc/common/EJ2_ASP.NETCORE/content-security-policy.md

@@ -0,0 +1,78 @@
+---
+layout: post
+title: Content Security Policy in ##Platform_Name## Common Control | Syncfusion
+description: Learn here all about Content Security Policy in Syncfusion ##Platform_Name## Common control of Syncfusion Essential JS 2 and more.
+platform: ej2-asp-core-mvc
+control: Common
+publishingplatform: ##Platform_Name##
+documentation: ug
+---
+
+# Content Security Policy
+
+Content Security Policy (CSP) is a security feature implemented by web browsers to protect against attacks such as cross-site scripting (XSS) and data injection. It limits the sources from which content can be loaded on a web page. To enable strict Content Security Policy (CSP), certain browser features are disabled by default. To use Syncfusion controls with strict CSP mode, it is essential to include the following directives:
+
+`nonce` attribute is used in CSP to validate requests and prevent attackers from injecting JavaScript code into a web application.
+
+
+## Steps to Create and Include the Nonce Attribute in an ASP.NET Core Application
+
+* Generate the `nonce` attribute value by adding the below code in **Program.cs** file.
+
+* Syncfusion material and tailwind built-in themes contain a reference to the Roboto’s external font, which is also blocked. To allow them, add the external font reference to the `style-src` and `font-src` directives in the above meta tag.
+
+{% tabs %}
+{% highlight c# tabtitle="Program.cs" %}
+
+using System.Security.Cryptography;
+
+...
+app.Use(async (context, next) =>
+{
+    RNGCryptoServiceProvider rng = new RNGCryptoServiceProvider();
+    byte[] nonceBytes = new byte[32];
+    rng.GetBytes(nonceBytes);
+    string nonceValue = Convert.ToBase64String(nonceBytes);
+    context.Items.Add("ScriptNonce", nonceValue);
+    context.Response.Headers.Add("Content-Security-Policy", string.Format(
+    "script-src 'self' 'nonce-{0}' https://cdn.syncfusion.com;" +
+    "style-src-elem 'self' 'unsafe-inline' https://cdn.syncfusion.com https://fonts.googleapis.com;" +
+    "font-src 'self' data: https://fonts.gstatic.com;" +
+    "object-src 'none';", nonceValue));
+    await next();
+});
+
+
+{% endhighlight %}
+{% endtabs %}
+
+* Open **_Layout.cshtml** file and add `nonce` attribute in the client side resources like below,
+
+{% tabs %}
+{% highlight c# tabtitle="~/_Layout.cshtml" %}
+<head>
+    ...
+    <!-- Syncfusion ASP.NET Core controls scripts -->
+    <script src="https://cdn.syncfusion.com/ej2/{{ site.ej2version }}/dist/ej2.min.js" nonce="@Context.Items["ScriptNonce"]"></script>
+</head>
+{% endhighlight %}
+{% endtabs %}
+
+* Set `add-nonce` for `ejs-scripts` while registering the script manager at the end of `<body>` of **_Layout.cshtml** file as follows,
+
+{% tabs %}
+{% highlight c# tabtitle="~/_Layout.cshtml" %}
+<body>
+    ...
+    <!-- Syncfusion ASP.NET Core Script Manager -->
+    <ejs-scripts add-nonce="@Context.Items["ScriptNonce"]"></ejs-scripts>
+</body>
+{% endhighlight %}
+{% endtabs %}
+
+N> The `unsafe-eval` directive needs to be added in `script-src` for controls which uses the templates.
+
+* Run the application then see the DOM, `nonce` attribute is added in script tag and it's value hidden for security purpose.
+
+
+

ej2-asp-core-mvc/common/EJ2_ASP.NETCORE/security-aspects.md

@@ -41,64 +41,6 @@ The following list demonstrates the Syncfusion ASP.NET Core controls that are su
 * [Tooltip](https://help.syncfusion.com/cr/aspnetcore-js2/Syncfusion.EJ2.Popups.Tooltip.html#Syncfusion_EJ2_Popups_Tooltip_EnableHtmlSanitizer)
 * [TreeView](https://help.syncfusion.com/cr/aspnetcore-js2/Syncfusion.EJ2.Navigations.TreeView.html#Syncfusion_EJ2_Navigations_TreeView_EnableHtmlSanitizer)
 
-## Adding Nonce to Script tag in ASP.NET Core
-
-`Nonce` attribute is used in content security policy to find out whether given request is valid or not and it prevents the attackers injecting the javascript code in a web application.
-
-The following steps demonstrates how to create and include the nonce attribute in ASP.NET Core application.
-
-* Generate the `nonce` attribute value by adding the below code in **Program.cs** file.
-
-{% tabs %}
-{% highlight c# tabtitle="Program.cs" %}
-
-using System.Security.Cryptography;
-
-...
-app.Use(async (context, next) =>
-{
-    RNGCryptoServiceProvider rng = new RNGCryptoServiceProvider();
-    byte[] nonceBytes = new byte[32];
-    rng.GetBytes(nonceBytes);
-    string nonceValue = Convert.ToBase64String(nonceBytes);
-    context.Items.Add("ScriptNonce", nonceValue);
-    context.Response.Headers.Add("Content-Security-Policy", string.Format(
-    "script-src 'self' 'nonce-{0}' cdn.syncfusion.com;" +
-    "style-src-elem 'self' cdn.syncfusion.com fonts.googleapis.com;" +
-    "font-src 'self' data: fonts.gstatic.com;" +
-    "object-src 'none';", nonceValue));
-    await next();
-});
-
-{% endhighlight %}
-{% endtabs %}
-
-* Open **_Layout.cshtml** file and add `nonce` attribute in the client side resources like below,
-
-{% tabs %}
-{% highlight c# tabtitle="~/_Layout.cshtml" %}
-<head>
-    ...
-    <!-- Syncfusion ASP.NET Core controls scripts -->
-    <script src="https://cdn.syncfusion.com/ej2/{{ site.ej2version }}/dist/ej2.min.js" nonce="@Context.Items["ScriptNonce"]"></script>
-</head>
-{% endhighlight %}
-{% endtabs %}
-
-* Set `add-nonce` for `ejs-scripts` while registering the script manager at the end of `<body>` of **_Layout.cshtml** file as follows,
-
-{% tabs %}
-{% highlight c# tabtitle="~/_Layout.cshtml" %}
-<body>
-    ...
-    <!-- Syncfusion ASP.NET Core Script Manager -->
-    <ejs-scripts add-nonce="@Context.Items["ScriptNonce"]"></ejs-scripts>
-</body>
-{% endhighlight %}
-{% endtabs %}
-
-* Run the application then see the DOM, nonce attribute is added in script tag and it's value hidden for security purpose.
-
 ## See also
 
 * [Develop an ASP.NET Core web application securely](https://www.syncfusion.com/blogs/post/10-practices-secure-asp-net-core-mvc-app.aspx)

ej2-asp-core-mvc/common/EJ2_ASP.NETCORE/showcase-samples.md

@@ -17,4 +17,5 @@ Syncfusion has a collection of sample applications that demonstrate the use of S
 | [Diagram Builder](https://ej2.syncfusion.com/showcase/aspnetcore/diagrambuilder/) |  Diagram Builder is a web application which is used to create the diagrams like Flow Chart, process diagrams and more. | [GitHub code](https://github.com/syncfusion/ej2-showcase-aspnetcore-diagram-builder) |
 | [Expense Tracker](https://ej2.syncfusion.com/showcase/aspnetcore/expense-tracker/) | Track and visualize your daily expenses with a great UI. | [GitHub code](https://github.com/syncfusion/ej2-showcase-aspnetcore-expensetracker) |
 | [Loan Calculator](https://ej2.syncfusion.com/showcase/aspnetcore/loan-calculator/) | Calculate loan payments, interest rates, and amortization schedules. When you are planning for a personal loan or analyzing business financing options, this provides accurate results and helps you make informed financial decisions. | [GitHub code](https://github.com/syncfusion/ej2-showcase-aspnetcore-loan-calculator) |
-| [Web Mail](https://ej2.syncfusion.com/showcase/aspnetcore/webmail/) | Outlook like user interface to manage your mailbox. | [GitHub code](https://github.com/syncfusion/ej2-showcase-aspnetcore-outlook) |
+| [Web Mail](https://ej2.syncfusion.com/showcase/aspnetcore/webmail/) | Outlook like user interface to manage your mailbox. | [GitHub code](https://github.com/syncfusion/ej2-showcase-aspnetcore-outlook) |
+

ej2-asp-core-mvc/diagram/user-handle.md

@@ -312,3 +312,27 @@ To show tooltip on mouse over, the [`tooltip`](../api/diagram#tooltip) property
 {% endhighlight %}
 {% endtabs %}
 {% endif %}
+
+### Tooltip support for Fixed User Handle
+
+The diagram provides support to show tooltip when the mouse hovers over any fixed user handle. To show the tooltip on mouse over, the [`tooltip`](../api/diagram#tooltip) property of diagram model needs to be set with the tooltip [`content`](../api/diagram/diagramTooltip/#content) and [`position`](../api/diagram/diagramTooltip/#position) as shown in the following example.
+
+{% if page.publishingplatform == "aspnet-core" %}
+
+{% tabs %}
+{% highlight cshtml tabtitle="CSHTML" %}
+{% include code-snippet/diagram/interaction/nodefixeduserhandle2/tagHelper %}
+{% endhighlight %}
+{% highlight c# tabtitle="Node.cs" %}
+{% include code-snippet/diagram/interaction/nodefixeduserhandle2/node.cs %}
+{% endhighlight %}
+{% endtabs %}
+
+{% elsif page.publishingplatform == "aspnet-mvc" %}
+
+{% tabs %}
+{% highlight c# tabtitle="Node.cs" %}
+{% include code-snippet/diagram/interaction/nodefixeduserhandle2/node.cs %}
+{% endhighlight %}
+{% endtabs %}
+{% endif %}

ej2-asp-core-mvc/floating-action-button/EJ2_ASP.MVC/styles.md

@@ -70,4 +70,23 @@ By using [CssClass](https://help.syncfusion.com/cr/aspnetmvc-js2/Syncfusion.EJ2.
 
 {% endif %}
 
-![Asp.Net MVC Floating Action Button control with Hover](images/onhover.png)
+![Asp.Net MVC Floating Action Button control with Hover](images/onhover.png)
+
+## Outline customization
+
+By using the [CssClass](https://help.syncfusion.com/cr/aspnetmvc-js2/Syncfusion.EJ2.Buttons.Fab.html#Syncfusion_EJ2_Buttons_Fab_CssClass) property, you can customize the outline color of the Floating Action Button.
+
+{% if page.publishingplatform == "aspnet-mvc" %}
+
+{% tabs %}
+{% highlight razor tabtitle="CSHTML" %}
+{% include code-snippet/floating-action-button/styles/custom-outline/razor %}
+{% endhighlight %}
+{% highlight c# tabtitle="Fabstyles.cs" %}
+{% include code-snippet/floating-action-button/styles/custom-outline/fabstyles.cs %}
+{% endhighlight %}
+{% endtabs %}
+
+{% endif %}
+
+![Asp.Net MVC Floating Action Button control with Outline](images/FabOutline.png)