Skip to content

Commit 1dae839

Browse files
author
Kendo Bot
committed
Sync with Kendo UI Professional
1 parent 7ce6180 commit 1dae839

File tree

14 files changed

+234
-12
lines changed

14 files changed

+234
-12
lines changed

‎docs-aspnet-core/backwards-compatibility.md

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,30 @@ position: 250
88

99
# Breaking Changes
1010

11+
## Changes from 2018 R1
12+
13+
To enable more complex widget configuration scenarios and ensure the tag-naming consistency across the Telerik UI for ASP.NET Core suite, the Kendo UI R1 2018 release introduces changes in the tags of the following wrappers:
14+
15+
Dialog:
16+
17+
* Previously, it was possible to nest content directly in the `<kendo-dialog>` tag while now, after the release, the content must be nested within a `<content>` tag.
18+
19+
Window:
20+
21+
* Previously, it was possible to nest content directly in the `<kendo-window>` tag while now, after the release, the content must be nested within a `<content>` tag.
22+
23+
Upload:
24+
25+
* The `<kendo-upload-async-settings>` tag name is changed to `<async>`
26+
* The `<kendo-upload-files>` tag name is changed to `<files>`.
27+
* The `<kendo-upload-file>` tag name is changed to `<file>`.
28+
* The `<kendo-upload-localization-settings>` tag name is changed to `<localization>`.
29+
* The `<kendo-upload-validation-settings>` tag name is changed to `<validation>`.
30+
31+
Splitter:
32+
33+
* Previously, the tag name of the pane was `<kendo-splitter-pane>` while now, after the release, it is changed to `<pane>`.
34+
1135
[Telerik UI for ASP.NET Core](http://www.telerik.com/aspnet-core-ui) is a set of server-side wrappers that allows using the [Kendo UI widgets](../kendo-ui/introduction) from the server code.
1236

1337
That is why, all important changes in the Kendo UI suite also apply to the client-side code and behavior of the Telerik UI for ASP.NET Core wrappers. For the list of all breaking changes, refer to the articles on the [Kendo UI breaking changes](../kendo-ui/backwards-compatibility/2017-backward-compatibility).

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,7 @@ To add the NuGet packages:
106106

107107
@using MyASPNETCoreProject
108108
@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
109+
@addTagHelper *, Kendo.Mvc
109110
@using Kendo.Mvc.UI
110111

111112
6. Copy the Kendo UI client-side resources. You can use either of the following approaches:

‎docs-aspnet-core/helpers/html-helpers/autocomplete.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ The AutoComplete HtmlHelper extension is a server-side wrapper for the [Kendo UI
1111

1212
It enables you to configure the Kendo UI AutoComplete widget from server-side code. The [AutoComplete](http://docs.telerik.com/kendo-ui/controls/editors/autocomplete/overview) provides suggestions depending on the typed text. It also allows multiple value entries. The suggestions shown by the widget come either from a local array or from a remote data service.
1313

14-
For more information on the HtmlHelper, refer to the article on the [AutoComplete HtmlHelper for ASP.NET MVC](http://demos.telerik.com/aspnet-mvc/autocomplete/index).
14+
For more information on the HtmlHelper, refer to the article on the [AutoComplete HtmlHelper for ASP.NET MVC](https://docs.telerik.com/aspnet-mvc/helpers/autocomplete/overview).
1515

1616
## Basic Usage
1717

‎docs-aspnet-core/helpers/html-helpers/button.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ The Button HtmlHelper extension is a server-side wrapper for the [Kendo UI Butto
1111

1212
It enables you to configure the Kendo UI Button widget from server-side code. The [Button](http://docs.telerik.com/kendo-ui/controls/navigation/button/overview) provides a styled clickable UI functionality with arbitrary content. Apart from consistent Kendo UI styling, the Button provides keyboard operability for elements, which natively do not have it&mdash;for example, `span`.
1313

14-
For more information on the HtmlHelper, refer to the article on the [Button HtmlHelper for ASP.NET MVC](http://docs.telerik.com/aspnet-mvc/helpers/upload/overview).
14+
For more information on the HtmlHelper, refer to the article on the [Button HtmlHelper for ASP.NET MVC](https://docs.telerik.com/aspnet-mvc/helpers/button/overview).
1515

1616
## Basic Usage
1717

‎docs-aspnet-core/helpers/html-helpers/combobox.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ The ComboBox HtmlHelper extension is a server-side wrapper for the [Kendo UI Com
1111

1212
It enables you to configure the Kendo UI ComboBox widget from server-side code. The [ComboBox](http://docs.telerik.com/kendo-ui/controls/editors/combobox/overview) enables the user to enter custom values through the keyboard. It represents a richer version of the `<select>` element and provides support for local and remote data binding, item templates, and configurable options for controlling the list behavior.
1313

14-
For more information on the HtmlHelper, refer to the article on the [ComboBox HtmlHelper for ASP.NET MVC](http://demos.telerik.com/aspnet-mvc/combobox/index).
14+
For more information on the HtmlHelper, refer to the article on the [ComboBox HtmlHelper for ASP.NET MVC](https://docs.telerik.com/aspnet-mvc/helpers/combobox/overview).
1515

1616
## Basic Usage
1717

‎docs-aspnet-core/helpers/html-helpers/dropdownlist.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ The DropDownList HtmlHelper extension is a server-side wrapper for the [Kendo UI
1111

1212
It allows you to configure the Kendo UI DropDownList widget from server-side code. The [DropDownList](http://docs.telerik.com/kendo-ui/controls/editors/dropdownlist/overview) displays a list of values and allows for a single selection from the list. The user input is restricted within the predefined options.
1313

14-
For more information on the HtmlHelper, refer to the article on the [DropDownList HtmlHelper for ASP.NET MVC](http://docs.telerik.com/aspnet-mvc/helpers/dropdownlist/overview).
14+
For more information on the HtmlHelper, refer to the article on the [DropDownList HtmlHelper for ASP.NET MVC](https://docs.telerik.com/aspnet-mvc/helpers/dropdownlist/overview).
1515

1616
## Basic Usage
1717

‎docs/_plugins/api_generator.rb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ def initialize(site, base, dir, page_schema)
3535
self.data['parent_path'] = dir
3636
self.data['is_api'] = true
3737
self.data['publish'] = false
38+
self.data.delete('previous_url')
3839
end
3940
end
4041

@@ -191,7 +192,7 @@ def parse(markdown)
191192
def parse_element(element)
192193
description = ""
193194
if element.type === :codeblock
194-
description += element_value(element).indent(4)
195+
description += "\n#{element_value(element).indent(4)}"
195196
end
196197

197198
if element.type === :blank

‎docs/controls/navigation/buttongroup/overview.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -182,4 +182,6 @@ Kendo UI ButtonGroup container has a `role=group` attribute that semantically de
182182
Other articles on Kendo UI ButtonGroup:
183183

184184
* [Overview of the ASP.NET MVC HtmlHelper Extension for the ButtonGroup Widget](http://docs.telerik.com/aspnet-mvc/helpers/buttongroup/overview)
185+
* [Overview of the ButtonGroup JSP Tag]({% slug overview_buttongroup_uiforjsp %})
186+
* [Overview of the ButtonGroup PHP Class]({% slug overview_buttongroup_uiforphp %})
185187
* [ButtonGroup JavaScript API Reference](/api/javascript/ui/buttongroup)

‎docs/jsp/tags/buttongroup/overview.md

Lines changed: 93 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,93 @@
1+
---
2+
title: Overview
3+
page_title: Overview | ButtonGroup JSP Tag
4+
description: "Get started with the ButtonGroup JSP tag in Kendo UI."
5+
slug: overview_buttongroup_uiforjsp
6+
position: 1
7+
---
8+
9+
# ButtonGroup JSP Tag Overview
10+
11+
The ButtonGroup JSP tag is a server-side wrapper for the [Kendo UI ButtonGroup](/api/javascript/ui/buttongroup) widget.
12+
13+
## Getting Started
14+
15+
Make sure you are familiar with some of the fundamental [Kendo UI widget concepts]({% slug getting_started_installation_kendoui %}) and
16+
that the [Kendo UI Java wrappers]({% slug overview_uiforjsp %}) are set up correctly.
17+
18+
### The Basics
19+
20+
The ButtonGroup widget groups a series of buttons together on a single line.
21+
22+
### Initialization
23+
24+
The example below demonstrates how to initialize the ButtonGroup by using the default `buttongroup` tag.
25+
26+
###### Example
27+
28+
<kendo:buttonGroup name="select-period">
29+
<kendo:buttonGroup-items>
30+
<kendo:buttonGroup-item text="Month">
31+
</kendo:buttonGroup-item>
32+
<kendo:buttonGroup-item text="Quarter">
33+
</kendo:buttonGroup-item>
34+
<kendo:buttonGroup-item text="Year">
35+
</kendo:buttonGroup-item>
36+
</kendo:buttonGroup-items>
37+
</kendo:buttonGroup>
38+
39+
## Features
40+
41+
### Enable and Disable ButtonGroup
42+
43+
You can configure the ButtonGroup to be initially disabled by using its `enable` property. The ButtonGroup can also be disabled or enabled at any time with JavaScript by using the `enable()` method with a Boolean argument.
44+
45+
The following example demonstrates how to enable and disable the ButtonGroup.
46+
47+
###### Example
48+
49+
<kendo:buttonGroup name="select-period" enable="false">
50+
<kendo:buttonGroup-items>
51+
<kendo:buttonGroup-item text="Month">
52+
</kendo:buttonGroup-item>
53+
<kendo:buttonGroup-item text="Quarter">
54+
</kendo:buttonGroup-item>
55+
<kendo:buttonGroup-item text="Year">
56+
</kendo:buttonGroup-item>
57+
</kendo:buttonGroup-items>
58+
</kendo:buttonGroup>
59+
60+
For more information on the [`enable` method of the ButtonGroup](/api/javascript/ui/buttongroup#methods-enable), refer to the [ButtonGroup API](/api/javascript/ui/buttongroup).
61+
62+
### Index
63+
64+
The initially selected index of the ButtonGroup can be configured by using its `index` property. An index can also be selected over the `select()` method with an Integer argument.
65+
66+
The following example demonstrates how to select a button by its index.
67+
68+
<kendo:buttonGroup name="align" selection="single" index="0">
69+
<kendo:buttonGroup-items>
70+
<kendo:buttonGroup-item icon="align-left">
71+
</kendo:buttonGroup-item>
72+
<kendo:buttonGroup-item icon="align-center">
73+
</kendo:buttonGroup-item>
74+
<kendo:buttonGroup-item icon="align-right">
75+
</kendo:buttonGroup-item>
76+
</kendo:buttonGroup-items>
77+
</kendo:buttonGroup>
78+
79+
For more information on the [`select` method of the ButtonGroup](/api/javascript/ui/buttongroup#methods-select), refer to the [ButtonGroup API](/api/javascript/ui/buttongroup).
80+
81+
## Reference
82+
83+
### Existing Instance
84+
85+
To reference an existing ButtonGroup instance, refer to the [introductory article on the ButtonGroup]({% slug overview_kendoui_buttongroup_widget %}#reference).
86+
87+
## See Also
88+
89+
Other articles on Telerik UI for JSP and on the ButtonGroup:
90+
91+
* [Overview of the Kendo UI ButtonGroup Widget]({% slug overview_kendoui_buttongroup_widget %})
92+
* [Telerik UI for JSP API Reference Folder](/api/jsp/autocomplete/animation)
93+
* [Telerik UI for JSP Tags Folder]({% slug overview_autocomplete_uiforjsp %})

‎docs/php/widgets/buttongroup/overview.md

Lines changed: 91 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,91 @@
1+
---
2+
title: Overview
3+
page_title: Overview | ButtonGroup PHP Class
4+
description: "Get started with the ButtonGroup PHP class in Kendo UI."
5+
slug: overview_buttongroup_uiforphp
6+
position: 1
7+
---
8+
9+
# ButtonGroup PHP Class Overview
10+
11+
The Kendo UI ButtonGroup for PHP is a server-side wrapper for the [Kendo UI ButtonGroup](/api/javascript/ui/buttongroup) widget.
12+
13+
## Getting Started
14+
15+
Make sure you are familiar with some of the fundamental [Kendo UI widget concepts]({% slug initialize_widgets_using_jquery_plugins_installation %}) and that the [Kendo UI PHP wrappers]({% slug overview_uiforphp %}) are setup correctly.
16+
17+
### The Basics
18+
19+
The ButtonGroup widget groups a series of buttons together on a single line.
20+
21+
### Initialization
22+
23+
The example below demonstrates how to initialize the ButtonGroup by using the default `buttongroup` tag.
24+
25+
###### Example
26+
27+
$buttonGroup = new \Kendo\UI\ButtonGroup('select-period');
28+
$month = new \Kendo\UI\ButtonGroupItem();
29+
$month->text("Month");
30+
$quarter = new \Kendo\UI\ButtonGroupItem();
31+
$quarter->text("Quarter");
32+
$year = new \Kendo\UI\ButtonGroupItem();
33+
$year->text("Year");
34+
35+
$buttonGroup->addItem($month, $quarter, $year);
36+
37+
echo $buttonGroup->render();
38+
39+
## Features
40+
41+
### Enable and Disable ButtonGroup
42+
43+
You can configure the ButtonGroup to be initially disabled by using its `enable` property. The ButtonGroup can also be disabled or enabled at any time with JavaScript by using the `enable()` method with a Boolean argument.
44+
45+
The following example demonstrates how to enable and disable the ButtonGroup.
46+
47+
###### Example
48+
49+
$disabledButtonGroup = new \Kendo\UI\ButtonGroup('disabledButton');
50+
$disabledButtonGroup->attr('type', 'buttongroup')
51+
->enable(false)
52+
->content('Disabled buttongroup');
53+
54+
echo $disabledButtonGroup->render();
55+
56+
For more information on the [`enable` method of the ButtonGroup](/api/javascript/ui/buttongroup#methods-enable), refer to the [ButtonGroup API](/api/javascript/ui/buttongroup).
57+
58+
### Index
59+
60+
The initially selected index of the ButtonGroup can be configured by using its `index` property. An index can also be selected over the `select()` method with an Integer argument.
61+
62+
The following example demonstrates how to select a button by its index.
63+
64+
$buttonGroup = new \Kendo\UI\ButtonGroup('select-period');
65+
$month = new \Kendo\UI\ButtonGroupItem();
66+
$month->text("Month");
67+
$quarter = new \Kendo\UI\ButtonGroupItem();
68+
$quarter->text("Quarter");
69+
$year = new \Kendo\UI\ButtonGroupItem();
70+
$year->text("Year");
71+
72+
$buttonGroup->addItem($month, $quarter, $year);
73+
$buttonGroup->select(0);
74+
75+
echo $buttonGroup->render();
76+
77+
For more information on the [`select` method of the ButtonGroup](/api/javascript/ui/buttongroup#methods-select), refer to the [ButtonGroup API](/api/javascript/ui/buttongroup).
78+
79+
## Reference
80+
81+
### Existing Instances
82+
83+
To reference an existing ButtonGroup instance, refer to the [introductory article on the ButtonGroup]({% slug overview_kendoui_buttongroup_widget %}#reference).
84+
85+
## See Also
86+
87+
Other articles on Telerik UI for PHP and on the ButtonGroup:
88+
89+
* [Overview of the Kendo UI ButtonGroup Widget]({% slug overview_kendoui_buttongroup_widget %})
90+
* [Telerik UI for PHP API Reference Folder](/api/php/Kendo/UI/AutoComplete)
91+
* [Telerik UI for PHP Classes Folder]({% slug overview_autocomplete_uiforphp %})

‎docs/web.config

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -219,11 +219,10 @@
219219
<action type="Redirect" url="api/javascript/ui/grid/configuration/pdf.margin#pdf.margin.{R:1}" />
220220
</rule>
221221

222-
{% for api_group in site.api %}
222+
{% for api_group in site.api %}{% if api_group.skip_redirect == true %}{% continue %}{% else %}
223223
{% for group_parent in api_group.group_parents %}
224-
<rule name="api-redirect-{{ group_parent | replace: '.', '-' }}" enabled="true"><match url="^{{ api_group.file }}/configuration/{{ group_parent }}.(.*)$" /><action type="Redirect" url="{{ api_group.file }}/configuration/{{ group_parent }}" /></rule>
225-
{% endfor %}
226-
{% endfor %}
224+
<rule name="api-redirect-{{ api_group.file | replace: '/', '-' }}-{{ group_parent | replace: '.', '-' }}" enabled="true"><match url="^{{ api_group.file }}/configuration/{{ group_parent }}.(.*)$" /><action type="Redirect" url="{{ api_group.file }}/configuration/{{ group_parent }}" /></rule>
225+
{% endfor %}{% endif %}{% endfor %}
227226

228227
{% for directory in site.redirect_directories %}
229228
<rule name="redirect-directory-{{ directory.path | replace: '/', '-' }}" enabled="true"><match url="^{{ directory.path }}/?$" /><conditions logicalGrouping="MatchAll"><add input="{REQUEST_FILENAME}.html" matchType="IsFile" negate="true" /></conditions><action type="Redirect" url="{{ directory.url }}" redirectType="Found" /></rule>

‎styles/web/common/button.less

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,17 @@ input[type="reset"].k-button-expand {
248248
.k-button {
249249
float: left;
250250
}
251+
252+
&.k-dialog-buttongroup .k-button {
253+
float: right;
254+
}
251255
}
252-
.k-ie9 .k-rtl .k-button-group .k-button {
253-
float: right;
256+
.k-ie9 .k-rtl .k-button-group {
257+
.k-button {
258+
float: right;
259+
}
260+
261+
&.k-dialog-buttongroup .k-button {
262+
float: left;
263+
}
254264
}

‎styles/web/common/toolbar.less

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
display: block;
55
vertical-align: middle;
66
padding: 0.28571428em 0;
7+
overflow: hidden;
78
}
89

910
.k-toolbar .k-button .k-sprite,

‎styles/web/type-material.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4051,7 +4051,7 @@ div.k-scheduler-marquee:after {
40514051
border-color: @panelbar-items-border;
40524052
}
40534053

4054-
&.k-state-active,
4054+
&:active,
40554055
&.k-state-border-down {
40564056
color: @button-active-text-color;
40574057
background-color: @button-active-background;

0 commit comments

Comments
 (0)