From b69341ecb2fe3a05f899eaa2e8f8b41cbe550bfc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= Date: Fri, 26 Jan 2024 12:00:26 +0100 Subject: [PATCH] MOBILE-4456 course: Add new 4.4 activity icons --- src/assets/img/mod/assign.svg | 2 +- src/assets/img/mod/bigbluebuttonbn.svg | 2 +- src/assets/img/mod/book.svg | 2 +- src/assets/img/mod/chat.svg | 2 +- src/assets/img/mod/choice.svg | 2 +- src/assets/img/mod/data.svg | 2 +- src/assets/img/mod/external-tool.svg | 2 +- src/assets/img/mod/feedback.svg | 2 +- src/assets/img/mod/folder.svg | 2 +- src/assets/img/mod/forum.svg | 2 +- src/assets/img/mod/glossary.svg | 2 +- src/assets/img/mod/h5pactivity.svg | 2 +- src/assets/img/mod/imscp.svg | 2 +- src/assets/img/mod/label.svg | 2 +- src/assets/img/mod/lesson.svg | 2 +- src/assets/img/mod/lti.svg | 2 +- src/assets/img/mod/page.svg | 2 +- src/assets/img/mod/quiz.svg | 2 +- src/assets/img/mod/resource.svg | 2 +- src/assets/img/mod/scorm.svg | 2 +- src/assets/img/mod/survey.svg | 2 +- src/assets/img/mod/url.svg | 2 +- src/assets/img/mod/wiki.svg | 2 +- src/assets/img/mod/workshop.svg | 2 +- src/assets/img/mod_40/assign.svg | 1 + src/assets/img/mod_40/bigbluebuttonbn.svg | 1 + src/assets/img/mod_40/book.svg | 1 + src/assets/img/mod_40/chat.svg | 1 + src/assets/img/mod_40/choice.svg | 1 + src/assets/img/mod_40/data.svg | 1 + src/assets/img/mod_40/external-tool.svg | 1 + src/assets/img/mod_40/feedback.svg | 1 + src/assets/img/mod_40/folder.svg | 1 + src/assets/img/mod_40/forum.svg | 1 + src/assets/img/mod_40/glossary.svg | 1 + src/assets/img/mod_40/h5pactivity.svg | 1 + src/assets/img/mod_40/imscp.svg | 1 + src/assets/img/mod_40/label.svg | 1 + src/assets/img/mod_40/lesson.svg | 1 + src/assets/img/mod_40/lti.svg | 1 + src/assets/img/mod_40/page.svg | 1 + src/assets/img/mod_40/quiz.svg | 1 + src/assets/img/mod_40/resource.svg | 1 + src/assets/img/mod_40/scorm.svg | 1 + src/assets/img/mod_40/survey.svg | 1 + src/assets/img/mod_40/url.svg | 1 + src/assets/img/mod_40/wiki.svg | 1 + src/assets/img/mod_40/workshop.svg | 1 + src/core/components/mod-icon/mod-icon.ts | 6 +---- src/core/features/course/services/course.ts | 25 ++++++++++++++++----- 50 files changed, 69 insertions(+), 34 deletions(-) create mode 100644 src/assets/img/mod_40/assign.svg create mode 100644 src/assets/img/mod_40/bigbluebuttonbn.svg create mode 100644 src/assets/img/mod_40/book.svg create mode 100644 src/assets/img/mod_40/chat.svg create mode 100644 src/assets/img/mod_40/choice.svg create mode 100644 src/assets/img/mod_40/data.svg create mode 100644 src/assets/img/mod_40/external-tool.svg create mode 100644 src/assets/img/mod_40/feedback.svg create mode 100644 src/assets/img/mod_40/folder.svg create mode 100644 src/assets/img/mod_40/forum.svg create mode 100644 src/assets/img/mod_40/glossary.svg create mode 100644 src/assets/img/mod_40/h5pactivity.svg create mode 100644 src/assets/img/mod_40/imscp.svg create mode 100644 src/assets/img/mod_40/label.svg create mode 100644 src/assets/img/mod_40/lesson.svg create mode 100644 src/assets/img/mod_40/lti.svg create mode 100644 src/assets/img/mod_40/page.svg create mode 100644 src/assets/img/mod_40/quiz.svg create mode 100644 src/assets/img/mod_40/resource.svg create mode 100644 src/assets/img/mod_40/scorm.svg create mode 100644 src/assets/img/mod_40/survey.svg create mode 100644 src/assets/img/mod_40/url.svg create mode 100644 src/assets/img/mod_40/wiki.svg create mode 100644 src/assets/img/mod_40/workshop.svg diff --git a/src/assets/img/mod/assign.svg b/src/assets/img/mod/assign.svg index 6721bd13a..0b4d78333 100644 --- a/src/assets/img/mod/assign.svg +++ b/src/assets/img/mod/assign.svg @@ -1 +1 @@ - + diff --git a/src/assets/img/mod/bigbluebuttonbn.svg b/src/assets/img/mod/bigbluebuttonbn.svg index e5e0e91a6..13cf8581b 100644 --- a/src/assets/img/mod/bigbluebuttonbn.svg +++ b/src/assets/img/mod/bigbluebuttonbn.svg @@ -1 +1 @@ - + diff --git a/src/assets/img/mod/book.svg b/src/assets/img/mod/book.svg index 3c43cad61..e99a62f47 100644 --- a/src/assets/img/mod/book.svg +++ b/src/assets/img/mod/book.svg @@ -1 +1 @@ - + diff --git a/src/assets/img/mod/chat.svg b/src/assets/img/mod/chat.svg index f6ec94d25..54087a7b9 100644 --- a/src/assets/img/mod/chat.svg +++ b/src/assets/img/mod/chat.svg @@ -1 +1 @@ - + diff --git a/src/assets/img/mod/choice.svg b/src/assets/img/mod/choice.svg index e81b8f5c5..3506f7a46 100644 --- a/src/assets/img/mod/choice.svg +++ b/src/assets/img/mod/choice.svg @@ -1 +1 @@ - + diff --git a/src/assets/img/mod/data.svg b/src/assets/img/mod/data.svg index 66f3a996b..677bdfef0 100644 --- a/src/assets/img/mod/data.svg +++ b/src/assets/img/mod/data.svg @@ -1 +1 @@ - + diff --git a/src/assets/img/mod/external-tool.svg b/src/assets/img/mod/external-tool.svg index ff362e431..8a0148259 100644 --- a/src/assets/img/mod/external-tool.svg +++ b/src/assets/img/mod/external-tool.svg @@ -1 +1 @@ - + diff --git a/src/assets/img/mod/feedback.svg b/src/assets/img/mod/feedback.svg index 7fa5f02c5..0d212e239 100644 --- a/src/assets/img/mod/feedback.svg +++ b/src/assets/img/mod/feedback.svg @@ -1 +1 @@ - + diff --git a/src/assets/img/mod/folder.svg b/src/assets/img/mod/folder.svg index 9ad8f814f..a77d266bd 100644 --- a/src/assets/img/mod/folder.svg +++ b/src/assets/img/mod/folder.svg @@ -1 +1 @@ - + diff --git a/src/assets/img/mod/forum.svg b/src/assets/img/mod/forum.svg index c1dbbb7ee..e40826c65 100644 --- a/src/assets/img/mod/forum.svg +++ b/src/assets/img/mod/forum.svg @@ -1 +1 @@ - + diff --git a/src/assets/img/mod/glossary.svg b/src/assets/img/mod/glossary.svg index e77fa85ad..543d9e9bb 100644 --- a/src/assets/img/mod/glossary.svg +++ b/src/assets/img/mod/glossary.svg @@ -1 +1 @@ - + diff --git a/src/assets/img/mod/h5pactivity.svg b/src/assets/img/mod/h5pactivity.svg index 0dddac960..efdbf3376 100644 --- a/src/assets/img/mod/h5pactivity.svg +++ b/src/assets/img/mod/h5pactivity.svg @@ -1 +1 @@ - + diff --git a/src/assets/img/mod/imscp.svg b/src/assets/img/mod/imscp.svg index 87f31fd32..148b2a22d 100644 --- a/src/assets/img/mod/imscp.svg +++ b/src/assets/img/mod/imscp.svg @@ -1 +1 @@ - + diff --git a/src/assets/img/mod/label.svg b/src/assets/img/mod/label.svg index 49db2f821..90954192c 100644 --- a/src/assets/img/mod/label.svg +++ b/src/assets/img/mod/label.svg @@ -1 +1 @@ - + diff --git a/src/assets/img/mod/lesson.svg b/src/assets/img/mod/lesson.svg index 12d1824e7..301d7efe3 100644 --- a/src/assets/img/mod/lesson.svg +++ b/src/assets/img/mod/lesson.svg @@ -1 +1 @@ - + diff --git a/src/assets/img/mod/lti.svg b/src/assets/img/mod/lti.svg index ff362e431..8a0148259 100644 --- a/src/assets/img/mod/lti.svg +++ b/src/assets/img/mod/lti.svg @@ -1 +1 @@ - + diff --git a/src/assets/img/mod/page.svg b/src/assets/img/mod/page.svg index 0a202805e..742fc783d 100644 --- a/src/assets/img/mod/page.svg +++ b/src/assets/img/mod/page.svg @@ -1 +1 @@ - + diff --git a/src/assets/img/mod/quiz.svg b/src/assets/img/mod/quiz.svg index 04aaadfc8..3cf45e83f 100644 --- a/src/assets/img/mod/quiz.svg +++ b/src/assets/img/mod/quiz.svg @@ -1 +1 @@ - + diff --git a/src/assets/img/mod/resource.svg b/src/assets/img/mod/resource.svg index e123e7470..a67145fe6 100644 --- a/src/assets/img/mod/resource.svg +++ b/src/assets/img/mod/resource.svg @@ -1 +1 @@ - + diff --git a/src/assets/img/mod/scorm.svg b/src/assets/img/mod/scorm.svg index 95d97e0dd..517cc23ef 100644 --- a/src/assets/img/mod/scorm.svg +++ b/src/assets/img/mod/scorm.svg @@ -1 +1 @@ - + diff --git a/src/assets/img/mod/survey.svg b/src/assets/img/mod/survey.svg index a99aa548f..0ea8bf840 100644 --- a/src/assets/img/mod/survey.svg +++ b/src/assets/img/mod/survey.svg @@ -1 +1 @@ - + diff --git a/src/assets/img/mod/url.svg b/src/assets/img/mod/url.svg index fe096966e..6fec97bfd 100644 --- a/src/assets/img/mod/url.svg +++ b/src/assets/img/mod/url.svg @@ -1 +1 @@ - + diff --git a/src/assets/img/mod/wiki.svg b/src/assets/img/mod/wiki.svg index 9c4ff6281..27c277461 100644 --- a/src/assets/img/mod/wiki.svg +++ b/src/assets/img/mod/wiki.svg @@ -1 +1 @@ - + diff --git a/src/assets/img/mod/workshop.svg b/src/assets/img/mod/workshop.svg index ed7652eb3..5c3c86745 100644 --- a/src/assets/img/mod/workshop.svg +++ b/src/assets/img/mod/workshop.svg @@ -1 +1 @@ - + diff --git a/src/assets/img/mod_40/assign.svg b/src/assets/img/mod_40/assign.svg new file mode 100644 index 000000000..7c70fce84 --- /dev/null +++ b/src/assets/img/mod_40/assign.svg @@ -0,0 +1 @@ + diff --git a/src/assets/img/mod_40/bigbluebuttonbn.svg b/src/assets/img/mod_40/bigbluebuttonbn.svg new file mode 100644 index 000000000..41db39941 --- /dev/null +++ b/src/assets/img/mod_40/bigbluebuttonbn.svg @@ -0,0 +1 @@ + diff --git a/src/assets/img/mod_40/book.svg b/src/assets/img/mod_40/book.svg new file mode 100644 index 000000000..8c60b140f --- /dev/null +++ b/src/assets/img/mod_40/book.svg @@ -0,0 +1 @@ + diff --git a/src/assets/img/mod_40/chat.svg b/src/assets/img/mod_40/chat.svg new file mode 100644 index 000000000..cd4657b6c --- /dev/null +++ b/src/assets/img/mod_40/chat.svg @@ -0,0 +1 @@ + diff --git a/src/assets/img/mod_40/choice.svg b/src/assets/img/mod_40/choice.svg new file mode 100644 index 000000000..005b62d13 --- /dev/null +++ b/src/assets/img/mod_40/choice.svg @@ -0,0 +1 @@ + diff --git a/src/assets/img/mod_40/data.svg b/src/assets/img/mod_40/data.svg new file mode 100644 index 000000000..b3b0d1f4d --- /dev/null +++ b/src/assets/img/mod_40/data.svg @@ -0,0 +1 @@ + diff --git a/src/assets/img/mod_40/external-tool.svg b/src/assets/img/mod_40/external-tool.svg new file mode 100644 index 000000000..18e5751d1 --- /dev/null +++ b/src/assets/img/mod_40/external-tool.svg @@ -0,0 +1 @@ + diff --git a/src/assets/img/mod_40/feedback.svg b/src/assets/img/mod_40/feedback.svg new file mode 100644 index 000000000..0a44345fe --- /dev/null +++ b/src/assets/img/mod_40/feedback.svg @@ -0,0 +1 @@ + diff --git a/src/assets/img/mod_40/folder.svg b/src/assets/img/mod_40/folder.svg new file mode 100644 index 000000000..ab0942c5e --- /dev/null +++ b/src/assets/img/mod_40/folder.svg @@ -0,0 +1 @@ + diff --git a/src/assets/img/mod_40/forum.svg b/src/assets/img/mod_40/forum.svg new file mode 100644 index 000000000..7373ed187 --- /dev/null +++ b/src/assets/img/mod_40/forum.svg @@ -0,0 +1 @@ + diff --git a/src/assets/img/mod_40/glossary.svg b/src/assets/img/mod_40/glossary.svg new file mode 100644 index 000000000..ef05d9cb7 --- /dev/null +++ b/src/assets/img/mod_40/glossary.svg @@ -0,0 +1 @@ + diff --git a/src/assets/img/mod_40/h5pactivity.svg b/src/assets/img/mod_40/h5pactivity.svg new file mode 100644 index 000000000..c6616d073 --- /dev/null +++ b/src/assets/img/mod_40/h5pactivity.svg @@ -0,0 +1 @@ + diff --git a/src/assets/img/mod_40/imscp.svg b/src/assets/img/mod_40/imscp.svg new file mode 100644 index 000000000..4bc715bc9 --- /dev/null +++ b/src/assets/img/mod_40/imscp.svg @@ -0,0 +1 @@ + diff --git a/src/assets/img/mod_40/label.svg b/src/assets/img/mod_40/label.svg new file mode 100644 index 000000000..fdaf2b314 --- /dev/null +++ b/src/assets/img/mod_40/label.svg @@ -0,0 +1 @@ + diff --git a/src/assets/img/mod_40/lesson.svg b/src/assets/img/mod_40/lesson.svg new file mode 100644 index 000000000..3a384db60 --- /dev/null +++ b/src/assets/img/mod_40/lesson.svg @@ -0,0 +1 @@ + diff --git a/src/assets/img/mod_40/lti.svg b/src/assets/img/mod_40/lti.svg new file mode 100644 index 000000000..18e5751d1 --- /dev/null +++ b/src/assets/img/mod_40/lti.svg @@ -0,0 +1 @@ + diff --git a/src/assets/img/mod_40/page.svg b/src/assets/img/mod_40/page.svg new file mode 100644 index 000000000..1cda47d15 --- /dev/null +++ b/src/assets/img/mod_40/page.svg @@ -0,0 +1 @@ + diff --git a/src/assets/img/mod_40/quiz.svg b/src/assets/img/mod_40/quiz.svg new file mode 100644 index 000000000..ac4220539 --- /dev/null +++ b/src/assets/img/mod_40/quiz.svg @@ -0,0 +1 @@ + diff --git a/src/assets/img/mod_40/resource.svg b/src/assets/img/mod_40/resource.svg new file mode 100644 index 000000000..eeb98b598 --- /dev/null +++ b/src/assets/img/mod_40/resource.svg @@ -0,0 +1 @@ + diff --git a/src/assets/img/mod_40/scorm.svg b/src/assets/img/mod_40/scorm.svg new file mode 100644 index 000000000..4a98b13a7 --- /dev/null +++ b/src/assets/img/mod_40/scorm.svg @@ -0,0 +1 @@ + diff --git a/src/assets/img/mod_40/survey.svg b/src/assets/img/mod_40/survey.svg new file mode 100644 index 000000000..a2eeb5b5f --- /dev/null +++ b/src/assets/img/mod_40/survey.svg @@ -0,0 +1 @@ + diff --git a/src/assets/img/mod_40/url.svg b/src/assets/img/mod_40/url.svg new file mode 100644 index 000000000..c029667d0 --- /dev/null +++ b/src/assets/img/mod_40/url.svg @@ -0,0 +1 @@ + diff --git a/src/assets/img/mod_40/wiki.svg b/src/assets/img/mod_40/wiki.svg new file mode 100644 index 000000000..ff2435cb2 --- /dev/null +++ b/src/assets/img/mod_40/wiki.svg @@ -0,0 +1 @@ + diff --git a/src/assets/img/mod_40/workshop.svg b/src/assets/img/mod_40/workshop.svg new file mode 100644 index 000000000..25a60d834 --- /dev/null +++ b/src/assets/img/mod_40/workshop.svg @@ -0,0 +1 @@ + diff --git a/src/core/components/mod-icon/mod-icon.ts b/src/core/components/mod-icon/mod-icon.ts index d35294ff7..db317f61b 100644 --- a/src/core/components/mod-icon/mod-icon.ts +++ b/src/core/components/mod-icon/mod-icon.ts @@ -116,11 +116,7 @@ export class CoreModIconComponent implements OnInit, OnChanges { ? fallbackModName : this.modname; - let path = assetsPath + 'mod/'; - if (this.legacyIcon) { - // @deprecatedonmoodle since 3.11. - path = assetsPath + 'mod_legacy/'; - } + const path = CoreCourse.getModuleIconsPath(); this.icon = path + moduleName + '.svg'; this.noFilter = await this.getIconNoFilter(); diff --git a/src/core/features/course/services/course.ts b/src/core/features/course/services/course.ts index 23cea44b1..d6de7ab10 100644 --- a/src/core/features/course/services/course.ts +++ b/src/core/features/course/services/course.ts @@ -832,16 +832,31 @@ export class CoreCourseProvider { moduleName = 'external-tool'; } - let path = 'assets/img/mod/'; - if (!CoreSites.getCurrentSite()?.isVersionGreaterEqualThan('4.0')) { - // @deprecatedonmoodle since 3.11. - path = 'assets/img/mod_legacy/'; - } + const path = this.getModuleIconsPath(); // Use default icon on core modules. return path + moduleName + '.svg'; } + /** + * Get the path where the module icons are stored. + * + * @returns Path. + */ + getModuleIconsPath(): string { + if (!CoreSites.getCurrentSite()?.isVersionGreaterEqualThan('4.0')) { + // @deprecatedonmoodle since 3.11. + return 'assets/img/mod_legacy/'; + } + + if (!CoreSites.getCurrentSite()?.isVersionGreaterEqualThan('4.4')) { + // @deprecatedonmoodle since 4.3. + return 'assets/img/mod_40/'; + } + + return 'assets/img/mod/'; + } + /** * Return a specific section. *