Skip to content

Commit 7601266

Browse files
authored
Merge pull request #3817 from syncfusion-content/ES-935084-conflict
935084: Resolve conflict - Merging from hotfix 28.1.33 to development
2 parents 7be0af0 + bc4879c commit 7601266

File tree

169 files changed

+2565
-2059
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

169 files changed

+2565
-2059
lines changed
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
---
2+
title: Essential Studio for ##Platform_Name## Weekly Release Release Notes
3+
description: Essential Studio for ##Platform_Name## Weekly Release Release Notes
4+
platform: ej2-asp-core-mvc
5+
documentation: ug
6+
---
7+
8+
# Essential Studio for ##Platform_Name## Release Notes
9+
10+
{% include release-info.html date="January 14, 2025" version="v28.1.39" %}
11+
12+
{% directory path: _includes/release-notes/v28.1.39 %}
13+
14+
{% include {{file.url}} %}
15+
16+
{% enddirectory %}
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
---
2+
title: Essential Studio for ##Platform_Name## Weekly Release Release Notes
3+
description: Essential Studio for ##Platform_Name## Weekly Release Release Notes
4+
platform: ej2-asp-core-mvc
5+
documentation: ug
6+
---
7+
8+
# Essential Studio for ##Platform_Name## Release Notes
9+
10+
{% include release-info.html date="January 21, 2025" version="v28.1.41" %}
11+
12+
{% directory path: _includes/release-notes/v28.1.41 %}
13+
14+
{% include {{file.url}} %}
15+
16+
{% enddirectory %}

ej2-asp-core-mvc/avatar/EJ2_ASP.MVC/getting-started.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ documentation: ug
1111

1212
# Getting Started with ASP.NET MVC Avatar Control
1313

14-
This section briefly explains about how to include [ASP.NET MVC Avatar](https://www.syncfusion.com/aspnet-mvc-ui-controls/avatar) control in your ASP.NET MVC application using Visual Studio.
14+
This section explains about how to include [ASP.NET MVC Avatar](https://www.syncfusion.com/aspnet-mvc-ui-controls/avatar) control in your ASP.NET MVC application using Visual Studio.
1515

1616
## Prerequisites
1717

@@ -25,7 +25,7 @@ This section briefly explains about how to include [ASP.NET MVC Avatar](https://
2525

2626
## Add stylesheet
2727

28-
Here, the theme is referred using CDN inside the `<head>` of `~/Views/Shared/_Layout.cshtml` file as follows,
28+
Here, the desired theme is referred using CDN inside the `<head>` of **~/Views/Shared/_Layout.cshtml** file as follows,
2929

3030
{% tabs %}
3131
{% highlight c# tabtitle="~/_Layout.cshtml" %}
@@ -43,7 +43,7 @@ N> Checkout the [Themes topic](https://ej2.syncfusion.com/aspnetmvc/documentatio
4343

4444
## Add ASP.NET MVC Avatar control
4545

46-
Now, add the Syncfusion<sup style="font-size:70%">&reg;</sup> ASP.NET MVC Avatar control in `~/Home/Index.cshtml` page.
46+
Now, add the Syncfusion<sup style="font-size:70%">&reg;</sup> ASP.NET MVC Avatar control in **~/Home/Index.cshtml** page.
4747

4848
{% tabs %}
4949
{% highlight razor tabtitle="CSHTML" %}

ej2-asp-core-mvc/avatar/EJ2_ASP.NETCORE/getting-started.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ documentation: ug
1111

1212
# Getting Started with ASP.NET Core Avatar Control
1313

14-
This section briefly explains about how to include [ASP.NET Core Avatar](https://www.syncfusion.com/aspnet-core-ui-controls/avatar) control in your ASP.NET Core application using Visual Studio.
14+
This section explains about how to include [ASP.NET Core Avatar](https://www.syncfusion.com/aspnet-core-ui-controls/avatar) control in your ASP.NET Core application using Visual Studio.
1515

1616
## Prerequisites
1717

@@ -25,7 +25,7 @@ This section briefly explains about how to include [ASP.NET Core Avatar](https:/
2525

2626
## Add stylesheet
2727

28-
Here, the theme is referred using CDN inside the `<head>` of `~/Pages/Shared/_Layout.cshtml` file as follows,
28+
Here, the desired theme is referred using CDN inside the `<head>` of **~/Pages/Shared/_Layout.cshtml** file as follows,
2929

3030
{% tabs %}
3131
{% highlight cshtml tabtitle="~/_Layout.cshtml" %}
@@ -43,7 +43,7 @@ N> Checkout the [Themes topic](https://ej2.syncfusion.com/aspnetcore/documentati
4343

4444
## Add ASP.NET Core Avatar control
4545

46-
Now, add the Syncfusion<sup style="font-size:70%">&reg;</sup> ASP.NET Core Avatar tag helper in `~/Pages/Index.cshtml` page.
46+
Now, add the Syncfusion<sup style="font-size:70%">&reg;</sup> ASP.NET Core Avatar tag helper in **~/Pages/Index.cshtml** page.
4747

4848
{% tabs %}
4949
{% highlight cshtml tabtitle="CSHTML" %}

ej2-asp-core-mvc/avatar/how-to/avatar-customization.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
layout: post
3-
title: Avatar Customization in ##Platform_Name## Avatar Component | Syncfusion
4-
description: Learn here all about Avatar Customization in Syncfusion ##Platform_Name## Avatar component of Syncfusion Essential JS 2 and more.
3+
title: Avatar Customization in ##Platform_Name## Avatar control | Syncfusion
4+
description: Learn here all about Avatar Customization in Syncfusion ##Platform_Name## Avatar control of Syncfusion Essential JS 2 and more.
55
platform: ej2-asp-core-mvc
66
control: Avatar Customization
77
publishingplatform: ##Platform_Name##
@@ -12,7 +12,7 @@ documentation: ug
1212

1313
## Color customization
1414

15-
The avatar comes with default background color (Grey). This can be easily customized to desired color by adding custom class or directly selecting the avatar class from the CSS.
15+
The Avatar comes with default background color (Grey). This can be easily customized to the desired color by adding custom class or directly selecting the Avatar class from the CSS.
1616

1717
{% if page.publishingplatform == "aspnet-core" %}
1818

@@ -37,9 +37,9 @@ The avatar comes with default background color (Grey). This can be easily custom
3737

3838
![Avatar Color](../images/color.PNG)
3939

40-
## Customize avatar sizes
40+
## Customize Avatar sizes
4141

42-
Even though the avatar comes with five predefined sizes, sometimes it's not enough. So, the avatar is designed in such a way that the width and height will be relative to font-size. By changing the `font-size` of the avatar element, you can change the width and height automatically.
42+
Even though the Avatar comes with five predefined sizes, sometimes it's not enough. The Avatar is designed so that the width and height are relative to the font-size. By changing the `font-size` of the Avatar element, you can change the width and height automatically.
4343

4444
{% if page.publishingplatform == "aspnet-core" %}
4545

@@ -66,9 +66,9 @@ Even though the avatar comes with five predefined sizes, sometimes it's not enou
6666

6767
N> [View Sample in GitHub](https://github.com/SyncfusionExamples/ASP-NET-Core-UG-Examples/tree/main/Avatar/AvatarUGSample).
6868

69-
## Use various media in avatar
69+
## Use various media in Avatar
7070

71-
Avatars can be used with a wide variety of media formats like SVG, font-icons, images, letters, words, etc.
71+
Avatars can be used with a wide variety of types of media formats like SVG, font-icons, images, letters, words, etc.
7272

7373
{% if page.publishingplatform == "aspnet-core" %}
7474

ej2-asp-core-mvc/avatar/how-to/integrate-avatar-into-badge.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
---
22
layout: post
3-
title: Integrate Avatar Into Badge in ##Platform_Name## Avatar Component
4-
description: Learn here all about how to integrate avatar into badge in Syncfusion ##Platform_Name## Avatar component of Syncfusion Essential JS 2 and more.
3+
title: Integrate Avatar Into Badge in ##Platform_Name## Avatar control | Syncfusion
4+
description: Learn here all about how to integrate Avatar into Badge in Syncfusion ##Platform_Name## Avatar control of Syncfusion Essential JS 2 and more.
55
platform: ej2-asp-core-mvc
66
control: Integrate Avatar Into Badge
77
publishingplatform: ##Platform_Name##
88
documentation: ug
99
---
1010

11-
# Integrate avatar into Badge
11+
# Integrate Avatar into Badge
1212

13-
The badge is dependent and supportive component, and it can be used with avatar to create a notification avatar. The default avatar (.`e-avatar`) and circle avatar (.`e-avatar-circle`) have been used with notification badges (.`e-badge-notification`) in the following sample.
13+
The Badge is a dependent and supportive control that can be used with Avatar to create a notification Avatar. The default Avatar `(.e-avatar)` and circle Avatar `(.e-avatar-circle)` have been used with notification badges `(.e-badge-notification)` in the following sample.
1414

1515
{% if page.publishingplatform == "aspnet-core" %}
1616

ej2-asp-core-mvc/avatar/how-to/integrate-avatar-into-listview.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
---
22
layout: post
3-
title: Integrate Avatar Into Listview in ##Platform_Name## Avatar Component
4-
description: Learn here all about how to integrate avatar into Listview in Syncfusion ##Platform_Name## Avatar component of Syncfusion Essential JS 2 and more.
3+
title: Integrate Avatar Into ListView in ##Platform_Name## Avatar control | Syncfusion
4+
description: Learn here all about how to integrate Avatar into ListView in Syncfusion ##Platform_Name## Avatar control of Syncfusion Essential JS 2 and more.
55
platform: ej2-asp-core-mvc
6-
control: Integrate Avatar Into Listview
6+
control: Integrate Avatar Into ListView
77
publishingplatform: ##Platform_Name##
88
documentation: ug
99
---
1010

11-
# Integrate avatar into ListView
11+
# Integrate Avatar into ListView
1212

13-
Avatar is integrated into the listview to create contacts applications. The `xsmall` size avatar is used to match the size of the list item. Letters and images are also used as avatar content.
13+
Avatar is integrated into the ListView to create contacts applications. The `xsmall` size Avatar is used to match the size of the list items. Both letters and images are also used as Avatar content.
1414

1515
{% if page.publishingplatform == "aspnet-core" %}
1616

ej2-asp-core-mvc/avatar/types.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,19 +11,19 @@ documentation: ug
1111

1212
# Types and Styles in ##Platform_Name## Avatar Control
1313

14-
This section explains different types of avatar.
14+
This section explains different types of Avatar.
1515

1616
## Avatar size
1717

18-
The Essential<sup style="font-size:70%">&reg;</sup> JS 2 Avatar has the following predefined sizes that can be used with the `.e-avatar` class to change the appearance of the avatar.
18+
The Essential<sup style="font-size:70%">&reg;</sup> JS 2 Avatar has the following predefined sizes that can be used with the `.e-avatar` class to change the appearance of the Avatar.
1919

2020
| Class Name | Description |
2121
| ------------- | ------------- |
22-
| e-avatar-xlarge | Displays xlarge size avatar. |
23-
| e-avatar-large | Displays apply large size avatar. |
24-
| e-avatar | Displays apply default size avatar. |
25-
| e-avatar-small | Displays apply small size avatar. |
26-
| e-avatar-xsmall | Displays apply xsmall size avatar. |
22+
| e-avatar-xlarge | Displays xlarge size Avatar. |
23+
| e-avatar-large | Displays apply large size Avatar. |
24+
| e-avatar | Displays apply default size Avatar. |
25+
| e-avatar-small | Displays apply small size Avatar. |
26+
| e-avatar-xsmall | Displays apply xsmall size Avatar. |
2727

2828
{% if page.publishingplatform == "aspnet-core" %}
2929

@@ -50,14 +50,14 @@ The Essential<sup style="font-size:70%">&reg;</sup> JS 2 Avatar has the followin
5050

5151
## Avatar types
5252

53-
The types of Essential<sup style="font-size:70%">&reg;</sup> JS 2 avatar are:
53+
The types of Essential<sup style="font-size:70%">&reg;</sup> JS 2 Avatar are:
5454

5555
* Default
5656
* Circle
5757

5858
### Default
5959

60-
The default style of the avatar is rectangular shape with rounded corners, which can be applied from adding the modifier class `.e-avatar` to the target element.
60+
The default style of the Avatar is rectangular shape with rounded corners, which can be applied from adding the modifier class `.e-avatar` to the target element.
6161

6262
{% if page.publishingplatform == "aspnet-core" %}
6363

@@ -83,7 +83,7 @@ The default style of the avatar is rectangular shape with rounded corners, which
8383

8484
### Circle
8585

86-
The circle avatar style can be applied by adding the modifier class `.e-avatar-circle` to the target element.
86+
The circle Avatar style can be applied by adding the modifier class `.e-avatar-circle` to the target element.
8787

8888
{% if page.publishingplatform == "aspnet-core" %}
8989

ej2-asp-core-mvc/badge/EJ2_ASP.MVC/getting-started-asp-mvc.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ This section briefly explains about how to include [ASP.NET MVC Badge](https://w
2525

2626
## Add stylesheet
2727

28-
Here, the theme is referred using CDN inside the `<head>` of `~/Views/Shared/_Layout.cshtml` file as follows,
28+
Here, the theme is referred using CDN inside the `<head>` of **~/Views/Shared/_Layout.cshtml** file as follows,
2929

3030
{% tabs %}
3131
{% highlight c# tabtitle="~/_Layout.cshtml" %}
@@ -43,7 +43,7 @@ N> Checkout the [Themes topic](https://ej2.syncfusion.com/aspnetmvc/documentatio
4343

4444
## Add ASP.NET MVC Badge control
4545

46-
Now, add the Syncfusion<sup style="font-size:70%">&reg;</sup> ASP.NET MVC Badge control in `~/Home/Index.cshtml` page.
46+
Now, add the Syncfusion<sup style="font-size:70%">&reg;</sup> ASP.NET MVC Badge control in **~/Home/Index.cshtml** page.
4747

4848
{% tabs %}
4949
{% highlight razor tabtitle="CSHTML" %}

ej2-asp-core-mvc/badge/EJ2_ASP.NETCORE/getting-started-asp-core.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ This section briefly explains about how to include [ASP.NET Core Badge](https://
2525

2626
## Add stylesheet
2727

28-
Here, the theme is referred using CDN inside the `<head>` of `~/Pages/Shared/_Layout.cshtml` file as follows,
28+
Here, the theme is referred using CDN inside the `<head>` of **~/Pages/Shared/_Layout.cshtml** file as follows,
2929

3030
{% tabs %}
3131
{% highlight cshtml tabtitle="~/_Layout.cshtml" %}
@@ -43,7 +43,7 @@ N> Checkout the [Themes topic](https://ej2.syncfusion.com/aspnetcore/documentati
4343

4444
## Add ASP.NET Core Badge Control
4545

46-
Now, add the Syncfusion<sup style="font-size:70%">&reg;</sup> ASP.NET Core Badge tag helper in `~/Pages/Index.cshtml` page.
46+
Now, add the Syncfusion<sup style="font-size:70%">&reg;</sup> ASP.NET Core Badge tag helper in **~/Pages/Index.cshtml** page.
4747

4848
{% tabs %}
4949
{% highlight cshtml tabtitle="CSHTML" %}

ej2-asp-core-mvc/badge/how-to/badge-customization.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
layout: post
3-
title: Badge Customization in ##Platform_Name## Badge Component
4-
description: Learn here all about Badge Customization in Syncfusion ##Platform_Name## Badge component of Syncfusion Essential JS 2 and more.
3+
title: Badge Customization in ##Platform_Name## Badge control | Syncfusion
4+
description: Learn here all about Badge Customization in Syncfusion ##Platform_Name## Badge control of Syncfusion Essential JS 2 and more.
55
platform: ej2-asp-core-mvc
66
control: Badge Customization
77
publishingplatform: ##Platform_Name##
@@ -10,9 +10,9 @@ documentation: ug
1010

1111
# Customization in ##Platform_Name## Badge Control
1212

13-
## Colour customization
13+
## Color customization
1414

15-
Even though badges come with `8 predefined colors`, you can also customize the colour of the badge as desired.
15+
Even though Badges come with `8 predefined colors`, you can also customize the color of the Badge as desired.
1616

1717
{% if page.publishingplatform == "aspnet-core" %}
1818

@@ -37,9 +37,9 @@ Even though badges come with `8 predefined colors`, you can also customize the c
3737

3838
![Badge Color Customization](../images/colorcustom.PNG)
3939

40-
## Customize badge size
40+
## Customize Badge size
4141

42-
Badges are designed to change its size based on the content. To change the size of a badge, adjust the `font size` of the badge.
42+
Badges are designed to change its size based on the content. To change the size of a Badge, adjust the `font size` of the Badge.
4343

4444
{% if page.publishingplatform == "aspnet-core" %}
4545

@@ -66,7 +66,7 @@ Badges are designed to change its size based on the content. To change the size
6666

6767
## Custom position
6868

69-
Even though the badges support the conventional `top` and `bottom` positions, the position of the badges can be changed as desired. This can be done by adding a custom class to the badge element to override the default position applied from the source.
69+
Even though the Badges support the conventional `top` and `bottom` positions, the position of the Badges can be changed as desired. This can be done by adding a custom class to the Badge element to override the default position applied from the source.
7070

7171
{% if page.publishingplatform == "aspnet-core" %}
7272

ej2-asp-core-mvc/badge/how-to/dynamic-badge-content.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
layout: post
3-
title: Dynamic Badge Content in ##Platform_Name## Badge Component
4-
description: Learn here all about Dynamic Badge Content in Syncfusion ##Platform_Name## Badge component of Syncfusion Essential JS 2 and more.
3+
title: Dynamic Badge Content in ##Platform_Name## Badge control | Syncfusion
4+
description: Learn here all about Dynamic Badge Content in Syncfusion ##Platform_Name## Badge control of Syncfusion Essential JS 2 and more.
55
platform: ej2-asp-core-mvc
66
control: Dynamic Badge Content
77
publishingplatform: ##Platform_Name##
@@ -10,7 +10,7 @@ documentation: ug
1010

1111
# Dynamic Badge Content
1212

13-
Badges in real-time needs to be updated dynamically based on the requirements. The following sample demonstrates how to update the badges content dynamically. Click the increment button to change the badge value.
13+
Badges in real-time needs to be updated dynamically based on the requirements. The following sample demonstrates how to update the Badges content dynamically. Click the increment button to change the Badge value.
1414

1515
{% if page.publishingplatform == "aspnet-core" %}
1616

ej2-asp-core-mvc/badge/how-to/integrate-badge-into-listview.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
layout: post
3-
title: Integrate Badge Into Listview in ##Platform_Name## Badge Component
4-
description: Learn here all about how to integrate badge into Listview in Syncfusion ##Platform_Name## Badge component of Syncfusion Essential JS 2 and more.
3+
title: Integrate Badge Into Listview in ##Platform_Name## Badge control | Syncfusion
4+
description: Learn here all about how to integrate Badge into Listview in Syncfusion ##Platform_Name## Badge control of Syncfusion Essential JS 2 and more.
55
platform: ej2-asp-core-mvc
66
control: Integrate Badge Into Listview
77
publishingplatform: ##Platform_Name##
@@ -10,9 +10,9 @@ documentation: ug
1010

1111
# Integrate Badge into ListView
1212

13-
The badges can be integrated with the `listview` component to indicate new notification with colour based on priority.
13+
The Badges can be integrated with the `listview` control to indicate new notification with color based on priority.
1414

15-
In the following sample, `default` badges are used and there is no need to customize the badge size. The component will automatically adjust the size based on the container element.
15+
In the following sample, `default` Badges are used and there is no need to customize the Badge size. The control will automatically adjust the size based on the container element.
1616

1717
{% if page.publishingplatform == "aspnet-core" %}
1818

0 commit comments

Comments
 (0)