Skip to content

Commit 190d4da

Browse files
committed
Sync with Kendo UI Professional
1 parent b911cb7 commit 190d4da

26 files changed

+1075
-928
lines changed

docs-aspnet/_config.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,7 @@ navigation:
306306
position: 60
307307
"html-helpers":
308308
title: "Components"
309-
position: 7
309+
position: 8
310310
"html-helpers/datasource":
311311
title: "Data Source"
312312
"html-helpers/data-management":
@@ -487,16 +487,16 @@ navigation:
487487
title: "PDFViewer"
488488
"styles-and-layout":
489489
title: "Styles and Appearance"
490-
position: 8
490+
position: 9
491491
"styles-and-layout/sass-themes":
492492
title: "SASS Themes"
493493
position: 2
494494
"styles-and-layout/less-themes":
495495
title: "LESS Themes"
496496
position: 3
497497
"ai":
498-
title: "AI Coding Assistant"
499-
position: 9
498+
title: "AI Tools"
499+
position: 3
500500
"globalization":
501501
title: "Globalization"
502502
position: 10
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
#status-telerik-com
2+
3+
## Telerik NuGet Feed Status
4+
5+
Visit [status.telerik.com](https://status.telerik.com) to check the status of the Telerik NuGet server. The top section shows manually logged incidents with possible updates or workaround suggestions. The [**System Metrics** section](https://status.telerik.com/#system-metrics) provides real-time automated diagnostics.
6+
7+
#end
8+
9+
#identical-versions-note-core
10+
11+
> The installed {{ site.product }} NuGet package and the required [client-side assets]({% slug copyclientresources_aspnetmvc6_aspnetmvc %}) must have identical versions.
12+
13+
#end
14+
15+
#identical-versions-note-mvc
16+
17+
> The `Kendo.Mvc.dll` and the required [client-side assets]({% slug copyclientresources_aspnetmvc6_aspnetmvc %}) must have identical versions.
18+
19+
#end
20+
21+
#scripts-references-notes
22+
23+
>* The `kendo.all.min.js` and `kendo.aspnetmvc.min.js` scripts must be loaded after the `jquery.min.js` script.
24+
>* `jQuery` must be loaded only once. Ensure there are no duplicate references elsewhere in the `_Layout`.
25+
>* Starting with version 2023.3.1010, the Kendo UI bundles do not include the jQuery library in their `js` directories and you can use any available jQuery source you prefer (https://jquery.com/download/).
26+
27+
#end
Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
#generate-nuget-api-key
2+
3+
As the Telerik NuGet server requires authentication, the first step is to obtain an API key that you will use instead of a password. Using an API key instead of a password is a more secure approach{% if site.core %}, especially when working with the .NET CLI or a `NuGet.Config` file{% endif %}.
4+
5+
1. Go to the [API Keys](https://www.telerik.com/account/downloads/api-keys) page in your Telerik account.
6+
1. Click **Generate New Key +**.
7+
1. In the **Key Note** field, add a note that describes the API key.
8+
1. Click **Generate Key**.
9+
1. Select **Copy and Close**. Once you close the window, you can no longer copy the generated key. For security reasons, the **API Keys** page displays only a portion of the key.
10+
1. Store the generated NuGet API key as you will need it in the next steps. Whenever you need to authenticate your system with the Telerik NuGet server, use `api-key` as the username and your generated API key as the password.
11+
12+
> API keys expire after two years. Telerik will send you an email when a key is about to expire, but we recommend that you set your own calendar reminder with information about where you used that key: file paths, project links, AzDO and GitHub Action variable names, and so on.
13+
14+
#end
15+
16+
#add-nuget-feed
17+
18+
In this tutorial, you will use the [Telerik NuGet feed]({% slug nuget_install_aspnetmvc6_aspnetmvc%}) to download the {{ site.product_short }} components. This NuGet feed is private and requires you to authenticate with a NuGet API key.
19+
20+
To generate your NuGet API key:
21+
22+
1. Go to the [API Keys](https://www.telerik.com/account/downloads/api-keys) page in your Telerik account.
23+
24+
1. Click **Generate New Key +**.
25+
26+
1. In the **Key Note** field, add a note that describes the API key.
27+
28+
1. Click **Generate Key**.
29+
30+
1. Select **Copy and Close**. Once you close the window, you can no longer copy the generated key. For security reasons, the **API Keys** page displays only a portion of the key.
31+
32+
1. Store the generated NuGet API key as you will need it in the next steps.
33+
34+
Next, add the Telerik NuGet feed to Visual Studio:
35+
36+
1. In Visual Studio and go to **Tools** > **NuGet Package Manager** > **Package Manager Settings**.
37+
38+
1. Select **Package Sources** and then click the **+** button to add a new package source.
39+
40+
1. Enter a **Name** for the new package source, for example, `telerik.com`.
41+
42+
1. Add the `https://nuget.telerik.com/v3/index.json` URL as a **Source**. Click **OK**.
43+
44+
![Add the Telerik NuGet Feed in Visual Studio](images/add-nuget-source.png)
45+
46+
1. Whenever Visual Studio displays a dialog to enter credentials for `nuget.telerik.com`, use `api-key` as the username and your NuGet API key as the password.
47+
48+
#end
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
#nuget-security-links
2+
3+
You may find useful the following Microsoft articles on securing your NuGet feed setup and supply chain as general best practices:
4+
5+
* <a href="https://devblogs.microsoft.com/nuget/lock-down-your-dependencies-using-configurable-trust-policies/" target="_blank">Lock down your dependencies using configurable trust policies - Blog Post</a>
6+
* <a href="https://devblogs.microsoft.com/nuget/how-to-scan-nuget-packages-for-security-vulnerabilities/" target="_blank">How to Scan NuGet Packages for Security Vulnerabilities - Blog Post</a>
7+
* <a href="https://docs.microsoft.com/en-us/nuget/concepts/security-best-practices" target="_blank">Best practices for a secure software supply chain - MSDN docs</a>
8+
9+
Telerik provides signed NuGet packages that you can verify.
10+
11+
#end

docs-aspnet/_contentTemplates/mvc/add-client-side-resources.md

Lines changed: 44 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -2,76 +2,73 @@
22

33
## Including the Client-Side Resources
44

5-
Before you can use a Telerik UI component, you must include the theme, the jQuery script, and the Kendo UI scripts:
5+
To enable the Telerik UI for ASP.NET MVC components, you must add several [client-side]({% slug copyclientresources_aspnetmvc6_aspnetmvc %}) dependencies to the application, like scripts and a [theme file]({% slug sassbasedthemes_overview%})
66

7-
1. Go to `~\Views\Shared\_Layout.cshtml` and add the Kendo UI theme of your choice to the `<head>` of the document. Since Microsoft's project template uses Bootstrap, you can use the Kendo UI SASS Bootstrap theme to match it.
7+
Before adding a Telerik UI component, you must include the theme, the jQuery script, and the Kendo UI scripts:
8+
9+
1. Go to `~\Views\Shared\_Layout.cshtml` and add the theme of your choice to the `<head>` of the document. Since ASP.NET Web Application template uses Bootstrap, you can use the [Telerik UI Bootstrap theme]({% slug sassbasedthemes_overview%}#built-in-themes) to match it:
810

911
```HTML
1012
<head>
11-
<meta charset="utf-8" />
12-
<meta name="viewport" content="width=device-width, initial-scale=1.0">
13-
<title>@ViewBag.Title - My ASP.NET Application</title>
14-
@Styles.Render("~/Content/css")
15-
@Scripts.Render("~/bundles/modernizr")
16-
17-
@* Add the Kendo SASS Bootstrap theme: *@
18-
<link href="https://kendo.cdn.telerik.com/themes/{{ site.themesCdnVersion }}/bootstrap/bootstrap-main.css" rel="stylesheet" type="text/css" />
13+
...
14+
@Styles.Render("~/Content/css")
15+
@Scripts.Render("~/bundles/modernizr")
16+
17+
@* Add the Telerik UI Bootstrap Main theme: *@
18+
<link href="https://kendo.cdn.telerik.com/themes/{{ site.themesCdnVersion }}/bootstrap/bootstrap-main.css" rel="stylesheet" type="text/css" />
19+
...
1920
</head>
2021
```
2122

22-
1. In the `_Layout.cshtml` file, locate the `@Scripts.Render("~/bundles/jquery")` line in the `<body>` of the document and delete it. This jQuery script reference comes with the Microsoft ASP.NET Web Application template.
23-
24-
Removing this script is crucial because in the next step you add the jQuery script provided by Telerik. Having more than one script references causes errors.
25-
26-
1. Add the jQuery script to the `<head>` tag.
23+
1. The ASP.NET Web Application template comes with a jQuery script reference at the end of `_Layout.cshtml` file. Locate the `@Scripts.Render("~/bundles/jquery")` line in the `<body>` of the document and move it to the `<head>`. Alterantively, use the jQuery script hosted on the jQuery CDN.
2724

2825
```HTML
2926
<head>
30-
...
31-
<link href="https://kendo.cdn.telerik.com/themes/{{ site.themesCdnVersion }}/bootstrap/bootstrap-main.css" rel="stylesheet" type="text/css" />
27+
...
28+
<link href="https://kendo.cdn.telerik.com/themes/{{ site.themesCdnVersion }}/bootstrap/bootstrap-main.css" rel="stylesheet" type="text/css" />
3229

33-
@* Add the jQuery script from the jQuery CDN: *@
34-
<script src="https://code.jquery.com/jquery-3.7.0.min.js"></script>
30+
@* Add the jQuery script from the jQuery CDN: *@
31+
<script src="https://code.jquery.com/jquery-3.7.1.min.js"></script>
3532
</head>
3633
```
37-
1. Add the Kendo UI scripts. The Kendo UI script files required by UI for ASP.NET MVC must be loaded in the `<head>` tag *after* the jQuery script.
34+
35+
1. Add the required Kendo UI script files in the `<head>` tag after the `jQuery` script reference:
3836

3937
```HTML
4038
<head>
41-
...
42-
<link href="https://kendo.cdn.telerik.com/themes/{{ site.themesCdnVersion }}/bootstrap/bootstrap-main.css" rel="stylesheet" type="text/css" />
43-
<script src="https://code.jquery.com/jquery-3.7.0.min.js"></script>
44-
45-
@* Add the Kendo UI scripts: *@
46-
<script src="https://unpkg.com/jszip/dist/jszip.min.js"></script>
47-
<script src="https://kendo.cdn.telerik.com/{{ site.mvcCoreVersion }}/js/kendo.all.min.js"></script>
48-
<script src="https://kendo.cdn.telerik.com/{{ site.mvcCoreVersion }}/js/kendo.aspnetmvc.min.js"></script>
39+
...
40+
<link href="https://kendo.cdn.telerik.com/themes/{{ site.themesCdnVersion }}/bootstrap/bootstrap-main.css" rel="stylesheet" type="text/css" />
41+
<script src="https://code.jquery.com/jquery-3.7.1.min.js"></script>
42+
43+
@* Add the Kendo UI scripts: *@
44+
<script src="https://kendo.cdn.telerik.com/{{ site.mvcCoreVersion }}/js/kendo.all.min.js"></script>
45+
<script src="https://kendo.cdn.telerik.com/{{ site.mvcCoreVersion }}/js/kendo.aspnetmvc.min.js"></script>
4946
</head>
5047
```
51-
1. Finally, add the `bootstrap.min.js` script available in Microsoft's ASP.NET Web Application template, and the `<head>` will look like this.
48+
49+
> The installed {{ site.product }} NuGet package and the required [client-side assets]({% slug copyclientresources_aspnetmvc6_aspnetmvc %}) must have identical versions.
50+
51+
1. Finally, add the `bootstrap.min.js` script available in ASP.NET Web Application template. The `<head>` tag must contain the following sylesheets and scripts:
5252

5353
```HTML
54-
<head>
55-
<meta charset="utf-8" />
56-
<meta name="viewport" content="width=device-width, initial-scale=1.0">
57-
<title>@ViewBag.Title - My Telerik MVC Application</title>
58-
@Styles.Render("~/Content/css")
59-
@Scripts.Render("~/bundles/modernizr")
60-
<link href="https://kendo.cdn.telerik.com/themes/{{ site.themesCdnVersion }}/bootstrap/bootstrap-main.css" rel="stylesheet" type="text/css" />
61-
<script src="https://code.jquery.com/jquery-3.7.0.min.js"></script>
62-
<script src="https://unpkg.com/jszip/dist/jszip.min.js"></script>
63-
<script src="https://kendo.cdn.telerik.com/{{ site.mvcCoreVersion }}/js/kendo.all.min.js"></script>
64-
<script src="https://kendo.cdn.telerik.com/{{ site.mvcCoreVersion }}/js/kendo.aspnetmvc.min.js"></script>
65-
66-
@* Add the bootstrap.min.js script: *@
67-
<script src="@Url.Content("~/Scripts/bootstrap.min.js")"></script>
54+
55+
@Styles.Render("~/Content/css")
56+
@Scripts.Render("~/bundles/modernizr")
57+
<link href="https://kendo.cdn.telerik.com/themes/{{ site.themesCdnVersion }}/bootstrap/bootstrap-main.css" rel="stylesheet" type="text/css" />
58+
<script src="https://code.jquery.com/jquery-3.7.1.min.js"></script>
59+
<script src="https://kendo.cdn.telerik.com/{{ site.mvcCoreVersion }}/js/kendo.all.min.js"></script>
60+
<script src="https://kendo.cdn.telerik.com/{{ site.mvcCoreVersion }}/js/kendo.aspnetmvc.min.js"></script>
61+
62+
@* Add the bootstrap.min.js script: *@
63+
<script src="@Url.Content("~/Scripts/bootstrap.min.js")"></script>
6864
</head>
6965
```
7066
>Always observe the following rules when adding client-side resources to your project:
71-
> * Put the Kendo UI script files (`kendo.all.min.js` and `kendo.aspnetmvc.min.js`) after the `jquery.min.js` script.
72-
> * A jQuery script must be loaded only once. It must be placed only in the `<head>` tag of the `_Layout.cshtml` file. Make sure there are no duplicate jQuery references elsewhere in the `_Layout` file.
73-
> * The Kendo UI scripts, the Kendo UI CSS file must use a compatible version of the theme, and the `Kendo.Mvc.dll` referenced in the project must be the same version as the Kendo UI script files.
67+
> * Register the Kendo UI script files (`kendo.all.min.js` and `kendo.aspnetmvc.min.js`) after the `jquery.min.js` script.
68+
> * The jQuery script must be loaded only once. It must be placed only in the `<head>` tag of the `_Layout.cshtml` file. Ensure there are no duplicate jQuery references elsewhere in the `_Layout` file.
69+
> * The Telerik UI for ASP.NET MVC version and the version of the included Telerik UI theme must be mutually compatible. For more information, refer to the [compatibility table]({% slug sass_themes_compatibility_aspnetmvc6_aspnetmvc %}).
70+
> * The `Kendo.Mvc.dll` and the referenced Kendo UI scripts must have identical versions.
7471
75-
If you prefer to include the Kendo UI scripts and styles from a local source instead of CDNs, refer to the [Local Client-Side Resources]({% slug using_local_client_side_resources %}) article.
72+
If you prefer to include the client-side resources from a local source instead of CDNs, refer to the [Local Client-Side Resources]({% slug using_local_client_side_resources %}) article.
7673

7774
#end

docs-aspnet/ai-components-and-features.md

Lines changed: 0 additions & 71 deletions
This file was deleted.

0 commit comments

Comments
 (0)