@ndla/ui 16.1.1 → 18.0.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/es/Article/Article.js +3 -3
- package/es/Article/ArticleFavoritesButton.js +4 -3
- package/es/Breadcrumblist/Breadcrumblist.js +7 -7
- package/es/Frontpage/FrontpageAllSubjects.js +8 -8
- package/es/Masthead/Masthead.js +2 -3
- package/es/Messages/MessageBanner.js +75 -0
- package/es/Messages/MessageBox.js +123 -0
- package/es/{MessageBox → Messages}/MessageBoxTag.js +1 -1
- package/es/{MessageBox → Messages}/index.js +3 -3
- package/es/MyNdla/Resource/Folder.js +6 -6
- package/es/MyNdla/index.js +1 -2
- package/es/Notion/ConceptNotion.js +1 -1
- package/es/Notion/index.js +2 -1
- package/es/Programme/Programme.js +6 -6
- package/es/Programme/ProgrammeSubjects.js +2 -2
- package/es/Resource/ListResource.js +6 -6
- package/es/TagSelector/SuggestionInput.js +111 -56
- package/es/TagSelector/Suggestions.js +19 -15
- package/es/TagSelector/TagSelector.js +8 -7
- package/es/Topic/Topic.js +22 -24
- package/es/TopicMenu/TopicMenu.js +2 -4
- package/es/TreeStructure/FolderItem.js +39 -28
- package/es/TreeStructure/FolderItems.js +8 -5
- package/es/TreeStructure/TreeStructure.js +6 -4
- package/es/TreeStructure/TreeStructureWrapper.js +2 -2
- package/es/index.js +3 -3
- package/es/locale/messages-en.js +9 -2
- package/es/locale/messages-nb.js +10 -3
- package/es/locale/messages-nn.js +11 -4
- package/es/locale/messages-se.js +10 -3
- package/es/locale/messages-sma.js +10 -3
- package/lib/Article/Article.js +3 -3
- package/lib/Article/ArticleFavoritesButton.js +4 -3
- package/lib/Breadcrumblist/Breadcrumblist.js +7 -7
- package/lib/Breadcrumblist/index.d.ts +1 -0
- package/lib/Frontpage/FrontpageAllSubjects.js +9 -9
- package/lib/Masthead/Masthead.js +2 -3
- package/lib/Messages/MessageBanner.d.ts +16 -0
- package/lib/Messages/MessageBanner.js +78 -0
- package/lib/{MessageBox → Messages}/MessageBox.d.ts +6 -14
- package/lib/Messages/MessageBox.js +128 -0
- package/lib/{MessageBox → Messages}/MessageBoxTag.d.ts +0 -0
- package/lib/{MessageBox → Messages}/MessageBoxTag.js +1 -1
- package/lib/{MessageBox → Messages}/index.d.ts +3 -3
- package/lib/Messages/index.js +31 -0
- package/lib/MyNdla/Resource/Folder.js +6 -6
- package/lib/MyNdla/index.d.ts +1 -2
- package/lib/MyNdla/index.js +0 -8
- package/lib/Notion/ConceptNotion.d.ts +1 -1
- package/lib/Notion/ConceptNotion.js +1 -1
- package/lib/Notion/index.d.ts +4 -1
- package/lib/Notion/index.js +11 -3
- package/lib/Programme/Programme.js +6 -6
- package/lib/Programme/ProgrammeSubjects.js +3 -3
- package/lib/Resource/ListResource.js +6 -6
- package/lib/TagSelector/SuggestionInput.js +111 -57
- package/lib/TagSelector/Suggestions.js +26 -23
- package/lib/TagSelector/TagSelector.js +8 -7
- package/lib/Topic/Topic.js +22 -24
- package/lib/TopicMenu/TopicMenu.js +2 -4
- package/lib/TreeStructure/FolderItem.d.ts +3 -2
- package/lib/TreeStructure/FolderItem.js +38 -28
- package/lib/TreeStructure/FolderItems.d.ts +1 -1
- package/lib/TreeStructure/FolderItems.js +8 -5
- package/lib/TreeStructure/TreeStructure.d.ts +1 -1
- package/lib/TreeStructure/TreeStructure.js +6 -4
- package/lib/TreeStructure/TreeStructure.types.d.ts +6 -3
- package/lib/TreeStructure/TreeStructureWrapper.js +2 -2
- package/lib/index.d.ts +8 -4
- package/lib/index.js +13 -13
- package/lib/locale/messages-en.d.ts +7 -0
- package/lib/locale/messages-en.js +9 -2
- package/lib/locale/messages-nb.d.ts +7 -0
- package/lib/locale/messages-nb.js +10 -3
- package/lib/locale/messages-nn.d.ts +7 -0
- package/lib/locale/messages-nn.js +11 -4
- package/lib/locale/messages-se.d.ts +7 -0
- package/lib/locale/messages-se.js +10 -3
- package/lib/locale/messages-sma.d.ts +7 -0
- package/lib/locale/messages-sma.js +10 -3
- package/package.json +13 -13
- package/src/Article/Article.tsx +1 -1
- package/src/Article/ArticleFavoritesButton.tsx +4 -3
- package/src/Breadcrumblist/Breadcrumblist.tsx +1 -1
- package/src/Breadcrumblist/{index.tsx → index.ts} +1 -0
- package/src/Frontpage/FrontpageAllSubjects.tsx +1 -1
- package/src/Masthead/Masthead.tsx +3 -6
- package/src/Messages/MessageBanner.tsx +66 -0
- package/src/Messages/MessageBox.tsx +156 -0
- package/src/{MessageBox → Messages}/MessageBoxTag.tsx +0 -0
- package/src/{MessageBox → Messages}/index.ts +3 -3
- package/src/MyNdla/Resource/Folder.tsx +1 -1
- package/src/MyNdla/index.ts +1 -2
- package/src/Notion/ConceptNotion.tsx +2 -1
- package/src/Notion/index.ts +4 -1
- package/src/Programme/Programme.tsx +1 -1
- package/src/Programme/ProgrammeSubjects.tsx +1 -1
- package/src/Resource/ListResource.tsx +1 -1
- package/src/TagSelector/SuggestionInput.tsx +90 -24
- package/src/TagSelector/Suggestions.tsx +14 -0
- package/src/TagSelector/TagSelector.tsx +6 -4
- package/src/Topic/Topic.tsx +2 -2
- package/src/TopicMenu/TopicMenu.jsx +2 -2
- package/src/TreeStructure/FolderItem.tsx +43 -19
- package/src/TreeStructure/FolderItems.tsx +3 -0
- package/src/TreeStructure/TreeStructure.tsx +2 -0
- package/src/TreeStructure/TreeStructure.types.ts +7 -3
- package/src/TreeStructure/TreeStructureWrapper.tsx +1 -1
- package/src/index.ts +17 -4
- package/src/locale/messages-en.ts +10 -2
- package/src/locale/messages-nb.ts +10 -3
- package/src/locale/messages-nn.ts +11 -4
- package/src/locale/messages-se.ts +10 -3
- package/src/locale/messages-sma.ts +10 -3
- package/es/MessageBox/MessageBox.js +0 -220
- package/es/MyNdla/Navigation/VerticalNavigation.js +0 -51
- package/es/MyNdla/Navigation/index.js +0 -2
- package/lib/MessageBox/MessageBox.js +0 -234
- package/lib/MessageBox/index.js +0 -35
- package/lib/MyNdla/Navigation/VerticalNavigation.d.ts +0 -10
- package/lib/MyNdla/Navigation/VerticalNavigation.js +0 -61
- package/lib/MyNdla/Navigation/index.d.ts +0 -2
- package/lib/MyNdla/Navigation/index.js +0 -15
- package/src/MessageBox/MessageBox.tsx +0 -201
- package/src/MyNdla/Navigation/VerticalNavigation.tsx +0 -93
- package/src/MyNdla/Navigation/index.ts +0 -2
package/lib/index.js
CHANGED
|
@@ -68,6 +68,7 @@ var _exportNames = {
|
|
|
68
68
|
FigureLicenseDialog: true,
|
|
69
69
|
FigureExpandButton: true,
|
|
70
70
|
FigureOpenDialogButton: true,
|
|
71
|
+
FigureBylineExpandButton: true,
|
|
71
72
|
LanguageSelector: true,
|
|
72
73
|
LearningPathWrapper: true,
|
|
73
74
|
LearningPathContent: true,
|
|
@@ -94,7 +95,7 @@ var _exportNames = {
|
|
|
94
95
|
Breadcrumblist: true,
|
|
95
96
|
MessageBox: true,
|
|
96
97
|
MessageBoxTag: true,
|
|
97
|
-
|
|
98
|
+
MessageBanner: true,
|
|
98
99
|
ResourceBox: true,
|
|
99
100
|
AudioPlayer: true,
|
|
100
101
|
initAudioPlayers: true,
|
|
@@ -178,7 +179,6 @@ var _exportNames = {
|
|
|
178
179
|
Notion: true,
|
|
179
180
|
ConceptNotion: true,
|
|
180
181
|
BannerCard: true,
|
|
181
|
-
VerticalNavigation: true,
|
|
182
182
|
Folder: true,
|
|
183
183
|
FolderInput: true,
|
|
184
184
|
ListResource: true,
|
|
@@ -560,6 +560,12 @@ Object.defineProperty(exports, "FigureOpenDialogButton", {
|
|
|
560
560
|
return _Figure.FigureOpenDialogButton;
|
|
561
561
|
}
|
|
562
562
|
});
|
|
563
|
+
Object.defineProperty(exports, "FigureBylineExpandButton", {
|
|
564
|
+
enumerable: true,
|
|
565
|
+
get: function get() {
|
|
566
|
+
return _Figure.FigureBylineExpandButton;
|
|
567
|
+
}
|
|
568
|
+
});
|
|
563
569
|
Object.defineProperty(exports, "LanguageSelector", {
|
|
564
570
|
enumerable: true,
|
|
565
571
|
get: function get() {
|
|
@@ -707,19 +713,19 @@ Object.defineProperty(exports, "Breadcrumblist", {
|
|
|
707
713
|
Object.defineProperty(exports, "MessageBox", {
|
|
708
714
|
enumerable: true,
|
|
709
715
|
get: function get() {
|
|
710
|
-
return
|
|
716
|
+
return _Messages.MessageBox;
|
|
711
717
|
}
|
|
712
718
|
});
|
|
713
719
|
Object.defineProperty(exports, "MessageBoxTag", {
|
|
714
720
|
enumerable: true,
|
|
715
721
|
get: function get() {
|
|
716
|
-
return
|
|
722
|
+
return _Messages.MessageBoxTag;
|
|
717
723
|
}
|
|
718
724
|
});
|
|
719
|
-
Object.defineProperty(exports, "
|
|
725
|
+
Object.defineProperty(exports, "MessageBanner", {
|
|
720
726
|
enumerable: true,
|
|
721
727
|
get: function get() {
|
|
722
|
-
return
|
|
728
|
+
return _Messages.MessageBanner;
|
|
723
729
|
}
|
|
724
730
|
});
|
|
725
731
|
Object.defineProperty(exports, "ResourceBox", {
|
|
@@ -1220,12 +1226,6 @@ Object.defineProperty(exports, "BannerCard", {
|
|
|
1220
1226
|
return _BannerCard.BannerCard;
|
|
1221
1227
|
}
|
|
1222
1228
|
});
|
|
1223
|
-
Object.defineProperty(exports, "VerticalNavigation", {
|
|
1224
|
-
enumerable: true,
|
|
1225
|
-
get: function get() {
|
|
1226
|
-
return _MyNdla.VerticalNavigation;
|
|
1227
|
-
}
|
|
1228
|
-
});
|
|
1229
1229
|
Object.defineProperty(exports, "Folder", {
|
|
1230
1230
|
enumerable: true,
|
|
1231
1231
|
get: function get() {
|
|
@@ -1354,7 +1354,7 @@ var _CreatedBy = _interopRequireDefault(require("./CreatedBy"));
|
|
|
1354
1354
|
|
|
1355
1355
|
var _Breadcrumblist = _interopRequireDefault(require("./Breadcrumblist"));
|
|
1356
1356
|
|
|
1357
|
-
var
|
|
1357
|
+
var _Messages = require("./Messages");
|
|
1358
1358
|
|
|
1359
1359
|
var _ResourceBox = require("./ResourceBox");
|
|
1360
1360
|
|
|
@@ -64,6 +64,8 @@ declare const messages: {
|
|
|
64
64
|
newFolderUnder: string;
|
|
65
65
|
myAccount: string;
|
|
66
66
|
favourites: string;
|
|
67
|
+
addToFavourites: string;
|
|
68
|
+
alreadyFavourited: string;
|
|
67
69
|
help: string;
|
|
68
70
|
more: string;
|
|
69
71
|
listView: string;
|
|
@@ -124,6 +126,10 @@ declare const messages: {
|
|
|
124
126
|
help: string;
|
|
125
127
|
};
|
|
126
128
|
treeStructure: {
|
|
129
|
+
folderChildOptions: {
|
|
130
|
+
edit: string;
|
|
131
|
+
delete: string;
|
|
132
|
+
};
|
|
127
133
|
createFolder: string;
|
|
128
134
|
newFolder: {
|
|
129
135
|
placeholder: string;
|
|
@@ -131,6 +137,7 @@ declare const messages: {
|
|
|
131
137
|
};
|
|
132
138
|
};
|
|
133
139
|
tagSelector: {
|
|
140
|
+
label: string;
|
|
134
141
|
placeholder: string;
|
|
135
142
|
removeTag: string;
|
|
136
143
|
hideAllTags: string;
|
|
@@ -29,6 +29,10 @@ var titleTemplate = ' - NDLA';
|
|
|
29
29
|
|
|
30
30
|
var messages = _objectSpread(_objectSpread({
|
|
31
31
|
treeStructure: {
|
|
32
|
+
folderChildOptions: {
|
|
33
|
+
edit: 'Edit foldername',
|
|
34
|
+
"delete": 'Delete'
|
|
35
|
+
},
|
|
32
36
|
createFolder: 'Create folder',
|
|
33
37
|
newFolder: {
|
|
34
38
|
placeholder: 'Add foldername',
|
|
@@ -36,7 +40,8 @@ var messages = _objectSpread(_objectSpread({
|
|
|
36
40
|
}
|
|
37
41
|
},
|
|
38
42
|
tagSelector: {
|
|
39
|
-
|
|
43
|
+
label: 'Add tag',
|
|
44
|
+
placeholder: 'Enter tag name',
|
|
40
45
|
removeTag: 'Remove tag {{name}}',
|
|
41
46
|
hideAllTags: 'Hide all tags',
|
|
42
47
|
showAllTags: 'Show all tags'
|
|
@@ -318,7 +323,7 @@ var messages = _objectSpread(_objectSpread({
|
|
|
318
323
|
feide: 'This resource is accessible only to teachers who are logged in with Feide.',
|
|
319
324
|
resources: 'This is not a complete course produced by NDLA, but a collection of resources we hope you will find useful.',
|
|
320
325
|
subjectOutdated: 'This course is not updated to the current curriculum.',
|
|
321
|
-
subjectBeta: 'This course is in beta.',
|
|
326
|
+
subjectBeta: 'This course is in beta. New resources are being added continously.',
|
|
322
327
|
newVersion: 'This learning resource is not updated to the current curriculum. You can find an updated version here: ',
|
|
323
328
|
frontPageBeta: 'Revised subjects have been revised in accordance with the new curriculum that will be put into effect from August 2022. Beta versions of subjects are subjects we are still working on. We hope, however, that the learning resources available by now may come in useful already.',
|
|
324
329
|
frontPageExpired: 'Expired subjects are not being taught any longer, but it may still be possible to take exams in these subjects.',
|
|
@@ -951,6 +956,8 @@ var messages = _objectSpread(_objectSpread({
|
|
|
951
956
|
newFolderUnder: 'Create new folder under {{folderName}}',
|
|
952
957
|
myAccount: 'My account',
|
|
953
958
|
favourites: 'Favourites',
|
|
959
|
+
addToFavourites: 'Add to my favourites',
|
|
960
|
+
alreadyFavourited: 'Already in my favourites',
|
|
954
961
|
help: 'Help',
|
|
955
962
|
more: 'More options',
|
|
956
963
|
listView: 'List view',
|
|
@@ -64,6 +64,8 @@ declare const messages: {
|
|
|
64
64
|
newFolderUnder: string;
|
|
65
65
|
myAccount: string;
|
|
66
66
|
favourites: string;
|
|
67
|
+
addToFavourites: string;
|
|
68
|
+
alreadyFavourited: string;
|
|
67
69
|
help: string;
|
|
68
70
|
more: string;
|
|
69
71
|
listView: string;
|
|
@@ -124,6 +126,10 @@ declare const messages: {
|
|
|
124
126
|
help: string;
|
|
125
127
|
};
|
|
126
128
|
treeStructure: {
|
|
129
|
+
folderChildOptions: {
|
|
130
|
+
edit: string;
|
|
131
|
+
delete: string;
|
|
132
|
+
};
|
|
127
133
|
createFolder: string;
|
|
128
134
|
newFolder: {
|
|
129
135
|
placeholder: string;
|
|
@@ -131,6 +137,7 @@ declare const messages: {
|
|
|
131
137
|
};
|
|
132
138
|
};
|
|
133
139
|
tagSelector: {
|
|
140
|
+
label: string;
|
|
134
141
|
placeholder: string;
|
|
135
142
|
removeTag: string;
|
|
136
143
|
hideAllTags: string;
|
|
@@ -29,6 +29,10 @@ var titleTemplate = ' - NDLA';
|
|
|
29
29
|
|
|
30
30
|
var messages = _objectSpread(_objectSpread({
|
|
31
31
|
treeStructure: {
|
|
32
|
+
folderChildOptions: {
|
|
33
|
+
edit: 'Endre mappenavn',
|
|
34
|
+
"delete": 'Slett'
|
|
35
|
+
},
|
|
32
36
|
createFolder: 'Lag mappe',
|
|
33
37
|
newFolder: {
|
|
34
38
|
placeholder: 'Skriv navn på mappe',
|
|
@@ -36,8 +40,9 @@ var messages = _objectSpread(_objectSpread({
|
|
|
36
40
|
}
|
|
37
41
|
},
|
|
38
42
|
tagSelector: {
|
|
39
|
-
|
|
40
|
-
|
|
43
|
+
label: 'Legg til tag',
|
|
44
|
+
placeholder: 'Skriv tag navn',
|
|
45
|
+
removeTag: 'Ta vekk {{name}}',
|
|
41
46
|
hideAllTags: 'Skjul alle tagger',
|
|
42
47
|
showAllTags: 'Vis alle tagger'
|
|
43
48
|
},
|
|
@@ -318,7 +323,7 @@ var messages = _objectSpread(_objectSpread({
|
|
|
318
323
|
feide: 'Denne ressursen er bare tilgjengelig for lærere som er pålogget med Feide.',
|
|
319
324
|
resources: 'Dette er ikke et komplett læremiddel produsert av NDLA, men ei ressurssamling som vi håper kan være nyttig for deg.',
|
|
320
325
|
subjectOutdated: 'Dette faget følger en utgått læreplan.',
|
|
321
|
-
subjectBeta: 'Dette faget er i betaversjon.',
|
|
326
|
+
subjectBeta: 'Dette faget er i betaversjon. Vi fyller på med ressurser fortløpende.',
|
|
322
327
|
newVersion: 'Denne læringsressursen er ikke oppdatert etter gjeldende læreplan. Du finner en oppdatert versjon her: ',
|
|
323
328
|
frontPageBeta: 'Kommende fag er tilpassa ny læreplan som gjelder fra høsten 2022. Betafag er fag under arbeid. Vi håper likevel at læringsressursene i betafaga kan være nyttige allerede nå.',
|
|
324
329
|
frontPageExpired: 'Utgåtte fag undervises det ikke i lenger, men det kan fortsatt være mulig å ta eksamen i faga som privatist.',
|
|
@@ -951,6 +956,8 @@ var messages = _objectSpread(_objectSpread({
|
|
|
951
956
|
newFolderUnder: 'Lag ny mappe under {{folderName}}',
|
|
952
957
|
myAccount: 'Min konto',
|
|
953
958
|
favourites: 'Favoritter',
|
|
959
|
+
addToFavourites: 'Legg til i mine favoritter',
|
|
960
|
+
alreadyFavourited: 'Allerede lagt til i mine favoritter',
|
|
954
961
|
help: 'Hjelp',
|
|
955
962
|
more: 'Flere valg',
|
|
956
963
|
listView: 'Listevisning',
|
|
@@ -64,6 +64,8 @@ declare const messages: {
|
|
|
64
64
|
newFolderUnder: string;
|
|
65
65
|
myAccount: string;
|
|
66
66
|
favourites: string;
|
|
67
|
+
addToFavourites: string;
|
|
68
|
+
alreadyFavourited: string;
|
|
67
69
|
help: string;
|
|
68
70
|
more: string;
|
|
69
71
|
listView: string;
|
|
@@ -124,6 +126,10 @@ declare const messages: {
|
|
|
124
126
|
help: string;
|
|
125
127
|
};
|
|
126
128
|
treeStructure: {
|
|
129
|
+
folderChildOptions: {
|
|
130
|
+
edit: string;
|
|
131
|
+
delete: string;
|
|
132
|
+
};
|
|
127
133
|
createFolder: string;
|
|
128
134
|
newFolder: {
|
|
129
135
|
placeholder: string;
|
|
@@ -131,6 +137,7 @@ declare const messages: {
|
|
|
131
137
|
};
|
|
132
138
|
};
|
|
133
139
|
tagSelector: {
|
|
140
|
+
label: string;
|
|
134
141
|
placeholder: string;
|
|
135
142
|
removeTag: string;
|
|
136
143
|
hideAllTags: string;
|
|
@@ -29,15 +29,20 @@ var titleTemplate = ' - NDLA';
|
|
|
29
29
|
|
|
30
30
|
var messages = _objectSpread(_objectSpread({
|
|
31
31
|
treeStructure: {
|
|
32
|
+
folderChildOptions: {
|
|
33
|
+
edit: 'Endre mappenamn',
|
|
34
|
+
"delete": 'Slett'
|
|
35
|
+
},
|
|
32
36
|
createFolder: 'Lag mappe',
|
|
33
37
|
newFolder: {
|
|
34
|
-
placeholder: 'Skriv
|
|
38
|
+
placeholder: 'Skriv namn på mappe',
|
|
35
39
|
defaultName: 'Ny mappe'
|
|
36
40
|
}
|
|
37
41
|
},
|
|
38
42
|
tagSelector: {
|
|
39
|
-
|
|
40
|
-
|
|
43
|
+
label: 'Legg til tag',
|
|
44
|
+
placeholder: 'Skriv tag namn',
|
|
45
|
+
removeTag: 'Ta vekk {{name}}',
|
|
41
46
|
hideAllTags: 'Skjul alle tagger',
|
|
42
47
|
showAllTags: 'Vis alle tagger'
|
|
43
48
|
},
|
|
@@ -318,7 +323,7 @@ var messages = _objectSpread(_objectSpread({
|
|
|
318
323
|
feide: 'Denne ressursen er berre tilgjengeleg for lærarar som er pålogga med Feide.',
|
|
319
324
|
resources: 'Dette er ikkje eit komplett læremiddel produsert av NDLA, men ei ressurssamling som vi håper kan vere nyttig for deg.',
|
|
320
325
|
subjectOutdated: 'Dette faget følgjer ein utgått læreplan.',
|
|
321
|
-
subjectBeta: 'Dette faget er i betaversjon.',
|
|
326
|
+
subjectBeta: 'Dette faget er i betaversjon. Vi fyller på med ressurser fortløpande.',
|
|
322
327
|
newVersion: 'Denne læringsressursen er ikkje oppdatert etter gjeldande læreplan. Du finn ein oppdatert versjon her: ',
|
|
323
328
|
frontPageBeta: 'Kommande fag er tilpassa ny læreplan som gjeld fra hausten 2022. Betafag er fag under arbeid. Vi håper likevel at læringsressursane i betafaga kan vere nyttige allereie no.',
|
|
324
329
|
frontPageExpired: 'Utgåtte fag blir det ikkje undervist i lenger, men det kan framleis vere mogleg å ta eksamen i faget som privatist.',
|
|
@@ -951,6 +956,8 @@ var messages = _objectSpread(_objectSpread({
|
|
|
951
956
|
newFolderUnder: 'Lag ny mappe under {{folderName}}',
|
|
952
957
|
myAccount: 'Min konto',
|
|
953
958
|
favourites: 'Favorittar',
|
|
959
|
+
addToFavourites: 'Legg til i mine favorittar',
|
|
960
|
+
alreadyFavourited: 'Allereie lagt til i mine favorittar',
|
|
954
961
|
help: 'Hjelp',
|
|
955
962
|
more: 'Fleire val',
|
|
956
963
|
listView: 'Listevisning',
|
|
@@ -64,6 +64,8 @@ declare const messages: {
|
|
|
64
64
|
newFolderUnder: string;
|
|
65
65
|
myAccount: string;
|
|
66
66
|
favourites: string;
|
|
67
|
+
addToFavourites: string;
|
|
68
|
+
alreadyFavourited: string;
|
|
67
69
|
help: string;
|
|
68
70
|
more: string;
|
|
69
71
|
listView: string;
|
|
@@ -124,6 +126,10 @@ declare const messages: {
|
|
|
124
126
|
help: string;
|
|
125
127
|
};
|
|
126
128
|
treeStructure: {
|
|
129
|
+
folderChildOptions: {
|
|
130
|
+
edit: string;
|
|
131
|
+
delete: string;
|
|
132
|
+
};
|
|
127
133
|
createFolder: string;
|
|
128
134
|
newFolder: {
|
|
129
135
|
placeholder: string;
|
|
@@ -131,6 +137,7 @@ declare const messages: {
|
|
|
131
137
|
};
|
|
132
138
|
};
|
|
133
139
|
tagSelector: {
|
|
140
|
+
label: string;
|
|
134
141
|
placeholder: string;
|
|
135
142
|
removeTag: string;
|
|
136
143
|
hideAllTags: string;
|
|
@@ -29,6 +29,10 @@ var titleTemplate = ' - NDLA';
|
|
|
29
29
|
|
|
30
30
|
var messages = _objectSpread(_objectSpread({
|
|
31
31
|
treeStructure: {
|
|
32
|
+
folderChildOptions: {
|
|
33
|
+
edit: 'Endre mappenavn',
|
|
34
|
+
"delete": 'Slett'
|
|
35
|
+
},
|
|
32
36
|
createFolder: 'Lag mappe',
|
|
33
37
|
newFolder: {
|
|
34
38
|
placeholder: 'Skriv navn på mappe',
|
|
@@ -36,8 +40,9 @@ var messages = _objectSpread(_objectSpread({
|
|
|
36
40
|
}
|
|
37
41
|
},
|
|
38
42
|
tagSelector: {
|
|
39
|
-
|
|
40
|
-
|
|
43
|
+
label: 'Legg til tag',
|
|
44
|
+
placeholder: 'Skriv tag navn',
|
|
45
|
+
removeTag: 'Ta vekk {{name}}',
|
|
41
46
|
hideAllTags: 'Skjul alla tags',
|
|
42
47
|
showAllTags: 'Vis alla tags'
|
|
43
48
|
},
|
|
@@ -318,7 +323,7 @@ var messages = _objectSpread(_objectSpread({
|
|
|
318
323
|
feide: 'Denne ressursen er bare tilgjengelig for lærere som er pålogget med Feide.',
|
|
319
324
|
resources: 'Dette er ikke et komplett læremiddel produsert av NDLA, men ei ressurssamling som vi håper kan være nyttig for deg.',
|
|
320
325
|
subjectOutdated: 'Dette faget følger en utgått læreplan.',
|
|
321
|
-
subjectBeta: 'Dette faget er i betaversjon.',
|
|
326
|
+
subjectBeta: 'Dette faget er i betaversjon. Vi fyller på med ressurser fortløpende.',
|
|
322
327
|
newVersion: 'Denne læringsressursen er ikke oppdatert etter gjeldende læreplan. Du finner en oppdatert versjon her: ',
|
|
323
328
|
frontPageBeta: 'Kommende fag er tilpassa ny læreplan som gjelder fra høsten 2022. Betafag er fag under arbeid. Vi håper likevel at læringsressursene i betafaga kan være nyttige allerede nå.',
|
|
324
329
|
frontPageExpired: 'Utgåtte fag undervises det ikke i lenger, men det kan fortsatt være mulig å ta eksamen i faga som privatist.',
|
|
@@ -951,6 +956,8 @@ var messages = _objectSpread(_objectSpread({
|
|
|
951
956
|
newFolderUnder: 'Lag ny mappe under {{folderName}}',
|
|
952
957
|
myAccount: 'Min konto',
|
|
953
958
|
favourites: 'Favoritter',
|
|
959
|
+
addToFavourites: 'Legg til i mine favoritter',
|
|
960
|
+
alreadyFavourited: 'Allerede lagt til i mine favoritter',
|
|
954
961
|
help: 'Hjelp',
|
|
955
962
|
more: 'Flere valg',
|
|
956
963
|
listView: 'Listevisning',
|
|
@@ -64,6 +64,8 @@ declare const messages: {
|
|
|
64
64
|
newFolderUnder: string;
|
|
65
65
|
myAccount: string;
|
|
66
66
|
favourites: string;
|
|
67
|
+
addToFavourites: string;
|
|
68
|
+
alreadyFavourited: string;
|
|
67
69
|
help: string;
|
|
68
70
|
more: string;
|
|
69
71
|
listView: string;
|
|
@@ -124,6 +126,10 @@ declare const messages: {
|
|
|
124
126
|
help: string;
|
|
125
127
|
};
|
|
126
128
|
treeStructure: {
|
|
129
|
+
folderChildOptions: {
|
|
130
|
+
edit: string;
|
|
131
|
+
delete: string;
|
|
132
|
+
};
|
|
127
133
|
createFolder: string;
|
|
128
134
|
newFolder: {
|
|
129
135
|
placeholder: string;
|
|
@@ -131,6 +137,7 @@ declare const messages: {
|
|
|
131
137
|
};
|
|
132
138
|
};
|
|
133
139
|
tagSelector: {
|
|
140
|
+
label: string;
|
|
134
141
|
placeholder: string;
|
|
135
142
|
removeTag: string;
|
|
136
143
|
hideAllTags: string;
|
|
@@ -29,6 +29,10 @@ var titleTemplate = ' - NDLA';
|
|
|
29
29
|
|
|
30
30
|
var messages = _objectSpread(_objectSpread({
|
|
31
31
|
treeStructure: {
|
|
32
|
+
folderChildOptions: {
|
|
33
|
+
edit: 'Endre mappenavn',
|
|
34
|
+
"delete": 'Slett'
|
|
35
|
+
},
|
|
32
36
|
createFolder: 'Lag mappe',
|
|
33
37
|
newFolder: {
|
|
34
38
|
placeholder: 'Skriv navn på mappe',
|
|
@@ -36,8 +40,9 @@ var messages = _objectSpread(_objectSpread({
|
|
|
36
40
|
}
|
|
37
41
|
},
|
|
38
42
|
tagSelector: {
|
|
39
|
-
|
|
40
|
-
|
|
43
|
+
label: 'Legg til tag',
|
|
44
|
+
placeholder: 'Skriv tag navn',
|
|
45
|
+
removeTag: 'Ta vekk {{name}}',
|
|
41
46
|
hideAllTags: 'Skjul alle tagger',
|
|
42
47
|
showAllTags: 'Vis alle tagger'
|
|
43
48
|
},
|
|
@@ -318,7 +323,7 @@ var messages = _objectSpread(_objectSpread({
|
|
|
318
323
|
feide: 'Denne ressursen er bare tilgjengelig for lærere som er pålogget med Feide.',
|
|
319
324
|
resources: 'Dette er ikke et komplett læremiddel produsert av NDLA, men ei ressurssamling som vi håper kan være nyttig for deg.',
|
|
320
325
|
subjectOutdated: 'Dette faget følger en utgått læreplan.',
|
|
321
|
-
subjectBeta: 'Dette faget er i betaversjon.',
|
|
326
|
+
subjectBeta: 'Dette faget er i betaversjon. Vi fyller på med ressurser fortløpende.',
|
|
322
327
|
newVersion: 'Denne læringsressursen er ikke oppdatert etter gjeldende læreplan. Du finner en oppdatert versjon her: ',
|
|
323
328
|
frontPageBeta: 'Kommende fag er tilpassa ny læreplan som gjelder fra høsten 2022. Betafag er fag under arbeid. Vi håper likevel at læringsressursene i betafaga kan være nyttige allerede nå.',
|
|
324
329
|
frontPageExpired: 'Utgåtte fag undervises det ikke i lenger, men det kan fortsatt være mulig å ta eksamen i faga som privatist.',
|
|
@@ -951,6 +956,8 @@ var messages = _objectSpread(_objectSpread({
|
|
|
951
956
|
newFolderUnder: 'Lag ny mappe under {{folderName}}',
|
|
952
957
|
myAccount: 'Min konto',
|
|
953
958
|
favourites: 'Favoritter',
|
|
959
|
+
addToFavourites: 'Legg til i mine favoritter',
|
|
960
|
+
alreadyFavourited: 'Allerede lagt til i mine favoritter',
|
|
954
961
|
help: 'Hjelp',
|
|
955
962
|
more: 'Flere valg',
|
|
956
963
|
listView: 'Listevisning',
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@ndla/ui",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "18.0.0",
|
|
4
4
|
"description": "UI component library for NDLA.",
|
|
5
5
|
"license": "GPL-3.0",
|
|
6
6
|
"main": "lib/index.js",
|
|
@@ -31,18 +31,18 @@
|
|
|
31
31
|
"types"
|
|
32
32
|
],
|
|
33
33
|
"dependencies": {
|
|
34
|
-
"@ndla/button": "^2.
|
|
35
|
-
"@ndla/carousel": "^1.2.
|
|
36
|
-
"@ndla/core": "^2.
|
|
34
|
+
"@ndla/button": "^2.6.0",
|
|
35
|
+
"@ndla/carousel": "^1.2.11",
|
|
36
|
+
"@ndla/core": "^2.3.0",
|
|
37
37
|
"@ndla/hooks": "^1.1.4",
|
|
38
|
-
"@ndla/icons": "^1.
|
|
39
|
-
"@ndla/licenses": "^5.0.
|
|
40
|
-
"@ndla/modal": "^1.2.
|
|
41
|
-
"@ndla/notion": "^3.1.
|
|
42
|
-
"@ndla/safelink": "^2.0.
|
|
43
|
-
"@ndla/switch": "^0.1.
|
|
44
|
-
"@ndla/tabs": "^1.1.
|
|
45
|
-
"@ndla/tooltip": "^2.1.
|
|
38
|
+
"@ndla/icons": "^1.10.0",
|
|
39
|
+
"@ndla/licenses": "^5.0.2",
|
|
40
|
+
"@ndla/modal": "^1.2.12",
|
|
41
|
+
"@ndla/notion": "^3.1.17",
|
|
42
|
+
"@ndla/safelink": "^2.0.8",
|
|
43
|
+
"@ndla/switch": "^0.1.7",
|
|
44
|
+
"@ndla/tabs": "^1.1.10",
|
|
45
|
+
"@ndla/tooltip": "^2.1.2",
|
|
46
46
|
"@ndla/util": "^3.0.0",
|
|
47
47
|
"@reach/menu-button": "^0.16.2",
|
|
48
48
|
"@reach/slider": "^0.16.0",
|
|
@@ -81,5 +81,5 @@
|
|
|
81
81
|
"publishConfig": {
|
|
82
82
|
"access": "public"
|
|
83
83
|
},
|
|
84
|
-
"gitHead": "
|
|
84
|
+
"gitHead": "917673dcc652e2cbc9106b8b4c30cd393c00cff5"
|
|
85
85
|
}
|
package/src/Article/Article.tsx
CHANGED
|
@@ -24,7 +24,7 @@ import LayoutItem from '../Layout';
|
|
|
24
24
|
import ArticleHeaderWrapper from './ArticleHeaderWrapper';
|
|
25
25
|
import ArticleNotions, { NotionRelatedContent } from './ArticleNotions';
|
|
26
26
|
import ArticleAccessMessage from './ArticleAccessMessage';
|
|
27
|
-
import MessageBox from '../
|
|
27
|
+
import MessageBox from '../Messages/MessageBox';
|
|
28
28
|
import { ConceptNotionType } from '../Notion/ConceptNotion';
|
|
29
29
|
|
|
30
30
|
const classes = new BEMHelper({
|
|
@@ -23,14 +23,15 @@ export const ArticleFavoritesButton = ({ isFavorite, onToggleAddToFavorites, art
|
|
|
23
23
|
const removeFromFavoritesLabel = t('myNdla.resource.addToMyNdla');
|
|
24
24
|
const addToFavoritesLabel = t('myNdla.resource.addedToMyNdla');
|
|
25
25
|
return (
|
|
26
|
-
<Tooltip tooltip={isFavorite ?
|
|
26
|
+
<Tooltip tooltip={isFavorite ? addToFavoritesLabel : removeFromFavoritesLabel}>
|
|
27
27
|
<IconButtonDualStates
|
|
28
|
-
ariaLabelActive={
|
|
29
|
-
ariaLabelInActive={
|
|
28
|
+
ariaLabelActive={t('myNdla.addToFavourites')}
|
|
29
|
+
ariaLabelInActive={t('myNdla.alreadyFavourited')}
|
|
30
30
|
activeIcon={<Heart />}
|
|
31
31
|
inactiveIcon={<HeartOutline />}
|
|
32
32
|
active={isFavorite}
|
|
33
33
|
size="small"
|
|
34
|
+
ghostPill
|
|
34
35
|
onClick={() => onToggleAddToFavorites(articleId, !isFavorite)}
|
|
35
36
|
/>
|
|
36
37
|
</Tooltip>
|
|
@@ -18,7 +18,7 @@ import {
|
|
|
18
18
|
} from '@ndla/icons/action';
|
|
19
19
|
import SafeLink from '@ndla/safelink';
|
|
20
20
|
import { useTranslation } from 'react-i18next';
|
|
21
|
-
import MessageBoxTag from '../
|
|
21
|
+
import MessageBoxTag from '../Messages/MessageBoxTag';
|
|
22
22
|
import { useMastheadHeight } from '../Masthead';
|
|
23
23
|
|
|
24
24
|
type WrapperProps = {
|
|
@@ -4,7 +4,7 @@ import { useTranslation } from 'react-i18next';
|
|
|
4
4
|
import Tabs from '@ndla/tabs';
|
|
5
5
|
import SafeLink from '@ndla/safelink';
|
|
6
6
|
import { colors, fonts, mq, breakpoints } from '@ndla/core';
|
|
7
|
-
import { MessageBox } from '../
|
|
7
|
+
import { MessageBox } from '../Messages';
|
|
8
8
|
// @ts-ignore
|
|
9
9
|
import { ToggleItem } from '../Filter';
|
|
10
10
|
|
|
@@ -10,7 +10,7 @@ import React, { ReactNode, useEffect, useRef } from 'react';
|
|
|
10
10
|
import BEMHelper from 'react-bem-helper';
|
|
11
11
|
import { WithTranslation, withTranslation } from 'react-i18next';
|
|
12
12
|
import { DisplayOnPageYOffset } from '../Animation';
|
|
13
|
-
import {
|
|
13
|
+
import { MessageBanner } from '../Messages';
|
|
14
14
|
|
|
15
15
|
const classes = new BEMHelper({
|
|
16
16
|
name: 'masthead',
|
|
@@ -95,12 +95,9 @@ export const Masthead = ({
|
|
|
95
95
|
)}
|
|
96
96
|
<div id="masthead" {...classes('', { fixed: !!fixed, infoContent: !!infoContent, ndlaFilm: !!ndlaFilm })}>
|
|
97
97
|
{messages?.map((message) => (
|
|
98
|
-
<
|
|
99
|
-
type={MessageBoxType.masthead}
|
|
100
|
-
showCloseButton={message.closable}
|
|
101
|
-
onClose={() => onCloseAlert?.(message.number)}>
|
|
98
|
+
<MessageBanner showCloseButton={message.closable} onClose={() => onCloseAlert?.(message.number)}>
|
|
102
99
|
{message.content}
|
|
103
|
-
</
|
|
100
|
+
</MessageBanner>
|
|
104
101
|
))}
|
|
105
102
|
{infoContent && (
|
|
106
103
|
<DisplayOnPageYOffset yOffsetMin={0} yOffsetMax={90}>
|
|
@@ -0,0 +1,66 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Copyright (c) 2022-present, NDLA.
|
|
3
|
+
*
|
|
4
|
+
* This source code is licensed under the GPLv3 license found in the
|
|
5
|
+
* LICENSE file in the root directory of this source tree.
|
|
6
|
+
*
|
|
7
|
+
*/
|
|
8
|
+
|
|
9
|
+
import React from 'react';
|
|
10
|
+
import styled from '@emotion/styled';
|
|
11
|
+
import { colors, spacing } from '@ndla/core';
|
|
12
|
+
// @ts-ignore
|
|
13
|
+
import { Remarkable } from 'remarkable';
|
|
14
|
+
import { CloseButton } from '@ndla/button';
|
|
15
|
+
|
|
16
|
+
interface WrapperProps {
|
|
17
|
+
small?: boolean;
|
|
18
|
+
}
|
|
19
|
+
|
|
20
|
+
const MessageBannerWrapper = styled.div<WrapperProps>`
|
|
21
|
+
display: grid;
|
|
22
|
+
grid-template-areas: '. content closebutton';
|
|
23
|
+
grid-template-columns: minmax(30px, 1fr) minmax(0, auto) minmax(30px, 1fr);
|
|
24
|
+
padding: ${({ small }) => (small ? spacing.xxsmall : spacing.small)};
|
|
25
|
+
background: ${colors.support.yellowLight};
|
|
26
|
+
color: ${colors.brand.greyDark};
|
|
27
|
+
border: none;
|
|
28
|
+
`;
|
|
29
|
+
|
|
30
|
+
const TextWrapper = styled.div`
|
|
31
|
+
display: flex;
|
|
32
|
+
grid-area: content;
|
|
33
|
+
align-items: center;
|
|
34
|
+
& p {
|
|
35
|
+
margin: 0;
|
|
36
|
+
}
|
|
37
|
+
`;
|
|
38
|
+
|
|
39
|
+
const StyledClosebutton = styled(CloseButton)`
|
|
40
|
+
grid-area: closebutton;
|
|
41
|
+
padding: 0;
|
|
42
|
+
justify-self: flex-end;
|
|
43
|
+
align-self: flex-start;
|
|
44
|
+
`;
|
|
45
|
+
|
|
46
|
+
interface Props {
|
|
47
|
+
small?: boolean;
|
|
48
|
+
children?: string;
|
|
49
|
+
showCloseButton?: boolean;
|
|
50
|
+
onClose?: () => void;
|
|
51
|
+
}
|
|
52
|
+
|
|
53
|
+
const markdown = new Remarkable({ breaks: true });
|
|
54
|
+
markdown.inline.ruler.enable(['sub', 'sup']);
|
|
55
|
+
markdown.block.ruler.disable(['list', 'table']);
|
|
56
|
+
|
|
57
|
+
const MessageBanner = ({ children, onClose, showCloseButton, small }: Props) => {
|
|
58
|
+
return (
|
|
59
|
+
<MessageBannerWrapper small={small}>
|
|
60
|
+
<TextWrapper dangerouslySetInnerHTML={{ __html: markdown.render(children) }} />
|
|
61
|
+
{showCloseButton && <StyledClosebutton onClick={onClose} />}
|
|
62
|
+
</MessageBannerWrapper>
|
|
63
|
+
);
|
|
64
|
+
};
|
|
65
|
+
|
|
66
|
+
export default MessageBanner;
|