Skip to content

Commit 205b773

Browse files
[update] commit after merge
2 parents 4136f3d + 5537a91 commit 205b773

File tree

10 files changed

+137
-64
lines changed

10 files changed

+137
-64
lines changed

docker/redirects.conf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/markdown-page/ /kanban/overview;

docs/api/config/js_kanban_cardtemplate_config.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ If you need to include a context menu into the card template, specify a custom i
3434
### Example
3535

3636
~~~jsx {1-23,28}
37-
function cardTemplate({ cardFields, selected, dragging, cardShape }){
37+
const cardTemplate = ({ cardFields, selected, dragging, cardShape }) => {
3838
const { label, color, id } = cardFields;
3939
if (selected) {
4040
return `
@@ -61,7 +61,7 @@ function cardTemplate({ cardFields, selected, dragging, cardShape }){
6161
new kanban.Kanban("#root", {
6262
cards,
6363
columns,
64-
cardTemplate
64+
cardTemplate: kanban.template(card => cardTemplate(card)),
6565
// other parameters
6666
});
6767
~~~

docs/api/config/toolbar_items_config.md

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ items?: [
3030
type: "sort",
3131
options?: [
3232
{
33-
label: string,
33+
text: string,
3434
by?: string, // by?: ((card: object) => any),
3535
dir?: "asc" | "desc"
3636
}, {...}
@@ -57,7 +57,7 @@ In the **items** array you can specify the following parameters:
5757
- `type` - (required) a type of control (*"search"*)
5858
- `options` - (optional) an array of objects, that define the search parameters. For each object (*search option*) you can specify the following parameters:
5959
- `id` - (required) a key of card field, by which the cards will be searched
60-
- `label` - (required) a name of option, used in a dropdawn list of the searchbar selector
60+
- `label` - (required) a name of option, used in a dropdown list of the searchbar selector
6161
- `searchRule` (optional) - a custom function that allows defining search rules. It takes the following arguments:
6262
- ***card*** - an object of the card data
6363
- ***value*** - a searched value, specified in the searchbar
@@ -98,7 +98,7 @@ items: [
9898

9999
- `type` - (required) a type of control (*"sort"*)
100100
- `options` - (optional) an array of objects, that define the sort parameters. For each object (*sort option*) you can specify the following parameters:
101-
- `label` - (required) a name of option, used in a dropdawn list of the sort selector
101+
- `text` - (required) a name of option, used in a dropdown list of the sort selector
102102
- `by` - (optional) a key of card field, by which the cards will be sorted. This parameter can be set to the *string* or *function* value. The function needs to return the card field for sorting
103103
- `dir` - (optional) an order of sorting. The possible values are *"asc"* and *"desc"*
104104

@@ -113,12 +113,12 @@ items: [
113113
type: "sort",
114114
options: [
115115
{
116-
label: "Sort by label",
116+
text: "Sort by label",
117117
by: "label",
118118
dir: "asc"
119119
},
120120
{
121-
label: "Sort by description",
121+
text: "Sort by description",
122122
by: "description",
123123
dir: "desc"
124124
}
@@ -158,7 +158,9 @@ new kanban.Toolbar("#toolbar", {
158158
});
159159
~~~
160160

161-
**Change log:** The *"Undo"* and *"Redo"* controls were added in v1.3
161+
**Change log:**
162+
- The *"Undo"* and *"Redo"* controls were added in v1.3
163+
- The ***items.options[0].label*** parameter of the **sort** control was replaced by the ***items.options[0].text*** parameter in v1.4
162164

163165
**Related articles:** [Configuration](../../../guides/configuration#toolbar) and [Customization](../../../guides/customization#custom-toolbar)
164166

docs/guides/localization.md

Lines changed: 45 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -15,39 +15,66 @@ The **English** locale is used by default:
1515
~~~jsx
1616
const en = {
1717
kanban: { // translations of the Kanabn labels
18-
"Save": "Save",
19-
"Close": "Close",
20-
"Delete": "Delete",
21-
"Name": "Name",
22-
"Description": "Description",
23-
"Type": "Type",
18+
Save: "Save",
19+
Close: "Close",
20+
Delete: "Delete",
21+
Name: "Name",
22+
Description: "Description",
23+
Type: "Type",
2424
"Start date": "Start date",
2525
"End date": "End date",
26-
"Result": "Result",
26+
27+
Result: "Result",
2728
"No results": "No results",
28-
"Search": "Search",
29+
Search: "Search",
2930
"Search in": "Search in",
3031
"Add new row": "Add new row",
3132
"Add new column": "Add new column",
3233
"Add new card": "Add new card",
3334
"Edit card": "Edit card",
34-
"Edit": "Edit",
35-
"Everywhere": "Everywhere",
36-
"Label": "Label",
37-
"Status": "Status",
38-
"Color": "Color",
39-
"Date": "Date",
40-
"Untitled": "Untitled",
41-
"Rename": "Rename",
35+
Edit: "Edit",
36+
37+
Everywhere: "Everywhere",
38+
Label: "Label",
39+
Status: "Status",
40+
Color: "Color",
41+
Date: "Date",
42+
Priority: "Priority",
43+
Progress: "Progress",
44+
Users: "Users",
45+
46+
Untitled: "Untitled",
47+
Rename: "Rename",
4248
"Move up": "Move up",
4349
"Move down": "Move down",
4450
"Move left": "Move left",
4551
"Move right": "Move right",
46-
"Sort": "Sort",
52+
Sort: "Sort",
4753
"Label (a-z)": "Label (a-z)",
4854
"Label (z-a)": "Label (z-a)",
4955
"Description (a-z)": "Description (a-z)",
50-
"Description (z-a)": "Description (z-a)"
56+
"Description (z-a)": "Description (z-a)",
57+
58+
Duplicate: "Duplicate",
59+
"Duplicate of": "Duplicate of",
60+
61+
"Relates to": "Relates to",
62+
"Depends on": "Depends on",
63+
"Is required for": "Is required for",
64+
Duplicates: "Duplicates",
65+
"Is duplicated by": "Is duplicated by",
66+
"Parent for": "Parent for",
67+
"SubTask of": "SubTask of",
68+
69+
Cancel: "Cancel",
70+
"Link task": "Link task",
71+
"Select a relation": "Select a relation",
72+
"Select a task": "Select a task",
73+
74+
"Would you like to delete this comment?":
75+
"Would you like to delete this comment?",
76+
"Would you like to delete this card?":
77+
"Would you like to delete this card?",
5178
},
5279
calendar: { // translations and settings of the calendar
5380
monthFull: [

docs/guides/stylization.md

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ or just include the needed theme on the page from the skins folder:
132132
:::
133133

134134
In this snippet you can see how to apply the **willow-dark** theme to Kanban
135-
<iframe src="https://snippet.dhtmlx.com/k3iw6ti0?mode=mobile" frameborder="0" class="snippet_iframe" width="100%" height="600"></iframe>
135+
<iframe src="https://snippet.dhtmlx.com/k3iw6ti0?mode=result&tag=kanban" frameborder="0" class="snippet_iframe" width="100%" height="600"></iframe>
136136

137137
## Scroll style
138138

@@ -149,6 +149,12 @@ You can also apply a custom style to a scroll bar of Kanban. For this, you can u
149149

150150
In this snippet you can see how to apply a custom style to Kanban
151151

152-
<iframe src="https://snippet.dhtmlx.com/oj18xwb5?mode=html&tag=kanban" frameborder="0" class="snippet_iframe" width="100%" height="600"></iframe>
152+
<iframe src="https://snippet.dhtmlx.com/oj18xwb5?mode=result&tag=kanban" frameborder="0" class="snippet_iframe" width="100%" height="600"></iframe>
153+
154+
## Adaptivity
155+
156+
In this snippet you can see how to create adaptive version of Kanban using custom CSS styles
157+
158+
<iframe src="https://snippet.dhtmlx.com/807qbp9v?mode=result&tag=kanban" frameborder="0" class="snippet_iframe" width="100%" height="600"></iframe>
153159

154160
**Related articles:** [Customization](../customization)

docs/how_to_start.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,11 @@ yarn config set @dhx:registry https://npm.dhtmlx.com
4848
yarn add @dhx/trial-kanban
4949
~~~
5050

51-
To get PRO version of Kanban, refer to **[Support Center](https://dhtmlx.com/docs/technical-support.shtml)**!
51+
To get Kanban under the proprietary license, refer to **[Support Center](https://dhtmlx.com/docs/technical-support.shtml)**!
52+
:::
53+
54+
:::tip
55+
If you want to integrate JavaScript Kanban into the React, Angular or Vue project, refer to the corresponding [**Examples on Replit**](https://replit.com/@dhtmlx) for more information.
5256
:::
5357

5458
## Step 2. Creating Kanban

docs/news/migration.md

Lines changed: 57 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ description: You can learn about the Migration to Newer Versions in the document
225225
- The [`cardTemplate`](../../api/config/js_kanban_cardtemplate_config) property of Kanban was updated in the following way:
226226

227227
~~~jsx {} title="Before v1.4"
228-
function cardTemplate({ cardFields, selected, dragging, cardShape }){
228+
const cardTemplate = ({ cardFields, selected, dragging, cardShape }) => {
229229
if (selected) {
230230
return `
231231
<div class="custom-card" style="padding:20px">
@@ -235,10 +235,16 @@ description: You can learn about the Migration to Newer Versions in the document
235235
`;
236236
}
237237
}
238+
239+
new kanban.Kanban("#root", {
240+
cards,
241+
columns,
242+
cardTemplate
243+
});
238244
~~~
239245

240246
~~~jsx {6-8} title="From v1.4"
241-
function cardTemplate({ cardFields, selected, dragging, cardShape }){
247+
const cardTemplate = ({ cardFields, selected, dragging, cardShape }) => {
242248
if (selected) {
243249
return `
244250
<div class="custom-card" style="padding:20px">
@@ -251,6 +257,55 @@ description: You can learn about the Migration to Newer Versions in the document
251257
`;
252258
}
253259
}
260+
261+
new kanban.Kanban("#root", {
262+
cards,
263+
columns,
264+
cardTemplate: kanban.template(card => cardTemplate(card)),
265+
// other parameters
266+
});
267+
~~~
268+
269+
- The **sort** control in the [`items`](../../api/config/toolbar_items_config) property of Kanban Toolbar was updated in the following way:
270+
271+
~~~jsx {} title="Before v1.4"
272+
[
273+
{ // custom sort control
274+
type: "sort",
275+
options: [
276+
{
277+
label: "Sort by label",
278+
by: "label",
279+
dir: "asc"
280+
},
281+
{
282+
label: "Sort by description",
283+
by: "description",
284+
dir: "desc"
285+
}
286+
]
287+
},
288+
]
289+
~~~
290+
291+
~~~jsx {6,11} title="From v1.4"
292+
[
293+
{ // custom sort control
294+
type: "sort",
295+
options: [
296+
{
297+
text: "Sort by label",
298+
by: "label",
299+
dir: "asc"
300+
},
301+
{
302+
text: "Sort by description",
303+
by: "description",
304+
dir: "desc"
305+
}
306+
]
307+
},
308+
]
254309
~~~
255310

256311
#### Methods

docs/news/whats_new.md

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,19 @@ description: You can explore what's new in DHTMLX Kanban and its release history
88

99
If you are updating Kanban from an older version, check [Migration to newer versions](news/migration.md) for details.
1010

11-
## Version 1.4.1
11+
## Version 1.4.2
12+
13+
Released on April 13, 2023
14+
15+
### Fixes
16+
17+
- Backend ID is not saved to local card/column/row data after add actions
18+
- Add missing TS definitions
19+
- Dark skin is leaking its styles
1220

13-
Released on Month Day, 2023
21+
## Version 1.4.1
1422

15-
[Review of release on the blog](https://dhtmlx.com/blog/maintenance-release-kanban-1-4-1/)
23+
Released on March 29, 2023
1624

1725
### Fixes
1826

src/pages/index.module.css

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

src/pages/markdown-page.md

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

0 commit comments

Comments
 (0)