Skip to content

Commit ab5ed34

Browse files
author
Kendo Bot
committed
Sync with Kendo UI Professional
1 parent 53d3a50 commit ab5ed34

File tree

18 files changed

+132
-54
lines changed

18 files changed

+132
-54
lines changed
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<!doctype html>
2+
<html>
3+
<head>
4+
<meta charset="utf-8">
5+
</head>
6+
<body>
7+
{% capture site_url %}{% if site.url %}{{ site.url }}{% else %}{{ site.github.url }}{% endif %}{% endcapture %}
8+
{% for post in site.html_pages %}
9+
<a href="https://kendobuild.telerik.com/aspnet-core{{ post.url | replace:'.html','' }}">https://kendobuild.telerik.com/aspnet-core{{ post.url | replace:'.html','' }}</a>
10+
{% endfor %}
11+
</body>
12+
</html>

docs-aspnet-core/all-pages.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
---
2+
publish: false
3+
layout: all-pages-staging
4+
---

docs-aspnet-core/getting-started/getting-started.md

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,19 @@ position: 1
99

1010
# Getting Started with Progress<sup>®</sup> Telerik<sup>®</sup> UI for ASP.NET Core
1111

12-
This article demonstrates how to configure an ASP.NET Core project to use Telerik UI for ASP.NET Core in Visual Studio 2017.
12+
This article demonstrates how to configure an ASP.NET Core project to use Telerik UI for ASP.NET Core in Visual Studio (VS) 2017.
1313

1414
## Prerequisites
1515

16-
The prerequisites for creating and running an ASP.NET Core on Windows with Visual Studio 2017 are described on the [.NET Core documentation site](https://docs.microsoft.com/en-us/dotnet/core/windows-prerequisites).
16+
The prerequisites for creating and running an ASP.NET Core on Windows with VS 2017 are described on the [.NET Core documentation site](https://docs.microsoft.com/en-us/dotnet/core/windows-prerequisites).
1717

1818
> **Important**
1919
>
20-
> It's possible to use Visual Studio 2015 only for .NET Core 1.x development, but it's not recommended for the following reasons:
20+
> You can use Visual Studio 2015 only for .NET Core 1.x development. However, this approach is not recommended because:
21+
> * The .NET Core tooling is in a preview version which is not officially supported.
22+
> * The projects are `project.json`-based which is deprecated.
2123
>
22-
> * The .NET Core tooling is a preview version, which is not officially supported.
23-
> * The projects are project.json-based, which is deprecated.
24-
>
25-
> Note also, that if you use VS 2015, in order to ensure the matching of the ASP.NET Core version which is distributed with the Telerik UI for ASP.NET Core, you need to manually change the `Microsoft.AspNetCore.Routing` and `Microsoft.AspNetCore.Mvc` versions to `1.1.0` in `project.json`.
24+
> If you use Visual Studio 2015, to ensure the matching of the ASP.NET Core version which is distributed with the Telerik UI for ASP.NET Core, manually change the `Microsoft.AspNetCore.Routing` and `Microsoft.AspNetCore.Mvc` versions to `1.1.0` in `project.json`.
2625
2726
## Configuration
2827

@@ -34,7 +33,7 @@ Configure an ASP.NET Core Web Application to use Telerik UI for ASP.NET Core:
3433
### Create ASP.NET Core Project
3534

3635
1. Select **File** > **New Project**.
37-
2. Choose **Installed** > **Visual C#** > **Web** > **ASP.NET Core Web Application**.
36+
2. Select **Installed** > **Visual C#** > **Web** > **ASP.NET Core Web Application**.
3837
3. Set a name and location for the project and click **OK**.
3938
4. Select **Web Application** from the **ASP.NET Core Templates** dialog.
4039
5. Click **OK** to create the project.
@@ -53,17 +52,17 @@ To add the NuGet packages:
5352

5453
![NuGet package manager](images/manage-nuget-packages.png)
5554

56-
2. Click the `Browse` tab, select the Telerik package source and search for `Telerik.UI.for.AspNet.Core`.
55+
2. Click the **Browse** tab, select the Telerik package source and search for `Telerik.UI.for.AspNet.Core`.
5756

58-
3. Install the `Telerik.UI.for.AspNet.Core` package. This should add a line to your `.csproj` file similar to the example below.
57+
3. Install the `Telerik.UI.for.AspNet.Core` package. It adds a line to your `.csproj` file similar to the following example.
5958

6059
###### Example
6160

6261
<PackageReference Include="Telerik.UI.for.AspNet.Core" Version="{{ site.mvcCoreVersion }}" />
6362

64-
4. Open `Startup.cs` and update it in the way demonstrated in the following examples:
63+
4. Open `Startup.cs` and update it in the following way:
6564

66-
* Locate the `ConfigureServices` method and add the calls shown in the code snippet below:
65+
* Locate the `ConfigureServices` method and add the calls.
6766

6867
###### Example
6968

@@ -74,15 +73,15 @@ To add the NuGet packages:
7473
// https://github.com/aspnet/Announcements/issues/194
7574
services
7675
.AddMvc()
77-
.AddJsonOptions(options =>
76+
.AddJsonOptions(options =>
7877
options.SerializerSettings.ContractResolver = new DefaultContractResolver());
7978

8079
// Add Kendo UI services to the services container
8180
services.AddKendo();
8281
}
83-
84-
* Add the required using for `Newtonsoft.Json.Serialization`:
85-
82+
83+
* Add the required `using Newtonsoft.Json.Serialization` line.
84+
8685
###### Example
8786

8887
...
@@ -121,7 +120,7 @@ To add the NuGet packages:
121120

122121
7. Register the Kendo UI styles and scripts in `~/Views/Shared/_Layout.cshtml`.
123122

124-
> **Important**
123+
> **Important**
125124
>
126125
> In the default .NET Core template, the jQuery scripts are included at the end of the `<body>` element. To properly load the Telerik UI for ASP.NET HtmlHelpers, move the jQuery scripts and the Kendo UI client-side scripts to the `<head>` element and make sure that the Kendo UI scripts are loaded after the jQuery ones.
127126

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<!doctype html>
2+
<html>
3+
<head>
4+
<meta charset="utf-8">
5+
</head>
6+
<body>
7+
{% capture site_url %}{% if site.url %}{{ site.url }}{% else %}{{ site.github.url }}{% endif %}{% endcapture %}
8+
{% for post in site.html_pages %}
9+
<a href="https://kendobuild.telerik.com/aspnet-mvc{{ post.url | replace:'.html','' }}">https://kendobuild.telerik.com/aspnet-mvc{{ post.url | replace:'.html','' }}</a>
10+
{% endfor %}
11+
</body>
12+
</html>

docs-aspnet-mvc/_layouts/page.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
</script>
3232
</div>
3333

34-
{% if page.editable %}<a id="page-edit-link" href="https://github.com/telerik/kendo-ui-core/edit/master/docs-aspnet-mvc/{{ page.url | replace: '.html','' }}.md"><span class="k-icon k-i-pencil"></span> Edit this page</a>{% endif %}
34+
{% if page.editable %}<a id="page-edit-link" href="https://github.com/telerik/kendo-ui-core/edit/master/docs-aspnet-mvc{{ page.url | replace: '.html','' }}.md"><span class="k-icon k-i-pencil"></span> Edit this page</a>{% endif %}
3535
{% if page.kind == "api" %}<div id="markdown-toc"></div>{% endif %}
3636

3737
<div id="page-article">

docs-aspnet-mvc/all-pages.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
---
2+
publish: false
3+
layout: all-pages-staging
4+
---

docs/_layouts/all-pages-gsa.html renamed to docs/_layouts/all-pages-staging.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<body>
77
{% capture site_url %}{% if site.url %}{{ site.url }}{% else %}{{ site.github.url }}{% endif %}{% endcapture %}
88
{% for post in site.html_pages %}
9-
<a href="{{ site_url }}{{ post.url | replace:'.html','' }}">{{ site_url }}{{ post.url | replace:'.html','' }}</a>
9+
<a href="https://kendobuild.telerik.com/kendo-ui{{ post.url | replace:'.html','' }}">https://kendobuild.telerik.com/kendo-ui{{ post.url | replace:'.html','' }}</a>
1010
{% endfor %}
1111
</body>
1212
</html>

docs/_layouts/api-index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
</script>
3232
</div>
3333

34-
{% if page.editable %}<a id="page-edit-link" href="https://github.com/telerik/kendo-ui-core/edit/master/docs/{{ page.parent_path | replace: '.html','' }}.md"><span class="k-icon k-i-pencil"></span> Edit this page</a>{% endif %}
34+
{% if page.editable %}<a id="page-edit-link" href="https://github.com/telerik/kendo-ui-core/edit/master/docs{{ page.parent_path | replace: '.html','' }}.md"><span class="k-icon k-i-pencil"></span> Edit this page</a>{% endif %}
3535
<div class="api-breadcrumbs-container"></div>
3636
<div id="page-article">
3737
<div class="api-toc-container"></div>

docs/_layouts/kb-page.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
</script>
3131
</div>
3232

33-
{% if page.editable %}<a id="page-edit-link" href="https://github.com/telerik/kendo-ui-core/edit/master/docs/{{ page.url | replace: '.html','' }}.md"><span class="k-icon k-i-pencil"></span> Edit this page</a>{% endif %}
33+
{% if page.editable %}<a id="page-edit-link" href="https://github.com/telerik/kendo-ui-core/edit/master/docs{{ page.url | replace: '.html','' }}.md"><span class="k-icon k-i-pencil"></span> Edit this page</a>{% endif %}
3434
{% if page.kind == "api" %}<div id="markdown-toc"></div>{% endif %}
3535

3636
<div id="page-article">

docs/_layouts/page.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
</script>
3232
</div>
3333

34-
{% if page.editable %}<a id="page-edit-link" href="https://github.com/telerik/kendo-ui-core/edit/master/docs/{{ page.url | replace: '.html','' }}.md"><span class="k-icon k-i-pencil"></span> Edit this page</a>{% endif %}
34+
{% if page.editable %}<a id="page-edit-link" href="https://github.com/telerik/kendo-ui-core/edit/master/docs{{ page.url | replace: '.html','' }}.md"><span class="k-icon k-i-pencil"></span> Edit this page</a>{% endif %}
3535
{% if page.kind == "api" %}<div id="markdown-toc"></div>{% endif %}
3636

3737
<div id="page-article">

0 commit comments

Comments
 (0)